linkshell-cli 0.2.114 → 0.2.115

package/src/runtime/acp/agent-workspace.ts

@@ -1207,6 +1207,7 @@ export class AgentWorkspaceProxy {
   private error: string | undefined;
   private activeConversationId: string | undefined;
   private currentTurnIds = new Map<string, string>();
+  private turnConversationIds = new Map<string, string>();
   private conversations = new Map<string, AgentConversation>();
   private conversationByAgentSessionId = new Map<string, string>();
   private timelines = new Map<string, AgentTimelineItem[]>();
@@ -1216,6 +1217,7 @@ export class AgentWorkspaceProxy {
   private permissionSources = new Map<string, string>();
   private pendingStructuredInputs = new Map<string, { conversationId: string; input: AgentStructuredInput }>();
   private structuredInputWaiters = new Map<string, PendingStructuredInputWaiter>();
+  private itemConversationIds = new Map<string, string>();
   private toolConversationIds = new Map<string, string>();
 
   constructor(
@@ -1277,7 +1279,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;
@@ -1769,7 +1771,7 @@ export class AgentWorkspaceProxy {
         this.conversationByAgentSessionId.set(nextAgentSessionId, conversation.id);
       }
       const turnId = this.extractTurnId(result);
-      if (turnId) this.currentTurnIds.set(conversation.id, turnId);
+      if (turnId) this.rememberTurnConversationId(conversation.id, turnId);
       if (conversation.status === "running" && protocol !== "codex-app-server") {
         this.updateConversationStatus(conversation.id, "idle");
       }
@@ -2007,7 +2009,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);
@@ -2033,7 +2035,7 @@ export class AgentWorkspaceProxy {
       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;
@@ -2058,14 +2060,14 @@ export class AgentWorkspaceProxy {
     if (method === "turn/started") {
       if (conversationId) {
         const turnId = this.extractTurnId(params);
-        if (turnId) this.currentTurnIds.set(conversationId, turnId);
+        if (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;
@@ -2124,7 +2126,7 @@ export class AgentWorkspaceProxy {
   private handleAgentMessageDelta(params: unknown): void {
     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");
     const delta = firstString(raw, ["delta", "text", "content"]);
@@ -2148,7 +2150,7 @@ export class AgentWorkspaceProxy {
 
   private handlePlanUpdated(params: unknown): void {
     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 : [];
     const steps = plan
@@ -2177,7 +2179,7 @@ export class AgentWorkspaceProxy {
   private handlePlanDelta(params: unknown): void {
     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";
     const delta = firstString(raw, ["delta", "text"]);
@@ -2199,23 +2201,25 @@ export class AgentWorkspaceProxy {
   private handleItemStarted(params: unknown): void {
     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)) return;
-    const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
-    const toolCall = this.toolCallFromItem(item, "running");
+    if (this.handleSemanticSystemItem(routedItem, "running", true)) return;
+    const conversationId = this.conversationIdFromParams(routedItem) ?? this.fallbackConversationId();
+    const toolCall = this.toolCallFromItem(routedItem, "running");
     if (!conversationId || !toolCall) return;
     this.toolConversationIds.set(toolCall.id, conversationId);
     this.upsertTool(conversationId, toolCall);
@@ -2224,23 +2228,25 @@ export class AgentWorkspaceProxy {
   private handleItemCompleted(params: unknown): void {
     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)) return;
-    const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
-    const toolCall = this.toolCallFromItem(item, normalizeToolStatus(item.status, true));
+    if (this.handleSemanticSystemItem(routedItem, normalizeToolStatus(routedItem.status, true), false)) return;
+    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);
     if (bufferedOutput && !toolCall.output) toolCall.output = bufferedOutput;
@@ -2256,7 +2262,8 @@ export class AgentWorkspaceProxy {
     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);
     this.toolOutputBuffers.set(itemId, output);
@@ -2278,7 +2285,8 @@ export class AgentWorkspaceProxy {
     const conversationId =
       this.conversationIdFromParams(raw) ??
       this.toolConversationIds.get(itemId) ??
-      this.activeConversationId;
+      this.itemConversationIds.get(itemId) ??
+      this.fallbackConversationId();
     if (!conversationId) return;
     const output =
       extractDiffText(raw) ??
@@ -2297,7 +2305,7 @@ export class AgentWorkspaceProxy {
   private handleTurnDiffUpdated(params: unknown): void {
     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);
     if (!diff) return;
@@ -2327,7 +2335,8 @@ export class AgentWorkspaceProxy {
     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);
     this.toolOutputBuffers.set(processId, output);
@@ -2344,7 +2353,7 @@ export class AgentWorkspaceProxy {
 
   private handleAutoApprovalReview(params: unknown, streaming: boolean): void {
     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";
     const existing = this.findItem(conversationId, itemId);
@@ -2374,7 +2383,7 @@ export class AgentWorkspaceProxy {
   }
 
   private handleCompletedMessageItem(item: Record<string, unknown>, streaming: boolean): void {
-    const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
+    const conversationId = this.conversationIdFromParams(item) ?? this.fallbackConversationId();
     if (!conversationId) return;
     const itemId = firstString(item, ["id"]) ?? id("msg");
     const existing = this.findItem(conversationId, itemId);
@@ -2401,7 +2410,7 @@ export class AgentWorkspaceProxy {
       firstString(raw, ["delta", "text", "content", "message"]) ??
       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"])) {
       this.upsertTool(conversationId, {
@@ -2438,7 +2447,7 @@ export class AgentWorkspaceProxy {
   ): boolean {
     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");
     const existing = this.findItem(conversationId, itemId);
@@ -2493,7 +2502,7 @@ export class AgentWorkspaceProxy {
     status: AgentToolCall["status"],
     streaming: boolean,
   ): void {
-    const conversationId = this.conversationIdFromParams(item) ?? this.activeConversationId;
+    const conversationId = this.conversationIdFromParams(item) ?? this.fallbackConversationId();
     if (!conversationId) return;
     const subagent = decodeSubagentAction(item, status);
     if (!subagent) return;
@@ -2519,7 +2528,7 @@ export class AgentWorkspaceProxy {
 
   private handleStructuredInput(params: unknown, waitForResponse = false): Promise<unknown> | void {
     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
@@ -2590,7 +2599,7 @@ export class AgentWorkspaceProxy {
     source?: string,
   ): Promise<unknown> | void {
     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");
     const rawToolCall = asRecord(raw.toolCall) ?? raw;
@@ -2726,6 +2735,7 @@ export class AgentWorkspaceProxy {
   }
 
   private addItem(conversationId: string, item: AgentTimelineItem): void {
+    this.rememberItemConversationId(conversationId, item);
     const timeline = this.timelines.get(conversationId) ?? [];
     timeline.push(item);
     timeline.sort((a, b) => a.createdAt - b.createdAt);
@@ -2737,6 +2747,7 @@ export class AgentWorkspaceProxy {
   }
 
   private upsertItem(conversationId: string, item: AgentTimelineItem): void {
+    this.rememberItemConversationId(conversationId, item);
     const timeline = this.timelines.get(conversationId) ?? [];
     const index = timeline.findIndex((entry) => entry.id === item.id);
     if (index >= 0) timeline[index] = item;
@@ -2764,6 +2775,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: AgentTimelineKind = nextToolCall.name.includes("文件")
       ? "file_change"
       : nextToolCall.name.includes("命令")
@@ -2863,6 +2876,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;
     }
@@ -2941,13 +2970,86 @@ export class AgentWorkspaceProxy {
 
   private conversationIdFromParams(params: unknown): string | undefined {
     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;
   }
 
+  private fallbackConversationId(): string | undefined {
+    const liveConversations = [...this.conversations.values()].filter((conversation) =>
+      conversation.status === "running" || conversation.status === "waiting_permission",
+    );
+    return liveConversations.length === 1 ? liveConversations[0]?.id : undefined;
+  }
+
+  private rememberTurnConversationId(conversationId: string, turnId: string): void {
+    this.currentTurnIds.set(conversationId, turnId);
+    this.turnConversationIds.set(turnId, conversationId);
+  }
+
+  private forgetCurrentTurn(conversationId: string, turnId?: string): void {
+    const currentTurnId = this.currentTurnIds.get(conversationId);
+    this.currentTurnIds.delete(conversationId);
+    if (turnId) this.turnConversationIds.delete(turnId);
+    if (currentTurnId && currentTurnId !== turnId) this.turnConversationIds.delete(currentTurnId);
+  }
+
+  private rememberItemConversationId(conversationId: string, item: AgentTimelineItem): void {
+    const keys = [
+      item.id,
+      item.itemId,
+      item.toolCall?.id,
+      item.permission?.requestId,
+      item.structuredInput?.requestId,
+    ].filter((key): key is string => Boolean(key));
+    for (const key of keys) {
+      this.itemConversationIds.set(key, conversationId);
+    }
+    if (item.turnId) {
+      this.turnConversationIds.set(item.turnId, conversationId);
+    }
+  }
+
   private handleProviderExit(provider: AgentProvider, message: string): void {
     this.clients.delete(provider);
     this.agentProtocols.delete(provider);