@@ -26,7 +26,11 @@ import { ServerConfig } from "../../config.ts";
2626import { ANTIGRAVITY_SIGN_IN_REQUIRED_MESSAGE } from "../antigravityAuthSupport.ts" ;
2727import type { AcpSessionRuntimeEvent } from "../acp/AcpSessionRuntime.ts" ;
2828import { makeAntigravityAcpRuntime } from "../acp/AntigravityAcpSupport.ts" ;
29- import { parseSessionUpdateEvent } from "../acp/AcpRuntimeModel.ts" ;
29+ import {
30+ mergeToolCallState ,
31+ parseSessionUpdateEvent ,
32+ type AcpToolCallState ,
33+ } from "../acp/AcpRuntimeModel.ts" ;
3034import { makeAntigravityAdapter , type AntigravityAdapterOptions } from "./AntigravityAdapter.ts" ;
3135
3236const instanceId = ProviderInstanceId . make ( "antigravity-test" ) ;
@@ -55,12 +59,13 @@ function nativeToolUpdate(
5559 AcpSchema . SessionNotification [ "update" ] ,
5660 { sessionUpdate : "tool_call" | "tool_call_update" }
5761 > ,
62+ previous ?: AcpToolCallState ,
5863) {
5964 const event = parseSessionUpdateEvent ( { sessionId : nativeSessionId , update } ) . events . find (
6065 ( event ) => event . _tag === "ToolCallUpdated" ,
6166 ) ;
6267 if ( ! event ) throw new Error ( "Expected a native tool update" ) ;
63- return event ;
68+ return { ... event , toolCall : mergeToolCallState ( previous , event . toolCall ) } ;
6469}
6570
6671const makeHarness = Effect . fn ( "makeAntigravityAdapterHarness" ) ( function * ( options ?: {
@@ -903,6 +908,135 @@ it.layer(layer)("AntigravityAdapter", (it) => {
903908 } ) ,
904909 ) ;
905910
911+ for ( const settlement of [ "cancelled" , "interrupted" , "completed" ] as const ) {
912+ it . effect ( `does not reopen a ${ settlement } subagent on late merged updates` , ( ) =>
913+ Effect . gen ( function * ( ) {
914+ const h = yield * makeHarness ( ) ;
915+ yield * h . adapter . startSession ( {
916+ threadId,
917+ cwd : process . cwd ( ) ,
918+ runtimeMode : "approval-required" ,
919+ } ) ;
920+ const first = yield * h . adapter
921+ . sendTurn ( { threadId, input : "Start review" } )
922+ . pipe ( Effect . forkChild ) ;
923+ const firstPrompt = yield * h . nextPrompt ;
924+ const started = nativeToolUpdate ( {
925+ sessionUpdate : "tool_call" ,
926+ toolCallId : "old:4" ,
927+ title : "Running start_subagent" ,
928+ kind : "other" ,
929+ status : "in_progress" ,
930+ rawInput : { } ,
931+ } ) ;
932+ yield * h . emitNative ( started ) ;
933+ yield * h . waitForEvent ( ( event ) => event . type === "task.progress" ) ;
934+ if ( settlement === "cancelled" ) {
935+ yield * h . adapter . interruptTurn ( threadId ) ;
936+ } else {
937+ if ( settlement === "completed" ) {
938+ yield * h . emitNative (
939+ nativeToolUpdate (
940+ {
941+ sessionUpdate : "tool_call_update" ,
942+ toolCallId : "old:4" ,
943+ status : "completed" ,
944+ rawOutput : "Original result." ,
945+ } ,
946+ started . toolCall ,
947+ ) ,
948+ ) ;
949+ }
950+ yield * Deferred . succeed ( firstPrompt . result , { stopReason : "end_turn" } ) ;
951+ }
952+ yield * Fiber . join ( first ) ;
953+ yield * h . waitForEvent ( ( event ) => event . type === "turn.completed" ) ;
954+ const second = yield * h . adapter
955+ . sendTurn ( { threadId, input : "Next review" } )
956+ . pipe ( Effect . forkChild ) ;
957+ const secondPrompt = yield * h . nextPrompt ;
958+ for ( const status of [ "in_progress" , "completed" ] as const ) {
959+ yield * h . emitNative (
960+ nativeToolUpdate (
961+ {
962+ sessionUpdate : "tool_call_update" ,
963+ toolCallId : "old:4" ,
964+ status,
965+ rawOutput : "Late result." ,
966+ } ,
967+ started . toolCall ,
968+ ) ,
969+ ) ;
970+ }
971+ yield * h . emitNative (
972+ nativeToolUpdate ( {
973+ sessionUpdate : "tool_call" ,
974+ toolCallId : "new:4" ,
975+ title : "Running start_subagent" ,
976+ kind : "other" ,
977+ status : "completed" ,
978+ rawOutput : "New result." ,
979+ } ) ,
980+ ) ;
981+ const completed = yield * h . waitForEvent ( ( event ) => event . type === "task.completed" ) ;
982+ expect ( completed . payload . taskId ) . toBe ( "new:4" ) ;
983+ yield * Deferred . succeed ( secondPrompt . result , { stopReason : "end_turn" } ) ;
984+ yield * Fiber . join ( second ) ;
985+ yield * h . waitForEvent ( ( event ) => event . type === "turn.completed" ) ;
986+ expect ( h . seen . filter ( ( event ) => event . type === "task.progress" ) ) . toHaveLength ( 1 ) ;
987+ expect (
988+ h . seen . filter (
989+ ( event ) => event . type === "task.completed" && event . payload . taskId === "old:4" ,
990+ ) ,
991+ ) . toHaveLength ( settlement === "completed" ? 1 : 0 ) ;
992+ } ) ,
993+ ) ;
994+ }
995+
996+ it . effect ( "keeps MCP identity when later updates omit metadata" , ( ) =>
997+ Effect . gen ( function * ( ) {
998+ const h = yield * makeHarness ( ) ;
999+ yield * h . adapter . startSession ( {
1000+ threadId,
1001+ cwd : process . cwd ( ) ,
1002+ runtimeMode : "approval-required" ,
1003+ } ) ;
1004+ const sending = yield * h . adapter
1005+ . sendTurn ( { threadId, input : "Run an MCP tool" } )
1006+ . pipe ( Effect . forkChild ) ;
1007+ const prompt = yield * h . nextPrompt ;
1008+ const started = nativeToolUpdate ( {
1009+ sessionUpdate : "tool_call" ,
1010+ toolCallId : "mcp-4" ,
1011+ title : "Running start_subagent" ,
1012+ kind : "other" ,
1013+ status : "in_progress" ,
1014+ rawInput : { arguments : { } } ,
1015+ _meta : { is_mcp_tool_call : true } ,
1016+ } ) ;
1017+ yield * h . emitNative ( started ) ;
1018+ for ( const status of [ "in_progress" , "completed" ] as const ) {
1019+ yield * h . emitNative (
1020+ nativeToolUpdate (
1021+ {
1022+ sessionUpdate : "tool_call_update" ,
1023+ toolCallId : "mcp-4" ,
1024+ status,
1025+ rawOutput : "MCP output." ,
1026+ } ,
1027+ started . toolCall ,
1028+ ) ,
1029+ ) ;
1030+ }
1031+ yield * Deferred . succeed ( prompt . result , { stopReason : "end_turn" } ) ;
1032+ yield * Fiber . join ( sending ) ;
1033+ yield * h . waitForEvent ( ( event ) => event . type === "turn.completed" ) ;
1034+ expect ( h . seen . filter ( ( event ) => event . type . startsWith ( "task." ) ) ) . toHaveLength ( 0 ) ;
1035+ expect ( h . seen . filter ( ( event ) => event . type === "item.updated" ) ) . toHaveLength ( 2 ) ;
1036+ expect ( h . seen . filter ( ( event ) => event . type === "item.completed" ) ) . toHaveLength ( 1 ) ;
1037+ } ) ,
1038+ ) ;
1039+
9061040 it . effect ( "shows pending subagents and closes a denied invocation" , ( ) =>
9071041 Effect . gen ( function * ( ) {
9081042 const h = yield * makeHarness ( ) ;
0 commit comments