linkshell-cli 0.3.27 → 0.3.29

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

@@ -1,56 +1,16 @@
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
-import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import { basename, join, relative } from "node:path";
 import { createEnvelope, parseTypedPayload, } from "@linkshell/protocol";
 import { AcpClient } from "./acp-client.js";
 import { ClaudeSdkClient } from "./claude-sdk-client.js";
 import { ClaudeStreamJsonClient } from "./claude-stream-json-client.js";
-import { CodexRpcBridge } from "./codex-rpc-bridge.js";
-import { listClaudeStoredSessions, loadClaudeStoredTimeline } from "./claude-sessions.js";
-import { loadCodexStoredTimeline } from "./codex-sessions.js";
 import { resolveAgentCommand } from "./provider-resolver.js";
 const PERMISSION_TIMEOUT_MS = 5 * 60_000;
 const MAX_TIMELINE_ITEMS = 200;
-const MAX_SNAPSHOT_ITEMS = 80;
-const MAX_SNAPSHOT_TEXT_BYTES = 128 * 1024;
-const MAX_DELTA_EVENTS = 500;
-const HISTORY_PAGE_MAX_ITEMS = 500;
 function id(prefix) {
     return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
-function clampHistoryCursor(value, fallback, max) {
-    if (!value)
-        return fallback;
-    const parsed = Number.parseInt(value, 10);
-    if (!Number.isFinite(parsed))
-        return fallback;
-    return Math.max(0, Math.min(max, parsed));
-}
-function appServerText(value) {
-    if (typeof value === "string") {
-        const text = value.trim();
-        return text || undefined;
-    }
-    if (Array.isArray(value)) {
-        const text = value
-            .map((part) => appServerText(part))
-            .filter(Boolean)
-            .join("\n")
-            .trim();
-        return text || undefined;
-    }
-    const record = asRecord(value);
-    if (!record)
-        return undefined;
-    if (typeof record.text === "string")
-        return appServerText(record.text);
-    if (typeof record.content === "string")
-        return appServerText(record.content);
-    if (typeof record.message === "string")
-        return appServerText(record.message);
-    return appServerText(record.content ?? record.message ?? record.parts);
-}
 function stringify(value) {
     if (typeof value === "string")
         return value;
@@ -61,62 +21,6 @@ function stringify(value) {
         return String(value);
     }
 }
-function truncateUtf8(value, maxBytes = MAX_SNAPSHOT_TEXT_BYTES) {
-    if (!value)
-        return value;
-    if (Buffer.byteLength(value, "utf8") <= maxBytes)
-        return value;
-    let end = Math.min(value.length, maxBytes);
-    while (end > 0 && Buffer.byteLength(value.slice(0, end), "utf8") > maxBytes) {
-        end = Math.floor(end * 0.9);
-    }
-    return `${value.slice(0, end)}\n\n[truncated by LinkShell: original ${Buffer.byteLength(value, "utf8")} bytes]`;
-}
-function snapshotContentBlocks(blocks, options = {}) {
-    if (!blocks)
-        return undefined;
-    return blocks.map((block) => block.type === "image" && options.stripImages !== false
-        ? { ...block, data: undefined, text: block.text || "图片附件" }
-        : { ...block, text: truncateUtf8(block.text) });
-}
-function snapshotTimelineItem(item, options = {}) {
-    return {
-        ...item,
-        content: snapshotContentBlocks(item.content, options),
-        text: truncateUtf8(item.text),
-        toolCall: item.toolCall
-            ? {
-                ...item.toolCall,
-                input: truncateUtf8(item.toolCall.input),
-                output: truncateUtf8(item.toolCall.output),
-            }
-            : undefined,
-        commandExecution: item.commandExecution
-            ? {
-                ...item.commandExecution,
-                command: truncateUtf8(item.commandExecution.command, 16 * 1024),
-                output: truncateUtf8(item.commandExecution.output),
-            }
-            : undefined,
-        fileChange: item.fileChange
-            ? {
-                ...item.fileChange,
-                diff: truncateUtf8(item.fileChange.diff),
-                summary: truncateUtf8(item.fileChange.summary),
-            }
-            : undefined,
-        permission: item.permission
-            ? {
-                ...item.permission,
-                toolInput: truncateUtf8(item.permission.toolInput),
-                context: truncateUtf8(item.permission.context),
-            }
-            : undefined,
-    };
-}
-function snapshotTimelineItems(items) {
-    return items.slice(-MAX_SNAPSHOT_ITEMS).map((item) => snapshotTimelineItem(item));
-}
 function asRecord(value) {
     return typeof value === "object" && value ? value : undefined;
 }
@@ -422,15 +326,7 @@ function titleFromCwd(cwd) {
 }
 function textFromBlocks(blocks) {
     return blocks
-        .map((block) => {
-        if (block.type === "text")
-            return block.text ?? "";
-        if (block.type === "image")
-            return `[${block.mimeType ?? "image"} attachment]`;
-        if (block.type === "file" && block.path)
-            return `@${block.path}`;
-        return "";
-    })
+        .map((block) => block.type === "text" ? block.text ?? "" : `[${block.mimeType ?? "image"} attachment]`)
         .filter(Boolean)
         .join("\n");
 }
@@ -463,11 +359,6 @@ function contentBlocksFromValue(value) {
         const text = firstString(raw, ["text", "content", "message"]);
         return text ? [{ type: "text", text }] : [];
     }
-    if (normalizedType === "file" || normalizedType === "inputfile" || normalizedType === "filereference") {
-        const path = firstString(raw, ["path", "file", "filePath", "file_path", "absolutePath", "relativePath"]);
-        const text = firstString(raw, ["text", "name", "label"]);
-        return path ? [{ type: "file", path, name: text, text: text ?? `@${path}` }] : [];
-    }
     const nested = raw.content ?? raw.contentItems ?? raw.parts;
     if (Array.isArray(nested))
         return contentBlocksFromValue(nested);
@@ -663,28 +554,8 @@ function providerLabel(provider) {
     return "Custom";
 }
 const ALL_REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh"];
-const CLAUDE_REASONING_EFFORTS = ["low", "medium", "high", "xhigh"];
-const ALL_SERVICE_TIERS = ["standard", "fast"];
-const AGENT_PERMISSION_MODES = ["read_only", "workspace_write", "full_access"];
-const COMMAND_OUTPUT_MAX_BYTES = 96 * 1024;
-const LINKSHELL_NATIVE_COMMANDS = [
-    { name: "status", description: "Show current Agent and workspace status", category: "LinkShell", argsMode: "none" },
-    { name: "plan", description: "Enter Plan mode for the next turn", category: "Agent", argsMode: "none" },
-    { name: "exit-plan", description: "Exit Plan mode", category: "Agent", argsMode: "none" },
-    { name: "review", description: "Ask the Agent to review current local changes", category: "Agent", argsMode: "optional" },
-    { name: "subagents", description: "Ask the Agent to split work across subagents when useful", category: "Agent", argsMode: "optional" },
-    { name: "compact", description: "Compact the active Codex context", category: "Codex", argsMode: "none", providers: ["codex"] },
-    { name: "new", description: "Start a fresh Codex thread", category: "Codex", argsMode: "none", providers: ["codex"], destructive: true },
-    { name: "clear", description: "Start a fresh Agent context for this conversation", category: "Agent", argsMode: "none", destructive: true },
-    { name: "git-status", description: "Show branch and working tree status", category: "Git", argsMode: "none" },
-    { name: "git-diff", description: "Show a compact diffstat for current changes", category: "Git", argsMode: "none" },
-    { name: "git-commit", description: "Commit staged changes with the given message", category: "Git", argsMode: "required" },
-    { name: "git-pull", description: "Pull with fast-forward only", category: "Git", argsMode: "none" },
-    { name: "git-push", description: "Push the current branch", category: "Git", argsMode: "none" },
-    { name: "git-stash", description: "Stash current working tree changes", category: "Git", argsMode: "optional" },
-    { name: "git-stash-pop", description: "Pop the latest stash", category: "Git", argsMode: "none" },
-];
-const CODEX_JSON_RPC_COMMANDS = new Set(["plan", "exit-plan", "review", "compact", "new"]);
+const ALL_PERMISSION_MODES = ["read_only", "workspace_write", "full_access"];
+const CODEX_COMMAND_NAMES = ["plan", "exit-plan", "compact", "clear", "status", "review", "subagents"];
 const CLAUDE_REMOTE_HIDDEN_COMMANDS = new Set([
     "add-dir",
     "agents",
@@ -946,31 +817,57 @@ function customClaudeCommands(cwd) {
 }
 function defaultProviderCommands(provider, cwd, enabled) {
     const disabledReason = enabled ? undefined : `${providerLabel(provider)} 未安装或启动失败`;
-    const linkshellCommands = LINKSHELL_NATIVE_COMMANDS
-        .filter((command) => provider !== "codex" || CODEX_JSON_RPC_COMMANDS.has(command.name))
-        .filter((command) => !command.providers || command.providers.includes(provider))
-        .map((command) => makeCommand({
-        provider,
-        name: command.name,
-        description: command.description,
-        source: "linkshell",
-        category: command.category,
-        argsMode: command.argsMode ?? "optional",
-        destructive: command.destructive,
-        disabledReason,
-        executionKind: "native",
-    }));
     if (provider === "codex") {
-        return linkshellCommands;
+        return CODEX_COMMAND_NAMES.map((name) => makeCommand({
+            provider,
+            name,
+            source: "linkshell",
+            category: name === "plan" || name === "exit-plan" ? "Modes" : "Codex",
+            description: {
+                "plan": "Enter Codex plan mode",
+                "exit-plan": "Exit Codex plan mode",
+                compact: "Compact the current thread",
+                clear: "Start a fresh Codex thread",
+                status: "Show LinkShell agent status",
+                review: "Ask Codex to review local changes",
+                subagents: "Insert a delegation prompt",
+            }[name],
+            argsMode: name === "review" || name === "subagents" ? "optional" : "none",
+            destructive: name === "clear",
+            disabledReason,
+            executionKind: name === "review" || name === "subagents" ? "prompt" : "native",
+        }));
     }
     if (provider === "claude") {
+        const builtIns = CLAUDE_BUILT_IN_COMMANDS
+            .filter((entry) => isClaudeRemoteFriendlyCommand(entry.name))
+            .map((entry) => makeCommand({
+            provider,
+            name: entry.name,
+            description: entry.description,
+            argsMode: entry.argsMode,
+            destructive: entry.destructive,
+            disabledReason,
+            executionKind: "prompt",
+        }));
         const custom = customClaudeCommands(cwd).map((command) => ({
             ...command,
             disabledReason: command.disabledReason ?? disabledReason,
         }));
-        return [...linkshellCommands, ...custom];
+        return [...builtIns, ...custom];
     }
-    return linkshellCommands;
+    return [
+        makeCommand({
+            provider,
+            name: "status",
+            source: "linkshell",
+            category: "LinkShell",
+            description: "Show LinkShell agent status",
+            argsMode: "none",
+            disabledReason,
+            executionKind: "native",
+        }),
+    ];
 }
 function mergeCommands(...groups) {
     const map = new Map();
@@ -987,76 +884,6 @@ function mergeCommands(...groups) {
     }
     return [...map.values()].sort((a, b) => a.name.localeCompare(b.name));
 }
-function isGitNativeCommand(name) {
-    return name === "git-status" ||
-        name === "git-diff" ||
-        name === "git-commit" ||
-        name === "git-pull" ||
-        name === "git-push" ||
-        name === "git-stash" ||
-        name === "git-stash-pop";
-}
-function gitCommandArgs(name, args) {
-    const message = args?.trim();
-    switch (name) {
-        case "git-status":
-            return { display: "git status --short --branch", argv: ["status", "--short", "--branch"] };
-        case "git-diff":
-            return { display: "git diff --stat", argv: ["diff", "--stat"] };
-        case "git-commit":
-            if (!message)
-                throw new Error("请先输入提交信息，例如 /git-commit fix mobile agent timeline");
-            return { display: `git commit -m ${JSON.stringify(message)}`, argv: ["commit", "-m", message] };
-        case "git-pull":
-            return { display: "git pull --ff-only", argv: ["pull", "--ff-only"] };
-        case "git-push":
-            return { display: "git push", argv: ["push"] };
-        case "git-stash":
-            return {
-                display: "git stash push -u",
-                argv: ["stash", "push", "-u", "-m", message || "LinkShell mobile stash"],
-            };
-        case "git-stash-pop":
-            return { display: "git stash pop", argv: ["stash", "pop"] };
-        default:
-            throw new Error(`未知 Git 命令：/${name}`);
-    }
-}
-function runProcess(command, args, options) {
-    return new Promise((resolve, reject) => {
-        const child = spawn(command, args, {
-            cwd: options.cwd,
-            stdio: ["ignore", "pipe", "pipe"],
-            windowsHide: true,
-        });
-        const maxBytes = options.maxBytes ?? COMMAND_OUTPUT_MAX_BYTES;
-        let output = "";
-        let bytes = 0;
-        let truncated = false;
-        const append = (chunk) => {
-            if (bytes >= maxBytes) {
-                truncated = true;
-                return;
-            }
-            const remaining = maxBytes - bytes;
-            const slice = chunk.byteLength > remaining ? chunk.subarray(0, remaining) : chunk;
-            output += slice.toString("utf8");
-            bytes += slice.byteLength;
-            if (slice.byteLength < chunk.byteLength)
-                truncated = true;
-        };
-        child.stdout.on("data", append);
-        child.stderr.on("data", append);
-        child.once("error", reject);
-        child.once("close", (exitCode, signal) => {
-            resolve({
-                output: `${output.trimEnd()}${truncated ? "\n\n[truncated by LinkShell]" : ""}`,
-                exitCode,
-                signal,
-            });
-        });
-    });
-}
 function runtimeCommands(provider, value) {
     const raw = asRecord(value);
     const commandsValue = Array.isArray(value) ? value :
@@ -1100,14 +927,10 @@ function runtimeCommands(provider, value) {
 function parseModelListCapabilities(value) {
     const raw = asRecord(value);
     const modelsValue = Array.isArray(value) ? value :
-        Array.isArray(raw?.data) ? raw.data :
-            Array.isArray(raw?.models) ? raw.models :
-                Array.isArray(raw?.items) ? raw.items :
-                    Array.isArray(raw?.modelOptions) ? raw.modelOptions :
-                        [];
-    const effortSet = new Set();
-    const speedTierSet = new Set(["standard"]);
-    let defaultModelFromEntry;
+        Array.isArray(raw?.models) ? raw.models :
+            Array.isArray(raw?.items) ? raw.items :
+                Array.isArray(raw?.modelOptions) ? raw.modelOptions :
+                    [];
     const models = modelsValue
         .map((entry, index) => {
         const model = asRecord(entry);
@@ -1117,56 +940,24 @@ function parseModelListCapabilities(value) {
                 : undefined;
         }
         const modelId = firstString(model, ["id", "model", "name", "value"]) ?? `model-${index + 1}`;
-        const label = firstString(model, ["displayName", "label", "title", "name", "model"]) ?? modelId;
-        if (model.hidden === true)
-            return undefined;
-        const modelEfforts = arrayFromKeys(model, ["supportedReasoningEfforts", "reasoningEfforts"])
-            .map((effort) => {
-            const rawEffort = asRecord(effort);
-            return firstString(rawEffort, ["reasoningEffort", "id", "value"]) ?? (typeof effort === "string" ? effort : undefined);
-        })
-            .filter((effort) => Boolean(effort) && ALL_REASONING_EFFORTS.includes(effort));
-        modelEfforts.forEach((effort) => effortSet.add(effort));
-        const defaultReasoningEffort = firstString(model, ["defaultReasoningEffort", "default_reasoning_effort"]);
-        if (defaultReasoningEffort && ALL_REASONING_EFFORTS.includes(defaultReasoningEffort)) {
-            effortSet.add(defaultReasoningEffort);
-        }
-        const modalities = arrayFromKeys(model, ["inputModalities", "modalities"]);
-        const speedTiers = arrayFromKeys(model, ["additionalSpeedTiers", "additional_speed_tiers", "serviceTiers", "service_tiers"])
-            .map((tier) => typeof tier === "string" ? tier : firstString(asRecord(tier), ["id", "tier", "value"]))
-            .filter((tier) => Boolean(tier) && ALL_SERVICE_TIERS.includes(tier));
-        speedTiers.forEach((tier) => speedTierSet.add(tier));
-        if (model.isDefault === true)
-            defaultModelFromEntry = modelId;
-        return {
-            id: modelId,
-            label,
-            ...(modelEfforts.length > 0 ? { reasoningEfforts: modelEfforts } : {}),
-            ...(defaultReasoningEffort ? { defaultReasoningEffort } : {}),
-            ...(speedTiers.length > 0 ? { speedTiers: ["standard", ...speedTiers.filter((tier) => tier !== "standard")] } : {}),
-            ...(modalities.length > 0 ? { supportsImages: modalities.includes("image") } : {}),
-            ...(firstString(model, ["description"]) ? { description: firstString(model, ["description"]) } : {}),
-        };
+        const label = firstString(model, ["label", "title", "displayName", "name"]) ?? modelId;
+        return { id: modelId, label };
     })
         .filter((entry) => Boolean(entry));
     const defaultModel = firstString(raw, ["defaultModel", "default_model", "currentModel"]) ??
-        firstString(asRecord(raw?.defaults), ["model"]) ??
-        defaultModelFromEntry;
+        firstString(asRecord(raw?.defaults), ["model"]);
     const effortsValue = Array.isArray(raw?.reasoningEfforts) ? raw.reasoningEfforts :
         Array.isArray(raw?.reasoning_efforts) ? raw.reasoning_efforts :
             Array.isArray(raw?.efforts) ? raw.efforts :
                 undefined;
     const reasoningEfforts = effortsValue
         ?.filter((entry) => typeof entry === "string" && ALL_REASONING_EFFORTS.includes(entry));
-    const resolvedReasoningEfforts = reasoningEfforts?.length ? reasoningEfforts : [...effortSet];
-    const resolvedSpeedTiers = [...speedTierSet];
-    if (models.length === 0 && !defaultModel && resolvedReasoningEfforts.length === 0 && resolvedSpeedTiers.length <= 1)
+    if (models.length === 0 && !defaultModel && !reasoningEfforts?.length)
         return undefined;
     return {
-        ...(models.length > 0 ? { models } : {}),
+        ...(models.length > 0 ? { models: [{ id: "default", label: "默认模型" }, ...models] } : {}),
         ...(defaultModel ? { defaultModel } : {}),
-        ...(resolvedReasoningEfforts.length > 0 ? { reasoningEfforts: resolvedReasoningEfforts } : {}),
-        ...(resolvedSpeedTiers.length > 0 ? { speedTiers: resolvedSpeedTiers } : {}),
+        ...(reasoningEfforts?.length ? { reasoningEfforts } : {}),
     };
 }
 function parseTimestamp(value) {
@@ -1206,35 +997,15 @@ function parseRemoteSessions(value) {
             model: firstString(source, ["model", "modelId"]),
             createdAt: parseTimestamp(source.createdAt ?? source.created_at),
             lastActivityAt: parseTimestamp(source.lastActivityAt ?? source.updatedAt ?? source.modifiedAt ?? source.lastModified ?? source.updated_at),
-            archived: typeof source.archived === "boolean" ? source.archived : undefined,
-            status: normalizeAgentStatus(firstString(source, ["status", "state", "phase"])),
-            runningTurnId: firstString(source, ["runningTurnId", "running_turn_id", "turnId", "activeTurnId"]),
         });
     }
     return result;
 }
-function normalizeAgentStatus(value) {
-    if (!value)
-        return undefined;
-    const normalized = value.toLowerCase();
-    if (normalized === "running" || normalized === "in_progress" || normalized === "busy")
-        return "running";
-    if (normalized === "waiting_permission" || normalized === "waiting" || normalized === "blocked")
-        return "waiting_permission";
-    if (normalized === "error" || normalized === "failed")
-        return "error";
-    if (normalized === "idle" || normalized === "completed" || normalized === "done")
-        return "idle";
-    return undefined;
-}
 export class AgentWorkspaceProxy {
     input;
     clients = new Map();
-    codexRpcBridge;
     agentProtocols = new Map();
     providerCapabilities = new Map();
-    providerCapabilityErrors = new Map();
-    capabilitiesRevision = 0;
     initialized = false;
     status = "unavailable";
     error;
@@ -1244,8 +1015,6 @@ export class AgentWorkspaceProxy {
     conversations = new Map();
     conversationByAgentSessionId = new Map();
     timelines = new Map();
-    conversationRevisions = new Map();
-    revisionEvents = new Map();
     toolOutputBuffers = new Map();
     pendingPermissions = new Map();
     permissionWaiters = new Map();
@@ -1259,32 +1028,6 @@ export class AgentWorkspaceProxy {
     }
     async handleEnvelope(envelope) {
         switch (envelope.type) {
-            case "agent.codex.rpc": {
-                const payload = parseTypedPayload("agent.codex.rpc", envelope.payload);
-                try {
-                    this.codexRpc().send(payload);
-                }
-                catch (error) {
-                    const idValue = payload && typeof payload === "object" && "id" in payload
-                        ? payload.id
-                        : undefined;
-                    if (typeof idValue === "string" || typeof idValue === "number") {
-                        this.input.send(createEnvelope({
-                            type: "agent.codex.rpc",
-                            hostDeviceId: this.input.hostDeviceId,
-                            payload: {
-                                jsonrpc: "2.0",
-                                id: idValue,
-                                error: {
-                                    code: -32000,
-                                    message: error instanceof Error ? error.message : String(error),
-                                },
-                            },
-                        }));
-                    }
-                }
-                break;
-            }
             case "agent.v2.capabilities.request":
                 await this.initialize();
                 this.sendCapabilities();
@@ -1300,8 +1043,8 @@ export class AgentWorkspaceProxy {
                 const conversations = [...this.conversations.values()].filter((conversation) => payload.includeArchived ? true : !conversation.archived);
                 this.input.send(createEnvelope({
                     type: "agent.v2.conversation.list.result",
-                    hostDeviceId: this.input.hostDeviceId,
-                    payload: { conversations: conversations.map((conversation) => this.conversationSnapshot(conversation)) },
+                    sessionId: this.input.sessionId,
+                    payload: { conversations },
                 }));
                 break;
             }
@@ -1310,16 +1053,6 @@ export class AgentWorkspaceProxy {
                 this.sendSnapshot(payload.conversationId);
                 break;
             }
-            case "agent.v2.history.request": {
-                const payload = parseTypedPayload("agent.v2.history.request", envelope.payload);
-                await this.sendHistoryPage(payload);
-                break;
-            }
-            case "agent.v2.delta.request": {
-                const payload = parseTypedPayload("agent.v2.delta.request", envelope.payload);
-                this.sendDelta(payload);
-                break;
-            }
             case "agent.v2.prompt": {
                 const payload = parseTypedPayload("agent.v2.prompt", envelope.payload);
                 await this.sendPrompt(payload);
@@ -1357,8 +1090,6 @@ export class AgentWorkspaceProxy {
         }
     }
     stop() {
-        this.codexRpcBridge?.stop();
-        this.codexRpcBridge = undefined;
         for (const client of this.clients.values()) {
             client.stop();
         }
@@ -1367,16 +1098,6 @@ export class AgentWorkspaceProxy {
     clientForProvider(provider) {
         return this.clients.get(provider);
     }
-    codexRpc() {
-        this.codexRpcBridge ??= new CodexRpcBridge({
-            command: this.input.command,
-            cwd: this.input.cwd,
-            hostDeviceId: this.input.hostDeviceId,
-            send: this.input.send,
-            verbose: this.input.verbose,
-        });
-        return this.codexRpcBridge;
-    }
     protocolForProvider(provider) {
         return this.agentProtocols.get(provider);
     }
@@ -1385,9 +1106,7 @@ export class AgentWorkspaceProxy {
             return;
         this.initialized = true;
         // Eagerly start all detected providers so capabilities report real status
-        const startPromises = this.input.availableProviders
-            .filter((provider) => provider !== "codex")
-            .map((p) => this.ensureProviderClient(p));
+        const startPromises = this.input.availableProviders.map((p) => this.ensureProviderClient(p));
         await Promise.allSettled(startPromises);
         this.status = "idle";
         this.error = undefined;
@@ -1493,13 +1212,10 @@ export class AgentWorkspaceProxy {
         try {
             const result = await listModels.call(client);
             const runtimeCapabilities = parseModelListCapabilities(result);
-            if (runtimeCapabilities) {
+            if (runtimeCapabilities)
                 this.providerCapabilities.set(provider, runtimeCapabilities);
-                this.providerCapabilityErrors.delete(provider);
-            }
         }
         catch (error) {
-            this.providerCapabilityErrors.set(provider, error instanceof Error ? error.message : String(error));
             if (this.input.verbose) {
                 process.stderr.write(`[agent:v2] model/list failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
             }
@@ -1507,11 +1223,36 @@ export class AgentWorkspaceProxy {
     }
     async syncProviderSessions() {
         await this.initialize();
-        this.upsertProviderSessions("claude", listClaudeStoredSessions(this.input.cwd));
         for (const [provider, client] of this.clients) {
             try {
                 const result = await client.listSessions();
-                this.upsertProviderSessions(provider, result);
+                for (const remote of parseRemoteSessions(result)) {
+                    const agentSessionId = remote.id;
+                    const existingId = this.conversationByAgentSessionId.get(agentSessionId);
+                    const now = Date.now();
+                    const conversationId = existingId ?? `agent:${agentSessionId}`;
+                    const existing = this.conversations.get(conversationId);
+                    const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
+                    const conversation = {
+                        id: conversationId,
+                        agentSessionId,
+                        provider,
+                        cwd,
+                        title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
+                        model: remote.model ?? existing?.model,
+                        reasoningEffort: existing?.reasoningEffort,
+                        permissionMode: existing?.permissionMode,
+                        collaborationMode: existing?.collaborationMode,
+                        status: existing?.status ?? "idle",
+                        archived: existing?.archived ?? false,
+                        lastMessagePreview: existing?.lastMessagePreview,
+                        lastActivityAt: remote.lastActivityAt ?? existing?.lastActivityAt ?? now,
+                        createdAt: remote.createdAt ?? existing?.createdAt ?? now,
+                    };
+                    this.conversations.set(conversation.id, conversation);
+                    this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
+                    this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
+                }
             }
             catch (error) {
                 if (this.input.verbose) {
@@ -1520,55 +1261,16 @@ export class AgentWorkspaceProxy {
             }
         }
     }
-    upsertProviderSessions(provider, result) {
-        for (const remote of parseRemoteSessions(result)) {
-            const agentSessionId = remote.id;
-            const existingId = this.conversationByAgentSessionId.get(agentSessionId);
-            const now = Date.now();
-            const conversationId = existingId ?? `agent:${agentSessionId}`;
-            const existing = this.conversations.get(conversationId);
-            const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
-            const conversation = {
-                id: conversationId,
-                agentSessionId,
-                provider,
-                cwd,
-                title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
-                model: remote.model ?? existing?.model,
-                reasoningEffort: existing?.reasoningEffort,
-                serviceTier: existing?.serviceTier,
-                permissionMode: existing?.permissionMode,
-                collaborationMode: existing?.collaborationMode,
-                status: remote.status ?? existing?.status ?? "idle",
-                archived: remote.archived ?? existing?.archived ?? false,
-                timelineRevision: existing?.timelineRevision ?? this.getRevision(conversationId),
-                historyComplete: existing?.historyComplete ?? false,
-                runningTurnId: remote.runningTurnId ?? this.currentTurnIds.get(conversationId),
-                source: "device",
-                canonical: true,
-                lastMessagePreview: existing?.lastMessagePreview,
-                lastActivityAt: remote.lastActivityAt ?? existing?.lastActivityAt ?? now,
-                createdAt: remote.createdAt ?? existing?.createdAt ?? now,
-            };
-            this.conversations.set(conversation.id, conversation);
-            this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
-            if (remote.runningTurnId)
-                this.rememberTurnConversationId(conversation.id, remote.runningTurnId);
-            this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
-        }
-    }
     sendCapabilities() {
         const providers = this.input.availableProviders.map((provider) => {
             const client = this.clients.get(provider);
-            const protocol = provider === "codex" ? "codex-app-server" : this.agentProtocols.get(provider);
+            const protocol = this.agentProtocols.get(provider);
             const runtimeCapabilities = this.providerCapabilities.get(provider);
-            const enabled = provider === "codex" ? true : Boolean(client);
-            const hasRuntimeModels = Boolean(runtimeCapabilities?.models?.length);
+            const enabled = Boolean(client);
             const supportsImages = enabled && protocolSupportsImages(protocol);
-            const isClaudeSdk = protocol === "claude-agent-sdk";
             const isClaudeFallback = protocol === "claude-stream-json";
-            const supportsPermission = enabled && (isClaudeSdk || !isClaudeFallback);
-            const supportsReasoningEffort = enabled;
+            const supportsPermission = enabled && !isClaudeFallback;
+            const supportsReasoningEffort = enabled && !isClaudeFallback;
             const commands = mergeCommands(defaultProviderCommands(provider, this.input.cwd, enabled), runtimeCapabilities?.commands);
             const currentMode = [...this.conversations.values()].find((conversation) => conversation.provider === provider)?.collaborationMode;
             return {
@@ -1576,23 +1278,21 @@ export class AgentWorkspaceProxy {
                 label: providerLabel(provider),
                 enabled,
                 reason: enabled ? undefined : `${providerLabel(provider)} 未安装或启动失败`,
-                providerProtocol: protocol,
                 supportsImages,
                 supportsPermission,
                 supportsPlan: enabled,
                 supportsCancel: enabled,
                 models: runtimeCapabilities?.models ?? [{ id: "default", label: "默认模型" }],
-                defaultModel: runtimeCapabilities?.defaultModel,
-                modelsSource: hasRuntimeModels ? "runtime" : enabled ? "fallback" : "unavailable",
-                modelListError: this.providerCapabilityErrors.get(provider),
+                defaultModel: runtimeCapabilities?.defaultModel ?? "default",
                 reasoningEfforts: supportsReasoningEffort
-                    ? runtimeCapabilities?.reasoningEfforts ?? (provider === "claude" ? [...CLAUDE_REASONING_EFFORTS] : [...ALL_REASONING_EFFORTS])
+                    ? runtimeCapabilities?.reasoningEfforts ?? [...ALL_REASONING_EFFORTS]
                     : [],
-                speedTiers: provider === "codex" ? runtimeCapabilities?.speedTiers ?? ["standard"] : [],
-                defaultServiceTier: provider === "codex" ? runtimeCapabilities?.defaultServiceTier : undefined,
-                permissionModes: supportsPermission ? AGENT_PERMISSION_MODES : [],
+                permissionModes: supportsPermission ? [...ALL_PERMISSION_MODES] : [],
                 commands,
-                modes: runtimeCapabilities?.modes ?? [],
+                modes: runtimeCapabilities?.modes ?? (provider === "codex" ? [
+                    { id: "default", title: "Default", description: "Run normal implementation turns" },
+                    { id: "plan", title: "Plan", description: "Discuss and produce an implementation plan first" },
+                ] : []),
                 currentMode,
                 features: {
                     images: supportsImages,
@@ -1600,8 +1300,6 @@ export class AgentWorkspaceProxy {
                     plan: enabled,
                     cancel: enabled,
                     reasoningEffort: supportsReasoningEffort,
-                    serviceTier: provider === "codex" && Boolean(runtimeCapabilities?.speedTiers?.includes("fast")),
-                    claudeSdk: isClaudeSdk,
                     streamJsonFallback: isClaudeFallback,
                 },
             };
@@ -1610,14 +1308,13 @@ export class AgentWorkspaceProxy {
         const anyPermission = providers.some((p) => p.supportsPermission);
         this.input.send(createEnvelope({
             type: "agent.v2.capabilities",
-            hostDeviceId: this.input.hostDeviceId,
+            sessionId: this.input.sessionId,
             payload: {
                 enabled: anyEnabled,
                 provider: this.input.availableProviders[0] ?? "codex",
                 providers,
                 protocolVersion: 1,
                 workspaceProtocolVersion: 2,
-                capabilitiesRevision: ++this.capabilitiesRevision,
                 error: anyEnabled ? undefined : "没有可用的 Agent provider。请安装 Claude Code 或 Codex CLI。",
                 supportsSessionList: anyEnabled,
                 supportsSessionLoad: anyEnabled,
@@ -1631,6 +1328,16 @@ export class AgentWorkspaceProxy {
     }
     async openConversation(payload) {
         const provider = payload.provider ?? this.input.availableProviders[0];
+        if (!provider) {
+            return this.openFailure(payload, "没有可用的 Agent provider。");
+        }
+        if (!this.input.availableProviders.includes(provider)) {
+            return this.openFailure(payload, `${providerLabel(provider)} 未安装或不可用。`);
+        }
+        const client = await this.ensureProviderClient(provider);
+        if (!client) {
+            return this.openFailure(payload, `${providerLabel(provider)} 启动失败。请确认 CLI 已安装并可用。`);
+        }
         const cwd = payload.cwd ?? this.input.cwd;
         let agentSessionId = payload.agentSessionId;
         let existingConversation = (payload.conversationId ? this.conversations.get(payload.conversationId) : undefined) ??
@@ -1639,34 +1346,17 @@ export class AgentWorkspaceProxy {
             if (payload.conversationId && existingConversation.id !== payload.conversationId) {
                 existingConversation = this.adoptConversationId(existingConversation.id, payload.conversationId);
             }
-            this.hydrateStoredTimeline(existingConversation);
             this.activeConversationId = existingConversation.id;
-            const snapshot = this.latestSnapshot(existingConversation.id);
             this.input.send(createEnvelope({
                 type: "agent.v2.conversation.opened",
-                hostDeviceId: this.input.hostDeviceId,
+                sessionId: this.input.sessionId,
                 payload: {
-                    conversation: this.conversationSnapshot(existingConversation),
-                    snapshot: snapshot.items,
-                    revision: this.getRevision(existingConversation.id),
-                    cursor: snapshot.cursor,
-                    hasMore: snapshot.hasMore,
-                    source: "device-history",
-                    canonical: true,
+                    conversation: existingConversation,
+                    snapshot: this.timelines.get(existingConversation.id) ?? [],
                 },
             }));
             return existingConversation;
         }
-        if (!provider) {
-            return this.openFailure(payload, "没有可用的 Agent provider。");
-        }
-        if (!this.input.availableProviders.includes(provider)) {
-            return this.openFailure(payload, `${providerLabel(provider)} 未安装或不可用。`);
-        }
-        const client = await this.ensureProviderClient(provider);
-        if (!client) {
-            return this.openFailure(payload, `${providerLabel(provider)} 启动失败。请确认 CLI 已安装并可用。`);
-        }
         try {
             const result = agentSessionId
                 ? await client.loadSession({ sessionId: agentSessionId, cwd })
@@ -1683,16 +1373,10 @@ export class AgentWorkspaceProxy {
                 title: payload.title ?? existingConversation?.title ?? titleFromCwd(cwd),
                 model: payload.model ?? existingConversation?.model,
                 reasoningEffort: payload.reasoningEffort ?? existingConversation?.reasoningEffort,
-                serviceTier: payload.serviceTier ?? existingConversation?.serviceTier,
                 permissionMode: payload.permissionMode ?? existingConversation?.permissionMode,
                 collaborationMode: payload.collaborationMode ?? existingConversation?.collaborationMode,
                 status: "idle",
                 archived: existingConversation?.archived ?? false,
-                timelineRevision: existingConversation?.timelineRevision ?? this.getRevision(conversationId),
-                historyComplete: existingConversation?.historyComplete ?? false,
-                runningTurnId: this.currentTurnIds.get(conversationId),
-                source: "device",
-                canonical: true,
                 lastMessagePreview: existingConversation?.status === "error" ? undefined : existingConversation?.lastMessagePreview,
                 lastActivityAt: now,
                 createdAt: existingConversation?.createdAt ?? now,
@@ -1701,20 +1385,10 @@ export class AgentWorkspaceProxy {
             this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
             this.activeConversationId = conversation.id;
             this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
-            this.hydrateStoredTimeline(conversation);
-            const snapshot = this.latestSnapshot(conversation.id);
             this.input.send(createEnvelope({
                 type: "agent.v2.conversation.opened",
-                hostDeviceId: this.input.hostDeviceId,
-                payload: {
-                    conversation: this.conversationSnapshot(conversation),
-                    snapshot: snapshot.items,
-                    revision: this.getRevision(conversation.id),
-                    cursor: snapshot.cursor,
-                    hasMore: snapshot.hasMore,
-                    source: "device-history",
-                    canonical: true,
-                },
+                sessionId: this.input.sessionId,
+                payload: { conversation, snapshot: this.timelines.get(conversation.id) ?? [] },
             }));
             return conversation;
         }
@@ -1737,10 +1411,6 @@ export class AgentWorkspaceProxy {
             collaborationMode: payload.collaborationMode,
             status: "error",
             archived: false,
-            timelineRevision: this.getRevision(fallbackId),
-            historyComplete: false,
-            source: "device",
-            canonical: true,
             lastMessagePreview: message,
             lastActivityAt: now,
             createdAt: now,
@@ -1756,15 +1426,8 @@ export class AgentWorkspaceProxy {
         });
         this.input.send(createEnvelope({
             type: "agent.v2.conversation.opened",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversation: this.conversationSnapshot(conversation),
-                snapshot: snapshotTimelineItems(this.timelines.get(conversation.id) ?? []),
-                revision: this.getRevision(conversation.id),
-                hasMore: false,
-                source: "device",
-                canonical: true,
-            },
+            sessionId: this.input.sessionId,
+            payload: { conversation, snapshot: this.timelines.get(conversation.id) ?? [] },
         }));
         return conversation;
     }
@@ -1808,21 +1471,10 @@ export class AgentWorkspaceProxy {
             });
             return;
         }
-        if (Object.prototype.hasOwnProperty.call(payload, "model")) {
-            conversation.model = payload.model ?? undefined;
-        }
-        if (Object.prototype.hasOwnProperty.call(payload, "reasoningEffort")) {
-            conversation.reasoningEffort = payload.reasoningEffort ?? undefined;
-        }
-        if (Object.prototype.hasOwnProperty.call(payload, "serviceTier")) {
-            conversation.serviceTier = payload.serviceTier ?? undefined;
-        }
-        if (Object.prototype.hasOwnProperty.call(payload, "permissionMode")) {
-            conversation.permissionMode = payload.permissionMode ?? undefined;
-        }
-        if (Object.prototype.hasOwnProperty.call(payload, "collaborationMode")) {
-            conversation.collaborationMode = payload.collaborationMode ?? "default";
-        }
+        conversation.model = payload.model ?? conversation.model;
+        conversation.reasoningEffort = payload.reasoningEffort ?? conversation.reasoningEffort;
+        conversation.permissionMode = payload.permissionMode ?? conversation.permissionMode;
+        conversation.collaborationMode = payload.collaborationMode ?? conversation.collaborationMode;
         conversation.status = "running";
         conversation.lastActivityAt = Date.now();
         this.activeConversationId = conversation.id;
@@ -1842,11 +1494,10 @@ export class AgentWorkspaceProxy {
                 sessionId: conversation.agentSessionId,
                 content: payload.contentBlocks,
                 clientMessageId: payload.clientMessageId,
-                model: conversation.model,
-                reasoningEffort: conversation.reasoningEffort,
-                serviceTier: conversation.serviceTier,
-                permissionMode: conversation.permissionMode,
-                collaborationMode: conversation.collaborationMode,
+                model: payload.model,
+                reasoningEffort: payload.reasoningEffort,
+                permissionMode: payload.permissionMode,
+                collaborationMode: payload.collaborationMode ?? conversation.collaborationMode,
                 cwd: conversation.cwd,
             });
             const nextAgentSessionId = this.extractSessionId(result);
@@ -1926,7 +1577,6 @@ export class AgentWorkspaceProxy {
                 contentBlocks: [{ type: "text", text: rawText }],
                 model: conversation.model,
                 reasoningEffort: conversation.reasoningEffort,
-                serviceTier: conversation.serviceTier,
                 permissionMode: conversation.permissionMode,
                 collaborationMode: conversation.collaborationMode,
             });
@@ -1957,8 +1607,14 @@ export class AgentWorkspaceProxy {
                 this.emitStatus(conversation.id, conversation.status, `${providerLabel(conversation.provider)} · ${conversation.collaborationMode === "plan" ? "Plan mode" : "Default mode"} · ${conversation.cwd}`);
                 return;
             }
-            if (isGitNativeCommand(command.name)) {
-                await this.executeGitNativeCommand(conversation, command.name, args);
+            if (conversation.provider !== "codex") {
+                this.addItem(conversation.id, {
+                    id: id("error"),
+                    conversationId: conversation.id,
+                    type: "error",
+                    error: `${command.title} 暂无 ${providerLabel(conversation.provider)} 原生实现。`,
+                    createdAt: now,
+                });
                 return;
             }
             if (command.name === "plan" || command.name === "exit-plan") {
@@ -1973,22 +1629,6 @@ export class AgentWorkspaceProxy {
                     : "已退出 Plan mode。");
                 return;
             }
-            if (command.name === "review" || command.name === "subagents") {
-                const prompt = command.name === "review"
-                    ? args || "Review the current local changes."
-                    : args || "Run subagents for distinct tasks in parallel when useful, then synthesize the results.";
-                await this.sendPrompt({
-                    conversationId: conversation.id,
-                    clientMessageId: id(command.name),
-                    contentBlocks: [{ type: "text", text: prompt }],
-                    model: conversation.model,
-                    reasoningEffort: conversation.reasoningEffort,
-                    serviceTier: conversation.serviceTier,
-                    permissionMode: conversation.permissionMode,
-                    collaborationMode: conversation.collaborationMode,
-                });
-                return;
-            }
             if (command.name === "compact") {
                 if (!(client instanceof AcpClient))
                     throw new Error("当前 Codex runtime 不支持原生 compact。");
@@ -2009,7 +1649,7 @@ export class AgentWorkspaceProxy {
                 this.emitStatus(conversation.id, "idle", "上下文压缩完成。");
                 return;
             }
-            if (command.name === "clear" || command.name === "new") {
+            if (command.name === "clear") {
                 if (!client)
                     throw new Error("Agent provider 不在线。");
                 const result = await client.newSession({ cwd: conversation.cwd });
@@ -2027,6 +1667,21 @@ export class AgentWorkspaceProxy {
                 this.emitStatus(conversation.id, "idle", "上下文已重置，已创建新的 Codex thread。");
                 return;
             }
+            if (command.name === "review" || command.name === "subagents") {
+                const prompt = command.name === "review"
+                    ? args || "Review the current local changes."
+                    : args || "Run subagents for distinct tasks in parallel when useful, then synthesize the results.";
+                await this.sendPrompt({
+                    conversationId: conversation.id,
+                    clientMessageId: id(command.name),
+                    contentBlocks: [{ type: "text", text: prompt }],
+                    model: conversation.model,
+                    reasoningEffort: conversation.reasoningEffort,
+                    permissionMode: conversation.permissionMode,
+                    collaborationMode: conversation.collaborationMode,
+                });
+                return;
+            }
             throw new Error(`命令暂未实现：/${command.name}`);
         }
         catch (error) {
@@ -2041,41 +1696,6 @@ export class AgentWorkspaceProxy {
             });
         }
     }
-    async executeGitNativeCommand(conversation, commandName, args) {
-        const git = gitCommandArgs(commandName, args);
-        const toolId = id(commandName);
-        const now = Date.now();
-        conversation.status = "running";
-        conversation.lastMessagePreview = git.display;
-        conversation.lastActivityAt = now;
-        this.emitConversation(conversation);
-        this.upsertTool(conversation.id, {
-            id: toolId,
-            name: "命令",
-            input: `${git.display}\n\ncwd: ${conversation.cwd}`,
-            createdAt: now,
-            status: "running",
-        });
-        const result = await runProcess("git", git.argv, {
-            cwd: conversation.cwd,
-            maxBytes: COMMAND_OUTPUT_MAX_BYTES,
-        });
-        const ok = result.exitCode === 0;
-        this.upsertTool(conversation.id, {
-            id: toolId,
-            name: "命令",
-            input: `${git.display}\n\ncwd: ${conversation.cwd}`,
-            output: result.output || (ok ? "完成" : `退出码 ${result.exitCode ?? "unknown"}`),
-            createdAt: now,
-            status: ok ? "completed" : "failed",
-        });
-        conversation.status = ok ? "idle" : "error";
-        conversation.lastMessagePreview = ok
-            ? `${git.display} 完成`
-            : `${git.display} 失败`;
-        conversation.lastActivityAt = Date.now();
-        this.emitConversation(conversation);
-    }
     handleRequest(method, params) {
         if (method === "item/tool/requestUserInput" || method === "tool/requestUserInput") {
             return this.handleStructuredInput(params, true);
@@ -2113,7 +1733,6 @@ export class AgentWorkspaceProxy {
         }
         if (method.startsWith("account/") ||
             method.startsWith("mcpServer/startupStatus/") ||
-            method.startsWith("remoteControl/") ||
             method === "thread/status/changed" ||
             method === "thread/tokenUsage/updated" ||
             method === "serverRequest/resolved" ||
@@ -2139,9 +1758,6 @@ export class AgentWorkspaceProxy {
                 this.conversationByAgentSessionId.set(agentSessionId, conversationId);
                 const conversation = this.conversations.get(conversationId);
                 if (conversation) {
-                    if (conversation.agentSessionId && conversation.agentSessionId !== agentSessionId) {
-                        this.conversationByAgentSessionId.delete(conversation.agentSessionId);
-                    }
                     conversation.agentSessionId = agentSessionId;
                     conversation.lastActivityAt = Date.now();
                     this.emitConversation(conversation);
@@ -2720,7 +2336,7 @@ export class AgentWorkspaceProxy {
         this.upsertItem(conversationId, item);
         this.input.send(createEnvelope({
             type: "agent.v2.permission.request",
-            hostDeviceId: this.input.hostDeviceId,
+            sessionId: this.input.sessionId,
             payload: { conversationId, ...permission, item },
         }));
         if (!waitForResponse)
@@ -2731,14 +2347,6 @@ export class AgentWorkspaceProxy {
                 this.permissionWaiters.delete(requestId);
                 this.permissionSources.delete(requestId);
                 resolve(formatPermissionResponse(source, "cancelled", "cancelled"));
-                this.markPermission(conversationId, requestId, {
-                    permissionOutcome: "cancelled",
-                    optionId: "cancelled",
-                    permissionLive: false,
-                    permissionPending: false,
-                    permissionExpired: true,
-                    permissionError: "等待授权超时",
-                });
                 this.updateConversationStatus(conversationId, "idle");
             }, PERMISSION_TIMEOUT_MS);
             this.permissionWaiters.set(requestId, { resolve, timer });
@@ -2768,8 +2376,6 @@ export class AgentWorkspaceProxy {
         this.markPermission(payload.conversationId, payload.requestId, {
             permissionOutcome: payload.outcome,
             optionId: selectedOptionId,
-            permissionLive: false,
-            permissionExpired: false,
             permissionError: undefined,
             permissionPending: false,
         });
@@ -2816,209 +2422,6 @@ export class AgentWorkspaceProxy {
             updatedAt: Date.now(),
         });
     }
-    getRevision(conversationId) {
-        return this.conversationRevisions.get(conversationId) ??
-            this.conversations.get(conversationId)?.timelineRevision ??
-            0;
-    }
-    setRevisionFloor(conversationId, revision) {
-        const nextRevision = Math.max(this.getRevision(conversationId), revision);
-        this.conversationRevisions.set(conversationId, nextRevision);
-        const conversation = this.conversations.get(conversationId);
-        if (conversation) {
-            conversation.timelineRevision = nextRevision;
-            conversation.runningTurnId = this.currentTurnIds.get(conversationId);
-        }
-        return nextRevision;
-    }
-    conversationSnapshot(conversation) {
-        return {
-            ...conversation,
-            timelineRevision: this.getRevision(conversation.id),
-            historyComplete: conversation.historyComplete ?? false,
-            runningTurnId: this.currentTurnIds.get(conversation.id),
-            source: conversation.source ?? "device",
-            canonical: conversation.canonical ?? true,
-        };
-    }
-    annotateTimelineItem(item, revision, source) {
-        return {
-            ...item,
-            revision: revision ?? item.revision,
-            source: item.source ?? source,
-            canonical: item.canonical ?? true,
-        };
-    }
-    recordRevisionEvent(conversationId, change) {
-        const revision = this.getRevision(conversationId) + 1;
-        this.conversationRevisions.set(conversationId, revision);
-        const conversation = this.conversations.get(conversationId);
-        if (conversation) {
-            conversation.timelineRevision = revision;
-            conversation.runningTurnId = this.currentTurnIds.get(conversationId);
-        }
-        const event = {
-            revision,
-            item: change.item ? this.annotateTimelineItem(change.item, revision, "device-live") : undefined,
-            conversation: change.conversation ? this.conversationSnapshot(change.conversation) : undefined,
-        };
-        const events = this.revisionEvents.get(conversationId) ?? [];
-        events.push(event);
-        if (events.length > MAX_DELTA_EVENTS) {
-            events.splice(0, events.length - MAX_DELTA_EVENTS);
-        }
-        this.revisionEvents.set(conversationId, events);
-        return event;
-    }
-    storedTimeline(conversation, maxItems = HISTORY_PAGE_MAX_ITEMS) {
-        if (!conversation.agentSessionId)
-            return [];
-        const result = conversation.provider === "codex"
-            ? loadCodexStoredTimeline(conversation.agentSessionId, conversation.id, conversation.cwd || this.input.cwd, { maxItems })
-            : conversation.provider === "claude"
-                ? loadClaudeStoredTimeline(conversation.agentSessionId, conversation.id, { maxItems })
-                : { items: [] };
-        return result.items
-            .sort((a, b) => a.createdAt - b.createdAt)
-            .map((item, index) => this.annotateTimelineItem(item, index + 1, "device-history"));
-    }
-    canonicalTimeline(conversation, maxItems = HISTORY_PAGE_MAX_ITEMS) {
-        const merged = new Map();
-        for (const item of this.storedTimeline(conversation, maxItems)) {
-            merged.set(item.id, item);
-        }
-        for (const item of this.timelines.get(conversation.id) ?? []) {
-            merged.set(item.id, this.annotateTimelineItem(item, item.revision, item.source ?? "device-live"));
-        }
-        const items = [...merged.values()]
-            .sort((a, b) => a.createdAt - b.createdAt)
-            .slice(-maxItems);
-        this.setRevisionFloor(conversation.id, Math.max(this.getRevision(conversation.id), items.length));
-        return items;
-    }
-    async appServerTimeline(conversation, maxItems = HISTORY_PAGE_MAX_ITEMS) {
-        if (conversation.provider !== "codex" || !conversation.agentSessionId)
-            return [];
-        if (this.protocolForProvider(conversation.provider) !== "codex-app-server")
-            return [];
-        const client = this.clientForProvider(conversation.provider);
-        const listTurns = client?.listTurns;
-        if (typeof listTurns !== "function")
-            return [];
-        try {
-            const result = await listTurns.call(client, { sessionId: conversation.agentSessionId, limit: maxItems });
-            return this.timelineFromAppServerTurns(conversation.id, conversation.agentSessionId, result);
-        }
-        catch (error) {
-            if (this.input.verbose) {
-                process.stderr.write(`[agent:v2] thread/turns/list failed: ${error instanceof Error ? error.message : String(error)}\n`);
-            }
-            return [];
-        }
-    }
-    timelineFromAppServerTurns(conversationId, agentSessionId, value) {
-        const raw = asRecord(value);
-        const turns = Array.isArray(value) ? value :
-            Array.isArray(raw?.turns) ? raw.turns :
-                Array.isArray(raw?.items) ? raw.items :
-                    Array.isArray(raw?.entries) ? raw.entries :
-                        [];
-        const items = [];
-        turns.forEach((entry, index) => {
-            const turn = asRecord(entry);
-            if (!turn)
-                return;
-            const turnId = firstString(turn, ["id", "turnId", "turn_id"]) ?? `turn-${index + 1}`;
-            const createdAt = parseTimestamp(turn.createdAt ?? turn.created_at ?? turn.startedAt ?? turn.started_at) ?? Date.now() + index;
-            const updatedAt = parseTimestamp(turn.updatedAt ?? turn.updated_at ?? turn.completedAt ?? turn.completed_at);
-            const userText = appServerText(turn.input ?? turn.prompt ?? turn.user ?? turn.userMessage ?? turn.request);
-            if (userText) {
-                items.push({
-                    id: `app-server:${agentSessionId}:${turnId}:user`,
-                    conversationId,
-                    type: "message",
-                    kind: "chat",
-                    turnId,
-                    role: "user",
-                    content: [{ type: "text", text: userText }],
-                    text: userText,
-                    createdAt,
-                    updatedAt,
-                    metadata: { source: "app-server", provider: "codex" },
-                });
-            }
-            const assistantText = appServerText(turn.output ?? turn.response ?? turn.assistant ?? turn.assistantMessage ?? turn.result);
-            if (assistantText) {
-                items.push({
-                    id: `app-server:${agentSessionId}:${turnId}:assistant`,
-                    conversationId,
-                    type: "message",
-                    kind: "chat",
-                    turnId,
-                    role: "assistant",
-                    content: [{ type: "text", text: assistantText }],
-                    text: assistantText,
-                    createdAt: updatedAt ?? createdAt + 1,
-                    updatedAt,
-                    metadata: { source: "app-server", provider: "codex" },
-                });
-            }
-            const nestedItems = Array.isArray(turn.items) ? turn.items : Array.isArray(turn.messages) ? turn.messages : [];
-            for (const nested of nestedItems) {
-                const nestedRecord = asRecord(nested);
-                if (!nestedRecord)
-                    continue;
-                const text = appServerText(nestedRecord.content ?? nestedRecord.text ?? nestedRecord.message);
-                const role = nestedRecord.role === "user" || nestedRecord.role === "assistant" || nestedRecord.role === "system"
-                    ? nestedRecord.role
-                    : undefined;
-                if (!text || !role)
-                    continue;
-                const itemId = firstString(nestedRecord, ["id", "itemId", "messageId"]) ?? `${role}-${items.length + 1}`;
-                items.push({
-                    id: `app-server:${agentSessionId}:${turnId}:${itemId}`,
-                    conversationId,
-                    type: "message",
-                    kind: "chat",
-                    turnId,
-                    itemId,
-                    role,
-                    content: [{ type: "text", text }],
-                    text,
-                    createdAt: parseTimestamp(nestedRecord.createdAt ?? nestedRecord.created_at) ?? createdAt + items.length,
-                    updatedAt: parseTimestamp(nestedRecord.updatedAt ?? nestedRecord.updated_at),
-                    metadata: { source: "app-server", provider: "codex" },
-                });
-            }
-        });
-        return items
-            .sort((a, b) => a.createdAt - b.createdAt)
-            .map((item, index) => this.annotateTimelineItem(item, index + 1, "app-server"));
-    }
-    mergeCanonicalTimelineItems(items, maxItems) {
-        const byKey = new Map();
-        for (const item of items.sort((a, b) => a.createdAt - b.createdAt)) {
-            const key = item.type === "message" && item.role && item.text
-                ? `${item.role}:${item.text.replace(/\s+/g, " ").trim().slice(0, 500)}`
-                : item.id;
-            const existing = byKey.get(key);
-            if (!existing || item.source === "app-server" || (item.updatedAt ?? item.createdAt) >= (existing.updatedAt ?? existing.createdAt)) {
-                byKey.set(key, item);
-            }
-        }
-        return [...byKey.values()]
-            .sort((a, b) => a.createdAt - b.createdAt)
-            .slice(-maxItems);
-    }
-    latestSnapshot(conversationId) {
-        const timeline = this.timelines.get(conversationId) ?? [];
-        const start = Math.max(0, timeline.length - MAX_SNAPSHOT_ITEMS);
-        return {
-            items: timeline.slice(start).map((item) => snapshotTimelineItem(item)),
-            cursor: start > 0 ? String(start) : undefined,
-            hasMore: start > 0,
-        };
-    }
     addItem(conversationId, item) {
         this.rememberItemConversationId(conversationId, item);
         const timeline = this.timelines.get(conversationId) ?? [];
@@ -3056,8 +2459,6 @@ export class AgentWorkspaceProxy {
             ...existing,
             ...toolCall,
             id: targetToolId,
-            input: toolCall.input ?? existing?.input,
-            output: toolCall.output ?? existing?.output,
             createdAt: existing?.createdAt ?? toolCall.createdAt ?? Date.now(),
         };
         this.toolConversationIds.set(toolCall.id, conversationId);
@@ -3126,7 +2527,6 @@ export class AgentWorkspaceProxy {
             conversation.title = conversation.title ?? target.title;
             conversation.model = conversation.model ?? target.model;
             conversation.reasoningEffort = conversation.reasoningEffort ?? target.reasoningEffort;
-            conversation.serviceTier = conversation.serviceTier ?? target.serviceTier;
             conversation.permissionMode = conversation.permissionMode ?? target.permissionMode;
             conversation.lastMessagePreview = conversation.lastMessagePreview ?? target.lastMessagePreview;
             conversation.createdAt = Math.min(conversation.createdAt, target.createdAt);
@@ -3139,17 +2539,6 @@ export class AgentWorkspaceProxy {
         this.timelines.set(newId, [...mergedTimeline.values()]
             .sort((a, b) => a.createdAt - b.createdAt)
             .slice(-MAX_TIMELINE_ITEMS));
-        const oldRevision = this.conversationRevisions.get(oldId) ?? 0;
-        if (oldRevision > 0) {
-            this.conversationRevisions.delete(oldId);
-            this.setRevisionFloor(newId, oldRevision);
-        }
-        const oldEvents = this.revisionEvents.get(oldId);
-        if (oldEvents) {
-            this.revisionEvents.delete(oldId);
-            const existingEvents = this.revisionEvents.get(newId) ?? [];
-            this.revisionEvents.set(newId, [...existingEvents, ...oldEvents].slice(-MAX_DELTA_EVENTS));
-        }
         for (const [agentSessionId, conversationId] of this.conversationByAgentSessionId) {
             if (conversationId === oldId) {
                 this.conversationByAgentSessionId.set(agentSessionId, newId);
@@ -3183,47 +2572,17 @@ export class AgentWorkspaceProxy {
     }
     emitItem(conversationId, item) {
         const conversation = this.conversations.get(conversationId);
-        const itemSnapshot = snapshotTimelineItem(item, { stripImages: false });
-        const event = this.recordRevisionEvent(conversationId, { conversation, item: itemSnapshot });
         this.input.send(createEnvelope({
             type: "agent.v2.event",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversationId,
-                conversation: event.conversation,
-                item: event.item,
-                revision: event.revision,
-                source: "device-live",
-                canonical: true,
-            },
+            sessionId: this.input.sessionId,
+            payload: { conversationId, conversation, item },
         }));
     }
     emitConversation(conversation) {
-        const event = this.recordRevisionEvent(conversation.id, { conversation });
         this.input.send(createEnvelope({
             type: "agent.v2.event",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversationId: conversation.id,
-                conversation: event.conversation,
-                revision: event.revision,
-                source: "device-live",
-                canonical: true,
-            },
-        }));
-        this.input.send(createEnvelope({
-            type: "agent.v2.running_state",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversationId: conversation.id,
-                status: conversation.status,
-                runningTurnId: this.currentTurnIds.get(conversation.id),
-                revision: event.revision,
-                error: conversation.status === "error" ? conversation.lastMessagePreview : undefined,
-                updatedAt: conversation.lastActivityAt,
-                source: "device-live",
-                canonical: true,
-            },
+            sessionId: this.input.sessionId,
+            payload: { conversationId: conversation.id, conversation },
         }));
     }
     emitStatus(conversationId, status, text) {
@@ -3257,169 +2616,20 @@ export class AgentWorkspaceProxy {
         this.emitConversation(conversation);
     }
     sendSnapshot(conversationId) {
-        if (conversationId) {
-            const conversation = this.conversations.get(conversationId);
-            if (conversation)
-                this.hydrateStoredTimeline(conversation);
-        }
-        else if (this.activeConversationId) {
-            const conversation = this.conversations.get(this.activeConversationId);
-            if (conversation)
-                this.hydrateStoredTimeline(conversation);
-        }
-        const conversations = [...this.conversations.values()].map((conversation) => this.conversationSnapshot(conversation));
-        const snapshot = conversationId ? this.latestSnapshot(conversationId) : { items: [], cursor: undefined, hasMore: false };
+        const conversations = [...this.conversations.values()];
+        const items = conversationId
+            ? this.timelines.get(conversationId) ?? []
+            : [...this.timelines.values()].flat();
         this.input.send(createEnvelope({
             type: "agent.v2.snapshot",
-            hostDeviceId: this.input.hostDeviceId,
+            sessionId: this.input.sessionId,
             payload: {
                 conversations,
                 activeConversationId: this.activeConversationId,
-                items: snapshot.items,
-                revision: conversationId ? this.getRevision(conversationId) : undefined,
-                cursor: snapshot.cursor,
-                hasMore: snapshot.hasMore,
-                source: "device-history",
-                canonical: true,
-            },
-        }));
-    }
-    async sendHistoryPage(payload) {
-        const conversation = this.conversations.get(payload.conversationId);
-        if (!conversation)
-            return;
-        const limit = Math.min(Math.max(payload.limit ?? MAX_SNAPSHOT_ITEMS, 1), 200);
-        const items = this.mergeCanonicalTimelineItems([
-            ...this.canonicalTimeline(conversation, HISTORY_PAGE_MAX_ITEMS),
-            ...await this.appServerTimeline(conversation, HISTORY_PAGE_MAX_ITEMS),
-        ], HISTORY_PAGE_MAX_ITEMS);
-        this.timelines.set(conversation.id, items.slice(-MAX_TIMELINE_ITEMS).map((item) => this.annotateTimelineItem(item, item.revision, item.source ?? "device-history")));
-        for (const item of this.timelines.get(conversation.id) ?? []) {
-            this.rememberItemConversationId(conversation.id, item);
-        }
-        const direction = payload.direction ?? "older";
-        let page;
-        let cursor;
-        let hasMore = false;
-        if (direction === "newer") {
-            const start = clampHistoryCursor(payload.cursor, 0, items.length);
-            const end = Math.min(items.length, start + limit);
-            page = items.slice(start, end);
-            hasMore = end < items.length;
-            cursor = hasMore ? String(end) : undefined;
-        }
-        else {
-            const end = clampHistoryCursor(payload.cursor, items.length, items.length);
-            const start = Math.max(0, end - limit);
-            page = items.slice(start, end);
-            hasMore = start > 0;
-            cursor = hasMore ? String(start) : undefined;
-        }
-        conversation.historyComplete = !hasMore;
-        const revision = this.setRevisionFloor(conversation.id, Math.max(this.getRevision(conversation.id), items.length));
-        this.input.send(createEnvelope({
-            type: "agent.v2.history.page",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversationId: conversation.id,
-                conversation: this.conversationSnapshot(conversation),
-                items: page.map((item) => snapshotTimelineItem(item)),
-                revision,
-                cursor,
-                hasMore,
-                source: "device-history",
-                canonical: true,
-            },
-        }));
-    }
-    sendDelta(payload) {
-        const conversation = this.conversations.get(payload.conversationId);
-        if (!conversation)
-            return;
-        this.hydrateStoredTimeline(conversation);
-        const sinceRevision = payload.sinceRevision ?? 0;
-        const limit = Math.min(Math.max(payload.limit ?? 100, 1), 500);
-        const events = this.revisionEvents.get(conversation.id) ?? [];
-        const oldestAvailable = events[0]?.revision ?? this.getRevision(conversation.id);
-        const newestRevision = this.getRevision(conversation.id);
-        const reset = sinceRevision > 0 &&
-            (sinceRevision > newestRevision ||
-                (sinceRevision < newestRevision &&
-                    (events.length === 0 || sinceRevision < oldestAvailable - 1)));
-        if (reset) {
-            const snapshot = this.latestSnapshot(conversation.id);
-            this.input.send(createEnvelope({
-                type: "agent.v2.delta",
-                hostDeviceId: this.input.hostDeviceId,
-                payload: {
-                    conversationId: conversation.id,
-                    conversation: this.conversationSnapshot(conversation),
-                    items: snapshot.items,
-                    sinceRevision,
-                    revision: newestRevision,
-                    reset: true,
-                    cursor: snapshot.cursor,
-                    hasMore: snapshot.hasMore,
-                    source: "device-history",
-                    canonical: true,
-                },
-            }));
-            return;
-        }
-        const changed = events
-            .filter((event) => event.revision > sinceRevision)
-            .slice(-limit);
-        const itemsById = new Map();
-        for (const event of changed) {
-            if (event.item)
-                itemsById.set(event.item.id, event.item);
-        }
-        this.input.send(createEnvelope({
-            type: "agent.v2.delta",
-            hostDeviceId: this.input.hostDeviceId,
-            payload: {
-                conversationId: conversation.id,
-                conversation: this.conversationSnapshot(conversation),
-                items: [...itemsById.values()].map((item) => snapshotTimelineItem(item)),
-                sinceRevision,
-                revision: newestRevision,
-                reset: false,
-                hasMore: changed.length === limit && events.some((event) => event.revision > sinceRevision && event.revision < changed[0].revision),
-                source: "device-live",
-                canonical: true,
+                items,
             },
         }));
     }
-    hydrateStoredTimeline(conversation) {
-        if (!conversation.agentSessionId)
-            return;
-        const existing = this.timelines.get(conversation.id) ?? [];
-        if (existing.length > 0) {
-            this.setRevisionFloor(conversation.id, Math.max(existing.length, ...existing.map((item) => item.revision ?? 0)));
-            return;
-        }
-        const stored = this.storedTimeline(conversation, MAX_TIMELINE_ITEMS);
-        conversation.historyComplete = stored.length <= MAX_SNAPSHOT_ITEMS;
-        if (stored.length === 0) {
-            this.setRevisionFloor(conversation.id, this.getRevision(conversation.id));
-            return;
-        }
-        const items = stored
-            .sort((a, b) => a.createdAt - b.createdAt)
-            .slice(-MAX_TIMELINE_ITEMS);
-        this.timelines.set(conversation.id, items);
-        for (const item of items)
-            this.rememberItemConversationId(conversation.id, item);
-        this.setRevisionFloor(conversation.id, Math.max(items.length, ...items.map((item) => item.revision ?? 0)));
-        const lastMessage = [...items].reverse().find((item) => item.text?.trim());
-        if (lastMessage?.text && !conversation.lastMessagePreview) {
-            conversation.lastMessagePreview = previewText(lastMessage.text);
-        }
-        const lastActivityAt = items.at(-1)?.createdAt;
-        if (lastActivityAt) {
-            conversation.lastActivityAt = Math.max(conversation.lastActivityAt, lastActivityAt);
-        }
-    }
     conversationIdFromParams(params) {
         const raw = asRecord(params);
         if (!raw)
@@ -3479,9 +2689,6 @@ export class AgentWorkspaceProxy {
     rememberTurnConversationId(conversationId, turnId) {
         this.currentTurnIds.set(conversationId, turnId);
         this.turnConversationIds.set(turnId, conversationId);
-        const conversation = this.conversations.get(conversationId);
-        if (conversation)
-            conversation.runningTurnId = turnId;
     }
     forgetCurrentTurn(conversationId, turnId) {
         const currentTurnId = this.currentTurnIds.get(conversationId);
@@ -3490,9 +2697,6 @@ export class AgentWorkspaceProxy {
             this.turnConversationIds.delete(turnId);
         if (currentTurnId && currentTurnId !== turnId)
             this.turnConversationIds.delete(currentTurnId);
-        const conversation = this.conversations.get(conversationId);
-        if (conversation)
-            conversation.runningTurnId = undefined;
     }
     rememberItemConversationId(conversationId, item) {
         const keys = [
@@ -3532,51 +2736,28 @@ export class AgentWorkspaceProxy {
     }
     cancelPendingPermissions(conversationId) {
         for (const [requestId, waiter] of this.permissionWaiters) {
-            const ownerConversationId = this.conversationIdForPermissionRequest(requestId);
-            if (conversationId && ownerConversationId && ownerConversationId !== conversationId)
-                continue;
             clearTimeout(waiter.timer);
             waiter.resolve(formatPermissionResponse(this.permissionSources.get(requestId), "cancelled", "cancelled"));
-            if (ownerConversationId) {
-                this.markPermission(ownerConversationId, requestId, {
-                    permissionOutcome: "cancelled",
-                    optionId: "cancelled",
-                    permissionLive: false,
-                    permissionPending: false,
-                    permissionExpired: false,
-                    permissionError: "已停止",
-                });
-            }
-            this.permissionWaiters.delete(requestId);
             this.pendingPermissions.delete(requestId);
             this.permissionSources.delete(requestId);
         }
+        this.permissionWaiters.clear();
         for (const [requestId, waiter] of this.structuredInputWaiters) {
-            const pending = this.pendingStructuredInputs.get(requestId);
-            if (conversationId && pending?.conversationId && pending.conversationId !== conversationId)
-                continue;
             clearTimeout(waiter.timer);
             waiter.resolve(formatStructuredInputResponse({}));
+            const pending = this.pendingStructuredInputs.get(requestId);
             if (pending) {
                 this.markStructuredInput(pending.conversationId, requestId, {
                     inputPending: false,
                     inputError: "已停止",
                 });
             }
-            this.structuredInputWaiters.delete(requestId);
             this.pendingStructuredInputs.delete(requestId);
         }
+        this.structuredInputWaiters.clear();
         if (conversationId)
             this.updateConversationStatus(conversationId, "idle");
     }
-    conversationIdForPermissionRequest(requestId) {
-        for (const [conversationId, timeline] of this.timelines) {
-            if (timeline.some((item) => item.type === "permission" && item.permission?.requestId === requestId)) {
-                return conversationId;
-            }
-        }
-        return undefined;
-    }
     extractSessionId(value) {
         const raw = asRecord(value);
         if (!raw)