@lucascouts/claude-agent-acp-plus 0.8.1 → 0.9.0

package/dist/session-titles.d.ts

@@ -0,0 +1,77 @@
+/**
+ * AI-generated session titles.
+ *
+ * Claude Code's own auto-title generation never runs under the Agent SDK — the
+ * latch that arms it is pre-set in the headless path — so `SDKSessionInfo.summary`
+ * degrades to the raw first prompt. This module asks the CLI for a real title
+ * instead, via the `generate_session_title` control request, and publishes it
+ * over ACP as a `session_info_update`.
+ *
+ * {@link SessionTitles} holds the per-session state and is owned by `Session`.
+ * `acp-agent.ts` drives it from four places: {@link SessionTitles.onPrompt} and
+ * {@link SessionTitles.onAssistantText} to collect text,
+ * {@link SessionTitles.onTurnEnd} at `session_state_changed: idle`, and
+ * {@link SessionTitles.reset} on `conversation_reset`.
+ */
+import type { ContentBlock, PromptRequest } from "@agentclientprotocol/sdk";
+import type { ClaudeAcpAgent, Session } from "./acp-agent.js";
+export declare function sanitizeTitle(text: string): string;
+/** Rolling text a title is generated from: `previous` plus `text`, keeping only
+ *  the trailing {@link MAX_TITLE_CONTEXT_LENGTH} characters. */
+export declare function appendTitleContext(previous: string | undefined, text: string): string;
+/** One session's title: the text a generated title is derived from, whether a
+ *  title has been settled on, and the last one published. Created with the
+ *  session and reachable as `session.titles`. */
+export declare class SessionTitles {
+    private readonly agent;
+    private readonly sessionId;
+    /** Last title pushed to the client via `session_info_update`, so an unchanged
+     *  title is never re-notified. Undefined until the first push. */
+    private lastTitle?;
+    /** Rolling tail of this session's own user + assistant text, capped at
+     *  {@link MAX_TITLE_CONTEXT_LENGTH}. Dropped once a title exists. */
+    private context?;
+    /** Set once this session has a title or has asked for one. A title is
+     *  generated at most once per session: the SDK reports a generated title in
+     *  the same field as a user `/rename`, so re-titling could silently overwrite
+     *  one. Released by {@link reset}, and when generation yields nothing. */
+    private settled;
+    constructor(agent: ClaudeAcpAgent, sessionId: string);
+    /** Collect a prompt's own text for the title, skipping openers not worth
+     *  titling after. No-op once the title is settled. */
+    onPrompt(prompt: PromptRequest["prompt"]): void;
+    /** Collect the assistant's own answer for the title. Chunks are appended
+     *  verbatim so streamed text reassembles. No-op once the title is settled. */
+    onAssistantText(content: ContentBlock): void;
+    /** Drop the title state so the next turn re-evaluates. Used on
+     *  `conversation_reset`, which mounts a fresh transcript. */
+    reset(): void;
+    /** Turn-end title handling. `idle` is the SDK's turn-over signal, so it is
+     *  when a title may have landed or become generatable.
+     *
+     *  `info.customTitle` is non-empty only once the session file holds a real
+     *  title — a user `/rename` or one generated earlier; the SDK folds both into
+     *  that one field. Adopt it and latch, so neither is ever titled over.
+     *
+     *  With no title yet, ask the SDK to generate one in the background: it is a
+     *  ~2s small-model call and turn-end must not wait on it. Only when that is
+     *  not possible do we fall back to `summary`, which for an SDK-driven session
+     *  is just the raw first prompt. */
+    onTurnEnd(session: Session): Promise<void>;
+    /** Read the SDK's stored info for this session. A missing session file or read
+     *  error is non-fatal: the title is best-effort and another turn will retry. */
+    private readSessionInfo;
+    /** Notify the client of a title, unless it is the one we last sent. */
+    private publish;
+    /** Whether to ask the SDK for a generated title now: once per session, on a
+     *  live query, with enough collected text for the generator to work with. */
+    private canRequest;
+    /** Generate a title from the session's own text and publish it. `persist`
+     *  writes it to the session file, which is what carries it into
+     *  `session/list` and `session/load`. A null or failed generation releases the
+     *  latch so a later turn retries, and publishes `fallback` (the stored
+     *  summary) so a backend that can't generate titles is no worse off than
+     *  before. */
+    private requestGenerateTitle;
+}
+//# sourceMappingURL=session-titles.d.ts.map

package/dist/session-titles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-titles.d.ts","sourceRoot":"","sources":["../src/session-titles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA0B9D,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAUlD;AAED;gEACgE;AAChE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGrF;AAOD;;iDAEiD;AACjD,qBAAa,aAAa;IAgBtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAhB5B;sEACkE;IAClE,OAAO,CAAC,SAAS,CAAC,CAAS;IAE3B;yEACqE;IACrE,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB;;;8EAG0E;IAC1E,OAAO,CAAC,OAAO,CAAS;gBAGL,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM;IAGpC;0DACsD;IACtD,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI;IAW/C;kFAC8E;IAC9E,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI;IAO5C;iEAC6D;IAC7D,KAAK,IAAI,IAAI;IAMb;;;;;;;;;;wCAUoC;IAC9B,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BhD;oFACgF;YAClE,eAAe;IAS7B,uEAAuE;YACzD,OAAO;IAgBrB;iFAC6E;IAC7E,OAAO,CAAC,UAAU;IAUlB;;;;;kBAKc;YACA,oBAAoB;CAoCnC"}

package/dist/session-titles.js

@@ -0,0 +1,199 @@
+/**
+ * AI-generated session titles.
+ *
+ * Claude Code's own auto-title generation never runs under the Agent SDK — the
+ * latch that arms it is pre-set in the headless path — so `SDKSessionInfo.summary`
+ * degrades to the raw first prompt. This module asks the CLI for a real title
+ * instead, via the `generate_session_title` control request, and publishes it
+ * over ACP as a `session_info_update`.
+ *
+ * {@link SessionTitles} holds the per-session state and is owned by `Session`.
+ * `acp-agent.ts` drives it from four places: {@link SessionTitles.onPrompt} and
+ * {@link SessionTitles.onAssistantText} to collect text,
+ * {@link SessionTitles.onTurnEnd} at `session_state_changed: idle`, and
+ * {@link SessionTitles.reset} on `conversation_reset`.
+ */
+import { getSessionInfo } from "@anthropic-ai/claude-agent-sdk";
+const MAX_TITLE_LENGTH = 256;
+/** How much session text the title is generated from. The CLI caps its own
+ *  title input at the same 1000 trailing characters. */
+const MAX_TITLE_CONTEXT_LENGTH = 1000;
+/** Below this the generator returns null without calling the model, so there is
+ *  nothing to gain by asking yet. */
+const MIN_TITLE_CONTEXT_LENGTH = 10;
+export function sanitizeTitle(text) {
+    // Replace newlines and collapse whitespace
+    const sanitized = text
+        .replace(/[\r\n]+/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (sanitized.length <= MAX_TITLE_LENGTH) {
+        return sanitized;
+    }
+    return sanitized.slice(0, MAX_TITLE_LENGTH - 1) + "…";
+}
+/** Rolling text a title is generated from: `previous` plus `text`, keeping only
+ *  the trailing {@link MAX_TITLE_CONTEXT_LENGTH} characters. */
+export function appendTitleContext(previous, text) {
+    const next = (previous ?? "") + text;
+    return next.length > MAX_TITLE_CONTEXT_LENGTH ? next.slice(-MAX_TITLE_CONTEXT_LENGTH) : next;
+}
+/** Whether this SDK still offers on-demand title generation. */
+function supportsTitleGeneration(query) {
+    return typeof query.generateSessionTitle === "function";
+}
+/** One session's title: the text a generated title is derived from, whether a
+ *  title has been settled on, and the last one published. Created with the
+ *  session and reachable as `session.titles`. */
+export class SessionTitles {
+    agent;
+    sessionId;
+    /** Last title pushed to the client via `session_info_update`, so an unchanged
+     *  title is never re-notified. Undefined until the first push. */
+    lastTitle;
+    /** Rolling tail of this session's own user + assistant text, capped at
+     *  {@link MAX_TITLE_CONTEXT_LENGTH}. Dropped once a title exists. */
+    context;
+    /** Set once this session has a title or has asked for one. A title is
+     *  generated at most once per session: the SDK reports a generated title in
+     *  the same field as a user `/rename`, so re-titling could silently overwrite
+     *  one. Released by {@link reset}, and when generation yields nothing. */
+    settled = false;
+    constructor(agent, sessionId) {
+        this.agent = agent;
+        this.sessionId = sessionId;
+    }
+    /** Collect a prompt's own text for the title, skipping openers not worth
+     *  titling after. No-op once the title is settled. */
+    onPrompt(prompt) {
+        if (this.settled) {
+            return;
+        }
+        const promptText = prompt
+            .flatMap((chunk) => (chunk.type === "text" ? [chunk.text] : []))
+            .join("\n");
+        this.context = appendTitleContext(this.context, `\n${promptText}\n`);
+    }
+    /** Collect the assistant's own answer for the title. Chunks are appended
+     *  verbatim so streamed text reassembles. No-op once the title is settled. */
+    onAssistantText(content) {
+        if (this.settled || content.type !== "text") {
+            return;
+        }
+        this.context = appendTitleContext(this.context, content.text);
+    }
+    /** Drop the title state so the next turn re-evaluates. Used on
+     *  `conversation_reset`, which mounts a fresh transcript. */
+    reset() {
+        this.settled = false;
+        this.context = undefined;
+        this.lastTitle = undefined;
+    }
+    /** Turn-end title handling. `idle` is the SDK's turn-over signal, so it is
+     *  when a title may have landed or become generatable.
+     *
+     *  `info.customTitle` is non-empty only once the session file holds a real
+     *  title — a user `/rename` or one generated earlier; the SDK folds both into
+     *  that one field. Adopt it and latch, so neither is ever titled over.
+     *
+     *  With no title yet, ask the SDK to generate one in the background: it is a
+     *  ~2s small-model call and turn-end must not wait on it. Only when that is
+     *  not possible do we fall back to `summary`, which for an SDK-driven session
+     *  is just the raw first prompt. */
+    async onTurnEnd(session) {
+        const info = await this.readSessionInfo(session);
+        if (info?.customTitle) {
+            this.settled = true;
+            this.context = undefined;
+            await this.publish(info.customTitle, info.lastModified);
+            return;
+        }
+        const fallback = info?.summary
+            ? { title: info.summary, lastModified: info.lastModified }
+            : undefined;
+        if (this.canRequest(session)) {
+            this.settled = true;
+            void this.requestGenerateTitle(session, fallback).catch((error) => {
+                this.agent.logger.error(`Session ${this.sessionId}: session title update failed: ${error}`);
+            });
+            return;
+        }
+        // Only while this session has no title of its own: `summary` degrades to the
+        // raw first prompt, which must never overwrite a generated title if the
+        // persisted one is slow to show up in `info`.
+        if (fallback && !this.settled) {
+            await this.publish(fallback.title, fallback.lastModified);
+        }
+    }
+    /** Read the SDK's stored info for this session. A missing session file or read
+     *  error is non-fatal: the title is best-effort and another turn will retry. */
+    async readSessionInfo(session) {
+        try {
+            return await getSessionInfo(this.sessionId, { dir: session.cwd });
+        }
+        catch (error) {
+            this.agent.logger.error(`Session ${this.sessionId}: failed to read session info: ${error}`);
+            return undefined;
+        }
+    }
+    /** Notify the client of a title, unless it is the one we last sent. */
+    async publish(rawTitle, lastModified) {
+        const title = sanitizeTitle(rawTitle);
+        if (title === this.lastTitle) {
+            return;
+        }
+        this.lastTitle = title;
+        await this.agent.client.sessionUpdate({
+            sessionId: this.sessionId,
+            update: {
+                sessionUpdate: "session_info_update",
+                title,
+                updatedAt: new Date(lastModified).toISOString(),
+            },
+        });
+    }
+    /** Whether to ask the SDK for a generated title now: once per session, on a
+     *  live query, with enough collected text for the generator to work with. */
+    canRequest(session) {
+        if (this.settled || session.queryClosed || session.cancelled) {
+            return false;
+        }
+        if (!supportsTitleGeneration(session.query)) {
+            return false;
+        }
+        return (this.context?.trim().length ?? 0) >= MIN_TITLE_CONTEXT_LENGTH;
+    }
+    /** Generate a title from the session's own text and publish it. `persist`
+     *  writes it to the session file, which is what carries it into
+     *  `session/list` and `session/load`. A null or failed generation releases the
+     *  latch so a later turn retries, and publishes `fallback` (the stored
+     *  summary) so a backend that can't generate titles is no worse off than
+     *  before. */
+    async requestGenerateTitle(session, fallback) {
+        const description = this.context?.trim() ?? "";
+        let title = null;
+        try {
+            title =
+                (await session.query.generateSessionTitle?.(description, {
+                    persist: true,
+                })) ?? null;
+        }
+        catch (error) {
+            this.agent.logger.error(`Session ${this.sessionId}: failed to generate a session title: ${error}`);
+        }
+        // A session torn down or replaced while the title was in flight must not
+        // adopt it.
+        if (this.agent.sessions[this.sessionId] !== session) {
+            return;
+        }
+        if (!title) {
+            this.settled = false;
+            if (fallback) {
+                await this.publish(fallback.title, fallback.lastModified);
+            }
+            return;
+        }
+        this.context = undefined;
+        await this.publish(title, Date.now());
+    }
+}

package/dist/tool-result-meta.d.ts

@@ -0,0 +1,8 @@
+export type ToolResultMeta = {
+    nonExecutionKind: string;
+    userFeedback?: string;
+};
+/** Validate the SDK's currently untyped tool_result_meta sidecar. Unknown
+ * non-execution kinds are preserved so newer CLIs remain forward-compatible. */
+export declare function parseToolResultMeta(raw: unknown): Map<string, ToolResultMeta> | undefined;
+//# sourceMappingURL=tool-result-meta.d.ts.map

package/dist/tool-result-meta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-result-meta.d.ts","sourceRoot":"","sources":["../src/tool-result-meta.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;gFACgF;AAChF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,SAAS,CAczF"}

package/dist/tool-result-meta.js

@@ -0,0 +1,19 @@
+/** Validate the SDK's currently untyped tool_result_meta sidecar. Unknown
+ * non-execution kinds are preserved so newer CLIs remain forward-compatible. */
+export function parseToolResultMeta(raw) {
+    if (!Array.isArray(raw))
+        return undefined;
+    let byToolUseId;
+    for (const entry of raw) {
+        if (typeof entry !== "object" || entry === null)
+            continue;
+        const { id, non_execution_kind, user_feedback } = entry;
+        if (typeof id !== "string" || typeof non_execution_kind !== "string")
+            continue;
+        (byToolUseId ??= new Map()).set(id, {
+            nonExecutionKind: non_execution_kind,
+            ...(typeof user_feedback === "string" ? { userFeedback: user_feedback } : {}),
+        });
+    }
+    return byToolUseId;
+}

package/dist/tools.d.ts

@@ -1,6 +1,6 @@
 import { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
-import { TaskCreateInput, TaskCreateOutput, TaskUpdateInput } from "@anthropic-ai/claude-agent-sdk/sdk-tools.js";
+import { TaskCreateInput, TaskCreateOutput, TaskListOutput, TaskUpdateInput, TaskUpdateOutput } 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";
 interface ToolInfo {
@@ -57,14 +57,12 @@ export type TaskEntry = {
     description?: string;
 };
 export type TaskState = Map<string, TaskEntry>;
-/**
- * Best-effort parse of a TaskCreate tool_result content into the structured
- * TaskCreateOutput. The SDK delivers tool outputs either as a string or as
- * an array of TextBlockParam-like blocks containing JSON text; try both.
- */
 export declare function parseTaskCreateOutput(content: unknown): TaskCreateOutput | undefined;
+export declare function parseTaskListOutput(content: unknown): TaskListOutput | undefined;
+export declare function parseTaskUpdateOutput(content: unknown, expectedTaskId?: string): TaskUpdateOutput | undefined;
 export declare function applyTaskCreate(state: TaskState, input: TaskCreateInput | undefined, output: TaskCreateOutput | undefined): void;
 export declare function applyTaskUpdate(state: TaskState, input: TaskUpdateInput | undefined): void;
+export declare function applyTaskList(state: TaskState, output: TaskListOutput): void;
 export declare function taskStateToPlanEntries(state: TaskState): PlanEntry[];
 export declare function markdownEscape(text: string): string;
 /**

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":"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"}

package/dist/tools.js

@@ -96,7 +96,7 @@ export function toolInfoFromToolUse(toolUse, supportsTerminalOutput = false, cwd
             }
             const displayPath = input?.file_path ? toDisplayPath(input.file_path, cwd) : undefined;
             return {
-                title: displayPath ? `Write ${displayPath}` : "Write",
+                title: displayPath ? `Write ${displayPath}` : "Preparing file…",
                 kind: "edit",
                 content,
                 locations: input?.file_path ? [{ path: input.file_path }] : [],
@@ -211,15 +211,8 @@ export function toolInfoFromToolUse(toolUse, supportsTerminalOutput = false, cwd
         }
         case "WebSearch": {
             const input = toolUse.input;
-            let label = input?.query ? `"${input.query}"` : "Web search";
-            if (input?.allowed_domains && input.allowed_domains.length > 0) {
-                label += ` (allowed: ${input.allowed_domains.join(", ")})`;
-            }
-            if (input?.blocked_domains && input.blocked_domains.length > 0) {
-                label += ` (blocked: ${input.blocked_domains.join(", ")})`;
-            }
             return {
-                title: label,
+                title: input?.query ? `Search "${input.query}"` : "Web search",
                 kind: "fetch",
                 content: [],
             };
@@ -284,13 +277,22 @@ export function toolInfoFromToolUse(toolUse, supportsTerminalOutput = false, cwd
         case "ExitPlanMode": {
             const planInput = toolUse.input;
             return {
-                title: "Ready to code?",
+                title: "Approve Plan",
                 kind: "switch_mode",
                 content: planInput?.plan
                     ? [{ type: "content", content: { type: "text", text: planInput.plan } }]
                     : [],
             };
         }
+        case "Skill": {
+            const input = toolUse.input;
+            const skillName = input?.skill;
+            return {
+                title: skillName ? `Load skill: ${skillName}` : "Load skill",
+                kind: "other",
+                content: [],
+            };
+        }
         case "AskUserQuestion": {
             const input = toolUse.input;
             const questions = Array.isArray(input?.questions) ? input.questions : [];
@@ -658,6 +660,9 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
             // renders, no worse than before.
             return toAcpContentUpdate(stripAgentTrailerFromContent(toolResult.content), "is_error" in toolResult ? toolResult.is_error : false);
         }
+        case "Skill": {
+            return {};
+        }
         case "Edit": // Edit is handled in hooks
         case "Write": {
             return {};
@@ -798,35 +803,32 @@ function toAcpContentBlock(content, isError) {
 }
 export function planEntries(input) {
     return (input?.todos ?? []).map((todo) => ({
-        content: todo.content,
+        content: todo.status === "in_progress" && todo.activeForm ? todo.activeForm : todo.content,
         status: todo.status,
         priority: "medium",
     }));
 }
 /**
- * Best-effort parse of a TaskCreate tool_result content into the structured
- * TaskCreateOutput. The SDK delivers tool outputs either as a string or as
- * an array of TextBlockParam-like blocks containing JSON text; try both.
+ * Best-effort parse of a structured Task* tool_result. The SDK delivers tool
+ * outputs either as a string or as an array of TextBlockParam-like blocks
+ * containing JSON text; try both.
  */
-export function parseTaskCreateOutput(content) {
+function parseJsonToolOutput(content, isExpectedOutput) {
     const tryParse = (text) => {
         try {
             const parsed = JSON.parse(text);
-            if (parsed &&
-                typeof parsed === "object" &&
-                parsed.task &&
-                typeof parsed.task.id === "string") {
-                return parsed;
-            }
+            return isExpectedOutput(parsed) ? parsed : undefined;
         }
         catch {
-            // ignore
+            return undefined;
         }
-        return undefined;
     };
     if (typeof content === "string") {
         return tryParse(content);
     }
+    if (content && typeof content === "object" && !Array.isArray(content)) {
+        return isExpectedOutput(content) ? content : undefined;
+    }
     if (Array.isArray(content)) {
         for (const block of content) {
             if (block && typeof block === "object" && "type" in block && block.type === "text") {
@@ -841,6 +843,96 @@ export function parseTaskCreateOutput(content) {
     }
     return undefined;
 }
+function toolOutputTexts(content) {
+    if (typeof content === "string")
+        return [content];
+    if (!Array.isArray(content))
+        return [];
+    return content.flatMap((block) => block &&
+        typeof block === "object" &&
+        "type" in block &&
+        block.type === "text" &&
+        "text" in block &&
+        typeof block.text === "string"
+        ? [block.text]
+        : []);
+}
+export function parseTaskCreateOutput(content) {
+    const structured = parseJsonToolOutput(content, (parsed) => Boolean(parsed &&
+        typeof parsed === "object" &&
+        "task" in parsed &&
+        parsed.task &&
+        typeof parsed.task === "object" &&
+        "id" in parsed.task &&
+        typeof parsed.task.id === "string"));
+    if (structured)
+        return structured;
+    for (const text of toolOutputTexts(content)) {
+        const match = /^Task #(\S+) created successfully: (.+)$/.exec(text.trim());
+        if (match)
+            return { task: { id: match[1], subject: match[2] } };
+    }
+    return undefined;
+}
+export function parseTaskListOutput(content) {
+    const validStatuses = new Set(["pending", "in_progress", "completed"]);
+    const structured = parseJsonToolOutput(content, (parsed) => Boolean(parsed &&
+        typeof parsed === "object" &&
+        "tasks" in parsed &&
+        Array.isArray(parsed.tasks) &&
+        parsed.tasks.every((task) => task &&
+            typeof task === "object" &&
+            typeof task.id === "string" &&
+            typeof task.subject === "string" &&
+            typeof task.status === "string" &&
+            validStatuses.has(task.status))));
+    if (structured)
+        return structured;
+    for (const text of toolOutputTexts(content)) {
+        if (text.trim() === "No tasks found")
+            return { tasks: [] };
+        const tasks = [];
+        const lines = text.trim().split("\n");
+        for (const line of lines) {
+            const match = /^#(\S+) \[(pending|in_progress|completed)\] (.+?)(?: \(([^()]*)\))?(?: \[blocked by ((?:#[^,\]]+(?:, )?)+)\])?$/.exec(line);
+            if (!match) {
+                tasks.length = 0;
+                break;
+            }
+            tasks.push({
+                id: match[1],
+                subject: match[3],
+                status: match[2],
+                ...(match[4] ? { owner: match[4] } : {}),
+                blockedBy: match[5] ? match[5].split(", ").map((id) => id.slice(1)) : [],
+            });
+        }
+        if (tasks.length > 0)
+            return { tasks };
+    }
+    return undefined;
+}
+export function parseTaskUpdateOutput(content, expectedTaskId) {
+    const structured = parseJsonToolOutput(content, (parsed) => Boolean(parsed &&
+        typeof parsed === "object" &&
+        "success" in parsed &&
+        typeof parsed.success === "boolean" &&
+        "taskId" in parsed &&
+        typeof parsed.taskId === "string" &&
+        "updatedFields" in parsed &&
+        Array.isArray(parsed.updatedFields) &&
+        parsed.updatedFields.every((field) => typeof field === "string")));
+    if (structured)
+        return structured;
+    for (const text of toolOutputTexts(content)) {
+        const notFound = /^Task #(\S+) not found$/.exec(text.trim());
+        const taskId = notFound?.[1] ?? expectedTaskId;
+        if (taskId && (notFound || text.trim() === "Failed to delete task")) {
+            return { success: false, taskId, updatedFields: [], error: text.trim() };
+        }
+    }
+    return undefined;
+}
 export function applyTaskCreate(state, input, output) {
     const taskId = output?.task?.id;
     if (!taskId || !input)
@@ -872,9 +964,22 @@ export function applyTaskUpdate(state, input) {
         description: input.description ?? existing?.description,
     });
 }
+export function applyTaskList(state, output) {
+    const previous = new Map(state);
+    state.clear();
+    for (const task of output.tasks) {
+        const existing = previous.get(task.id);
+        state.set(task.id, {
+            subject: task.subject,
+            status: task.status,
+            activeForm: existing?.activeForm,
+            description: existing?.description,
+        });
+    }
+}
 export function taskStateToPlanEntries(state) {
     return Array.from(state.values()).map((task) => ({
-        content: task.subject,
+        content: task.status === "in_progress" && task.activeForm ? task.activeForm : task.subject,
         status: task.status,
         priority: "medium",
     }));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.8.1",
+  "version": "0.9.0",
   "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",
@@ -68,11 +68,11 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.3.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.233",
+    "@anthropic-ai/claude-agent-sdk": "0.3.235",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.117.1",
+    "@anthropic-ai/sdk": "0.120.0",
     "@eslint/js": "10.0.1",
     "@tsconfig/node24": "24.0.5",
     "@types/node": "26.2.0",