linkshell-cli 0.2.114 → 0.2.116

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

@@ -10,6 +10,7 @@ export declare class AgentWorkspaceProxy {
     private error;
     private activeConversationId;
     private currentTurnIds;
+    private turnConversationIds;
     private conversations;
     private conversationByAgentSessionId;
     private timelines;
@@ -19,6 +20,7 @@ export declare class AgentWorkspaceProxy {
     private permissionSources;
     private pendingStructuredInputs;
     private structuredInputWaiters;
+    private itemConversationIds;
     private toolConversationIds;
     constructor(input: {
         sessionId: string;
@@ -81,6 +83,10 @@ export declare class AgentWorkspaceProxy {
     private updateConversationStatus;
     private sendSnapshot;
     private conversationIdFromParams;
+    private fallbackConversationId;
+    private rememberTurnConversationId;
+    private forgetCurrentTurn;
+    private rememberItemConversationId;
     private handleProviderExit;
     private cancelPendingPermissions;
     private extractSessionId;

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

@@ -967,6 +967,7 @@ export class AgentWorkspaceProxy {
     error;
     activeConversationId;
     currentTurnIds = new Map();
+    turnConversationIds = new Map();
     conversations = new Map();
     conversationByAgentSessionId = new Map();
     timelines = new Map();
@@ -976,6 +977,7 @@ export class AgentWorkspaceProxy {
     permissionSources = new Map();
     pendingStructuredInputs = new Map();
     structuredInputWaiters = new Map();
+    itemConversationIds = new Map();
     toolConversationIds = new Map();
     constructor(input) {
         this.input = input;
@@ -1026,7 +1028,7 @@ export class AgentWorkspaceProxy {
                     sessionId: conversation?.agentSessionId,
                     turnId: this.currentTurnIds.get(payload.conversationId),
                 });
-                this.currentTurnIds.delete(payload.conversationId);
+                this.forgetCurrentTurn(payload.conversationId);
                 this.updateConversationStatus(payload.conversationId, "idle");
                 this.emitStatus(payload.conversationId, "idle", "已停止");
                 break;
@@ -1463,7 +1465,7 @@ export class AgentWorkspaceProxy {
             }
             const turnId = this.extractTurnId(result);
             if (turnId)
-                this.currentTurnIds.set(conversation.id, turnId);
+                this.rememberTurnConversationId(conversation.id, turnId);
             if (conversation.status === "running" && protocol !== "codex-app-server") {
                 this.updateConversationStatus(conversation.id, "idle");
             }
@@ -1670,7 +1672,7 @@ export class AgentWorkspaceProxy {
             process.stderr.write(`[agent:v2] ${method} ${stringify(params).slice(0, 500)}\n`);
         }
         if (method === "initialized") {
-            const conversationId = this.conversationIdFromParams(params) ?? this.activeConversationId;
+            const conversationId = this.conversationIdFromParams(params) ?? this.fallbackConversationId();
             const provider = conversationId ? this.conversations.get(conversationId)?.provider : this.input.availableProviders[0];
             if (provider) {
                 const commands = runtimeCommands(provider, params);
@@ -1693,7 +1695,7 @@ export class AgentWorkspaceProxy {
             method === "mcpServer/oauthLogin/completed") {
             return;
         }
-        const conversationId = this.conversationIdFromParams(params) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(params) ?? this.fallbackConversationId();
         if (method === "item/tool/requestUserInput" || method === "tool/requestUserInput") {
             this.handleStructuredInput(params);
             return;
@@ -1720,14 +1722,14 @@ export class AgentWorkspaceProxy {
             if (conversationId) {
                 const turnId = this.extractTurnId(params);
                 if (turnId)
-                    this.currentTurnIds.set(conversationId, turnId);
+                    this.rememberTurnConversationId(conversationId, turnId);
                 this.updateConversationStatus(conversationId, "running");
             }
             return;
         }
         if (method === "turn/completed") {
             if (conversationId) {
-                this.currentTurnIds.delete(conversationId);
+                this.forgetCurrentTurn(conversationId, this.extractTurnId(params));
                 this.updateConversationStatus(conversationId, "idle");
             }
             return;
@@ -1784,7 +1786,7 @@ export class AgentWorkspaceProxy {
         const raw = asRecord(params);
         if (!raw)
             return;
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const itemId = firstString(raw, ["itemId", "id", "messageId"]) ?? id("msg");
@@ -1809,7 +1811,7 @@ export class AgentWorkspaceProxy {
     }
     handlePlanUpdated(params) {
         const raw = asRecord(params);
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const plan = Array.isArray(raw?.plan) ? raw.plan : [];
@@ -1841,7 +1843,7 @@ export class AgentWorkspaceProxy {
         const raw = asRecord(params);
         if (!raw)
             return;
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const itemId = firstString(raw, ["itemId", "id"]) ?? "plan";
@@ -1865,24 +1867,26 @@ export class AgentWorkspaceProxy {
         const item = extractItem(params);
         if (!item)
             return;
-        const itemType = firstString(item, ["type"]);
+        const sourceConversationId = this.conversationIdFromParams(params);
+        const routedItem = sourceConversationId ? { ...item, conversationId: sourceConversationId } : item;
+        const itemType = firstString(routedItem, ["type"]);
         const normalizedItemType = normalizedIdentifier(itemType);
         if (normalizedItemType === "agentmessage" || normalizedItemType === "assistantmessage") {
-            this.handleCompletedMessageItem(item, true);
+            this.handleCompletedMessageItem(routedItem, true);
             return;
         }
         if (normalizedItemType === "plan") {
-            this.handlePlanUpdated({ plan: [item] });
+            this.handlePlanUpdated({ plan: [routedItem], conversationId: sourceConversationId });
             return;
         }
         if (isSubagentItemType(itemType)) {
-            this.handleSubagentItem(item, "running", true);
+            this.handleSubagentItem(routedItem, "running", true);
             return;
         }
-        if (this.handleSemanticSystemItem(item, "running", true))
+        if (this.handleSemanticSystemItem(routedItem, "running", true))
             return;
-        const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
-        const toolCall = this.toolCallFromItem(item, "running");
+        const conversationId = this.conversationIdFromParams(routedItem) ?? this.fallbackConversationId();
+        const toolCall = this.toolCallFromItem(routedItem, "running");
         if (!conversationId || !toolCall)
             return;
         this.toolConversationIds.set(toolCall.id, conversationId);
@@ -1892,24 +1896,26 @@ export class AgentWorkspaceProxy {
         const item = extractItem(params);
         if (!item)
             return;
-        const itemType = firstString(item, ["type"]);
+        const sourceConversationId = this.conversationIdFromParams(params);
+        const routedItem = sourceConversationId ? { ...item, conversationId: sourceConversationId } : item;
+        const itemType = firstString(routedItem, ["type"]);
         const normalizedItemType = normalizedIdentifier(itemType);
         if (normalizedItemType === "agentmessage" || normalizedItemType === "assistantmessage") {
-            this.handleCompletedMessageItem(item, false);
+            this.handleCompletedMessageItem(routedItem, false);
             return;
         }
         if (normalizedItemType === "plan") {
-            this.handlePlanDelta({ ...item, delta: firstString(item, ["text", "content", "message"]) });
+            this.handlePlanDelta({ ...routedItem, delta: firstString(routedItem, ["text", "content", "message"]) });
             return;
         }
         if (isSubagentItemType(itemType)) {
-            this.handleSubagentItem(item, normalizeToolStatus(item.status, true), false);
+            this.handleSubagentItem(routedItem, normalizeToolStatus(routedItem.status, true), false);
             return;
         }
-        if (this.handleSemanticSystemItem(item, normalizeToolStatus(item.status, true), false))
+        if (this.handleSemanticSystemItem(routedItem, normalizeToolStatus(routedItem.status, true), false))
             return;
-        const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
-        const toolCall = this.toolCallFromItem(item, normalizeToolStatus(item.status, true));
+        const conversationId = this.conversationIdFromParams(routedItem) ?? this.fallbackConversationId();
+        const toolCall = this.toolCallFromItem(routedItem, normalizeToolStatus(routedItem.status, true));
         if (!conversationId || !toolCall)
             return;
         const bufferedOutput = this.toolOutputBuffers.get(toolCall.id);
@@ -1927,7 +1933,8 @@ export class AgentWorkspaceProxy {
             return;
         const conversationId = this.conversationIdFromParams(raw) ??
             this.toolConversationIds.get(itemId) ??
-            this.activeConversationId;
+            this.itemConversationIds.get(itemId) ??
+            this.fallbackConversationId();
         if (!conversationId)
             return;
         const output = appendCapped(this.toolOutputBuffers.get(itemId), delta, 6000);
@@ -1949,7 +1956,8 @@ export class AgentWorkspaceProxy {
         const itemId = firstString(raw, ["itemId", "id"]) ?? id("file");
         const conversationId = this.conversationIdFromParams(raw) ??
             this.toolConversationIds.get(itemId) ??
-            this.activeConversationId;
+            this.itemConversationIds.get(itemId) ??
+            this.fallbackConversationId();
         if (!conversationId)
             return;
         const output = extractDiffText(raw) ??
@@ -1968,7 +1976,7 @@ export class AgentWorkspaceProxy {
         const raw = asRecord(params);
         if (!raw)
             return;
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const diff = extractDiffText(raw);
@@ -1998,7 +2006,8 @@ export class AgentWorkspaceProxy {
             return;
         const conversationId = this.conversationIdFromParams(raw) ??
             this.toolConversationIds.get(processId) ??
-            this.activeConversationId;
+            this.itemConversationIds.get(processId) ??
+            this.fallbackConversationId();
         if (!conversationId)
             return;
         const output = appendCapped(this.toolOutputBuffers.get(processId), delta, 6000);
@@ -2015,7 +2024,7 @@ export class AgentWorkspaceProxy {
     }
     handleAutoApprovalReview(params, streaming) {
         const raw = asRecord(params) ?? {};
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const itemId = firstString(raw, ["itemId", "id", "reviewId"]) ?? "auto-approval-review";
@@ -2044,7 +2053,7 @@ export class AgentWorkspaceProxy {
         this.updateConversationPreview(conversationId, streaming ? "正在审查自动授权" : "已完成自动授权审查", streaming ? "running" : undefined);
     }
     handleCompletedMessageItem(item, streaming) {
-        const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(item) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const itemId = firstString(item, ["id"]) ?? id("msg");
@@ -2072,7 +2081,7 @@ export class AgentWorkspaceProxy {
             firstString(nested, ["delta", "text", "content", "message"]);
         if (!text)
             return;
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         if (firstString(raw, ["toolName", "tool", "name"])) {
@@ -2105,7 +2114,7 @@ export class AgentWorkspaceProxy {
     handleSemanticSystemItem(item, status, streaming) {
         const itemType = firstString(item, ["type"]);
         const normalized = normalizedIdentifier(itemType);
-        const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(item) ?? this.fallbackConversationId();
         if (!conversationId)
             return false;
         const itemId = firstString(item, ["id", "itemId"]) ?? id("item");
@@ -2153,7 +2162,7 @@ export class AgentWorkspaceProxy {
         return false;
     }
     handleSubagentItem(item, status, streaming) {
-        const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(item) ?? this.fallbackConversationId();
         if (!conversationId)
             return;
         const subagent = decodeSubagentAction(item, status);
@@ -2180,7 +2189,7 @@ export class AgentWorkspaceProxy {
     }
     handleStructuredInput(params, waitForResponse = false) {
         const raw = asRecord(params) ?? {};
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         const source = firstString(raw, ["method", "source", "requestMethod"]);
         const formatResponse = source === "mcpServer/elicitation/request"
             ? formatMcpElicitationResponse
@@ -2246,7 +2255,7 @@ export class AgentWorkspaceProxy {
     }
     handlePermission(params, waitForResponse, source) {
         const raw = asRecord(params) ?? {};
-        const conversationId = this.conversationIdFromParams(raw) ?? this.activeConversationId;
+        const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
             return waitForResponse ? Promise.resolve({ outcome: { outcome: "cancelled" } }) : undefined;
         const requestId = firstString(raw, ["requestId", "id", "permissionId"]) ?? id("perm");
@@ -2360,6 +2369,7 @@ export class AgentWorkspaceProxy {
         });
     }
     addItem(conversationId, item) {
+        this.rememberItemConversationId(conversationId, item);
         const timeline = this.timelines.get(conversationId) ?? [];
         timeline.push(item);
         timeline.sort((a, b) => a.createdAt - b.createdAt);
@@ -2370,6 +2380,7 @@ export class AgentWorkspaceProxy {
         this.emitItem(conversationId, item);
     }
     upsertItem(conversationId, item) {
+        this.rememberItemConversationId(conversationId, item);
         const timeline = this.timelines.get(conversationId) ?? [];
         const index = timeline.findIndex((entry) => entry.id === item.id);
         if (index >= 0)
@@ -2398,6 +2409,8 @@ export class AgentWorkspaceProxy {
         };
         this.toolConversationIds.set(toolCall.id, conversationId);
         this.toolConversationIds.set(nextToolCall.id, conversationId);
+        this.itemConversationIds.set(toolCall.id, conversationId);
+        this.itemConversationIds.set(nextToolCall.id, conversationId);
         const kind = nextToolCall.name.includes("文件")
             ? "file_change"
             : nextToolCall.name.includes("命令")
@@ -2482,6 +2495,22 @@ export class AgentWorkspaceProxy {
                 this.toolConversationIds.set(toolId, newId);
             }
         }
+        for (const [turnId, conversationId] of this.turnConversationIds) {
+            if (conversationId === oldId) {
+                this.turnConversationIds.set(turnId, newId);
+            }
+        }
+        const currentTurnId = this.currentTurnIds.get(oldId);
+        if (currentTurnId) {
+            this.currentTurnIds.delete(oldId);
+            this.currentTurnIds.set(newId, currentTurnId);
+            this.turnConversationIds.set(currentTurnId, newId);
+        }
+        for (const [itemId, conversationId] of this.itemConversationIds) {
+            if (conversationId === oldId) {
+                this.itemConversationIds.set(itemId, newId);
+            }
+        }
         if (this.activeConversationId === oldId) {
             this.activeConversationId = newId;
         }
@@ -2549,14 +2578,87 @@ export class AgentWorkspaceProxy {
     }
     conversationIdFromParams(params) {
         const raw = asRecord(params);
-        const agentSessionId = this.extractSessionId(raw);
-        if (agentSessionId)
-            return this.conversationByAgentSessionId.get(agentSessionId);
+        if (!raw)
+            return undefined;
+        const directConversationId = firstString(raw, ["conversationId"]);
+        if (directConversationId && this.conversations.has(directConversationId)) {
+            return directConversationId;
+        }
         const threadId = firstString(raw, ["threadId", "sessionId", "agentSessionId"]);
-        if (threadId)
-            return this.conversationByAgentSessionId.get(threadId);
+        if (threadId) {
+            const conversationId = this.conversationByAgentSessionId.get(threadId);
+            if (conversationId)
+                return conversationId;
+        }
+        const agentSessionId = this.extractSessionId(raw);
+        if (agentSessionId) {
+            const conversationId = this.conversationByAgentSessionId.get(agentSessionId);
+            if (conversationId)
+                return conversationId;
+        }
+        const turnId = this.extractTurnId(raw) ?? firstString(raw, ["turnId"]);
+        if (turnId) {
+            const conversationId = this.turnConversationIds.get(turnId);
+            if (conversationId)
+                return conversationId;
+        }
+        const itemId = firstString(raw, [
+            "itemId",
+            "messageId",
+            "toolCallId",
+            "processId",
+            "callId",
+            "requestId",
+            "permissionId",
+            "id",
+        ]);
+        if (itemId) {
+            const conversationId = this.itemConversationIds.get(itemId) ??
+                this.toolConversationIds.get(itemId);
+            if (conversationId)
+                return conversationId;
+        }
+        for (const nested of [raw.params, raw.item, raw.message, raw.toolCall, raw.command, raw.event]) {
+            const nestedRecord = asRecord(nested);
+            if (!nestedRecord || nestedRecord === raw)
+                continue;
+            const conversationId = this.conversationIdFromParams(nestedRecord);
+            if (conversationId)
+                return conversationId;
+        }
         return undefined;
     }
+    fallbackConversationId() {
+        const liveConversations = [...this.conversations.values()].filter((conversation) => conversation.status === "running" || conversation.status === "waiting_permission");
+        return liveConversations.length === 1 ? liveConversations[0]?.id : undefined;
+    }
+    rememberTurnConversationId(conversationId, turnId) {
+        this.currentTurnIds.set(conversationId, turnId);
+        this.turnConversationIds.set(turnId, conversationId);
+    }
+    forgetCurrentTurn(conversationId, turnId) {
+        const currentTurnId = this.currentTurnIds.get(conversationId);
+        this.currentTurnIds.delete(conversationId);
+        if (turnId)
+            this.turnConversationIds.delete(turnId);
+        if (currentTurnId && currentTurnId !== turnId)
+            this.turnConversationIds.delete(currentTurnId);
+    }
+    rememberItemConversationId(conversationId, item) {
+        const keys = [
+            item.id,
+            item.itemId,
+            item.toolCall?.id,
+            item.permission?.requestId,
+            item.structuredInput?.requestId,
+        ].filter((key) => Boolean(key));
+        for (const key of keys) {
+            this.itemConversationIds.set(key, conversationId);
+        }
+        if (item.turnId) {
+            this.turnConversationIds.set(item.turnId, conversationId);
+        }
+    }
     handleProviderExit(provider, message) {
         this.clients.delete(provider);
         this.agentProtocols.delete(provider);