linkshell-cli 0.5.37 → 0.5.39

package/dist/cli/src/runtime/acp/agent-workspace.js

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, readFileSync, statSync, watch } from "node:fs";
+import { closeSync, existsSync, openSync, readFileSync, readSync, readdirSync, statSync, watch } from "node:fs";
 import { homedir } from "node:os";
 import { basename, join, relative } from "node:path";
 import { createEnvelope, parseTypedPayload, } from "@linkshell/protocol";
@@ -242,8 +242,9 @@ function normalizeToolStatus(value, completedFallback = false) {
 function normalizePlanStatus(value) {
     if (value === "completed" || value === "done")
         return "completed";
-    if (value === "inProgress" || value === "running" || value === "active")
+    if (value === "inProgress" || value === "in_progress" || value === "running" || value === "active") {
         return "in_progress";
+    }
     return "pending";
 }
 function applyThreadSettingsToConversation(conversation, value) {
@@ -577,7 +578,9 @@ function contentBlocksFromItem(item) {
     const text = firstString(item, ["text", "message"]);
     return text ? [{ type: "text", text }] : [];
 }
-function protocolSupportsImages(protocol) {
+function protocolSupportsImages(protocol, advertised) {
+    if (protocol === "acp")
+        return Boolean(advertised?.images);
     return protocol === "codex-app-server" ||
         protocol === "claude-agent-sdk" ||
         protocol === "claude-stream-json";
@@ -1442,6 +1445,244 @@ function codexSessionConfig(sessionId) {
     }
     return cfg;
 }
+const CODEX_ROLLOUT_NAME = /^rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-(.+)\.jsonl$/;
+function walkCodexRollouts(root, onFile) {
+    if (!existsSync(root))
+        return;
+    const walk = (dir) => {
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            return;
+        }
+        for (const name of entries) {
+            const path = join(dir, name);
+            let stat;
+            try {
+                stat = statSync(path);
+            }
+            catch {
+                continue;
+            }
+            if (stat.isDirectory()) {
+                walk(path);
+                continue;
+            }
+            const match = CODEX_ROLLOUT_NAME.exec(name);
+            if (match?.[1])
+                onFile(path, match[1], stat.mtimeMs);
+        }
+    };
+    walk(root);
+}
+function findCodexRolloutPath(sessionId, root = join(homedir(), ".codex", "sessions")) {
+    const byName = [];
+    const recent = [];
+    walkCodexRollouts(root, (path, filenameId, mt) => {
+        recent.push({ path, mt });
+        if (filenameId === sessionId)
+            byName.push({ path, mt });
+    });
+    if (byName.length > 0) {
+        byName.sort((a, b) => b.mt - a.mt);
+        return byName[0]?.path;
+    }
+    recent.sort((a, b) => b.mt - a.mt);
+    for (const candidate of recent.slice(0, 80)) {
+        try {
+            const fdText = readFileSync(candidate.path, "utf8");
+            const first = fdText.slice(0, fdText.indexOf("\n") >= 0 ? fdText.indexOf("\n") : fdText.length);
+            const metaId = firstString(asRecord(asRecord(JSON.parse(first))?.payload), ["session_id", "id"]);
+            if (metaId === sessionId)
+                return candidate.path;
+        }
+        catch { /* skip */ }
+    }
+    return undefined;
+}
+function findLatestCodexRolloutForCwd(cwd, root = join(homedir(), ".codex", "sessions")) {
+    const wanted = cwd.replace(/\/+$/, "");
+    const candidates = [];
+    walkCodexRollouts(root, (path, filenameId, mt) => {
+        candidates.push({ path, sessionId: filenameId, mt });
+    });
+    candidates.sort((a, b) => b.mt - a.mt);
+    for (const candidate of candidates.slice(0, 40)) {
+        try {
+            const text = readFileSync(candidate.path, "utf8");
+            const first = text.slice(0, text.indexOf("\n") >= 0 ? text.indexOf("\n") : text.length);
+            const payload = asRecord(asRecord(JSON.parse(first))?.payload);
+            const fileCwd = firstString(payload, ["cwd"])?.replace(/\/+$/, "");
+            const metaId = firstString(payload, ["session_id", "id"]) ?? candidate.sessionId;
+            if (fileCwd === wanted)
+                return { path: candidate.path, sessionId: metaId };
+        }
+        catch {
+            continue;
+        }
+    }
+    return undefined;
+}
+function publicWorkspaceRoots(roots) {
+    if (!Array.isArray(roots))
+        return undefined;
+    const cleaned = roots
+        .filter((root) => typeof root === "string" && root.length > 0)
+        .filter((root) => !root.includes("/.codex/visualizations/"));
+    return cleaned.length > 0 ? cleaned : undefined;
+}
+function isInjectedCodexUserText(text) {
+    const trimmed = text.trim();
+    return (trimmed.startsWith("<app-context>") ||
+        trimmed.startsWith("<recommended_plugins>") ||
+        trimmed.startsWith("<skills_instructions>") ||
+        trimmed.startsWith("# AGENTS.md") ||
+        trimmed.startsWith("You are `/root`"));
+}
+function textsFromCodexContent(content) {
+    if (typeof content === "string" && content.trim())
+        return [content];
+    if (!Array.isArray(content))
+        return [];
+    const texts = [];
+    for (const block of content) {
+        const rec = asRecord(block);
+        const text = typeof rec?.text === "string" ? rec.text : undefined;
+        if (text?.trim())
+            texts.push(text);
+    }
+    return texts;
+}
+/** Incremental Codex jsonl parser so live TUI/desktop sessions can tail the file. */
+export class CodexRolloutParser {
+    toolNames = new Map();
+    index = 0;
+    workspaceRoots;
+    sessionCwd;
+    consume(text, conversationId) {
+        const items = [];
+        for (const line of text.split(/\r?\n/)) {
+            if (!line.trim())
+                continue;
+            const next = this.consumeLine(line, conversationId);
+            if (next)
+                items.push(next);
+        }
+        return items;
+    }
+    consumeLine(line, conversationId) {
+        let record;
+        try {
+            record = asRecord(JSON.parse(line));
+        }
+        catch {
+            return undefined;
+        }
+        if (!record)
+            return undefined;
+        const payload = asRecord(record.payload) ?? record;
+        const recordType = firstString(record, ["type"]);
+        const payloadType = firstString(payload, ["type"]);
+        const roots = publicWorkspaceRoots(payload.workspace_roots ?? payload.workspaceRoots);
+        if (roots)
+            this.workspaceRoots = roots;
+        const cwd = firstString(payload, ["cwd"]);
+        if (cwd)
+            this.sessionCwd = cwd;
+        const createdAt = parseTimestamp(record.timestamp ?? payload.timestamp) ?? Date.now();
+        if (recordType === "response_item" && payloadType === "message") {
+            const roleRaw = firstString(payload, ["role"]);
+            if (roleRaw !== "user" && roleRaw !== "assistant")
+                return undefined;
+            const texts = textsFromCodexContent(payload.content).filter((text) => roleRaw === "assistant" || !isInjectedCodexUserText(text));
+            if (texts.length === 0)
+                return undefined;
+            const text = texts.join("\n\n");
+            this.index += 1;
+            return {
+                id: firstString(payload, ["id"]) ?? id(`codex-msg-${this.index}`),
+                conversationId,
+                type: "message",
+                kind: "chat",
+                role: roleRaw,
+                text,
+                content: [{ type: "text", text }],
+                createdAt,
+                updatedAt: createdAt,
+            };
+        }
+        if (recordType === "response_item" && payloadType === "reasoning") {
+            const texts = textsFromCodexContent(payload.content ?? payload.summary);
+            if (texts.length === 0)
+                return undefined;
+            this.index += 1;
+            return {
+                id: firstString(payload, ["id"]) ?? id(`codex-think-${this.index}`),
+                conversationId,
+                type: "status",
+                kind: "thinking",
+                text: texts.join("\n"),
+                createdAt,
+                updatedAt: createdAt,
+            };
+        }
+        if (recordType === "response_item" && (payloadType === "custom_tool_call" || payloadType === "function_call")) {
+            const callId = firstString(payload, ["call_id", "id"]) ?? id(`codex-tool-${this.index}`);
+            const name = firstString(payload, ["name"]) ?? "tool";
+            this.toolNames.set(callId, name);
+            const input = firstString(payload, ["input", "arguments"]) ?? stringify(payload.input ?? payload.arguments ?? "");
+            this.index += 1;
+            return {
+                id: `tool:${callId}`,
+                conversationId,
+                type: "tool_call",
+                kind: name === "exec" || name.includes("command") ? "command_execution" : "tool_activity",
+                itemId: callId,
+                toolCall: {
+                    id: callId,
+                    name,
+                    input,
+                    createdAt,
+                    status: "running",
+                },
+                createdAt,
+                updatedAt: createdAt,
+            };
+        }
+        if (recordType === "response_item" && (payloadType === "custom_tool_call_output" || payloadType === "function_call_output")) {
+            const callId = firstString(payload, ["call_id", "id"]);
+            if (!callId)
+                return undefined;
+            const outputTexts = textsFromCodexContent(payload.output);
+            const output = outputTexts.join("\n") || stringify(payload.output ?? "");
+            this.index += 1;
+            return {
+                id: `tool:${callId}`,
+                conversationId,
+                type: "tool_call",
+                kind: "tool_activity",
+                itemId: callId,
+                toolCall: {
+                    id: callId,
+                    name: this.toolNames.get(callId) ?? "tool",
+                    output,
+                    createdAt,
+                    status: "completed",
+                },
+                createdAt,
+                updatedAt: createdAt,
+            };
+        }
+        return undefined;
+    }
+}
+/** Parse a Codex on-disk rollout into timeline items. App-server thread/read
+ *  only sees threads it owns; desktop/TUI sessions live in jsonl. */
+export function timelineItemsFromCodexRolloutText(text, conversationId) {
+    return new CodexRolloutParser().consume(text, conversationId).slice(-MAX_TIMELINE_ITEMS);
+}
 function parseRemoteSessions(value) {
     const raw = asRecord(value);
     const sessionsValue = Array.isArray(value) ? value :
@@ -1826,6 +2067,22 @@ export class AgentWorkspaceProxy {
                 // Echo the updated record so every client refreshes (the web store
                 // force-replaces by id on any event carrying `conversation`).
                 this.emitConversation(conversation);
+                if (conversation.agentSessionId) {
+                    const client = this.clientForProvider(conversation.provider);
+                    if (client instanceof AcpClient && model?.trim() && client.advertised.setModel && conversation.provider !== "codex") {
+                        try {
+                            await client.setSessionModel({
+                                sessionId: conversation.agentSessionId,
+                                modelId: model.trim(),
+                            });
+                        }
+                        catch (error) {
+                            if (this.input.verbose) {
+                                process.stderr.write(`[agent:v2] session/set_model failed: ${error instanceof Error ? error.message : String(error)}\n`);
+                            }
+                        }
+                    }
+                }
                 if (conversation.provider === "codex" && conversation.agentSessionId) {
                     const client = this.clientForProvider(conversation.provider);
                     const settingsChanged = model !== undefined ||
@@ -1919,6 +2176,10 @@ export class AgentWorkspaceProxy {
                 const conversation = this.conversations.get(payload.conversationId);
                 if (!conversation)
                     break;
+                if (conversation.control === "attached" || this.attachedExternalCodex.has(conversation.id)) {
+                    this.rejectAgentAction(conversation, `${providerLabel(conversation.provider)} 这场会话在本机终端/桌面里运行。Web 无法停止它，请在那边操作。`, conversation.status);
+                    break;
+                }
                 const turnId = this.currentTurnIds.get(payload.conversationId);
                 if (this.protocolForProvider(conversation.provider) === "codex-app-server" && !turnId) {
                     this.rejectAgentAction(conversation, "无法停止 Codex：当前运行 turn 尚未同步，请重新打开对话后再试。", conversation.status);
@@ -1983,8 +2244,13 @@ export class AgentWorkspaceProxy {
     fsSyncRunning = false;
     lastPushedConversationSignature;
     lastHydrateAt = new Map();
-    static FS_SYNC_THROTTLE_MS = 1500;
-    static EXTERNAL_HYDRATE_THROTTLE_MS = 2000;
+    /** Session ids this LinkShell process created via app-server `newSession`. */
+    ownedCodexSessionIds = new Set();
+    /** Conversations attached to an external Codex TUI/desktop rollout (same file, not a copy). */
+    attachedExternalCodex = new Set();
+    codexFollow = new Map();
+    static FS_SYNC_THROTTLE_MS = 400;
+    static EXTERNAL_HYDRATE_THROTTLE_MS = 400;
     startSessionWatchers() {
         const roots = [
             join(homedir(), ".claude", "projects"),
@@ -2064,7 +2330,9 @@ export class AgentWorkspaceProxy {
                 this.lastHydrateAt.set(conversation.id, now);
                 try {
                     await this.hydrateConversationFromProvider(conversation, undefined, { rememberActiveTurn: false });
-                    this.sendSnapshot(conversation.id);
+                    if (this.followCodexRolloutDisk(conversation, true) > 0) {
+                        this.sendSnapshot(conversation.id);
+                    }
                 }
                 catch (error) {
                     if (this.input.verbose) {
@@ -2192,11 +2460,18 @@ export class AgentWorkspaceProxy {
                 : `${snapshot.provider}:${snapshot.pid}`;
             seenKeys.add(key);
             this.processMissCounts.set(key, 0);
-            const existingId = snapshot.sessionId
-                ? this.conversationByAgentSessionId.get(snapshot.sessionId)
+            let sessionId = snapshot.sessionId;
+            if (!sessionId && snapshot.provider === "codex") {
+                const matched = findLatestCodexRolloutForCwd(snapshot.cwd ?? this.input.cwd);
+                if (matched)
+                    sessionId = matched.sessionId;
+            }
+            const existingId = sessionId
+                ? this.conversationByAgentSessionId.get(sessionId)
                 : undefined;
-            const liveId = liveConversationId(snapshot);
-            const conversationId = existingId ?? liveId;
+            const liveId = liveConversationId({ ...snapshot, sessionId });
+            const conversationId = existingId
+                ?? (sessionId ? makeAgentV2RemoteConversationId(snapshot.provider, sessionId) : liveId);
             const existing = this.conversations.get(conversationId);
             const cwd = snapshot.cwd ?? existing?.cwd ?? this.input.cwd;
             const driving = this.currentTurnIds.has(conversationId);
@@ -2211,10 +2486,12 @@ export class AgentWorkspaceProxy {
                 existing.cwd = cwd;
                 if (!existing.title)
                     existing.title = agentProviderLabel(snapshot.provider);
-                if (snapshot.sessionId && !existing.agentSessionId) {
-                    existing.agentSessionId = snapshot.sessionId;
-                    this.conversationByAgentSessionId.set(snapshot.sessionId, existing.id);
+                if (sessionId && !existing.agentSessionId) {
+                    existing.agentSessionId = sessionId;
+                    this.conversationByAgentSessionId.set(sessionId, existing.id);
                 }
+                this.attachedExternalCodex.add(existing.id);
+                existing.control = "attached";
                 if (changed) {
                     listChanged = true;
                     this.emitConversation(existing);
@@ -2224,7 +2501,7 @@ export class AgentWorkspaceProxy {
             const now = Date.now();
             const conversation = {
                 id: conversationId,
-                agentSessionId: snapshot.sessionId,
+                agentSessionId: sessionId,
                 provider: snapshot.provider,
                 cwd,
                 title: agentProviderLabel(snapshot.provider),
@@ -2233,10 +2510,12 @@ export class AgentWorkspaceProxy {
                 lastMessagePreview: "本机终端中的 Agent 进程",
                 lastActivityAt: now,
                 createdAt: now,
+                control: "attached",
             };
             this.conversations.set(conversation.id, conversation);
-            if (snapshot.sessionId)
-                this.conversationByAgentSessionId.set(snapshot.sessionId, conversation.id);
+            if (sessionId)
+                this.conversationByAgentSessionId.set(sessionId, conversation.id);
+            this.attachedExternalCodex.add(conversation.id);
             this.emitConversation(conversation);
             listChanged = true;
         }
@@ -2426,8 +2705,15 @@ export class AgentWorkspaceProxy {
         });
     }
     async refreshProviderCapabilities(provider, client, protocol) {
-        if (client instanceof AcpClient && protocol !== "codex-app-server")
-            return;
+        if (client instanceof AcpClient) {
+            const prior = this.providerCapabilities.get(provider);
+            this.providerCapabilities.set(provider, {
+                ...prior,
+                advertised: client.advertised,
+            });
+            if (protocol !== "codex-app-server")
+                return;
+        }
         const listModels = client.listModels;
         let runtimeCapabilities;
         if (typeof listModels === "function") {
@@ -2457,6 +2743,8 @@ export class AgentWorkspaceProxy {
                 commands: mergeCommands(runtimeCapabilities?.commands, skillCommands),
                 modes: runtimeCapabilities?.modes,
                 currentMode: runtimeCapabilities?.currentMode,
+                advertised: this.providerCapabilities.get(provider)?.advertised
+                    ?? (client instanceof AcpClient ? client.advertised : undefined),
                 // Preserve any MCP status already accumulated from startupStatus events.
                 mcpServers: runtimeCapabilities?.mcpServers ?? this.providerCapabilities.get(provider)?.mcpServers,
             };
@@ -2482,7 +2770,12 @@ export class AgentWorkspaceProxy {
                     commands: mergeCommands(runtimeCapabilities.commands, skillCommands),
                 };
             }
-            this.providerCapabilities.set(provider, runtimeCapabilities);
+            this.providerCapabilities.set(provider, {
+                ...runtimeCapabilities,
+                advertised: runtimeCapabilities.advertised
+                    ?? this.providerCapabilities.get(provider)?.advertised
+                    ?? (client instanceof AcpClient ? client.advertised : undefined),
+            });
         }
         if (listedMcp.length > 0)
             this.mergeMcpServers(provider, listedMcp);
@@ -2594,6 +2887,8 @@ export class AgentWorkspaceProxy {
                         lastActivityAt: remote.lastActivityAt ?? existing?.lastActivityAt ?? now,
                         createdAt: remote.createdAt ?? existing?.createdAt ?? now,
                         usage,
+                        group: existing?.group ?? (provider === "claude" ? titleFromCwd(cwd) : existing?.group),
+                        workspaceRoots: existing?.workspaceRoots,
                     };
                     this.conversations.set(conversation.id, conversation);
                     this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
@@ -2729,7 +3024,13 @@ export class AgentWorkspaceProxy {
             if (turnCount > 0)
                 this.historyCursors.set(conversation.id, String(turnCount));
         }
-        const hydratedItems = timelineItemsFromProviderThread(source, conversation.id);
+        let hydratedItems = timelineItemsFromProviderThread(source, conversation.id);
+        if (conversation.provider === "codex") {
+            this.followCodexRolloutDisk(conversation, false);
+        }
+        if (hydratedItems.length === 0) {
+            hydratedItems = this.timelines.get(conversation.id) ?? [];
+        }
         if (hydratedItems.length === 0)
             return;
         const existing = this.timelines.get(conversation.id) ?? [];
@@ -2747,9 +3048,97 @@ export class AgentWorkspaceProxy {
         const lastPreview = [...nextItems].reverse()
             .map((item) => previewText(previewFromTimelineItem(item) ?? ""))
             .find(Boolean);
-        if (lastPreview && !conversation.lastMessagePreview) {
+        if (lastPreview)
             conversation.lastMessagePreview = lastPreview;
+    }
+    /** Tail a Codex desktop/TUI rollout. `emit` sends agent.v2.event for new lines
+     *  so a phone/web client sees tokens as the jsonl grows, not only on open. */
+    followCodexRolloutDisk(conversation, emit) {
+        if (conversation.provider !== "codex")
+            return 0;
+        let path = conversation.agentSessionId
+            ? findCodexRolloutPath(conversation.agentSessionId)
+            : undefined;
+        if (!path && conversation.cwd) {
+            const matched = findLatestCodexRolloutForCwd(conversation.cwd);
+            if (matched) {
+                path = matched.path;
+                if (!conversation.agentSessionId) {
+                    conversation.agentSessionId = matched.sessionId;
+                    this.conversationByAgentSessionId.set(matched.sessionId, conversation.id);
+                }
+            }
         }
+        if (!path)
+            return 0;
+        let follow = this.codexFollow.get(conversation.id);
+        if (!follow || follow.path !== path) {
+            follow = { path, offset: 0, carry: "", parser: new CodexRolloutParser() };
+            this.codexFollow.set(conversation.id, follow);
+        }
+        let stat;
+        try {
+            stat = statSync(path);
+        }
+        catch {
+            return 0;
+        }
+        if (stat.size < follow.offset) {
+            follow.offset = 0;
+            follow.carry = "";
+            follow.parser = new CodexRolloutParser();
+        }
+        if (stat.size === follow.offset && !follow.carry)
+            return 0;
+        const length = stat.size - follow.offset;
+        const buf = Buffer.alloc(length);
+        const fd = openSync(path, "r");
+        try {
+            readSync(fd, buf, 0, length, follow.offset);
+        }
+        finally {
+            closeSync(fd);
+        }
+        follow.offset = stat.size;
+        const combined = follow.carry + buf.toString("utf8");
+        const lastNl = combined.lastIndexOf("\n");
+        if (lastNl < 0) {
+            follow.carry = combined;
+            return 0;
+        }
+        const complete = combined.slice(0, lastNl + 1);
+        follow.carry = combined.slice(lastNl + 1);
+        const items = follow.parser.consume(complete, conversation.id);
+        if (items.length === 0)
+            return 0;
+        if (emit) {
+            for (const item of items)
+                this.upsertItem(conversation.id, item);
+        }
+        else {
+            const existing = this.timelines.get(conversation.id) ?? [];
+            const merged = new Map(existing.map((item) => [item.id, item]));
+            for (const item of items)
+                merged.set(item.id, item);
+            const nextItems = [...merged.values()]
+                .sort((a, b) => a.createdAt - b.createdAt)
+                .slice(-MAX_TIMELINE_ITEMS);
+            this.timelines.set(conversation.id, nextItems);
+            for (const item of nextItems)
+                this.rememberItemConversationId(conversation.id, item);
+        }
+        const timeline = this.timelines.get(conversation.id) ?? [];
+        const lastPreview = [...timeline].reverse()
+            .map((item) => previewText(previewFromTimelineItem(item) ?? ""))
+            .find(Boolean);
+        if (lastPreview)
+            conversation.lastMessagePreview = lastPreview;
+        conversation.lastActivityAt = Date.now();
+        if (follow.parser.workspaceRoots?.length)
+            conversation.workspaceRoots = follow.parser.workspaceRoots;
+        if (follow.parser.sessionCwd && !conversation.cwd)
+            conversation.cwd = follow.parser.sessionCwd;
+        return items.length;
     }
     sendCapabilities() {
         const catalog = [...new Set([
@@ -2760,11 +3149,23 @@ export class AgentWorkspaceProxy {
             const client = this.clients.get(provider);
             const protocol = this.agentProtocols.get(provider);
             const runtimeCapabilities = this.providerCapabilities.get(provider);
+            const advertised = runtimeCapabilities?.advertised
+                ?? (client instanceof AcpClient ? client.advertised : undefined);
             const enabled = Boolean(client);
-            const supportsImages = enabled && protocolSupportsImages(protocol);
+            const isAcp = protocol === "acp";
+            const supportsImages = enabled && protocolSupportsImages(protocol, advertised);
             const isClaudeFallback = protocol === "claude-stream-json";
             const supportsPermission = enabled && !isClaudeFallback;
             const supportsReasoningEffort = enabled && !isClaudeFallback;
+            const supportsSessionList = enabled && (isAcp ? Boolean(advertised?.listSession) : !isClaudeFallback);
+            const supportsSessionLoad = enabled && (isAcp ? Boolean(advertised?.loadSession) : !isClaudeFallback);
+            const supportsCancel = enabled && (isAcp ? Boolean(advertised?.cancel) : true);
+            const supportsFork = enabled && (isAcp
+                ? Boolean(advertised?.forkSession)
+                : protocol === "codex-app-server" || protocol === "claude-agent-sdk");
+            const supportsSetModel = enabled && (isAcp
+                ? Boolean(advertised?.setModel)
+                : protocol === "codex-app-server");
             const protocolBacked = isProtocolAgentProvider(provider);
             const commands = mergeCommands(defaultProviderCommands(provider, this.input.cwd, enabled), runtimeCapabilities?.commands);
             const currentMode = [...this.conversations.values()].find((conversation) => conversation.provider === provider)?.collaborationMode;
@@ -2779,8 +3180,8 @@ export class AgentWorkspaceProxy {
                         : `${providerLabel(provider)} 已在本机检测；远程对话请在终端继续`,
                 supportsImages,
                 supportsPermission,
-                supportsPlan: enabled,
-                supportsCancel: enabled,
+                supportsPlan: enabled && (isAcp ? Boolean(advertised?.embeddedContext) : true),
+                supportsCancel,
                 models: runtimeCapabilities?.models ?? [{ id: "default", label: "默认模型" }],
                 defaultModel: runtimeCapabilities?.defaultModel ?? "default",
                 reasoningEfforts: supportsReasoningEffort
@@ -2795,11 +3196,17 @@ export class AgentWorkspaceProxy {
                 currentMode,
                 features: {
                     images: supportsImages,
+                    audio: Boolean(advertised?.audio),
                     permissions: supportsPermission,
-                    plan: enabled,
-                    cancel: enabled,
+                    plan: enabled && (protocol === "acp" ? Boolean(advertised?.embeddedContext) : true),
+                    cancel: supportsCancel,
                     reasoningEffort: supportsReasoningEffort,
                     streamJsonFallback: isClaudeFallback,
+                    loadSession: supportsSessionLoad,
+                    sessionList: supportsSessionList,
+                    sessionFork: supportsFork,
+                    setModel: supportsSetModel,
+                    mcp: Boolean(advertised?.mcp) || Boolean(runtimeCapabilities?.mcpServers && runtimeCapabilities.mcpServers.size > 0),
                 },
                 mcpServers: runtimeCapabilities?.mcpServers && runtimeCapabilities.mcpServers.size > 0
                     ? [...runtimeCapabilities.mcpServers.values()]
@@ -2818,13 +3225,13 @@ export class AgentWorkspaceProxy {
                 protocolVersion: 1,
                 workspaceProtocolVersion: 2,
                 error: anyEnabled ? undefined : "没有可远程驱动的 Agent。请安装 Claude Code 或 Codex CLI；其它 Agent 只要在本机终端运行就会出现在列表里。",
-                supportsSessionList: anyEnabled,
-                supportsSessionLoad: anyEnabled,
+                supportsSessionList: providers.some((p) => p.features.sessionList),
+                supportsSessionLoad: providers.some((p) => p.features.loadSession),
                 supportsImages: providers.some((p) => p.supportsImages),
-                supportsAudio: false,
+                supportsAudio: providers.some((p) => p.features.audio),
                 supportsPermission: anyPermission,
-                supportsPlan: anyEnabled,
-                supportsCancel: anyEnabled,
+                supportsPlan: providers.some((p) => p.supportsPlan),
+                supportsCancel: providers.some((p) => p.supportsCancel),
             },
         }));
     }
@@ -2917,7 +3324,7 @@ export class AgentWorkspaceProxy {
                     this.emitNotice({ kind: "warning", title: "分叉失败", detail: "无法复制该会话的历史记录，已新建空会话。" });
                 }
             }
-            else if (provider === "codex" && typeof forkThread === "function" && sourceSessionId) {
+            else if (typeof forkThread === "function" && sourceSessionId) {
                 if (source?.cwd && !payload.cwd)
                     cwd = source.cwd;
                 try {
@@ -2958,61 +3365,95 @@ export class AgentWorkspaceProxy {
                 });
             }
         }
-        if (existingConversation && existingConversation.status !== "error" && existingConversation.agentSessionId) {
-            const requestedCanonicalId = makeAgentV2RemoteConversationId(provider, existingConversation.agentSessionId);
-            if (payload.conversationId &&
-                payload.conversationId === requestedCanonicalId &&
-                existingConversation.id !== payload.conversationId) {
-                existingConversation = this.adoptConversationId(existingConversation.id, payload.conversationId);
+        if (existingConversation &&
+            !existingConversation.agentSessionId &&
+            provider === "codex") {
+            const matched = findLatestCodexRolloutForCwd(existingConversation.cwd ?? cwd);
+            if (matched) {
+                existingConversation.agentSessionId = matched.sessionId;
+                this.conversationByAgentSessionId.set(matched.sessionId, existingConversation.id);
             }
-            // Hydrate the transcript from disk when we have no timeline yet, UNLESS
-            // LinkShell is itself driving a live turn for this conversation — in that
-            // case the event stream is the source of truth and re-hydrating would be
-            // redundant/racy. We key on currentTurnIds (LinkShell-driving), NOT on
-            // status === "running": an EXTERNALLY-driven session also reports
-            // "running" now (live-status feature) but has no event stream, so gating
-            // on status would skip hydration and leave its timeline stuck empty
-            // ("加载对话记录…" forever).
-            if ((this.timelines.get(existingConversation.id) ?? []).length === 0 &&
+        }
+        if (existingConversation && existingConversation.status !== "error") {
+            const owned = Boolean(existingConversation.agentSessionId &&
+                this.ownedCodexSessionIds.has(existingConversation.agentSessionId));
+            // External Codex (desktop/TUI) is the same session on disk. Attach by
+            // tailing that rollout — never loadSession/newSession (those mint another thread).
+            if (provider === "codex" &&
+                !owned &&
+                this.attachedExternalCodex.has(existingConversation.id) &&
                 !this.currentTurnIds.has(existingConversation.id)) {
-                try {
-                    const existingAgentSessionId = existingConversation.agentSessionId;
-                    let result;
+                existingConversation.control = "attached";
+                this.followCodexRolloutDisk(existingConversation, false);
+                this.activeConversationId = existingConversation.id;
+                this.input.send(createEnvelope({
+                    type: "agent.v2.conversation.opened",
+                    sessionId: this.input.sessionId,
+                    payload: {
+                        conversation: existingConversation,
+                        snapshot: this.timelines.get(existingConversation.id) ?? [],
+                        requestedConversationId: payload.conversationId,
+                    },
+                }));
+                return existingConversation;
+            }
+            if (existingConversation.agentSessionId) {
+                const requestedCanonicalId = makeAgentV2RemoteConversationId(provider, existingConversation.agentSessionId);
+                if (payload.conversationId &&
+                    payload.conversationId === requestedCanonicalId &&
+                    existingConversation.id !== payload.conversationId) {
+                    existingConversation = this.adoptConversationId(existingConversation.id, payload.conversationId);
+                }
+                // Hydrate the transcript from disk when we have no timeline yet, UNLESS
+                // LinkShell is itself driving a live turn for this conversation — in that
+                // case the event stream is the source of truth and re-hydrating would be
+                // redundant/racy. We key on currentTurnIds (LinkShell-driving), NOT on
+                // status === "running": an EXTERNALLY-driven session also reports
+                // "running" now (live-status feature) but has no event stream, so gating
+                // on status would skip hydration and leave its timeline stuck empty
+                // ("加载对话记录…" forever).
+                if ((this.timelines.get(existingConversation.id) ?? []).length === 0 &&
+                    !this.currentTurnIds.has(existingConversation.id)) {
                     try {
-                        result = await client.loadSession({ sessionId: existingAgentSessionId, cwd });
+                        const existingAgentSessionId = existingConversation.agentSessionId;
+                        let result;
+                        try {
+                            result = await client.loadSession({ sessionId: existingAgentSessionId, cwd });
+                        }
+                        catch (error) {
+                            const recovered = await this.recycleProviderClient(provider, error);
+                            if (!recovered)
+                                throw error;
+                            client = recovered;
+                            result = await client.loadSession({ sessionId: existingAgentSessionId, cwd });
+                        }
+                        const nextAgentSessionId = this.extractSessionId(result);
+                        if (nextAgentSessionId && nextAgentSessionId !== existingAgentSessionId) {
+                            this.conversationByAgentSessionId.delete(existingAgentSessionId);
+                            existingConversation.agentSessionId = nextAgentSessionId;
+                            this.conversationByAgentSessionId.set(nextAgentSessionId, existingConversation.id);
+                        }
+                        await this.hydrateConversationFromProvider(existingConversation, result);
                     }
                     catch (error) {
-                        const recovered = await this.recycleProviderClient(provider, error);
-                        if (!recovered)
-                            throw error;
-                        client = recovered;
-                        result = await client.loadSession({ sessionId: existingAgentSessionId, cwd });
-                    }
-                    const nextAgentSessionId = this.extractSessionId(result);
-                    if (nextAgentSessionId && nextAgentSessionId !== existingAgentSessionId) {
-                        this.conversationByAgentSessionId.delete(existingAgentSessionId);
-                        existingConversation.agentSessionId = nextAgentSessionId;
-                        this.conversationByAgentSessionId.set(nextAgentSessionId, existingConversation.id);
-                    }
-                    await this.hydrateConversationFromProvider(existingConversation, result);
-                }
-                catch (error) {
-                    if (this.input.verbose) {
-                        process.stderr.write(`[agent:v2] resume failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
+                        if (this.input.verbose) {
+                            process.stderr.write(`[agent:v2] resume failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
+                        }
+                        await this.hydrateConversationFromProvider(existingConversation, undefined);
                     }
                 }
+                this.activeConversationId = existingConversation.id;
+                this.input.send(createEnvelope({
+                    type: "agent.v2.conversation.opened",
+                    sessionId: this.input.sessionId,
+                    payload: {
+                        conversation: existingConversation,
+                        snapshot: this.timelines.get(existingConversation.id) ?? [],
+                        requestedConversationId: payload.conversationId,
+                    },
+                }));
+                return existingConversation;
             }
-            this.activeConversationId = existingConversation.id;
-            this.input.send(createEnvelope({
-                type: "agent.v2.conversation.opened",
-                sessionId: this.input.sessionId,
-                payload: {
-                    conversation: existingConversation,
-                    snapshot: this.timelines.get(existingConversation.id) ?? [],
-                    requestedConversationId: payload.conversationId,
-                },
-            }));
-            return existingConversation;
         }
         try {
             let result;
@@ -3031,6 +3472,8 @@ export class AgentWorkspaceProxy {
                     : await client.newSession({ cwd });
             }
             agentSessionId = this.extractSessionId(result) ?? agentSessionId ?? id("agent-session");
+            if (provider === "codex")
+                this.ownedCodexSessionIds.add(agentSessionId);
             const now = Date.now();
             const conversationId = makeAgentV2RemoteConversationId(provider, agentSessionId);
             const conversation = {
@@ -3040,6 +3483,7 @@ export class AgentWorkspaceProxy {
                 provider,
                 cwd,
                 title: payload.title ?? existingConversation?.title ?? titleFromCwd(cwd),
+                control: "owned",
                 model: payload.model ?? existingConversation?.model,
                 reasoningEffort: payload.reasoningEffort ?? existingConversation?.reasoningEffort,
                 permissionMode: payload.permissionMode ?? existingConversation?.permissionMode,
@@ -3149,9 +3593,13 @@ export class AgentWorkspaceProxy {
             await this.openConversation({ conversationId: payload.conversationId });
         if (!conversation)
             return;
+        if (conversation.control === "attached" || this.attachedExternalCodex.has(conversation.id)) {
+            this.rejectAgentAction(conversation, `${providerLabel(conversation.provider)} 这场会话在本机终端/桌面里运行。Web 只旁观同一份记录，停止和插话请在那边操作。`, conversation.status);
+            return;
+        }
         if (!conversation.agentSessionId) {
             this.rejectAgentAction(conversation, isLiveConversationId(conversation.id) || !isProtocolAgentProvider(conversation.provider)
-                ? `${providerLabel(conversation.provider)} 正在本机终端中运行。远程对话协议尚未接入，请打开终端面板继续。`
+                ? `${providerLabel(conversation.provider)} 正在本机终端中运行。请打开终端面板继续。`
                 : "Agent session 尚未就绪，消息没有发送。请重新打开对话后再试。");
             return;
         }
@@ -3163,7 +3611,9 @@ export class AgentWorkspaceProxy {
             return;
         }
         const protocol = this.protocolForProvider(conversation.provider);
-        if (payload.contentBlocks.some((block) => block.type === "image") && !protocolSupportsImages(protocol)) {
+        const advertised = this.providerCapabilities.get(conversation.provider)?.advertised
+            ?? (client instanceof AcpClient ? client.advertised : undefined);
+        if (payload.contentBlocks.some((block) => block.type === "image") && !protocolSupportsImages(protocol, advertised)) {
             this.rejectAgentAction(conversation, "当前 Agent provider 暂不支持图片输入，请升级 CLI 或切换到 Codex。");
             return;
         }
@@ -4223,33 +4673,93 @@ export class AgentWorkspaceProxy {
     }
     handleSessionUpdate(params) {
         const raw = asRecord(params) ?? {};
-        const nested = asRecord(raw.params) ?? {};
-        const text = firstString(raw, ["delta", "text", "content", "message"]) ??
-            firstString(nested, ["delta", "text", "content", "message"]);
-        const content = contentBlocksFromItem(raw);
-        if (!text && content.length === 0)
-            return;
-        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
+        const update = asRecord(raw.update) ?? raw;
+        const conversationId = this.conversationIdFromParams(raw)
+            ?? this.conversationIdFromParams(update)
+            ?? this.fallbackConversationId();
         if (!conversationId)
             return;
-        if (firstString(raw, ["toolName", "tool", "name"])) {
+        const kind = normalizedIdentifier(firstString(update, ["sessionUpdate", "session_update", "type"]));
+        if (kind === "agentthoughtchunk" || kind === "agentthought") {
+            const contentBlock = asRecord(update.content);
+            const thought = (typeof contentBlock?.text === "string" ? contentBlock.text : undefined)
+                ?? firstString(update, ["delta", "text", "content", "message"]);
+            if (!thought)
+                return;
+            this.handleReasoningDelta({
+                ...raw,
+                itemId: firstString(update, ["itemId", "id"]) ?? "thinking",
+                delta: thought,
+            });
+            return;
+        }
+        if (kind === "toolcall" || kind === "toolcallupdate") {
+            const toolCallId = firstString(update, ["toolCallId", "id"]) ?? id("tool");
+            const existing = this.findTool(conversationId, toolCallId);
+            const statusRaw = firstString(update, ["status"]);
+            const status = statusRaw === "in_progress" ? "running"
+                : statusRaw === "completed" || statusRaw === "failed" || statusRaw === "pending" || statusRaw === "running"
+                    ? statusRaw
+                    : existing?.status ?? "running";
+            const input = stringifyDefined(update.rawInput ?? update.input);
+            const output = stringifyDefined(update.rawOutput ?? update.output);
+            this.upsertTool(conversationId, {
+                id: toolCallId,
+                name: firstString(update, ["title", "kind", "name"]) ?? existing?.name ?? "tool",
+                ...(input ? { input } : {}),
+                ...(output ? { output } : {}),
+                createdAt: existing?.createdAt ?? Date.now(),
+                status,
+            });
+            return;
+        }
+        if (kind === "plan") {
+            const entries = Array.isArray(update.entries) ? update.entries : [];
+            this.handlePlanUpdated({
+                ...raw,
+                plan: entries.map((entry) => {
+                    const step = asRecord(entry) ?? {};
+                    return {
+                        text: firstString(step, ["content", "text", "title", "description"]),
+                        status: step.status,
+                    };
+                }),
+            });
+            return;
+        }
+        const nested = asRecord(raw.params) ?? asRecord(update.params) ?? {};
+        const contentBlock = asRecord(update.content);
+        const text = firstString(update, ["delta", "text", "content", "message"]) ??
+            firstString(raw, ["delta", "text", "content", "message"]) ??
+            firstString(nested, ["delta", "text", "content", "message"]) ??
+            (typeof contentBlock?.text === "string" ? contentBlock.text : undefined);
+        const content = contentBlocksFromItem(update).length > 0
+            ? contentBlocksFromItem(update)
+            : contentBlocksFromItem(raw);
+        if (firstString(raw, ["toolName", "tool", "name"]) || firstString(update, ["toolName", "tool", "name"])) {
             this.upsertTool(conversationId, {
-                id: firstString(raw, ["toolCallId", "callId", "id"]) ?? id("tool"),
-                name: firstString(raw, ["toolName", "tool", "name"]) ?? "tool",
-                input: stringify(raw.input ?? raw.toolInput ?? ""),
-                output: stringify(raw.output ?? raw.result ?? ""),
+                id: firstString(update, ["toolCallId", "callId", "id"])
+                    ?? firstString(raw, ["toolCallId", "callId", "id"])
+                    ?? id("tool"),
+                name: firstString(update, ["toolName", "tool", "name"])
+                    ?? firstString(raw, ["toolName", "tool", "name"])
+                    ?? "tool",
+                input: stringify(update.input ?? update.toolInput ?? raw.input ?? raw.toolInput ?? ""),
+                output: stringify(update.output ?? update.result ?? raw.output ?? raw.result ?? ""),
                 createdAt: Date.now(),
-                status: raw.status === "completed" || raw.status === "failed" || raw.status === "running"
-                    ? raw.status
+                status: update.status === "completed" || raw.status === "completed" || update.status === "failed" || raw.status === "failed" || update.status === "running" || raw.status === "running"
+                    ? (update.status ?? raw.status)
                     : "running",
             });
             return;
         }
+        if (!text && content.length === 0)
+            return;
         const role = raw.role === "user" || raw.role === "system" ? raw.role : "assistant";
         const blocks = content.length > 0 ? content : [{ type: "text", text }];
         const preview = textFromBlocks(blocks);
         this.upsertItem(conversationId, {
-            id: firstString(raw, ["messageId", "id"]) ?? id("msg"),
+            id: firstString(update, ["messageId", "id"]) ?? firstString(raw, ["messageId", "id"]) ?? id("msg"),
             conversationId,
             type: "message",
             role,
@@ -4257,7 +4767,7 @@ export class AgentWorkspaceProxy {
             text: preview,
             createdAt: Date.now(),
             updatedAt: Date.now(),
-            isStreaming: raw.done === false || raw.isStreaming === true,
+            isStreaming: raw.done === false || raw.isStreaming === true || kind === "agentmessagechunk",
         });
         this.updateConversationPreview(conversationId, preview || "图片附件", raw.done === true ? "idle" : "running");
     }