@qilin-agent/acp 3.1.3 → 3.1.5

package/README.i18n.yaml

@@ -5,78 +5,78 @@
 /:
   en: b360d0052dfc5542
   zh: 7aec4db9e8e9c442
-/qilin-acp:
-  en: 0be98274c6724fb6
-  zh: 9d79352e225e1359
-/qilin-acp/summary:
+/qilin-agent-acp:
+  en: 5eabd3505ec2e935
+  zh: 32da6cca8a9f2bcc
+/qilin-agent-acp/summary:
   en: bf65128192214b7f
   zh: 27b09c10d947f6a1
-/qilin-acp/table-of-contents:
+/qilin-agent-acp/table-of-contents:
   en: d152484eb41ac6b4
   zh: 09388d293f9be9cb
-/qilin-acp/use-this-package:
+/qilin-agent-acp/use-this-package:
   en: 014a5573a8c05663
   zh: e45302786655eea5
-/qilin-acp/use-this-package/when-to-choose-it:
+/qilin-agent-acp/use-this-package/when-to-choose-it:
   en: 58290e9360ae5091
   zh: 672d438827ce5f1a
-/qilin-acp/use-this-package/minimal-configuration:
-  en: 7bdf9d9fa5794dc6
-  zh: 2390e7af629db5dc
-/qilin-acp/use-this-package/start-a-server:
-  en: 9f70acea98c1c235
-  zh: 43f7cdd133fda80e
-/qilin-acp/use-this-package/protocol-contract:
+/qilin-agent-acp/use-this-package/minimal-configuration:
+  en: 5d5e826cadc74ec3
+  zh: 8eaff9cfd0e98cc0
+/qilin-agent-acp/use-this-package/start-a-server:
+  en: 6b6c81b4ce6c253b
+  zh: ca5e5f083fa68289
+/qilin-agent-acp/use-this-package/protocol-contract:
   en: 804b87d8ebed9f8d
   zh: 1b0c1c7269cdf040
-/qilin-acp/understand-the-implementation:
+/qilin-agent-acp/understand-the-implementation:
   en: ea8afe89dbdd1934
   zh: 6567979f92f34afd
-/qilin-acp/understand-the-implementation/design-philosophy:
+/qilin-agent-acp/understand-the-implementation/design-philosophy:
   en: 009136a2e340bf99
   zh: 35b33047ed9802ab
-/qilin-acp/understand-the-implementation/source-map:
+/qilin-agent-acp/understand-the-implementation/source-map:
   en: 9f85ae4ecdb5d022
   zh: dc2b911360768b9e
-/qilin-acp/understand-the-implementation/admission-and-prompt-settlement:
+/qilin-agent-acp/understand-the-implementation/admission-and-prompt-settlement:
   en: 6485d449b5945b4a
   zh: 90e56a9b410c9c42
-/qilin-acp/understand-the-implementation/teardown-and-connection-ownership:
+/qilin-agent-acp/understand-the-implementation/teardown-and-connection-ownership:
   en: 83e7a3b268ffbb86
   zh: 9ec7e32ce259f6c2
-/qilin-acp/further-exploration:
+/qilin-agent-acp/further-exploration:
   en: 70100881dc8023eb
   zh: eeedfdabf0d70cba
-/qilin-acp/model-experience:
+/qilin-agent-acp/model-experience:
   en: 215e7ba838619b7b
   zh: a311da3843709f90
-/qilin-acp/model-experience/prompt-content:
+/qilin-agent-acp/model-experience/prompt-content:
   en: 7fca865c9895801f
   zh: 78a0ab12c0bb0499
-/qilin-acp/model-experience/prompt-content/what-the-model-sees:
+/qilin-agent-acp/model-experience/prompt-content/what-the-model-sees:
   en: e3adbb072da5ff1d
   zh: 0af2105dd9e171d3
-/qilin-acp/model-experience/prompt-content/token-effect:
+/qilin-agent-acp/model-experience/prompt-content/token-effect:
   en: 93b8f76c67bef353
   zh: 354fa2dca0804f72
-/qilin-acp/model-experience/prompt-content/kv-cache-effect:
+/qilin-agent-acp/model-experience/prompt-content/kv-cache-effect:
   en: 54946b64b26a3171
   zh: 09550292ccfb36b0
-/qilin-acp/model-experience/permission-decisions:
+/qilin-agent-acp/model-experience/permission-decisions:
   en: 2e6d83c846a3a5e1
   zh: 8d4339c26f3d8f68
-/qilin-acp/model-experience/permission-decisions/what-the-model-sees:
+/qilin-agent-acp/model-experience/permission-decisions/what-the-model-sees:
   en: 87b55e04137085c3
   zh: cdba4acf2e38b872
-/qilin-acp/model-experience/permission-decisions/token-effect:
+/qilin-agent-acp/model-experience/permission-decisions/token-effect:
   en: bd0ded535cbedb19
   zh: 47bcaa76827f88f2
-/qilin-acp/model-experience/permission-decisions/kv-cache-effect:
+/qilin-agent-acp/model-experience/permission-decisions/kv-cache-effect:
   en: 83120763a07c4b72
   zh: 6a1a181dc4da869d
-/qilin-acp/known-limitations-and-deferred-work:
+/qilin-agent-acp/known-limitations-and-deferred-work:
   en: c7ec5c39a44e6e41
   zh: cd45b7744413faee
-/qilin-acp/known-limitations-and-deferred-work/dev-note:
+/qilin-agent-acp/known-limitations-and-deferred-work/dev-note:
   en: e67f633dc6fe7773
   zh: 3bb0c20c93f16f98

package/lib/index.js

@@ -787,7 +787,7 @@ var AcpSession = class AcpSession {
 		/* v8 ignore stop */
 	}
 	/**
-	* Admit, enqueue, and settle one prompt at whole-Agent quiescence.
+	* Admit one prompt and settle after the root, descendants, and updates finish.
 	* @param params - standard ACP prompt request for this session.
 	* @param imageEnabled - connection capability advertised at initialization.
 	* @param requestSignal - JSON-RPC request cancellation signal.
@@ -809,7 +809,8 @@ var AcpSession = class AcpSession {
 			admissionDone: admission.promise,
 			finishAdmission: admission.resolve,
 			admissionController,
-			cancelRequested: false,
+			cancellationDone: Promise.withResolvers(),
+			cancelStartedIdle: false,
 			settlementStarted: false,
 			outputError: void 0,
 			agentError: void 0
@@ -848,7 +849,7 @@ var AcpSession = class AcpSession {
 			} finally {
 				inflight.finishAdmission();
 			}
-			if (inflight.cancelRequested) {
+			if (inflight.admissionController.signal.aborted) {
 				this.settleAfterQuiescence(inflight);
 				return { stopReason: await completion.promise };
 			}
@@ -876,6 +877,10 @@ var AcpSession = class AcpSession {
 	* @param event - committed durable event.
 	*/
 	onSessionEvent(session, event) {
+		if (event.type === "turn/start" && this.inflight?.turn !== void 0) {
+			this.inflight.turn = event.data.turn;
+			this.inflight.endReason = void 0;
+		}
 		try {
 			if (event.type === "assistant/message") {
 				const inflight = this.inflight?.turn === event.data.turn ? this.inflight : void 0;
@@ -909,7 +914,10 @@ var AcpSession = class AcpSession {
 			}
 		} finally {
 			const inflight = this.inflight;
-			if (inflight !== void 0 && event.type === "turn/end" && inflight.turn === event.data.turn) inflight.endReason = event.data.reason;
+			if (inflight !== void 0 && event.type === "turn/end" && inflight.turn === event.data.turn) {
+				inflight.endReason = event.data.reason;
+				inflight.agentError = void 0;
+			}
 			if (event.type === "turn/end") this.modelControl.releaseTurn(event.data.turn);
 		}
 	}
@@ -926,16 +934,23 @@ var AcpSession = class AcpSession {
 	}
 	/**
 	* Correlate an Agent interval failure with the active ACP prompt.
-	* @param turn - failed turn number.
 	* @param error - original same-process failure.
 	*/
-	onAgentError(turn, error) {
+	onAgentError(error) {
 		const inflight = this.inflight;
 		if (inflight === void 0 || !inflight.messageQueued) return;
-		if (inflight.turn === turn) return;
 		inflight.agentError = new Error(errorChain(error));
 		this.settleAfterQuiescence(inflight);
 	}
+	/**
+	* Complete cancelled activity without following a later root driver.
+	* @param status - the emitted transition, which may precede a reentrant wake.
+	*/
+	onAgentStatus(status) {
+		const inflight = this.inflight;
+		if (inflight === void 0 || !inflight.messageQueued || !inflight.admissionController.signal.aborted) return;
+		if (status === "idle" || inflight.cancelStartedIdle) inflight.cancellationDone.resolve(this.outputTail);
+	}
 	/** Await every update queued before this call. */
 	drainUpdates() {
 		return this.outputTail;
@@ -961,10 +976,10 @@ var AcpSession = class AcpSession {
 			}
 			const subagents = this.ctx.get("subagents");
 			try {
-				await subagents?.drainContinuableDescendants([this.agent]);
+				await subagents?.drainDescendants([this.agent]);
 			} catch (error) {
-				this.ctx.logger.warn(`acp: continuable subagent teardown failed: ${errorChain(error)}`);
-				failures.push(new Error("continuable subagent teardown failed", { cause: error }));
+				this.ctx.logger.warn(`acp: subagent teardown failed: ${errorChain(error)}`);
+				failures.push(new Error("subagent teardown failed", { cause: error }));
 			}
 			try {
 				await this.ctx.sessions.flush(this.agent.session);
@@ -990,10 +1005,21 @@ var AcpSession = class AcpSession {
 	cancelPrompt(detail) {
 		const inflight = this.inflight;
 		if (inflight === void 0) return;
-		inflight.cancelRequested = true;
+		const firstCancellation = !inflight.admissionController.signal.aborted;
+		if (firstCancellation) inflight.cancelStartedIdle = this.agent.status === "idle";
 		inflight.admissionController.abort(new Error(detail));
 		this.settleAfterQuiescence(inflight);
-		if (inflight.messageQueued) this.agent.cancel({ kind: "user" });
+		if (!inflight.messageQueued) {
+			inflight.cancellationDone.resolve();
+			return;
+		}
+		this.agent.cancel({ kind: "user" });
+		if (firstCancellation) {
+			const done = inflight.cancellationDone;
+			this.agent.whenIdle().then(() => {
+				done.resolve(this.outputTail);
+			}, done.reject);
+		}
 	}
 	settleAfterQuiescence(inflight) {
 		if (inflight.settlementStarted) return;
@@ -1001,13 +1027,26 @@ var AcpSession = class AcpSession {
 		(async () => {
 			await inflight.admissionDone;
 			if (inflight.messageQueued) {
-				await this.agent.whenIdle();
-				await this.outputTail;
+				const subagents = this.ctx.get("subagents");
+				const cancelled = inflight.cancellationDone.promise;
+				const isCancelled = () => inflight.admissionController.signal.aborted;
+				const idleAt = (seq) => this.agent.status === "idle" && this.agent.session.seq === seq;
+				while (true) {
+					await Promise.race([this.agent.whenIdle(), cancelled]);
+					if (isCancelled()) break;
+					const idleSeq = this.agent.session.seq;
+					const children = await Promise.race([subagents?.waitForChildren(this.agent), cancelled]);
+					if (isCancelled()) break;
+					if (children || !idleAt(idleSeq)) continue;
+					await this.outputTail;
+					if (isCancelled() || idleAt(idleSeq)) break;
+				}
+				if (isCancelled()) await cancelled;
 			}
 			/* v8 ignore next -- this prompt owns the slot until this exact settlement clears it. */
 			if (this.inflight !== inflight) return;
 			this.inflight = void 0;
-			if (inflight.cancelRequested) {
+			if (inflight.admissionController.signal.aborted) {
 				inflight.resolve("cancelled");
 				return;
 			}
@@ -1107,8 +1146,11 @@ function apply(ctx, config) {
 	ctx.on("agent/inbox/claimed", ({ agent, message, turn }) => {
 		ownedRecord(agent)?.onInboxClaimed(message, turn);
 	});
-	ctx.on("agent/error", ({ agent, turn, error }) => {
-		ownedRecord(agent)?.onAgentError(turn, error);
+	ctx.on("agent/error", ({ agent, error }) => {
+		ownedRecord(agent)?.onAgentError(error);
+	});
+	ctx.on("agent/status", ({ agent, status }) => {
+		ownedRecord(agent)?.onAgentStatus(status);
 	});
 	ctx.on("llm/adapters-updated", () => {
 		for (const record of sessions.values()) record.topologyChanged();

package/lib/types/session.d.ts

@@ -1,7 +1,7 @@
 /** One standard ACP session's Agent, configuration, prompt, update, and teardown lifecycle. */
 import type { Context } from '@qilin-agent/kylin';
 import { type McpServer, type PromptRequest, type PromptResponse, type SessionConfigOption, type SessionNotification } from '@agentclientprotocol/sdk';
-import type { Agent, AgentOptions, ModelSelection } from '@qilin-agent/agent';
+import type { Agent, AgentOptions, AgentStatus, ModelSelection } from '@qilin-agent/agent';
 import { type UserMessage } from '@qilin-agent/llm';
 import { type Session, type SessionEvent, type SessionId } from '@qilin-agent/session';
 /** Inputs shared by fresh and resumed ACP session construction. */
@@ -81,7 +81,7 @@ export declare class AcpSession {
     /** Resolve topology state off-chain, then serialize its notification without blocking execution updates. */
     topologyChanged(): void;
     /**
-     * Admit, enqueue, and settle one prompt at whole-Agent quiescence.
+     * Admit one prompt and settle after the root, descendants, and updates finish.
      * @param params - standard ACP prompt request for this session.
      * @param imageEnabled - connection capability advertised at initialization.
      * @param requestSignal - JSON-RPC request cancellation signal.
@@ -104,10 +104,14 @@ export declare class AcpSession {
     onInboxClaimed(message: UserMessage, turn: number): void;
     /**
      * Correlate an Agent interval failure with the active ACP prompt.
-     * @param turn - failed turn number.
      * @param error - original same-process failure.
      */
-    onAgentError(turn: number, error: unknown): void;
+    onAgentError(error: unknown): void;
+    /**
+     * Complete cancelled activity without following a later root driver.
+     * @param status - the emitted transition, which may precede a reentrant wake.
+     */
+    onAgentStatus(status: AgentStatus): void;
     /** Await every update queued before this call. */
     drainUpdates(): Promise<void>;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qilin-agent/acp",
   "description": "Automation-only Agent Client Protocol server for driving QiLin agents over JSON-RPC stdio",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "publishConfig": {
     "access": "public"
   },
@@ -31,19 +31,19 @@
   "license": "MIT",
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",
-    "@qilin-agent/brand": "3.1.3",
+    "@qilin-agent/brand": "3.1.5",
     "@qilin-agent/schemastery": "~3.18.3"
   },
   "peerDependencies": {
     "@qilin-agent/kylin": "~4.0.3",
-    "@qilin-agent/attachment": "3.1.3",
-    "@qilin-agent/llm": "3.1.3",
-    "@qilin-agent/mcp-client": "3.1.3",
-    "@qilin-agent/agent": "3.1.3",
-    "@qilin-agent/session-persistence": "3.1.3",
-    "@qilin-agent/user-approval": "3.1.3",
-    "@qilin-agent/token-meter": "3.1.3",
-    "@qilin-agent/session": "3.1.3"
+    "@qilin-agent/agent": "3.1.5",
+    "@qilin-agent/attachment": "3.1.5",
+    "@qilin-agent/session": "3.1.5",
+    "@qilin-agent/llm": "3.1.5",
+    "@qilin-agent/token-meter": "3.1.5",
+    "@qilin-agent/user-approval": "3.1.5",
+    "@qilin-agent/session-persistence": "3.1.5",
+    "@qilin-agent/mcp-client": "3.1.5"
   },
   "peerDependenciesMeta": {
     "@qilin-agent/token-meter": {
@@ -51,19 +51,19 @@
     }
   },
   "devDependencies": {
+    "@qilin-agent/agent": "3.1.5",
+    "@qilin-agent/agent-loop": "3.1.5",
     "@qilin-agent/kylin": "~4.0.3",
-    "@qilin-agent/agent-loop": "3.1.3",
-    "@qilin-agent/agent-loop-testkit": "3.1.3",
-    "@qilin-agent/agent": "3.1.3",
-    "@qilin-agent/attachment": "3.1.3",
-    "@qilin-agent/mcp-client": "3.1.3",
-    "@qilin-agent/session": "3.1.3",
-    "@qilin-agent/session-persistence": "3.1.3",
-    "@qilin-agent/session-projection": "3.1.3",
-    "@qilin-agent/session-persistence-jsonl": "3.1.3",
-    "@qilin-agent/llm": "3.1.3",
-    "@qilin-agent/user-approval": "3.1.3",
-    "@qilin-agent/tools": "3.1.3",
-    "@qilin-agent/token-meter": "3.1.3"
+    "@qilin-agent/agent-loop-testkit": "3.1.5",
+    "@qilin-agent/attachment": "3.1.5",
+    "@qilin-agent/mcp-client": "3.1.5",
+    "@qilin-agent/llm": "3.1.5",
+    "@qilin-agent/session": "3.1.5",
+    "@qilin-agent/session-persistence": "3.1.5",
+    "@qilin-agent/session-persistence-jsonl": "3.1.5",
+    "@qilin-agent/session-projection": "3.1.5",
+    "@qilin-agent/token-meter": "3.1.5",
+    "@qilin-agent/tools": "3.1.5",
+    "@qilin-agent/user-approval": "3.1.5"
   }
 }