@yu_robotics/remote-cli 1.6.263 → 1.6.265
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +41 -0
- package/dist/client/MessageHandler.d.ts +12 -2
- package/dist/client/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +320 -168
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/client/WebSocketClient.d.ts.map +1 -1
- package/dist/client/WebSocketClient.js +1 -0
- package/dist/client/WebSocketClient.js.map +1 -1
- package/dist/delegation/piExtension.js +1 -1
- package/dist/delegation/piExtension.js.map +1 -1
- package/dist/executor/AcpExecutor.d.ts +11 -4
- package/dist/executor/AcpExecutor.d.ts.map +1 -1
- package/dist/executor/AcpExecutor.js +64 -11
- package/dist/executor/AcpExecutor.js.map +1 -1
- package/dist/executor/AgyExecutor.d.ts +6 -0
- package/dist/executor/AgyExecutor.d.ts.map +1 -1
- package/dist/executor/AgyExecutor.js +126 -9
- package/dist/executor/AgyExecutor.js.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts +5 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.js +81 -17
- package/dist/executor/ClaudePersistentExecutor.js.map +1 -1
- package/dist/executor/CodexAppServerClient.d.ts +1 -1
- package/dist/executor/CodexAppServerClient.d.ts.map +1 -1
- package/dist/executor/CodexAppServerClient.js +8 -2
- package/dist/executor/CodexAppServerClient.js.map +1 -1
- package/dist/executor/CodexAppServerExecutor.d.ts +3 -1
- package/dist/executor/CodexAppServerExecutor.d.ts.map +1 -1
- package/dist/executor/CodexAppServerExecutor.js +67 -22
- package/dist/executor/CodexAppServerExecutor.js.map +1 -1
- package/dist/executor/DshExecutor.d.ts +2 -0
- package/dist/executor/DshExecutor.d.ts.map +1 -1
- package/dist/executor/DshExecutor.js +26 -6
- package/dist/executor/DshExecutor.js.map +1 -1
- package/dist/executor/IExecutor.d.ts +4 -0
- package/dist/executor/IExecutor.d.ts.map +1 -1
- package/dist/executor/PiExecutor.d.ts +2 -0
- package/dist/executor/PiExecutor.d.ts.map +1 -1
- package/dist/executor/PiExecutor.js +96 -23
- package/dist/executor/PiExecutor.js.map +1 -1
- package/dist/executor/acp/AcpClient.d.ts +4 -3
- package/dist/executor/acp/AcpClient.d.ts.map +1 -1
- package/dist/executor/acp/AcpClient.js +18 -2
- package/dist/executor/acp/AcpClient.js.map +1 -1
- package/dist/executor/agy/AgyAcpRuntime.d.ts +12 -1
- package/dist/executor/agy/AgyAcpRuntime.d.ts.map +1 -1
- package/dist/executor/agy/AgyAcpRuntime.js +125 -11
- package/dist/executor/agy/AgyAcpRuntime.js.map +1 -1
- package/dist/executor/agy/AgyChatHost.d.ts +4 -1
- package/dist/executor/agy/AgyChatHost.d.ts.map +1 -1
- package/dist/executor/agy/AgyChatHost.js +3 -2
- package/dist/executor/agy/AgyChatHost.js.map +1 -1
- package/dist/executor/agy/AgySessionSelection.d.ts +3 -0
- package/dist/executor/agy/AgySessionSelection.d.ts.map +1 -1
- package/dist/executor/agy/AgySessionSelection.js +24 -0
- package/dist/executor/agy/AgySessionSelection.js.map +1 -1
- package/dist/executor/dsh/DshAcpClient.d.ts +1 -1
- package/dist/executor/dsh/DshAcpClient.d.ts.map +1 -1
- package/dist/executor/dsh/DshAcpClient.js +2 -2
- package/dist/executor/dsh/DshAcpClient.js.map +1 -1
- package/dist/executor/pi/PiClient.d.ts +3 -1
- package/dist/executor/pi/PiClient.d.ts.map +1 -1
- package/dist/executor/pi/PiClient.js +15 -1
- package/dist/executor/pi/PiClient.js.map +1 -1
- package/dist/executor/pi/PiTypes.d.ts +3 -1
- package/dist/executor/pi/PiTypes.d.ts.map +1 -1
- package/dist/executor/pi/PiTypes.js.map +1 -1
- package/dist/executor/zcode/ZCodeClient.d.ts +2 -2
- package/dist/executor/zcode/ZCodeClient.d.ts.map +1 -1
- package/dist/executor/zcode/ZCodeClient.js +26 -7
- package/dist/executor/zcode/ZCodeClient.js.map +1 -1
- package/dist/maintenance/release-notes.json +1 -1
- package/dist/managed/tools.d.ts +6 -6
- package/dist/scheduling/ScheduleCapabilities.d.ts +59 -14
- package/dist/scheduling/ScheduleCapabilities.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCapabilities.js +33 -29
- package/dist/scheduling/ScheduleCapabilities.js.map +1 -1
- package/dist/scheduling/ScheduleCardService.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCardService.js +3 -1
- package/dist/scheduling/ScheduleCardService.js.map +1 -1
- package/dist/scheduling/ScheduleCleanup.d.ts +3 -2
- package/dist/scheduling/ScheduleCleanup.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCleanup.js +3 -0
- package/dist/scheduling/ScheduleCleanup.js.map +1 -1
- package/dist/scheduling/ScheduleCommand.d.ts +1 -3
- package/dist/scheduling/ScheduleCommand.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCommand.js +10 -62
- package/dist/scheduling/ScheduleCommand.js.map +1 -1
- package/dist/scheduling/ScheduleDeliveryClient.d.ts +2 -1
- package/dist/scheduling/ScheduleDeliveryClient.d.ts.map +1 -1
- package/dist/scheduling/ScheduleDeliveryClient.js +20 -8
- package/dist/scheduling/ScheduleDeliveryClient.js.map +1 -1
- package/dist/scheduling/ScheduleService.d.ts +44 -4
- package/dist/scheduling/ScheduleService.d.ts.map +1 -1
- package/dist/scheduling/ScheduleService.js +537 -72
- package/dist/scheduling/ScheduleService.js.map +1 -1
- package/dist/scheduling/ScheduleToolScope.d.ts +4 -1
- package/dist/scheduling/ScheduleToolScope.d.ts.map +1 -1
- package/dist/scheduling/ScheduleToolScope.js +14 -13
- package/dist/scheduling/ScheduleToolScope.js.map +1 -1
- package/dist/scheduling/agy/AgyHookRelay.d.ts +3 -0
- package/dist/scheduling/agy/AgyHookRelay.d.ts.map +1 -1
- package/dist/scheduling/agy/AgyHookRelay.js +15 -1
- package/dist/scheduling/agy/AgyHookRelay.js.map +1 -1
- package/dist/scheduling/agy/AgyScheduleHost.d.ts +3 -1
- package/dist/scheduling/agy/AgyScheduleHost.d.ts.map +1 -1
- package/dist/scheduling/agy/AgyScheduleHost.js +2 -2
- package/dist/scheduling/agy/AgyScheduleHost.js.map +1 -1
- package/dist/scheduling/agy/AgySessionSchedules.d.ts +1 -0
- package/dist/scheduling/agy/AgySessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/agy/AgySessionSchedules.js +9 -0
- package/dist/scheduling/agy/AgySessionSchedules.js.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts +2 -0
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js +11 -0
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts +3 -2
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.js +12 -4
- package/dist/scheduling/claude/ClaudeSessionSchedules.js.map +1 -1
- package/dist/scheduling/dsh/ScheduledSessionGuard.js +1 -1
- package/dist/scheduling/dsh/ScheduledSessionGuard.js.map +1 -1
- package/dist/scheduling/host/HostScheduleRule.d.ts +6 -0
- package/dist/scheduling/host/HostScheduleRule.d.ts.map +1 -0
- package/dist/scheduling/host/HostScheduleRule.js +144 -0
- package/dist/scheduling/host/HostScheduleRule.js.map +1 -0
- package/dist/scheduling/toolContract.d.ts +3 -3
- package/dist/scheduling/toolContract.js +4 -4
- package/dist/scheduling/toolContract.js.map +1 -1
- package/dist/scheduling/types.d.ts +20 -2
- package/dist/scheduling/types.d.ts.map +1 -1
- package/dist/scheduling/types.js.map +1 -1
- package/dist/types/ScheduleCards.d.ts +2 -1
- package/dist/types/ScheduleCards.d.ts.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/native/prebuilds/darwin-arm64/managed_native.node +0 -0
- package/native/prebuilds/darwin-arm64/manifest.json +1 -1
- package/native/prebuilds/darwin-x64/managed_native.node +0 -0
- package/native/prebuilds/darwin-x64/manifest.json +1 -1
- package/native/prebuilds/win32-arm64/managed_native.node +0 -0
- package/native/prebuilds/win32-arm64/manifest.json +1 -1
- package/native/prebuilds/win32-x64/managed_native.node +0 -0
- package/native/prebuilds/win32-x64/manifest.json +1 -1
- package/package.json +1 -1
|
@@ -34,11 +34,11 @@ export interface AcpTransport {
|
|
|
34
34
|
createNativeSchedule?(sessionId: string, input: import('../../scheduling/types').NativeScheduleInput, onEvent: (event: import('../../scheduling/types').NativeScheduleEvent) => void | Promise<void>, current?: () => boolean): Promise<import('../../scheduling/types').NativeScheduleHandle>;
|
|
35
35
|
initialize(): Promise<unknown>;
|
|
36
36
|
newSession(cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
37
|
-
loadSession(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
37
|
+
loadSession(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[], assertCurrent?: () => void): Promise<AcpSessionResult>;
|
|
38
38
|
/** Optional initial-control transaction; ordinary transport signatures stay compatible. */
|
|
39
39
|
newSessionWithSetup?(cwd: string, mcpServers: AcpMcpServer[] | undefined, setup: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
40
40
|
loadSessionWithSetup?(sessionId: string, cwd: string, mcpServers: AcpMcpServer[] | undefined, setup: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
41
|
-
prompt(sessionId: string, blocks: AcpContentBlock[]): Promise<{
|
|
41
|
+
prompt(sessionId: string, blocks: AcpContentBlock[], assertCurrent?: () => void): Promise<{
|
|
42
42
|
stopReason: string;
|
|
43
43
|
}>;
|
|
44
44
|
setConfigOption(sessionId: string, configId: string, value: string): Promise<AcpSessionResult>;
|
|
@@ -68,6 +68,7 @@ export declare class AcpClient implements AcpTransport {
|
|
|
68
68
|
private nextId;
|
|
69
69
|
private readonly sessionAdmissions;
|
|
70
70
|
private sessionEpoch;
|
|
71
|
+
private pinnedPromptSession?;
|
|
71
72
|
private readonly sessionSetups;
|
|
72
73
|
private destroyed;
|
|
73
74
|
private closed;
|
|
@@ -80,7 +81,7 @@ export declare class AcpClient implements AcpTransport {
|
|
|
80
81
|
loadSession(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
81
82
|
loadSessionWithSetup(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[], setup?: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
82
83
|
private prepareSession;
|
|
83
|
-
prompt(sessionId: string, blocks: AcpContentBlock[]): Promise<{
|
|
84
|
+
prompt(sessionId: string, blocks: AcpContentBlock[], assertCurrent?: () => void): Promise<{
|
|
84
85
|
stopReason: string;
|
|
85
86
|
}>;
|
|
86
87
|
setConfigOption(sessionId: string, configId: string, value: string): Promise<AcpSessionResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcpClient.d.ts","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,eAAe,EAEf,sBAAsB,EAItB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACnD,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACrD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;IAC3F,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACpD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1F;AAQD;mFACmF;AACnF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,gBAAgB,EACtD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9F,MAAM,WAAW,YAAY;IAC3B;uFACmF;IACnF,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACzD,+EAA+E;IAC/E,gBAAgB,CAAC,IAAI,MAAM,GAAG,SAAS,CAAC;IACxC,oBAAoB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,EAClG,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,wBAAwB,EAAE,oBAAoB,CAAC,CAAC;IAC3L,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChF,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AcpClient.d.ts","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,eAAe,EAEf,sBAAsB,EAItB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACnD,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACrD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;IAC3F,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACpD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1F;AAQD;mFACmF;AACnF,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,gBAAgB,EACtD,SAAS,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9F,MAAM,WAAW,YAAY;IAC3B;uFACmF;IACnF,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACzD,+EAA+E;IAC/E,gBAAgB,CAAC,IAAI,MAAM,GAAG,SAAS,CAAC;IACxC,oBAAoB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,EAClG,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,wBAAwB,EAAE,oBAAoB,CAAC,CAAC;IAC3L,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChF,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,YAAY,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChI,2FAA2F;IAC3F,mBAAmB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7H,oBAAoB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjJ,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/F,cAAc,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,OAAO,IAAI,IAAI,CAAC;IAChB,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,8BAA8B,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,8FAA8F;AAC9F,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC;AAED,qBAAa,SAAU,YAAW,YAAY;IAiB4C,OAAO,CAAC,QAAQ,CAAC,cAAc;IAhBvH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA8B;IAC3D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqC;IACrE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAqB;IACxC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAyC;IAC3E,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;gBAE3B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAmB,cAAc,UAAQ,EAAE,MAAM,GAAE,gBAAqB;IAoC9J,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAIxB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,GAAE,YAAY,EAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAInF,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,GAAE,YAAY,EAAO,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKrH,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,GAAE,YAAY,EAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAIvG,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,GAAE,YAAY,EAAO,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAKjI,cAAc;IAkDtB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAYjH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAU9F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAMnC,OAAO,IAAI,IAAI;IAkBf,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIvD,gBAAgB,IAAI,MAAM,GAAG,SAAS;IAEtC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrD,OAAO,CAAC,aAAa;IAOrB,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAIjE,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,cAAc;IAgBtB,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IA4BnE,OAAO,CAAC,mBAAmB;cAeX,uBAAuB,CACrC,EAAE,EAAE,MAAM,EACV,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAA;KAAE,GACzE,OAAO,CAAC,IAAI,CAAC;IAiChB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,cAAc;CAIvB"}
|
|
@@ -51,6 +51,7 @@ class AcpClient {
|
|
|
51
51
|
nextId = 1;
|
|
52
52
|
sessionAdmissions = new Map();
|
|
53
53
|
sessionEpoch = {};
|
|
54
|
+
pinnedPromptSession;
|
|
54
55
|
sessionSetups = new Set();
|
|
55
56
|
destroyed = false;
|
|
56
57
|
closed = false;
|
|
@@ -176,12 +177,21 @@ class AcpClient {
|
|
|
176
177
|
this.sessionSetups.delete(ticket);
|
|
177
178
|
}
|
|
178
179
|
}
|
|
179
|
-
async prompt(sessionId, blocks) {
|
|
180
|
+
async prompt(sessionId, blocks, assertCurrent) {
|
|
180
181
|
if (this.sessionSetups.size) {
|
|
181
182
|
this.sessionEpoch = {};
|
|
182
183
|
throw new Error('ACP initial session setup is still pending.');
|
|
183
184
|
}
|
|
184
|
-
|
|
185
|
+
assertCurrent?.();
|
|
186
|
+
if (assertCurrent)
|
|
187
|
+
this.pinnedPromptSession = sessionId;
|
|
188
|
+
try {
|
|
189
|
+
return await this.sendRequest('session/prompt', { sessionId, prompt: blocks });
|
|
190
|
+
}
|
|
191
|
+
finally {
|
|
192
|
+
if (assertCurrent)
|
|
193
|
+
this.pinnedPromptSession = undefined;
|
|
194
|
+
}
|
|
185
195
|
}
|
|
186
196
|
async setConfigOption(sessionId, configId, value) {
|
|
187
197
|
this.sessionEpoch = {};
|
|
@@ -328,6 +338,8 @@ class AcpClient {
|
|
|
328
338
|
if (message.method !== 'session/update')
|
|
329
339
|
return;
|
|
330
340
|
const params = message.params;
|
|
341
|
+
if (this.pinnedPromptSession && params.sessionId !== this.pinnedPromptSession)
|
|
342
|
+
return;
|
|
331
343
|
const update = params.update;
|
|
332
344
|
if (!update)
|
|
333
345
|
return;
|
|
@@ -364,6 +376,10 @@ class AcpClient {
|
|
|
364
376
|
this.sendErrorResponse(message.id, -32601, 'Method not found');
|
|
365
377
|
return;
|
|
366
378
|
}
|
|
379
|
+
if (this.pinnedPromptSession && message.params?.sessionId !== this.pinnedPromptSession) {
|
|
380
|
+
this.sendResponse(message.id, { outcome: { outcome: 'cancelled' } });
|
|
381
|
+
return;
|
|
382
|
+
}
|
|
367
383
|
void this.handlePermissionRequest(message.id, message.params);
|
|
368
384
|
}
|
|
369
385
|
async handlePermissionRequest(id, params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcpClient.js","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AcpClient.js","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,15 @@ export interface AgyAcpRuntimeOptions {
|
|
|
14
14
|
mcpServers?: AcpMcpServer[];
|
|
15
15
|
sessionId?: string;
|
|
16
16
|
worker?: boolean;
|
|
17
|
+
/** Main chat whose schedule tools create host timers only. */
|
|
18
|
+
hostScheduleChat?: boolean;
|
|
19
|
+
beforeSessionLoad?(): void;
|
|
17
20
|
saveSession(id: string): void | Promise<void>;
|
|
18
21
|
beforeAllocation?(): void;
|
|
19
22
|
beforePrompt?(): void;
|
|
20
23
|
settledPrompt?(reusable: boolean): void;
|
|
21
24
|
/** Exact local group release only; this cannot certify empty native queues. */
|
|
22
|
-
ownedSessionClosed(id: string): void;
|
|
25
|
+
ownedSessionClosed(id: string, cleanHistory?: string, unpromptedHistory?: string): void;
|
|
23
26
|
/** Persist before the native schedule tool can run, even if its receipt is lost. */
|
|
24
27
|
retainScheduleOwner(sessionId: string, hostId: string, retired: boolean): void;
|
|
25
28
|
mapTool(name: string, args: Record<string, unknown>): {
|
|
@@ -50,6 +53,9 @@ export declare class AgyAcpRuntime {
|
|
|
50
53
|
get allocationUnconfirmed(): boolean;
|
|
51
54
|
private relayFault;
|
|
52
55
|
private continuityUnsafe;
|
|
56
|
+
private hostScheduleSettled;
|
|
57
|
+
private hostScheduleUnsafe;
|
|
58
|
+
private prompted;
|
|
53
59
|
private allocatedSessionId?;
|
|
54
60
|
private active?;
|
|
55
61
|
private retained;
|
|
@@ -58,6 +64,8 @@ export declare class AgyAcpRuntime {
|
|
|
58
64
|
private latestRecords;
|
|
59
65
|
private readonly tracker;
|
|
60
66
|
private streamed;
|
|
67
|
+
private question?;
|
|
68
|
+
private answerQuestion?;
|
|
61
69
|
private callbacks;
|
|
62
70
|
constructor(options: AgyAcpRuntimeOptions);
|
|
63
71
|
get sessionId(): string | undefined;
|
|
@@ -70,11 +78,14 @@ export declare class AgyAcpRuntime {
|
|
|
70
78
|
/** Admission to retire our host, never proof that the host has already exited. */
|
|
71
79
|
get canRetireForContextReset(): boolean;
|
|
72
80
|
get running(): boolean;
|
|
81
|
+
get hostScheduleAvailable(): boolean;
|
|
73
82
|
start(): Promise<void>;
|
|
74
83
|
private open;
|
|
75
84
|
private openSession;
|
|
76
85
|
execute(prompt: string, options: ExecuteOptions): Promise<ExecuteResult>;
|
|
86
|
+
private promptWithQuestions;
|
|
77
87
|
abort(): Promise<boolean>;
|
|
88
|
+
private cancelForeground;
|
|
78
89
|
withOperation<T>(id: string, current: () => boolean, run: () => Promise<T>, inTurn: boolean): Promise<T>;
|
|
79
90
|
action(id: string): import("../../scheduling/types").NativeScheduleToolAction | undefined;
|
|
80
91
|
create(input: NativeScheduleInput, emit: (event: NativeScheduleEvent) => void | Promise<void>, current: () => boolean): Promise<NativeScheduleHandle>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgyAcpRuntime.d.ts","sourceRoot":"","sources":["../../../src/executor/agy/AgyAcpRuntime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AgyAcpRuntime.d.ts","sourceRoot":"","sources":["../../../src/executor/agy/AgyAcpRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.AgyAcpRuntime = void 0;
|
|
7
7
|
const promises_1 = __importDefault(require("fs/promises"));
|
|
8
|
+
const node_util_1 = require("node:util");
|
|
8
9
|
const AgyChatHost_1 = require("./AgyChatHost");
|
|
10
|
+
const AgySessionSelection_1 = require("./AgySessionSelection");
|
|
9
11
|
const transcript_1 = require("../../scheduling/agy/transcript");
|
|
10
12
|
const AgyPermissions_1 = require("./AgyPermissions");
|
|
11
13
|
const Activity_1 = require("../Activity");
|
|
@@ -39,6 +41,9 @@ class AgyAcpRuntime {
|
|
|
39
41
|
get allocationUnconfirmed() { return this.allocationStarted && !this.allocatedSessionId; }
|
|
40
42
|
relayFault = false;
|
|
41
43
|
continuityUnsafe = false;
|
|
44
|
+
hostScheduleSettled = false;
|
|
45
|
+
hostScheduleUnsafe = false;
|
|
46
|
+
prompted = false;
|
|
42
47
|
allocatedSessionId;
|
|
43
48
|
active;
|
|
44
49
|
retained = false;
|
|
@@ -47,6 +52,8 @@ class AgyAcpRuntime {
|
|
|
47
52
|
latestRecords = [];
|
|
48
53
|
tracker = new Activity_1.ActivityTracker();
|
|
49
54
|
streamed = '';
|
|
55
|
+
question;
|
|
56
|
+
answerQuestion;
|
|
50
57
|
callbacks;
|
|
51
58
|
constructor(options) {
|
|
52
59
|
this.options = options;
|
|
@@ -62,12 +69,22 @@ class AgyAcpRuntime {
|
|
|
62
69
|
this.tracker.emitPublicText(block.text);
|
|
63
70
|
}
|
|
64
71
|
},
|
|
72
|
+
onToolCall: (call) => {
|
|
73
|
+
if (this.question?.args && call.name === 'ask_question' && call.status === 'pending'
|
|
74
|
+
&& (0, node_util_1.isDeepStrictEqual)(this.question.args, call.rawInput))
|
|
75
|
+
this.question.pendingCall = call.toolCallId;
|
|
76
|
+
},
|
|
77
|
+
onToolResult: call => {
|
|
78
|
+
const question = this.question;
|
|
79
|
+
if (question && question.pendingCall === call.toolCallId)
|
|
80
|
+
question.pendingCall = undefined;
|
|
81
|
+
},
|
|
65
82
|
onPermissionRequest: (title, choices) => this.permissions.request(title, choices, this.active, this.options.autoApprove),
|
|
66
83
|
};
|
|
67
84
|
}
|
|
68
85
|
get sessionId() { return this.host?.sessionId ?? this.chat?.sessionId; }
|
|
69
86
|
get hasJobs() { return this.retained; }
|
|
70
|
-
get busy() { return this.settingsBusy || this.scheduleOperations > 0 || !this.closed && (!!this.active || !!this.starting || !!this.host?.schedules.busy); }
|
|
87
|
+
get busy() { return this.settingsBusy || this.scheduleOperations > 0 || !this.closed && (!!this.active || !!this.starting || !this.blocked && !!this.host?.schedules.busy); }
|
|
71
88
|
get blocked() { return this.chat?.blocked ?? this.host?.schedules.status.blocked; }
|
|
72
89
|
get reusable() {
|
|
73
90
|
return !this.continuityUnsafe && !this.blocked && !this.retained && (this.chat?.reusable ?? true)
|
|
@@ -81,6 +98,11 @@ class AgyAcpRuntime {
|
|
|
81
98
|
&& [...this.entries.values()].every(entry => entry.cancelled && entry.handle.retirementConfirmed === true));
|
|
82
99
|
}
|
|
83
100
|
get running() { return !!this.client && !this.closed; }
|
|
101
|
+
get hostScheduleAvailable() {
|
|
102
|
+
return this.options.hostScheduleChat === true && !!this.chat && !this.closing && !this.closed
|
|
103
|
+
&& !this.hostScheduleUnsafe && !this.continuityUnsafe && !this.relayFault && !this.blocked && !this.retained
|
|
104
|
+
&& !this.settingsBusy && (this.active !== undefined || this.hostScheduleSettled && this.reusable);
|
|
105
|
+
}
|
|
84
106
|
async start() {
|
|
85
107
|
if (this.closing || this.closed)
|
|
86
108
|
throw new Error('AGY ACP host is retired.');
|
|
@@ -127,6 +149,10 @@ class AgyAcpRuntime {
|
|
|
127
149
|
throw new Error('AGY hook arrived before session admission.');
|
|
128
150
|
this.activity?.();
|
|
129
151
|
this.latestRecords = rows;
|
|
152
|
+
if (this.options.hostScheduleChat && ((!this.active && event !== 'SessionStart')
|
|
153
|
+
|| rows.some(row => row.source === 'SYSTEM' && row.type === 'SYSTEM_MESSAGE'
|
|
154
|
+
&& /sender=/.test(row.content ?? '') && !(0, transcript_1.nativeRestartNotice)(row))))
|
|
155
|
+
this.hostScheduleUnsafe = true;
|
|
130
156
|
const decision = this.chat ? this.chat.accept(event, payload, rows) : this.host.schedules.accept(event, payload, rows);
|
|
131
157
|
if (!this.continuityUnsafe && (event === 'PreToolUse' && decision.decision === 'deny'
|
|
132
158
|
|| rows.some(row => (0, transcript_1.creationReceipt)(row, payload.conversationId, row.step_index)))) {
|
|
@@ -137,6 +163,10 @@ class AgyAcpRuntime {
|
|
|
137
163
|
if (event === 'PreToolUse') {
|
|
138
164
|
const call = payload.toolCall;
|
|
139
165
|
if (call && Number.isSafeInteger(payload.stepIdx)) {
|
|
166
|
+
if (call.name === 'ask_question' && this.question) {
|
|
167
|
+
this.question.args = call.args;
|
|
168
|
+
this.question.pendingCall = undefined;
|
|
169
|
+
}
|
|
140
170
|
this.tools.set(payload.stepIdx, call.id);
|
|
141
171
|
const mapped = this.options.mapTool(call.name, call.args);
|
|
142
172
|
const description = typeof call.args.toolSummary === 'string' ? call.args.toolSummary : undefined;
|
|
@@ -153,10 +183,18 @@ class AgyAcpRuntime {
|
|
|
153
183
|
}
|
|
154
184
|
}
|
|
155
185
|
return decision;
|
|
156
|
-
}, () => {
|
|
186
|
+
}, () => {
|
|
187
|
+
this.relayFault = true;
|
|
188
|
+
this.chat?.fence('AGY hook relay failed; chat state is unconfirmed.');
|
|
189
|
+
this.host?.schedules.fence('AGY hook relay failed; native schedule state is unconfirmed.');
|
|
190
|
+
this.answerQuestion?.(undefined);
|
|
191
|
+
});
|
|
157
192
|
this.restore = await (0, AgyHookRelay_1.installAgyScheduleHooks)(this.options.home, await this.relay.start());
|
|
158
193
|
if (this.closing)
|
|
159
194
|
throw new Error('AGY startup was retired.');
|
|
195
|
+
// Consume a clean checkpoint under the per-HOME kernel gate, before spawning.
|
|
196
|
+
if (this.options.sessionId)
|
|
197
|
+
this.options.beforeSessionLoad?.();
|
|
160
198
|
const args = ['acp', '--stdio', '--process-per-session', '--disable-telemetry'];
|
|
161
199
|
if (this.options.autoApprove)
|
|
162
200
|
args.push('--dangerously-skip-permissions');
|
|
@@ -221,7 +259,7 @@ class AgyAcpRuntime {
|
|
|
221
259
|
setStage('host-admission');
|
|
222
260
|
if (this.relayFault)
|
|
223
261
|
throw new Error('AGY hook relay failed before session admission.');
|
|
224
|
-
if (this.options.worker || this.options.sessionId) {
|
|
262
|
+
if (this.options.worker || this.options.sessionId || this.options.hostScheduleChat) {
|
|
225
263
|
this.chat = new AgyChatHost_1.AgyChatHost(this.client, session.sessionId, this.options.cwd, this.options.threadId);
|
|
226
264
|
this.relay.bindSession(session.sessionId);
|
|
227
265
|
}
|
|
@@ -238,6 +276,7 @@ class AgyAcpRuntime {
|
|
|
238
276
|
this.host.bind(this.relay);
|
|
239
277
|
}
|
|
240
278
|
void this.client.waitForExit().then(() => {
|
|
279
|
+
this.answerQuestion?.(undefined);
|
|
241
280
|
if (!this.closing) {
|
|
242
281
|
this.host?.schedules.processClosed(false);
|
|
243
282
|
this.chat?.fence('AGY process closed unexpectedly.');
|
|
@@ -253,29 +292,34 @@ class AgyAcpRuntime {
|
|
|
253
292
|
this.tools.clear();
|
|
254
293
|
this.tracker.setCallback(options.onActivity);
|
|
255
294
|
this.tracker.reset();
|
|
295
|
+
this.hostScheduleSettled = false;
|
|
256
296
|
let timer;
|
|
257
297
|
let inactive;
|
|
258
298
|
this.activity = () => {
|
|
259
299
|
if (inactive)
|
|
260
300
|
clearTimeout(inactive);
|
|
261
301
|
if (options.inactivityTimeout && options.inactivityTimeout > 0)
|
|
262
|
-
inactive = setTimeout(() =>
|
|
302
|
+
inactive = setTimeout(() => this.cancelForeground(), options.inactivityTimeout);
|
|
263
303
|
};
|
|
264
304
|
this.activity();
|
|
265
305
|
try {
|
|
266
306
|
if (options.timeout && options.timeout > 0)
|
|
267
|
-
timer = setTimeout(() =>
|
|
307
|
+
timer = setTimeout(() => this.cancelForeground(), options.timeout);
|
|
268
308
|
this.options.beforePrompt?.();
|
|
269
309
|
const blocks = [{ type: 'text', text: options.resolvePrompt?.(this.sessionId ?? null) ?? prompt },
|
|
270
310
|
...(options.attachments ?? []).filter(item => item.type === 'image').map(item => ({ type: 'image', data: item.data, mimeType: item.mimeType }))];
|
|
271
|
-
|
|
311
|
+
this.prompted = true;
|
|
312
|
+
const work = (this.chat ?? this.host).prompt(blocks, input => this.promptWithQuestions(input));
|
|
272
313
|
const result = await work;
|
|
273
|
-
if (result.stopReason === 'cancelled' && !this.retained && !this.relayFault && !this.chat
|
|
314
|
+
if (result.stopReason === 'cancelled' && !this.retained && !this.relayFault && !this.continuityUnsafe && !this.chat
|
|
274
315
|
&& this.host?.schedules.status.blocked?.startsWith('AGY foreground cancelled:')) {
|
|
275
316
|
this.chat = new AgyChatHost_1.AgyChatHost(this.client, this.sessionId, this.options.cwd, this.options.threadId, this.latestRecords);
|
|
276
317
|
this.host = undefined;
|
|
277
318
|
}
|
|
278
319
|
this.options.settledPrompt?.(this.reusable && result.stopReason !== 'cancelled');
|
|
320
|
+
this.hostScheduleSettled = result.success && result.stopReason === 'end_turn' && this.reusable;
|
|
321
|
+
if (!this.hostScheduleSettled)
|
|
322
|
+
this.hostScheduleUnsafe = true;
|
|
279
323
|
// Current native Stop gives the final text without replaying buffered ACP
|
|
280
324
|
// output. With timers, this is a batch projection, not token streaming.
|
|
281
325
|
if (result.output && (this.retained || !this.streamed)) {
|
|
@@ -285,12 +329,18 @@ class AgyAcpRuntime {
|
|
|
285
329
|
return { success: result.success, output: result.output, sessionAbbr: this.sessionId?.slice(0, 8),
|
|
286
330
|
...(!result.success && { error: result.output || 'AGY native turn failed.' }) };
|
|
287
331
|
}
|
|
332
|
+
catch (error) {
|
|
333
|
+
this.hostScheduleUnsafe = true;
|
|
334
|
+
throw error;
|
|
335
|
+
}
|
|
288
336
|
finally {
|
|
289
337
|
if (timer)
|
|
290
338
|
clearTimeout(timer);
|
|
291
339
|
if (inactive)
|
|
292
340
|
clearTimeout(inactive);
|
|
293
341
|
this.permissions.cancel();
|
|
342
|
+
this.answerQuestion?.(undefined);
|
|
343
|
+
this.question = undefined;
|
|
294
344
|
this.tracker.reset();
|
|
295
345
|
this.tracker.setCallback(undefined);
|
|
296
346
|
this.activity = undefined;
|
|
@@ -298,11 +348,48 @@ class AgyAcpRuntime {
|
|
|
298
348
|
this.tools.clear();
|
|
299
349
|
}
|
|
300
350
|
}
|
|
351
|
+
async promptWithQuestions(blocks) {
|
|
352
|
+
for (;;) {
|
|
353
|
+
const question = this.question = {};
|
|
354
|
+
const terminal = await this.client.prompt(this.sessionId, blocks);
|
|
355
|
+
if (terminal.stopReason !== 'end_turn' || !question.pendingCall || !question.args || this.blocked || this.closing
|
|
356
|
+
|| !(this.chat ?? this.host.schedules).suspendForeground())
|
|
357
|
+
return terminal;
|
|
358
|
+
// ACP settles its request while the hook invocation remains open.
|
|
359
|
+
// The next native prompt on this session resumes that invocation.
|
|
360
|
+
this.activity?.();
|
|
361
|
+
const answer = await new Promise(resolve => {
|
|
362
|
+
this.answerQuestion = value => { this.answerQuestion = undefined; resolve(value); };
|
|
363
|
+
const questions = this.retained && Array.isArray(question.args?.questions) ? question.args.questions : [];
|
|
364
|
+
const text = questions.flatMap(item => typeof item?.question === 'string' && Array.isArray(item.options)
|
|
365
|
+
? [item.question, ...item.options.filter((option) => typeof option === 'string')
|
|
366
|
+
.map((option, index) => `- [${index + 1}] ${option}`)] : []).join('\n');
|
|
367
|
+
const message = `\n${text ? text + '\n' : ''}Reply in this thread to continue.\n`;
|
|
368
|
+
this.active?.onStream?.(message);
|
|
369
|
+
if (text)
|
|
370
|
+
this.active?.onDisplayText?.(text);
|
|
371
|
+
});
|
|
372
|
+
if (answer === undefined || this.closing || this.blocked)
|
|
373
|
+
return { stopReason: 'cancelled' };
|
|
374
|
+
this.activity?.();
|
|
375
|
+
blocks = [{ type: 'text', text: answer }];
|
|
376
|
+
}
|
|
377
|
+
}
|
|
301
378
|
async abort() {
|
|
302
379
|
this.permissions.cancel();
|
|
380
|
+
return this.cancelForeground();
|
|
381
|
+
}
|
|
382
|
+
cancelForeground() {
|
|
383
|
+
if (this.answerQuestion) {
|
|
384
|
+
this.continuityUnsafe = true;
|
|
385
|
+
this.chat?.fence('AGY question cancellation could not be confirmed.');
|
|
386
|
+
this.answerQuestion(undefined);
|
|
387
|
+
}
|
|
303
388
|
return (this.chat ?? this.host)?.cancelForeground() ?? false;
|
|
304
389
|
}
|
|
305
390
|
async withOperation(id, current, run, inTurn) {
|
|
391
|
+
if (this.answerQuestion)
|
|
392
|
+
throw new Error('AGY is waiting for the answer to a question.');
|
|
306
393
|
if (this.settingsBusy)
|
|
307
394
|
throw new Error('AGY settings are changing; native scheduling is unavailable.');
|
|
308
395
|
this.scheduleOperations++;
|
|
@@ -344,8 +431,15 @@ class AgyAcpRuntime {
|
|
|
344
431
|
this.scheduleOperations--;
|
|
345
432
|
}
|
|
346
433
|
}
|
|
347
|
-
isWaitingInput() { return this.permissions.waiting; }
|
|
348
|
-
sendInput(input) {
|
|
434
|
+
isWaitingInput() { return this.permissions.waiting || !!this.answerQuestion; }
|
|
435
|
+
sendInput(input) {
|
|
436
|
+
if (!this.answerQuestion)
|
|
437
|
+
return this.permissions.input(input);
|
|
438
|
+
if (!input.trim())
|
|
439
|
+
return false;
|
|
440
|
+
this.answerQuestion(input);
|
|
441
|
+
return true;
|
|
442
|
+
}
|
|
349
443
|
respondToApproval(id, action) { return this.permissions.respond(id, action); }
|
|
350
444
|
async waitForManagedProcessGroupExit() {
|
|
351
445
|
if (this.client && !this.client.waitForManagedProcessGroupExit)
|
|
@@ -385,8 +479,11 @@ class AgyAcpRuntime {
|
|
|
385
479
|
close() {
|
|
386
480
|
if (this.closed)
|
|
387
481
|
return Promise.resolve();
|
|
482
|
+
if (this.active || this.settingsBusy || this.scheduleOperations)
|
|
483
|
+
this.hostScheduleUnsafe = true;
|
|
388
484
|
this.closing = true;
|
|
389
485
|
this.permissions.cancel();
|
|
486
|
+
this.answerQuestion?.(undefined);
|
|
390
487
|
return this.closePromise ??= (async () => {
|
|
391
488
|
await this.starting?.catch(() => { });
|
|
392
489
|
await this.finishClose();
|
|
@@ -408,13 +505,30 @@ class AgyAcpRuntime {
|
|
|
408
505
|
this.options.retainScheduleOwner(this.host.sessionId, this.hostId, true);
|
|
409
506
|
this.host.schedules.processClosed(true);
|
|
410
507
|
}
|
|
508
|
+
let cleanHistory;
|
|
509
|
+
let unpromptedHistory;
|
|
510
|
+
if (this.options.hostScheduleChat && !this.hostScheduleUnsafe && !this.relayFault && this.reusable && this.sessionId && this.relay) {
|
|
511
|
+
try {
|
|
512
|
+
if (this.hostScheduleSettled) {
|
|
513
|
+
const history = (0, AgySessionSelection_1.agyHostScheduleHistory)(this.options.home, this.sessionId);
|
|
514
|
+
if (await this.relay.confirmsTerminal(this.latestRecords))
|
|
515
|
+
cleanHistory = history;
|
|
516
|
+
}
|
|
517
|
+
else if (!this.prompted && !this.latestRecords.length) {
|
|
518
|
+
unpromptedHistory = (0, AgySessionSelection_1.agyHostScheduleHistory)(this.options.home, this.sessionId, true);
|
|
519
|
+
}
|
|
520
|
+
}
|
|
521
|
+
catch { /* Missing history withholds checkpoint admission after an otherwise confirmed exit. */ }
|
|
522
|
+
}
|
|
411
523
|
await this.relay?.close();
|
|
412
524
|
await this.restore?.();
|
|
413
525
|
this.restore = undefined;
|
|
414
526
|
if (!this.reusable)
|
|
415
527
|
this.options.settledPrompt?.(false);
|
|
416
|
-
if (this.host || this.chat)
|
|
417
|
-
this.
|
|
528
|
+
if (this.host || this.chat) {
|
|
529
|
+
const safe = !this.hostScheduleUnsafe && !this.relayFault && this.reusable;
|
|
530
|
+
this.options.ownedSessionClosed(this.sessionId, safe ? cleanHistory : undefined, safe ? unpromptedHistory : undefined);
|
|
531
|
+
}
|
|
418
532
|
this.closed = true;
|
|
419
533
|
}
|
|
420
534
|
}
|