linkshell-cli 0.5.40 → 0.5.42

package/dist/cli/src/commands/doctor.js

@@ -1,5 +1,7 @@
 import { execSync } from "node:child_process";
+import { createRequire } from "node:module";
 import { loadConfig, getConfigPath } from "../config.js";
+const requireFromCli = createRequire(import.meta.url);
 function check(name, fn) {
     try {
         return { name, ok: true, detail: fn() };
@@ -44,11 +46,15 @@ export async function runDoctor(gatewayUrl) {
     }));
     results.push(check("node-pty", () => {
         try {
-            execSync("node -e \"require('node-pty')\"", { timeout: 5000, stdio: "pipe" });
+            // Resolve against this installation, not the user's current project.
+            requireFromCli("node-pty");
             return "loaded";
         }
-        catch {
-            throw new Error("native module not built — run: pnpm approve-builds && pnpm install --force");
+        catch (error) {
+            const reason = error instanceof Error ? error.message : String(error);
+            throw new Error(`could not load node-pty from this LinkShell installation: ${reason}. ` +
+                "Reinstall linkshell-cli with the package manager you used to install it. " +
+                "For a pnpm source checkout, approve node-pty build scripts and reinstall.");
         }
     }));
     // Optional CLI hints — not required, since LinkShell now bridges a plain shell.

package/dist/cli/src/commands/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../../src/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/runtime/acp/agent-workspace.d.ts

@@ -189,6 +189,8 @@ export declare class AgentWorkspaceProxy {
     private static readonly FS_SYNC_THROTTLE_MS;
     private static readonly EXTERNAL_HYDRATE_THROTTLE_MS;
     private static readonly LIST_IDLE_CAP;
+    private static readonly LIST_HARD_CAP;
+    private static readonly CLIENT_START_TIMEOUT_MS;
     private startSessionWatchers;
     private scheduleSessionSync;
     private syncAndPushSessions;
@@ -225,6 +227,9 @@ export declare class AgentWorkspaceProxy {
     private refreshProviderCapabilities;
     private listProviderMcpServers;
     private loadProviderSkillCommands;
+    private listDiskSessions;
+    private listClientSessions;
+    private upsertRemoteSession;
     private syncProviderSessions;
     private hydrateConversationFromProvider;
     /** Tail a Codex desktop/TUI rollout. `emit` sends agent.v2.event for new lines

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

@@ -1502,6 +1502,147 @@ function findCodexRolloutPath(sessionId, root = join(homedir(), ".codex", "sessi
     }
     return undefined;
 }
+function readJsonlPrefix(path, maxBytes = 8192) {
+    let fd;
+    try {
+        const size = statSync(path).size;
+        if (size <= 0)
+            return "";
+        fd = openSync(path, "r");
+        const buf = Buffer.alloc(Math.min(maxBytes, size));
+        readSync(fd, buf, 0, buf.length, 0);
+        return buf.toString("utf8");
+    }
+    catch {
+        return undefined;
+    }
+    finally {
+        if (fd !== undefined) {
+            try {
+                closeSync(fd);
+            }
+            catch { /* ignore */ }
+        }
+    }
+}
+/** Newest Codex rollouts as catalog metadata. Reads the first line only. */
+function listCodexSessionsFromDisk(limit = 80) {
+    const files = [];
+    walkCodexRollouts(join(homedir(), ".codex", "sessions"), (path, filenameId, mt) => {
+        files.push({ path, filenameId, mt });
+    });
+    files.sort((a, b) => b.mt - a.mt);
+    const out = [];
+    const seen = new Set();
+    for (const file of files) {
+        if (out.length >= limit)
+            break;
+        const prefix = readJsonlPrefix(file.path);
+        const first = prefix
+            ? prefix.slice(0, prefix.indexOf("\n") >= 0 ? prefix.indexOf("\n") : prefix.length)
+            : "";
+        let sessionId = file.filenameId;
+        let cwd;
+        let createdAt;
+        if (first) {
+            try {
+                const payload = asRecord(asRecord(JSON.parse(first))?.payload) ?? asRecord(JSON.parse(first));
+                sessionId = firstString(payload, ["session_id", "id"]) ?? file.filenameId;
+                cwd = firstString(payload, ["cwd"]);
+                createdAt = parseTimestamp(payload?.timestamp ?? asRecord(JSON.parse(first))?.timestamp);
+            }
+            catch {
+                sessionId = file.filenameId;
+            }
+        }
+        if (seen.has(sessionId))
+            continue;
+        seen.add(sessionId);
+        out.push({
+            id: sessionId,
+            cwd,
+            title: cwd ? titleFromCwd(cwd) : undefined,
+            createdAt,
+            lastActivityAt: file.mt,
+        });
+    }
+    return out;
+}
+function listClaudeSessionsFromDisk(limit = 80) {
+    const root = join(homedir(), ".claude", "projects");
+    if (!existsSync(root))
+        return [];
+    const files = [];
+    let projectDirs = [];
+    try {
+        projectDirs = readdirSync(root).map((name) => join(root, name));
+    }
+    catch {
+        return [];
+    }
+    for (const dir of projectDirs) {
+        let stat;
+        try {
+            stat = statSync(dir);
+        }
+        catch {
+            continue;
+        }
+        if (!stat.isDirectory())
+            continue;
+        const dirName = basename(dir);
+        const cwd = dirName.startsWith("-") ? `/${dirName.slice(1).replace(/-/g, "/")}` : undefined;
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            continue;
+        }
+        for (const name of entries) {
+            if (!name.endsWith(".jsonl"))
+                continue;
+            const path = join(dir, name);
+            let fileStat;
+            try {
+                fileStat = statSync(path);
+            }
+            catch {
+                continue;
+            }
+            if (!fileStat.isFile())
+                continue;
+            files.push({
+                id: name.replace(/\.jsonl$/, ""),
+                mt: fileStat.mtimeMs,
+                cwd,
+            });
+        }
+    }
+    files.sort((a, b) => b.mt - a.mt);
+    const out = [];
+    const seen = new Set();
+    for (const file of files) {
+        if (out.length >= limit)
+            break;
+        if (seen.has(file.id))
+            continue;
+        seen.add(file.id);
+        out.push({
+            id: file.id,
+            cwd: file.cwd,
+            title: file.cwd ? titleFromCwd(file.cwd) : undefined,
+            lastActivityAt: file.mt,
+        });
+    }
+    return out;
+}
+function withTimeout(promise, ms, message) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error(message)), ms);
+        promise.then((value) => { clearTimeout(timer); resolve(value); }, (error) => { clearTimeout(timer); reject(error); });
+    });
+}
 function findLatestCodexRolloutForCwd(cwd, root = join(homedir(), ".codex", "sessions")) {
     const wanted = cwd.replace(/\/+$/, "");
     const candidates = [];
@@ -1978,8 +2119,8 @@ function previewFromTimelineItem(item) {
 export class AgentWorkspaceProxy {
     input;
     clients = new Map();
-    // In-flight client starts, so concurrent ensureProviderClient calls (eager
-    // initialize() racing conversation.open) share one subprocess spawn.
+    // In-flight client starts, so concurrent ensureProviderClient calls
+    // (prompt racing conversation.open) share one subprocess spawn.
     clientStartPromises = new Map();
     agentProtocols = new Map();
     providerCapabilities = new Map();
@@ -2022,7 +2163,6 @@ export class AgentWorkspaceProxy {
             case "agent.v2.capabilities.request":
                 await this.initialize();
                 this.sendCapabilities();
-                this.sendUsageReport();
                 break;
             case "agent.v2.conversation.open": {
                 const payload = parseTypedPayload("agent.v2.conversation.open", envelope.payload);
@@ -2254,6 +2394,8 @@ export class AgentWorkspaceProxy {
     static FS_SYNC_THROTTLE_MS = 1500;
     static EXTERNAL_HYDRATE_THROTTLE_MS = 400;
     static LIST_IDLE_CAP = 40;
+    static LIST_HARD_CAP = 80;
+    static CLIENT_START_TIMEOUT_MS = 12_000;
     startSessionWatchers() {
         const roots = [
             join(homedir(), ".claude", "projects"),
@@ -2372,6 +2514,8 @@ export class AgentWorkspaceProxy {
             out.push(conversation);
         };
         for (const conversation of ranked) {
+            if (out.length >= AgentWorkspaceProxy.LIST_HARD_CAP)
+                break;
             if (conversation.status === "running" ||
                 conversation.status === "waiting_permission" ||
                 conversation.control === "owned" ||
@@ -2456,14 +2600,11 @@ export class AgentWorkspaceProxy {
         if (this.initialized)
             return;
         this.initialized = true;
-        // Eagerly start all detected providers so capabilities report real status
-        const startPromises = this.input.availableProviders.map((p) => this.ensureProviderClient(p));
-        await Promise.allSettled(startPromises);
         this.status = "idle";
         this.error = undefined;
+        // Presence only. Spawning every detected CLI here (especially
+        // `grok agent stdio`) blocked the sequential control plane on connect.
         this.sendCapabilities();
-        // Start watching the on-disk session stores so externally-started sessions
-        // and status changes surface live, not just at connect time.
         this.startSessionWatchers();
         this.startProcessDiscovery();
     }
@@ -2635,10 +2776,9 @@ export class AgentWorkspaceProxy {
         const existing = this.clients.get(provider);
         if (existing)
             return existing;
-        // Dedupe concurrent starts: eager initialize() and conversation.open can
-        // race here before this.clients is populated (it's only set AFTER the
-        // client finishes initializing), which would spawn the provider subprocess
-        // twice. Memoize the in-flight promise so both callers share one spawn;
+        // Dedupe concurrent starts: conversation.open and prompt can race here
+        // before this.clients is populated (it's only set AFTER initialize).
+        // Memoize the in-flight promise so both callers share one spawn;
         // drop it once settled so a failed start can be retried.
         const inflight = this.clientStartPromises.get(provider);
         if (inflight)
@@ -2696,8 +2836,17 @@ export class AgentWorkspaceProxy {
                         onRequest: (method, params) => this.handleRequest(method, params),
                         onExit: (message) => this.handleProviderExit(provider, message),
                     });
-            await client.initialize();
-            return client;
+            try {
+                await withTimeout(client.initialize(), AgentWorkspaceProxy.CLIENT_START_TIMEOUT_MS, `${providerLabel(provider)} 启动超时`);
+                return client;
+            }
+            catch (error) {
+                try {
+                    client.stop();
+                }
+                catch { /* ignore */ }
+                throw error;
+            }
         };
         try {
             const client = await tryCreateClient(resolved);
@@ -2865,96 +3014,112 @@ export class AgentWorkspaceProxy {
             return [];
         }
     }
-    async syncProviderSessions() {
-        await this.initialize();
-        for (const [provider, client] of this.clients) {
-            try {
-                let activeClient = client;
-                let result;
-                try {
-                    result = await activeClient.listSessions();
-                }
-                catch (error) {
-                    const recovered = await this.recycleProviderClient(provider, error);
-                    if (!recovered)
-                        throw error;
-                    activeClient = recovered;
-                    result = await activeClient.listSessions();
-                }
-                // Codex's thread/list carries no live status and only knows threads
-                // THIS app-server owns — so an externally-run `codex` shows idle. Read
-                // running state off disk once per sync (CPU-frugal: stats all rollouts,
-                // reads only the fresh few). Claude reports status via parseRemoteSessions.
-                const codexRunning = provider === "codex" ? runningCodexSessionIds(Date.now()) : undefined;
-                for (const remote of this.pickListedRemotes(parseRemoteSessions(result), provider, codexRunning)) {
-                    const agentSessionId = remote.id;
-                    // Skip conversations the user explicitly forgot — don't resurrect them.
-                    if (this.deletedAgentSessionIds.has(agentSessionId))
-                        continue;
-                    const existingId = this.conversationByAgentSessionId.get(agentSessionId);
-                    const now = Date.now();
-                    const conversationId = existingId ?? makeAgentV2RemoteConversationId(provider, agentSessionId);
-                    const existing = this.conversations.get(conversationId);
-                    const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
-                    const model = remote.model ?? existing?.model;
-                    // Usage read straight from the on-disk transcript (decoupled from any
-                    // live LinkShell turn) — so history + externally-started sessions all
-                    // carry a context meter. Falls back to any existing live-turn usage.
-                    const usageFields = normalizeUsageFields(remote.usage, model);
-                    const usage = usageFields
-                        ? { ...usageFields, updatedAt: remote.lastActivityAt ?? now }
-                        : existing?.usage;
-                    // Status precedence. While LinkShell is driving a turn for this
-                    // conversation, the in-memory status is authoritative — the transcript
-                    // lags (the SDK hasn't flushed the in-flight turn to disk), so trusting
-                    // it would flicker a live "running" turn back to idle. Otherwise the
-                    // transcript-derived running signal is authoritative (Claude reports it
-                    // via remote.status; Codex via the on-disk rollout set): surface
-                    // "running" while an external process drives it, and let it clear once
-                    // the external turn finishes. We only fall back to the existing status
-                    // to keep error/waiting_permission sticky across a re-sync — the
-                    // transcript signals never emit those, so they live only in `existing`;
-                    // defaulting everything else to idle avoids a purely-external session
-                    // getting stuck at "running" forever.
-                    const remoteRunning = remote.status === "running" || (codexRunning?.has(agentSessionId) ?? false);
-                    const linkshellDriving = this.currentTurnIds.has(conversationId);
-                    const status = linkshellDriving
-                        ? existing?.status ?? "running"
-                        : remoteRunning
-                            ? "running"
-                            : remote.status === "error"
-                                ? "error"
-                                : existing?.status === "error" || existing?.status === "waiting_permission"
-                                    ? existing.status
-                                    : "idle";
-                    const conversation = {
-                        id: conversationId,
-                        agentSessionId,
-                        provider,
-                        cwd,
-                        title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
-                        model,
-                        reasoningEffort: existing?.reasoningEffort,
-                        permissionMode: existing?.permissionMode,
-                        collaborationMode: existing?.collaborationMode,
-                        status,
-                        archived: existing?.archived ?? false,
-                        lastMessagePreview: existing?.lastMessagePreview,
-                        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);
-                    this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
+    listDiskSessions(provider) {
+        if (provider === "codex")
+            return listCodexSessionsFromDisk(AgentWorkspaceProxy.LIST_HARD_CAP);
+        if (provider === "claude")
+            return listClaudeSessionsFromDisk(AgentWorkspaceProxy.LIST_HARD_CAP);
+        return [];
+    }
+    async listClientSessions(provider) {
+        const client = this.clients.get(provider);
+        if (!client)
+            return [];
+        try {
+            return parseRemoteSessions(await client.listSessions());
+        }
+        catch (error) {
+            const recovered = await this.recycleProviderClient(provider, error);
+            if (!recovered) {
+                if (this.input.verbose) {
+                    process.stderr.write(`[agent:v2] session list failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
                 }
+                return [];
             }
-            catch (error) {
+            try {
+                return parseRemoteSessions(await recovered.listSessions());
+            }
+            catch (retryError) {
                 if (this.input.verbose) {
-                    process.stderr.write(`[agent:v2] session list failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
+                    process.stderr.write(`[agent:v2] session list failed for ${provider}: ${retryError instanceof Error ? retryError.message : String(retryError)}\n`);
                 }
+                return [];
+            }
+        }
+    }
+    upsertRemoteSession(provider, remote, now, runningIds) {
+        const agentSessionId = remote.id;
+        if (this.deletedAgentSessionIds.has(agentSessionId))
+            return;
+        const existingId = this.conversationByAgentSessionId.get(agentSessionId);
+        const conversationId = existingId ?? makeAgentV2RemoteConversationId(provider, agentSessionId);
+        const existing = this.conversations.get(conversationId);
+        const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
+        const model = remote.model ?? existing?.model;
+        const usageFields = normalizeUsageFields(remote.usage, model);
+        const usage = usageFields
+            ? { ...usageFields, updatedAt: remote.lastActivityAt ?? now }
+            : existing?.usage;
+        const remoteRunning = remote.status === "running" || (runningIds?.has(agentSessionId) ?? false);
+        const linkshellDriving = this.currentTurnIds.has(conversationId);
+        const owned = Boolean(agentSessionId && this.ownedCodexSessionIds.has(agentSessionId));
+        const attached = !owned && (existing?.control === "attached" ||
+            this.attachedExternalCodex.has(conversationId) ||
+            remoteRunning);
+        if (attached)
+            this.attachedExternalCodex.add(conversationId);
+        const status = linkshellDriving
+            ? existing?.status ?? "running"
+            : remoteRunning
+                ? "running"
+                : remote.status === "error"
+                    ? "error"
+                    : existing?.status === "error" || existing?.status === "waiting_permission"
+                        ? existing.status
+                        : "idle";
+        const conversation = {
+            id: conversationId,
+            agentSessionId,
+            provider,
+            cwd,
+            title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
+            model,
+            reasoningEffort: existing?.reasoningEffort,
+            permissionMode: existing?.permissionMode,
+            collaborationMode: existing?.collaborationMode,
+            control: owned ? "owned" : attached ? "attached" : existing?.control,
+            status,
+            archived: existing?.archived ?? false,
+            lastMessagePreview: existing?.lastMessagePreview,
+            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);
+        this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
+    }
+    async syncProviderSessions() {
+        await this.initialize();
+        const now = Date.now();
+        const codexRunning = runningCodexSessionIds(now);
+        const providers = new Set([
+            ...this.input.availableProviders,
+            ...this.clients.keys(),
+        ]);
+        for (const provider of providers) {
+            const byId = new Map();
+            for (const remote of this.listDiskSessions(provider))
+                byId.set(remote.id, remote);
+            for (const remote of await this.listClientSessions(provider)) {
+                const prev = byId.get(remote.id);
+                byId.set(remote.id, prev ? { ...prev, ...remote } : remote);
+            }
+            const runningIds = provider === "codex" ? codexRunning : undefined;
+            for (const remote of this.pickListedRemotes([...byId.values()], provider, runningIds)) {
+                this.upsertRemoteSession(provider, remote, now, runningIds);
             }
         }
     }
@@ -3202,26 +3367,38 @@ export class AgentWorkspaceProxy {
                 ...this.lastDiscoveredProviders,
             ])];
         const providers = catalog.map((provider) => {
+            const resolved = resolveAgentCommand({
+                provider,
+                command: this.input.command,
+            });
             const client = this.clients.get(provider);
-            const protocol = this.agentProtocols.get(provider);
+            const protocol = this.agentProtocols.get(provider) ?? resolved?.protocol;
             const runtimeCapabilities = this.providerCapabilities.get(provider);
             const advertised = runtimeCapabilities?.advertised
                 ?? (client instanceof AcpClient ? client.advertised : undefined);
-            const enabled = Boolean(client);
+            const canStart = Boolean(resolved) && (this.input.availableProviders.includes(provider) || Boolean(this.input.command?.trim()));
+            const enabled = Boolean(client) || canStart;
             const isAcp = protocol === "acp";
-            const supportsImages = enabled && protocolSupportsImages(protocol, advertised);
+            const supportsImages = Boolean(client) && 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
+            const supportsPermission = Boolean(client) && !isClaudeFallback;
+            const supportsReasoningEffort = (Boolean(client) || (canStart && protocol === "codex-app-server")) && !isClaudeFallback;
+            const diskListable = provider === "codex" || provider === "claude";
+            const supportsSessionList = Boolean(client)
+                ? (isAcp ? Boolean(advertised?.listSession) : !isClaudeFallback)
+                : canStart && diskListable;
+            const supportsSessionLoad = Boolean(client)
+                ? (isAcp ? Boolean(advertised?.loadSession) : !isClaudeFallback)
+                : canStart;
+            const supportsCancel = Boolean(client)
+                ? (isAcp ? Boolean(advertised?.cancel) : true)
+                : canStart && !isAcp;
+            const supportsFork = Boolean(client) && (isAcp
                 ? Boolean(advertised?.forkSession)
                 : protocol === "codex-app-server" || protocol === "claude-agent-sdk");
-            const supportsSetModel = enabled && (isAcp
-                ? Boolean(advertised?.setModel)
-                : protocol === "codex-app-server");
+            const supportsSetModel = Boolean(client)
+                ? (isAcp ? Boolean(advertised?.setModel) : protocol === "codex-app-server")
+                : canStart && 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;
@@ -3238,8 +3415,8 @@ export class AgentWorkspaceProxy {
                 supportsPermission,
                 supportsPlan: enabled && (isAcp ? Boolean(advertised?.embeddedContext) : true),
                 supportsCancel,
-                models: runtimeCapabilities?.models ?? [{ id: "default", label: "默认模型" }],
-                defaultModel: runtimeCapabilities?.defaultModel ?? "default",
+                models: runtimeCapabilities?.models ?? (provider === "codex" ? [...CODEX_FALLBACK_MODELS] : [{ id: "default", label: "默认模型" }]),
+                defaultModel: runtimeCapabilities?.defaultModel ?? (provider === "codex" ? CODEX_FALLBACK_DEFAULT_MODEL : "default"),
                 reasoningEfforts: supportsReasoningEffort
                     ? runtimeCapabilities?.reasoningEfforts ?? [...ALL_REASONING_EFFORTS]
                     : [],
@@ -3292,9 +3469,19 @@ export class AgentWorkspaceProxy {
         }));
     }
     shouldOpenAsAttachedView(conversation) {
-        return conversation.control === "attached"
-            || this.attachedExternalCodex.has(conversation.id)
-            || isLiveConversationId(conversation.id);
+        if (conversation.control === "attached")
+            return true;
+        if (this.attachedExternalCodex.has(conversation.id))
+            return true;
+        if (isLiveConversationId(conversation.id))
+            return true;
+        if (conversation.provider === "codex" &&
+            conversation.agentSessionId &&
+            !this.ownedCodexSessionIds.has(conversation.agentSessionId) &&
+            conversation.status === "running") {
+            return true;
+        }
+        return false;
     }
     openAttachedView(conversation, requestedConversationId) {
         conversation.control = "attached";
@@ -3316,6 +3503,7 @@ export class AgentWorkspaceProxy {
         return conversation;
     }
     async openConversation(payload) {
+        await this.initialize();
         const provider = payload.provider ?? this.input.availableProviders[0];
         if (!provider) {
             return this.openFailure(payload, "没有可用的 Agent provider。");
@@ -3353,6 +3541,12 @@ export class AgentWorkspaceProxy {
         if (existingConversation && this.shouldOpenAsAttachedView(existingConversation)) {
             return this.openAttachedView(existingConversation, payload.conversationId);
         }
+        if (existingConversation?.provider === "codex" &&
+            existingConversation.agentSessionId &&
+            !this.ownedCodexSessionIds.has(existingConversation.agentSessionId) &&
+            runningCodexSessionIds(Date.now()).has(existingConversation.agentSessionId)) {
+            return this.openAttachedView(existingConversation, payload.conversationId);
+        }
         let client = await this.ensureProviderClient(provider);
         if (!client) {
             const message = this.providerErrors.get(provider) ?? `${providerLabel(provider)} 启动失败。请确认 CLI 已安装并可用。`;
@@ -5386,10 +5580,15 @@ export class AgentWorkspaceProxy {
         this.emitConversation(conversation);
     }
     sendSnapshot(conversationId) {
-        const conversations = [...this.conversations.values()];
+        const conversations = this.listedConversations([...this.conversations.values()].filter((conversation) => !conversation.archived));
+        if (conversationId && !conversations.some((conversation) => conversation.id === conversationId)) {
+            const extra = this.conversations.get(conversationId);
+            if (extra)
+                conversations.push(extra);
+        }
         const items = conversationId
             ? this.timelines.get(conversationId) ?? []
-            : [...this.timelines.values()].flat();
+            : [...this.watchedConversationIds].flatMap((id) => this.timelines.get(id) ?? []);
         this.input.send(createEnvelope({
             type: "agent.v2.snapshot",
             sessionId: this.input.sessionId,