@lucascouts/claude-agent-acp-plus 0.4.0 → 0.5.1

package/dist/elicitation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elicitation.d.ts","sourceRoot":"","sources":["../src/elicitation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EACV,wBAAwB,EAKzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,6CAA6C,CAAC;AAErD;;;;;;;;;;;;;GAaG;AAEH,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,MAAM,GAChB,wBAAwB,GAAG,IAAI,CAyBjC;AAgBD;;;GAGG;AACH,wBAAgB,uCAAuC,CACrD,QAAQ,EAAE,yBAAyB,GAClC,iBAAiB,CAUnB;AAED;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,IAAI,CAUhG;AAwBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,eAAe,EAAE,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,wBAAwB,CAqD1B;AAED,+EAA+E;AAC/E,MAAM,MAAM,sBAAsB,GAChC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvF;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,yBAAyB,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,SAAS,EAAE,eAAe,EAAE,GAC3B,sBAAsB,CAkCxB;AAgBD;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,4BAA4B,CAAC;AAEtE;;;;;;;GAOG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,qBAAqB,GAAG,IAAI,CAW9B;AAYD;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,MAAM,GAChB,wBAAwB,CA+B1B;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,yBAAyB,GAAG,MAAM,CAG7F"}
+{"version":3,"file":"elicitation.d.ts","sourceRoot":"","sources":["../src/elicitation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EACV,wBAAwB,EAKzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,6CAA6C,CAAC;AAErD;;;;;;;;;;;;;GAaG;AAEH,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;CACd,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,MAAM,GAChB,wBAAwB,GAAG,IAAI,CAyBjC;AAgBD;;;GAGG;AACH,wBAAgB,uCAAuC,CACrD,QAAQ,EAAE,yBAAyB,GAClC,iBAAiB,CAUnB;AAED;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,IAAI,CAUhG;AAgCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,eAAe,EAAE,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,wBAAwB,CA2D1B;AAED,+EAA+E;AAC/E,MAAM,MAAM,sBAAsB,GAChC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvF;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,yBAAyB,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,SAAS,EAAE,eAAe,EAAE,GAC3B,sBAAsB,CAkCxB;AAgBD;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,4BAA4B,CAAC;AAEtE;;;;;;;GAOG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,qBAAqB,GAAG,IAAI,CAW9B;AAYD;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,MAAM,GAChB,wBAAwB,CA+B1B;AAED;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,yBAAyB,GAAG,MAAM,CAG7F"}

package/dist/elicitation.js

@@ -89,6 +89,13 @@ function questionCustomFieldKey(index) {
  * extensions (`_claude/...`).
  */
 const OPTION_META_KEY = "_claude/askUserQuestionOption";
+/**
+ * Shared `_meta` key for marking a per-question free-text field as the custom
+ * answer companion for a select question. This intentionally has no
+ * agent-specific namespace so ACP clients can recognize the same marker across
+ * Codex, Claude, and other AskUserQuestion bridges.
+ */
+const CUSTOM_ANSWER_META_KEY = "_askUserQuestionCustomAnswer";
 /**
  * Render the AskUserQuestion tool's questions as an ACP form elicitation.
  *
@@ -137,6 +144,12 @@ export function askUserQuestionsToCreateRequest(questions, sessionId, toolCallId
             type: "string",
             title: "Other",
             description: "Type your own answer instead of choosing an option above (optional).",
+            _meta: {
+                [CUSTOM_ANSWER_META_KEY]: {
+                    questionId: questionFieldKey(index),
+                    isCustomAnswer: true,
+                },
+            },
         };
     });
     const requestedSchema = {

package/dist/model-deprecation.d.ts

@@ -8,7 +8,7 @@ import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
  * `undefined`, or empty `displayName` or `description` is treated as an empty
  * string, so this never throws.
  *
- * See the module doc for WHY this is a heuristic (SDK 0.3.204 `ModelInfo` has no
+ * See the module doc for WHY this is a heuristic (SDK 0.3.220 `ModelInfo` has no
  * deprecation field).
  *
  * @param info - A single SDK model row.

package/dist/model-deprecation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-deprecation.d.ts","sourceRoot":"","sources":["../src/model-deprecation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AA4BhE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAI1D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAEtE"}
+{"version":3,"file":"model-deprecation.d.ts","sourceRoot":"","sources":["../src/model-deprecation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAiChE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAI1D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAEtE"}

package/dist/model-deprecation.js

@@ -1,12 +1,17 @@
 /**
  * Model deprecation heuristic.
  *
- * The Claude Agent SDK's `ModelInfo` (0.3.204) exposes NO deprecation flag —
- * its only capability fields are `supportsEffort` / `supportedEffortLevels`,
- * `supportsAdaptiveThinking`, `supportsFastMode`, and `supportsAutoMode`. There
+ * The Claude Agent SDK's `ModelInfo` exposes NO deprecation flag — its only
+ * capability fields are `supportsEffort` / `supportedEffortLevels`,
+ * `supportsAdaptiveThinking`, `supportsFastMode`, and `supportsAutoMode`
+ * (`resolvedModel` is an alias-resolution hint, not a lifecycle signal). There
  * is therefore no authoritative, machine-readable signal telling a host that a
  * model row has been retired.
  *
+ * LAST VERIFIED AGAINST SDK 0.3.220 (story 008, R5.5) — the type is byte-for-byte
+ * unchanged from 0.3.204/0.3.212, so the heuristic below is still necessary.
+ * Re-check this claim on every SDK bump and update the version named here.
+ *
  * As a stand-in this module scans the human-facing copy — `displayName` and
  * `description` — for the words "deprecated" or "legacy" (case-insensitive).
  * This is deliberately a HEURISTIC: it can only catch models the SDK happens to
@@ -31,7 +36,7 @@ const DEPRECATION_MARKER = /deprecated|legacy/i;
  * `undefined`, or empty `displayName` or `description` is treated as an empty
  * string, so this never throws.
  *
- * See the module doc for WHY this is a heuristic (SDK 0.3.204 `ModelInfo` has no
+ * See the module doc for WHY this is a heuristic (SDK 0.3.220 `ModelInfo` has no
  * deprecation field).
  *
  * @param info - A single SDK model row.

package/dist/rewind-command.d.ts

@@ -75,11 +75,21 @@ export declare function listCheckpoints(messages: SDKMessage[]): Checkpoint[];
 export declare function formatCheckpointList(cps: Checkpoint[]): string;
 /**
  * Confirm a completed rewind, naming the checkpoint that was restored by its
- * index and excerpt (R3.4).
+ * index and excerpt (R3.4). When the SDK reports files it refused to touch for
+ * link safety, the confirmation is qualified with their count (R1.1) in the
+ * grammatical number that count calls for (R1.4), so the sentence cannot claim
+ * a clean success the rewind did not have.
+ *
+ * The unqualified sentence is unchanged character for character: an absent,
+ * zero, negative or non-numeric count returns exactly what this function
+ * returned before the qualifier existed (R1.2). The SDK exposes a COUNT only,
+ * never the refused paths, so the message deliberately names no files.
  *
  * @param cp The checkpoint whose files were restored.
+ * @param skippedLinks How many tracked files the SDK left unchanged for link
+ *   safety (`RewindFilesResult.skippedLinks`); omit or pass 0 when none were.
  */
-export declare function formatRewindResult(cp: Checkpoint): string;
+export declare function formatRewindResult(cp: Checkpoint, skippedLinks?: number): string;
 /**
  * Build a `/rewind` usage/error message. Always names the `/rewind` command and,
  * when at least one checkpoint exists, the valid index range (R3.5). An optional
@@ -122,7 +132,9 @@ export interface RewindDeps {
  * nothing-to-rewind notice). `restore` fetches + rebuilds the list, validates
  * the requested index, and on a hit calls `query.rewindFiles` with the tracked
  * uuid inside a try/catch — a rejection (or a `canRewind: false` result) is
- * reported via {@link formatRewindError} and never claims success. An `invalid`
+ * reported via {@link formatRewindError} and never claims success. A success
+ * that refused files for link safety carries that count into the confirmation
+ * (R1.1), so a partial rewind is not reported as a whole one. An `invalid`
  * invocation, an out-of-range index, or a failed transcript read each emit an
  * error and leave files untouched (`rewindFiles` is never called); the
  * `invalid` path still reads the transcript so its usage message can name the

package/dist/rewind-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rewind-command.d.ts","sourceRoot":"","sources":["../src/rewind-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAMpF,qFAAqF;AACrF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1E,uFAAuF;AACvF,MAAM,MAAM,gBAAgB,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3F;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAkBjF;AAkED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CA4BpE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,MAAM,CAY9D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,CAEzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAIlF;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,yEAAyE;IACzE,MAAM,EAAE;QACN,aAAa,CAAC,YAAY,EAAE;YAC1B,SAAS,EAAE,MAAM,CAAC;YAClB,MAAM,EAAE;gBAAE,aAAa,EAAE,qBAAqB,CAAC;gBAAC,OAAO,EAAE;oBAAE,IAAI,EAAE,MAAM,CAAC;oBAAC,IAAI,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAC;SAC3F,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACnB,CAAC;IACF,oDAAoD;IACpD,KAAK,EAAE;QAAE,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;KAAE,CAAC;IAC1E,sEAAsE;IACtE,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;CAC9D;AAqBD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA8Df"}
+{"version":3,"file":"rewind-command.d.ts","sourceRoot":"","sources":["../src/rewind-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAMpF,qFAAqF;AACrF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1E,uFAAuF;AACvF,MAAM,MAAM,gBAAgB,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3F;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAkBjF;AAkED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CA4BpE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,MAAM,CAY9D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAiBhF;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAIlF;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACzB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,yEAAyE;IACzE,MAAM,EAAE;QACN,aAAa,CAAC,YAAY,EAAE;YAC1B,SAAS,EAAE,MAAM,CAAC;YAClB,MAAM,EAAE;gBAAE,aAAa,EAAE,qBAAqB,CAAC;gBAAC,OAAO,EAAE;oBAAE,IAAI,EAAE,MAAM,CAAC;oBAAC,IAAI,EAAE,MAAM,CAAA;iBAAE,CAAA;aAAE,CAAC;SAC3F,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACnB,CAAC;IACF,oDAAoD;IACpD,KAAK,EAAE;QAAE,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;KAAE,CAAC;IAC1E,sEAAsE;IACtE,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;CAC9D;AAqBD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAkEf"}

package/dist/rewind-command.js

@@ -170,12 +170,37 @@ export function formatCheckpointList(cps) {
 }
 /**
  * Confirm a completed rewind, naming the checkpoint that was restored by its
- * index and excerpt (R3.4).
+ * index and excerpt (R3.4). When the SDK reports files it refused to touch for
+ * link safety, the confirmation is qualified with their count (R1.1) in the
+ * grammatical number that count calls for (R1.4), so the sentence cannot claim
+ * a clean success the rewind did not have.
+ *
+ * The unqualified sentence is unchanged character for character: an absent,
+ * zero, negative or non-numeric count returns exactly what this function
+ * returned before the qualifier existed (R1.2). The SDK exposes a COUNT only,
+ * never the refused paths, so the message deliberately names no files.
  *
  * @param cp The checkpoint whose files were restored.
+ * @param skippedLinks How many tracked files the SDK left unchanged for link
+ *   safety (`RewindFilesResult.skippedLinks`); omit or pass 0 when none were.
  */
-export function formatRewindResult(cp) {
-    return `Rewound files to checkpoint ${cp.index}: "${cp.excerpt}".`;
+export function formatRewindResult(cp, skippedLinks) {
+    const confirmation = `Rewound files to checkpoint ${cp.index}: "${cp.excerpt}".`;
+    // Type AND value are checked: the SDK field is optional, so `undefined` is
+    // the normal path, and testing `> 0` on a number also rejects NaN, which a
+    // `typeof` test alone would admit (`typeof NaN === "number"`).
+    //
+    // It does NOT reject every malformed number: `Infinity` and `0.5` pass this
+    // guard and would render as "Infinity files were" / "0.5 files were". The
+    // SDK returns an integer count, so those are UNREACHABLE rather than
+    // handled — stated plainly because a comment claiming a guarantee it does
+    // not deliver is the exact failure this function was changed to fix.
+    if (typeof skippedLinks === "number" && skippedLinks > 0) {
+        // Subject + verb agree with the count (R1.4): "1 file was", "2 files were".
+        const refusal = skippedLinks === 1 ? "1 file was" : `${skippedLinks} files were`;
+        return `${confirmation} ${refusal} left unchanged for link safety.`;
+    }
+    return confirmation;
 }
 /**
  * Build a `/rewind` usage/error message. Always names the `/rewind` command and,
@@ -216,7 +241,9 @@ async function emit(deps, text) {
  * nothing-to-rewind notice). `restore` fetches + rebuilds the list, validates
  * the requested index, and on a hit calls `query.rewindFiles` with the tracked
  * uuid inside a try/catch — a rejection (or a `canRewind: false` result) is
- * reported via {@link formatRewindError} and never claims success. An `invalid`
+ * reported via {@link formatRewindError} and never claims success. A success
+ * that refused files for link safety carries that count into the confirmation
+ * (R1.1), so a partial rewind is not reported as a whole one. An `invalid`
  * invocation, an out-of-range index, or a failed transcript read each emit an
  * error and leave files untouched (`rewindFiles` is never called); the
  * `invalid` path still reads the transcript so its usage message can name the
@@ -263,8 +290,12 @@ export async function handleRewindCommand(deps, invocation) {
         await emit(deps, formatRewindError(checkpoints.length, `There is no checkpoint ${invocation.index}.`));
         return;
     }
+    // Declared out here (same shape as `checkpoints` above) so the confirmation
+    // below can read `skippedLinks` off it; the assignment and every early
+    // `return` stay inside the try/catch exactly where they were.
+    let result;
     try {
-        const result = await deps.query.rewindFiles(checkpoint.uuid);
+        result = await deps.query.rewindFiles(checkpoint.uuid);
         if (result.canRewind === false) {
             await emit(deps, formatRewindError(checkpoints.length, `Rewind failed: ${result.error ?? "the SDK could not rewind these files"}.`));
             return;
@@ -274,5 +305,5 @@ export async function handleRewindCommand(deps, invocation) {
         await emit(deps, formatRewindError(checkpoints.length, `Rewind failed: ${reasonText(error)}.`));
         return;
     }
-    await emit(deps, formatRewindResult(checkpoint));
+    await emit(deps, formatRewindResult(checkpoint, result.skippedLinks));
 }

package/dist/thinking-option.d.ts

@@ -5,11 +5,15 @@
  * session's thinking intent with the legacy `MAX_THINKING_TOKENS` env
  * resolution into the SDK's `thinking` option.
  *
- * Kept self-contained (no import from the daily-churning `acp-agent.ts`,
- * mirroring the `ask-user-question-fallback.ts` precedent) so the logic is
- * unit-testable in isolation; `acp-agent.ts` wires it into
- * `buildConfigOptions`/`setSessionConfigOption`/query creation in sub-tasks
- * 1.2/1.3.
+ * Kept self-contained — no import from `acp-agent.ts`; what this module needs
+ * from the adapter (a logger, the raw env value) is injected instead, which
+ * also leaves the logic unit-testable in isolation. This mirrors the
+ * `rewind-command.ts` precedent, likewise isolated from the adapter so it can
+ * be unit tested without a live SDK session. The reason is merge cost:
+ * `acp-agent.ts` is a ~7,900-line file that changes upstream almost daily, so
+ * every coupling to it is paid again at each sync. `acp-agent.ts` wires these
+ * helpers into `buildConfigOptions`, `setSessionConfigOption` and query
+ * creation.
  */
 import type { SessionConfigOption } from "@agentclientprotocol/sdk";
 import type { ThinkingConfig } from "@anthropic-ai/claude-agent-sdk";
@@ -53,9 +57,9 @@ export declare function resolveThinkingSelection(value: unknown): boolean | null
  * it); `0` → disabled; a positive integer → a fixed token budget. Anything
  * else is ignored with a logged error, i.e. treated as unset.
  *
- * NOTE: duplicated from the unexported `resolveThinkingConfig` in
- * `acp-agent.ts` (behavior and log message identical); sub-task 1.3 makes
- * `acp-agent.ts` consume this export and removes the duplication.
+ * This is the single source of truth for that translation: `acp-agent.ts`
+ * carries no copy of it and reaches it only through `effectiveThinkingConfig`
+ * below.
  *
  * @param raw The raw `MAX_THINKING_TOKENS` value (pass
  *   `process.env.MAX_THINKING_TOKENS`).

package/dist/thinking-option.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thinking-option.d.ts","sourceRoot":"","sources":["../src/thinking-option.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAErE,wDAAwD;AACxD,eAAO,MAAM,kBAAkB,aAAa,CAAC;AAC7C,oDAAoD;AACpD,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,qDAAqD;AACrD,eAAO,MAAM,YAAY,QAAQ,CAAC;AAGlC;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,CAahF;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,CAIvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,cAAc,GACrB,cAAc,GAAG,SAAS,CAQ5B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,OAAO,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,cAAc,GACrB,cAAc,GAAG,SAAS,CAI5B"}
+{"version":3,"file":"thinking-option.d.ts","sourceRoot":"","sources":["../src/thinking-option.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAErE,wDAAwD;AACxD,eAAO,MAAM,kBAAkB,aAAa,CAAC;AAC7C,oDAAoD;AACpD,eAAO,MAAM,WAAW,OAAO,CAAC;AAChC,qDAAqD;AACrD,eAAO,MAAM,YAAY,QAAQ,CAAC;AAGlC;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,CAahF;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,CAIvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,cAAc,GACrB,cAAc,GAAG,SAAS,CAQ5B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,OAAO,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,MAAM,EAAE,cAAc,GACrB,cAAc,GAAG,SAAS,CAI5B"}

package/dist/thinking-option.js

@@ -5,11 +5,15 @@
  * session's thinking intent with the legacy `MAX_THINKING_TOKENS` env
  * resolution into the SDK's `thinking` option.
  *
- * Kept self-contained (no import from the daily-churning `acp-agent.ts`,
- * mirroring the `ask-user-question-fallback.ts` precedent) so the logic is
- * unit-testable in isolation; `acp-agent.ts` wires it into
- * `buildConfigOptions`/`setSessionConfigOption`/query creation in sub-tasks
- * 1.2/1.3.
+ * Kept self-contained — no import from `acp-agent.ts`; what this module needs
+ * from the adapter (a logger, the raw env value) is injected instead, which
+ * also leaves the logic unit-testable in isolation. This mirrors the
+ * `rewind-command.ts` precedent, likewise isolated from the adapter so it can
+ * be unit tested without a live SDK session. The reason is merge cost:
+ * `acp-agent.ts` is a ~7,900-line file that changes upstream almost daily, so
+ * every coupling to it is paid again at each sync. `acp-agent.ts` wires these
+ * helpers into `buildConfigOptions`, `setSessionConfigOption` and query
+ * creation.
  */
 /** Stable id for the Thinking session config option. */
 export const THINKING_CONFIG_ID = "thinking";
@@ -62,9 +66,9 @@ export function resolveThinkingSelection(value) {
  * it); `0` → disabled; a positive integer → a fixed token budget. Anything
  * else is ignored with a logged error, i.e. treated as unset.
  *
- * NOTE: duplicated from the unexported `resolveThinkingConfig` in
- * `acp-agent.ts` (behavior and log message identical); sub-task 1.3 makes
- * `acp-agent.ts` consume this export and removes the duplication.
+ * This is the single source of truth for that translation: `acp-agent.ts`
+ * carries no copy of it and reaches it only through `effectiveThinkingConfig`
+ * below.
  *
  * @param raw The raw `MAX_THINKING_TOKENS` value (pass
  *   `process.env.MAX_THINKING_TOKENS`).

package/dist/tools.d.ts

@@ -3,7 +3,6 @@ import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
 import { TaskCreateInput, TaskCreateOutput, TaskUpdateInput } from "@anthropic-ai/claude-agent-sdk/sdk-tools.js";
 import { ToolResultBlockParam, WebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources";
 import { BetaBashCodeExecutionToolResultBlockParam, BetaCodeExecutionToolResultBlockParam, BetaRequestMCPToolResultBlockParam, BetaTextEditorCodeExecutionToolResultBlockParam, BetaToolResultBlockParam, BetaToolSearchToolResultBlockParam, BetaWebFetchToolResultBlockParam, BetaWebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources/beta.mjs";
-import { Logger } from "./acp-agent.js";
 interface ToolInfo {
     title: string;
     kind: ToolKind;
@@ -82,7 +81,7 @@ export declare function toolUpdateFromDiffToolResponse(toolResponse: unknown): {
 export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, }: {
     onPostToolUseHook?: (toolUseID: string, toolInput: unknown, toolResponse: unknown) => Promise<void>;
 }) => void;
-export declare const createPostToolUseHook: (logger?: Logger, options?: {
+export declare const createPostToolUseHook: (options?: {
     onEnterPlanMode?: () => Promise<void>;
 }) => HookCallback;
 /**

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACT,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAaL,eAAe,EACf,gBAAgB,EAChB,eAAe,EAKhB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAGL,oBAAoB,EAEpB,6BAA6B,EAE9B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEL,yCAAyC,EAGzC,qCAAqC,EAGrC,kCAAkC,EAGlC,+CAA+C,EAI/C,wBAAwB,EACxB,kCAAkC,EAIlC,gCAAgC,EAEhC,iCAAiC,EAClC,MAAM,sCAAsC,CAAC;AA2B9C,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,UAAU,UAAU;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE;QACN,aAAa,CAAC,EAAE;YACd,WAAW,EAAE,MAAM,CAAC;SACrB,CAAC;QACF,eAAe,CAAC,EAAE;YAChB,WAAW,EAAE,MAAM,CAAC;YACpB,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;QACF,aAAa,CAAC,EAAE;YACd,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;YAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;SACvB,CAAC;KACH,CAAC;CACH;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAQpE;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,EACZ,sBAAsB,GAAE,OAAe,EACvC,GAAG,CAAC,EAAE,MAAM,GACX,QAAQ,CAqWV;AAoFD,wBAAgB,wBAAwB,CACtC,UAAU,EACN,oBAAoB,GACpB,wBAAwB,GACxB,iCAAiC,GACjC,gCAAgC,GAChC,6BAA6B,GAC7B,qCAAqC,GACrC,yCAAyC,GACzC,+CAA+C,GAC/C,kCAAkC,GAClC,kCAAkC,EACtC,OAAO,EAAE,GAAG,GAAG,SAAS,EACxB,sBAAsB,GAAE,OAAe,EACvC,aAAa,CAAC,EAAE,OAAO,GACtB,UAAU,CAmUZ;AAiHD,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;IAChD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,WAAW,CAAC,KAAK,EAAE;IAAE,KAAK,EAAE,eAAe,EAAE,CAAA;CAAE,GAAG,SAAS,GAAG,SAAS,EAAE,CAMxF;AAED;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE/C;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS,CAiCpF;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,eAAe,GAAG,SAAS,EAClC,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,IAAI,CASN;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAiB1F;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,EAAE,CAMpE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQnD;AAeD;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,OAAO,GAAG;IACrE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC,CAoCA;AAcD,eAAO,MAAM,oBAAoB,GAC/B,WAAW,MAAM,EACjB,wBAEG;IACD,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAClB,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,SAKF,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAC/B,UAAU;IAAE,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,KAAG,YAiBtD,CAAC;AAEJ;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,GACxB,SAAS;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,KAAG,YAsBpE,CAAC"}

package/dist/tools.js

@@ -362,56 +362,39 @@ function structuredResult(toolUseResult) {
  * matching rather than mangle the report.
  */
 function stripAgentTrailer(text) {
-    // Matched by index rather than by tail-anchored regexes: an unanchored
-    // `…\s*$` pattern retries from every start position, so it costs O(n²) on
-    // text that repeats the trailer's opening token — and a subagent can echo
-    // exactly such text verbatim into its report. The index form is linear and
-    // keeps the same tail-anchored, independent semantics.
-    let out = text;
-    const beforeUsage = out.trimEnd();
-    if (beforeUsage.endsWith("</usage>")) {
-        // FIRST `<usage>`, not the last: the original pattern was unanchored, so
-        // it matched from the leftmost opener and its lazy body then stretched to
-        // the final `</usage>` to satisfy `$` — i.e. everything from the first
-        // opener onward is part of the stripped trailer.
-        const start = beforeUsage.indexOf("<usage>");
-        if (start !== -1) {
-            out = beforeUsage.slice(0, start);
-            if (out.endsWith("\n"))
-                out = out.slice(0, -1);
-        }
+    return stripAgentIdLine(stripUsageBlock(text));
+}
+const USAGE_OPEN = "<usage>";
+const USAGE_CLOSE = "</usage>";
+/** Remove a trailing `<usage>…</usage>` block, plus trailing whitespace and
+ *  one preceding newline. Matches from the *last* `<usage>` so a report that
+ *  merely mentions the marker earlier isn't truncated at the mention. */
+function stripUsageBlock(text) {
+    const body = text.trimEnd();
+    if (!body.endsWith(USAGE_CLOSE)) {
+        return text;
     }
-    // `agentId: <id> (…)`. The original `\n?` was optional, so the trailer did
-    // NOT have to start a line. Its match is nonetheless unique: `[^)]*` forbids
-    // `)` in the body, so the closing paren can only be the final character and
-    // the opener can only be the LAST `(` — which pins the whole match without
-    // scanning from every position.
-    const beforeAgentId = out.trimEnd();
-    if (beforeAgentId.endsWith(")")) {
-        const open = beforeAgentId.lastIndexOf("(");
-        const body = open === -1 ? null : beforeAgentId.slice(open + 1, beforeAgentId.length - 1);
-        // A `)` inside the body rules the trailer out (no earlier `(` can help:
-        // that stray `)` would still fall inside its body).
-        if (body !== null && !body.includes(")")) {
-            const head = beforeAgentId.slice(0, open);
-            if (head.endsWith(" ")) {
-                const beforeSpace = head.slice(0, -1);
-                const idStart = beforeSpace.lastIndexOf(" ") + 1;
-                const id = beforeSpace.slice(idStart);
-                if (AGENT_ID.test(id) && beforeSpace.slice(0, idStart).endsWith("agentId: ")) {
-                    let start = idStart - "agentId: ".length;
-                    if (start > 0 && beforeAgentId[start - 1] === "\n")
-                        start -= 1;
-                    out = beforeAgentId.slice(0, start);
-                }
-            }
-        }
+    const open = body.lastIndexOf(USAGE_OPEN, body.length - USAGE_CLOSE.length - USAGE_OPEN.length);
+    if (open === -1) {
+        return text;
     }
-    return out;
+    return body.slice(0, open > 0 && body[open - 1] === "\n" ? open - 1 : open);
+}
+/** The continuation line, anchored to a whole line so the regex has a single
+ *  start position and no ambiguous repetition (`[\w-]+` can't consume the
+ *  following space, `[^)]*` can't consume the closing paren) — it runs in
+ *  linear time on any input. */
+const AGENT_ID_LINE = /^agentId: [\w-]+ \([^)]*\)$/;
+/** Remove a final `agentId: <id> (…)` line, plus trailing whitespace and the
+ *  newline that preceded the line. */
+function stripAgentIdLine(text) {
+    const body = text.trimEnd();
+    const lineStart = body.lastIndexOf("\n") + 1;
+    if (!AGENT_ID_LINE.test(body.slice(lineStart))) {
+        return text;
+    }
+    return body.slice(0, Math.max(lineStart - 1, 0));
 }
-/** The `<id>` of an `agentId:` trailer — tested only against an already
- *  isolated, space-delimited token, never scanned across the whole report. */
-const AGENT_ID = /^[\w-]+$/;
 /** Apply {@link stripAgentTrailer} across a raw tool_result `content` (plain
  *  string or block array), leaving non-text blocks untouched. */
 function stripAgentTrailerFromContent(content) {
@@ -518,7 +501,17 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
         }
         case "Bash": {
             const result = toolResult.content;
-            const terminalId = "tool_use_id" in toolResult ? String(toolResult.tool_use_id) : "";
+            // The terminal was announced under the tool_use's own id (see
+            // `toolInfoFromToolUse`), so key the output/exit metas off that: it is the
+            // id the client actually created a terminal for. `toolResult.tool_use_id`
+            // is the same value whenever present — the caller looks the tool_use up by
+            // it — so preferring `toolUse.id` only adds a source for the case where the
+            // result block carries no id at all. Anything that isn't a non-empty
+            // string is no id at all: `""` matches no terminal, and stringifying a
+            // present-but-undefined field would invent the literal `"undefined"`.
+            const terminalIdOf = (id) => typeof id === "string" && id.length > 0 ? id : undefined;
+            const terminalId = terminalIdOf(toolUse?.id) ??
+                terminalIdOf("tool_use_id" in toolResult ? toolResult.tool_use_id : undefined);
             const isError = "is_error" in toolResult && toolResult.is_error;
             // Extract output and exit code from either format:
             // 1. The structured BashOutput (message-level tool_use_result): its
@@ -593,7 +586,14 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
                     return toAcpContentUpdate(result, isError);
                 }
             }
-            if (supportsTerminalOutput) {
+            // Without a terminal id there is nothing the client can reconcile these
+            // metas against, and emitting them anyway strands the output: a client that
+            // buffers output/exit for terminals it has not been told about (Zed keeps
+            // them in `pending_terminal_output`/`pending_terminal_exit`, drained only on
+            // a matching create) would hold them forever behind an id that never
+            // arrives, showing an empty terminal. Fall through to the code-block
+            // rendering below instead.
+            if (supportsTerminalOutput && terminalId !== undefined) {
                 return {
                     content: [{ type: "terminal", terminalId }],
                     _meta: {
@@ -944,7 +944,7 @@ export const registerHookCallback = (toolUseID, { onPostToolUseHook, }) => {
     };
 };
 /* A callback for Claude Code that is called when receiving a PostToolUse hook */
-export const createPostToolUseHook = (logger = console, options) => async (input, toolUseID) => {
+export const createPostToolUseHook = (options) => async (input, toolUseID) => {
     if (input.hook_event_name === "PostToolUse") {
         // Handle EnterPlanMode tool - notify client of mode change after successful execution
         if (input.tool_name === "EnterPlanMode" && options?.onEnterPlanMode) {
@@ -954,12 +954,8 @@ export const createPostToolUseHook = (logger = console, options) => async (input
             const onPostToolUseHook = toolUseCallbacks[toolUseID]?.onPostToolUseHook;
             if (onPostToolUseHook) {
                 await onPostToolUseHook(toolUseID, input.tool_input, input.tool_response);
-                delete toolUseCallbacks[toolUseID]; // Cleanup after execution
-            }
-            else {
-                logger.error(`No onPostToolUseHook found for tool use ID: ${toolUseID}`);
-                delete toolUseCallbacks[toolUseID];
             }
+            delete toolUseCallbacks[toolUseID]; // Cleanup after execution
         }
     }
     return { continue: true };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "ACP adapter for the Claude Agent SDK with VS Code-parity UX for Zed and other ACP clients — checkbox multi-select questions, refusal consent dialog, dynamic agent name. Fork of claude-agent-acp.",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -64,21 +64,28 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "1.2.1",
-    "@anthropic-ai/claude-agent-sdk": "0.3.207",
+    "@agentclientprotocol/sdk": "1.3.0",
+    "@anthropic-ai/claude-agent-sdk": "0.3.220",
     "zod": "^3.25.0 || ^4.0.0"
   },
+  "overrides": {
+    "@hono/node-server": "~2.0.6",
+    "brace-expansion": "^5.0.9",
+    "fast-uri": "^3.1.5",
+    "hono": "^4.12.34",
+    "ip-address": "^10.4.0"
+  },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.111.0",
+    "@anthropic-ai/sdk": "0.115.0",
     "@eslint/js": "10.0.1",
     "@tsconfig/node24": "24.0.4",
-    "@types/node": "26.1.1",
-    "@typescript-eslint/eslint-plugin": "8.63.0",
-    "@typescript-eslint/parser": "8.63.0",
-    "eslint": "10.7.0",
+    "@types/node": "26.1.2",
+    "@typescript-eslint/eslint-plugin": "8.65.0",
+    "@typescript-eslint/parser": "8.65.0",
+    "eslint": "10.8.0",
     "eslint-config-prettier": "10.1.8",
-    "globals": "17.7.0",
-    "prettier": "3.9.5",
+    "globals": "17.8.0",
+    "prettier": "3.9.6",
     "ts-node": "10.9.2",
     "typescript": "6.0.3",
     "vitest": "4.1.10"

package/dist/ask-user-question-fallback.d.ts

@@ -1,78 +0,0 @@
-/**
- * Fallback for the built-in AskUserQuestion tool when the connected client does
- * NOT advertise `elicitation.form`. Upstream disables the tool for such clients;
- * this module lets the agent instead route each question through ACP's
- * `session/request_permission` dialog. The path is gated by the
- * `ACP_ASKUSERQUESTION_FALLBACK` env var so it can be turned off to restore
- * byte-for-byte upstream behavior.
- *
- * Alongside the env gate this module provides the pure mapping/orchestration
- * helpers (`questionPermissionOptions`, `handleAskUserQuestionViaPermission`);
- * the ACP client is injected by the adapter that wires them in.
- */
-import type { PermissionOption } from "@agentclientprotocol/sdk";
-import { type AskUserQuestion } from "./elicitation.js";
-/**
- * Whether the AskUserQuestion permission fallback is enabled for clients lacking
- * `elicitation.form`. Defaults ON: only an explicit `0` or `false` (trimmed,
- * case-insensitive) turns it off; any other value — unset, `1`, `true`, … —
- * leaves it on.
- *
- * @param env Environment map to read `ACP_ASKUSERQUESTION_FALLBACK` from (pass
- *   `process.env`).
- */
-export declare function askUserQuestionFallbackEnabled(env: Record<string, string | undefined>): boolean;
-/**
- * Map one AskUserQuestion question to the options shown in ACP's
- * `session/request_permission` dialog: one `allow_once` option per choice (in
- * order) followed by a trailing `reject_once` "Skip this question" option.
- *
- * Each choice's `optionId` is its bare `label` — the value the tool records as
- * the answer — so the description is never folded into the id; a non-empty
- * `description` is instead appended to the human-readable `name` as
- * `"<label> — <description>"`. The skip option is given a random `optionId`
- * that cannot collide with any label, so the orchestrator can recognize a skip
- * by id alone.
- *
- * @param question The single question whose choices become permission options.
- */
-export declare function questionPermissionOptions(question: AskUserQuestion): PermissionOption[];
-/**
- * Route an AskUserQuestion tool call through ACP permission requests rather than
- * a form elicitation, for clients that lack `elicitation.form`. Each question is
- * asked sequentially via the injected `requestPermission`; the selected label is
- * accumulated into `answers` (keyed by the question text), a skipped question is
- * omitted, and a multi-select question naturally degrades to a single label
- * since each option is single-select here.
- *
- * Mirrors the upstream form handler's contract: input with no parseable
- * questions denies with the identical message, and an aborted signal or a
- * cancelled request throws `"Tool use aborted"`, discarding every accumulated
- * answer. On success it returns the original `toolInput` augmented with
- * `answers` as `updatedInput`.
- *
- * Pure and injectable — the real ACP client is wired in by the adapter — so the
- * orchestration can be exercised without a transport.
- *
- * @param toolInput Raw AskUserQuestion tool input (expected to carry `questions`).
- * @param requestPermission Injected permission-request function, invoked once per
- *   question, resolving to the user's selection or a cancellation.
- * @param signal Abort signal for the tool call; checked on entry and around each
- *   request.
- */
-export declare function handleAskUserQuestionViaPermission(toolInput: Record<string, unknown>, requestPermission: (req: {
-    question: AskUserQuestion;
-    options: PermissionOption[];
-}) => Promise<{
-    outcome: "selected";
-    optionId: string;
-} | {
-    outcome: "cancelled";
-}>, signal: AbortSignal): Promise<{
-    behavior: "allow";
-    updatedInput: Record<string, unknown>;
-} | {
-    behavior: "deny";
-    message: string;
-}>;
-//# sourceMappingURL=ask-user-question-fallback.d.ts.map

package/dist/ask-user-question-fallback.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ask-user-question-fallback.d.ts","sourceRoot":"","sources":["../src/ask-user-question-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAA2B,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEjF;;;;;;;;GAQG;AACH,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,OAAO,CAO/F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,eAAe,GAAG,gBAAgB,EAAE,CAYvF;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,kCAAkC,CACtD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,iBAAiB,EAAE,CAAC,GAAG,EAAE;IACvB,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC7B,KAAK,OAAO,CAAC;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,EACnF,MAAM,EAAE,WAAW,GAClB,OAAO,CACN;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAC5D;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CACxC,CAyBA"}