linkshell-cli 0.2.121 → 0.2.123

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

@@ -529,6 +529,49 @@ function textFromBlocks(blocks: AgentContentBlock[]): string {
     .join("\n");
 }
 
+function contentBlocksFromValue(value: unknown): AgentContentBlock[] {
+  if (typeof value === "string") {
+    return value.trim() ? [{ type: "text", text: value }] : [];
+  }
+  if (Array.isArray(value)) {
+    return value.flatMap((entry) => contentBlocksFromValue(entry));
+  }
+  const raw = asRecord(value);
+  if (!raw) return [];
+  const rawType = firstString(raw, ["type", "kind"]);
+  const normalizedType = normalizedIdentifier(rawType);
+  if (normalizedType === "image" || normalizedType === "inputimage" || normalizedType === "outputimage") {
+    const data = firstString(raw, [
+      "data",
+      "url",
+      "uri",
+      "imageUrl",
+      "image_url",
+      "base64",
+    ]);
+    const mimeType = firstString(raw, ["mimeType", "mime_type", "mediaType", "media_type"]);
+    const text = firstString(raw, ["text", "alt", "caption", "name"]);
+    return [{ type: "image", data, mimeType, text }];
+  }
+  if (normalizedType === "text" || normalizedType === "outputtext" || normalizedType === "inputtext") {
+    const text = firstString(raw, ["text", "content", "message"]);
+    return text ? [{ type: "text", text }] : [];
+  }
+  const nested = raw.content ?? raw.contentItems ?? raw.parts;
+  if (Array.isArray(nested)) return contentBlocksFromValue(nested);
+  const text = firstString(raw, ["text", "message", "content"]);
+  return text ? [{ type: "text", text }] : [];
+}
+
+function contentBlocksFromItem(item: Record<string, unknown>): AgentContentBlock[] {
+  for (const key of ["content", "contentItems", "parts", "message"]) {
+    const blocks = contentBlocksFromValue(item[key]);
+    if (blocks.length > 0) return blocks;
+  }
+  const text = firstString(item, ["text", "message"]);
+  return text ? [{ type: "text", text }] : [];
+}
+
 function protocolSupportsImages(protocol: AgentProtocol | undefined): boolean {
   return protocol === "codex-app-server" ||
     protocol === "claude-agent-sdk" ||
@@ -2053,7 +2096,11 @@ export class AgentWorkspaceProxy {
       if (agentSessionId && conversationId) {
         this.conversationByAgentSessionId.set(agentSessionId, conversationId);
         const conversation = this.conversations.get(conversationId);
-        if (conversation) conversation.agentSessionId = agentSessionId;
+        if (conversation) {
+          conversation.agentSessionId = agentSessionId;
+          conversation.lastActivityAt = Date.now();
+          this.emitConversation(conversation);
+        }
       }
       return;
     }
@@ -2387,20 +2434,24 @@ export class AgentWorkspaceProxy {
     if (!conversationId) return;
     const itemId = firstString(item, ["id"]) ?? id("msg");
     const existing = this.findItem(conversationId, itemId);
-    const content = firstString(item, ["text", "content", "message"]) ?? existing?.text;
-    if (!content) return;
+    const content = contentBlocksFromItem(item);
+    const nextContent = content.length > 0
+      ? content
+      : existing?.content ?? (existing?.text ? [{ type: "text", text: existing.text }] : []);
+    const text = textFromBlocks(nextContent);
+    if (!nextContent.length && !text) return;
     this.upsertItem(conversationId, {
       id: itemId,
       conversationId,
       type: "message",
       role: "assistant",
-      content: [{ type: "text", text: content }],
-      text: content,
+      content: nextContent,
+      text,
       createdAt: existing?.createdAt ?? Date.now(),
       updatedAt: Date.now(),
       isStreaming: streaming,
     });
-    this.updateConversationPreview(conversationId, content, streaming ? "running" : "idle");
+    this.updateConversationPreview(conversationId, text || "图片附件", streaming ? "running" : "idle");
   }
 
   private handleSessionUpdate(params: unknown): void {
@@ -2409,7 +2460,8 @@ export class AgentWorkspaceProxy {
     const text =
       firstString(raw, ["delta", "text", "content", "message"]) ??
       firstString(nested, ["delta", "text", "content", "message"]);
-    if (!text) return;
+    const content = contentBlocksFromItem(raw);
+    if (!text && content.length === 0) return;
     const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
     if (!conversationId) return;
     if (firstString(raw, ["toolName", "tool", "name"])) {
@@ -2426,18 +2478,20 @@ export class AgentWorkspaceProxy {
       return;
     }
     const role = raw.role === "user" || raw.role === "system" ? raw.role : "assistant";
+    const blocks = content.length > 0 ? content : [{ type: "text" as const, text }];
+    const preview = textFromBlocks(blocks);
     this.upsertItem(conversationId, {
       id: firstString(raw, ["messageId", "id"]) ?? id("msg"),
       conversationId,
       type: "message",
       role,
-      content: [{ type: "text", text }],
-      text,
+      content: blocks,
+      text: preview,
       createdAt: Date.now(),
       updatedAt: Date.now(),
       isStreaming: raw.done === false || raw.isStreaming === true,
     });
-    this.updateConversationPreview(conversationId, text, raw.done === true ? "idle" : "running");
+    this.updateConversationPreview(conversationId, preview || "图片附件", raw.done === true ? "idle" : "running");
   }
 
   private handleSemanticSystemItem(

package/src/runtime/acp/claude-sdk-client.ts

@@ -271,8 +271,18 @@ export class ClaudeSdkClient {
     let currentToolId: string | undefined;
     let currentToolName: string | undefined;
     let currentMessageId: string | undefined;
+    const progressItemId = `claude-progress:${input.clientMessageId}`;
 
     try {
+      this.input.onNotification("item/started", {
+        sessionId: input.sessionId ?? this.claudeSessionId,
+        item: {
+          id: progressItemId,
+          type: "thinking",
+          text: "Claude 正在处理请求",
+          status: "running",
+        },
+      });
       const queryPrompt = hasImages ? singleUserMessage(toClaudeMessageContent(inputBlocks)) : prompt;
       for await (const message of this.query({ prompt: queryPrompt, options: sdkOptions })) {
         if (abortController.signal.aborted) break;
@@ -295,6 +305,15 @@ export class ClaudeSdkClient {
       }
       return { sessionId: this.claudeSessionId, status: abortController.signal.aborted ? "cancelled" : "completed" };
     } finally {
+      this.input.onNotification("item/completed", {
+        sessionId: this.claudeSessionId ?? input.sessionId,
+        item: {
+          id: progressItemId,
+          type: "thinking",
+          text: abortController.signal.aborted ? "Claude 已停止" : "Claude 已完成",
+          status: abortController.signal.aborted ? "failed" : "completed",
+        },
+      });
       if (this.abortController === abortController) this.abortController = undefined;
     }
   }

package/src/runtime/acp/claude-stream-json-client.ts

@@ -222,10 +222,21 @@ export class ClaudeStreamJsonClient {
       let currentToolId: string | undefined;
       let currentToolName: string | undefined;
       let currentMessageId: string | undefined;
+      const progressItemId = `claude-progress:${input.clientMessageId}`;
       // Map tool_use_id → tool_name so tool_result can look up the correct name
       // even when multiple tools are in flight
       const toolNames = new Map<string, string>();
 
+      this.input.onNotification("item/started", {
+        sessionId: input.sessionId ?? this.claudeSessionId,
+        item: {
+          id: progressItemId,
+          type: "thinking",
+          text: "Claude 正在处理请求",
+          status: "running",
+        },
+      });
+
       rl.on("line", (line: string) => {
         if (this.pendingCancel) {
           child.kill("SIGTERM");
@@ -375,6 +386,16 @@ export class ClaudeStreamJsonClient {
           }
 
           case "result": {
+            const isError = event.subtype === "error" || event.is_error === true;
+            this.input.onNotification("item/completed", {
+              sessionId: this.claudeSessionId ?? input.sessionId,
+              item: {
+                id: progressItemId,
+                type: "thinking",
+                text: isError ? "Claude 运行出错" : "Claude 已完成",
+                status: isError ? "failed" : "completed",
+              },
+            });
             // Mark the last agent message as complete so isStreaming flips to false
             if (currentMessageId) {
               this.input.onNotification("item/completed", {
@@ -387,7 +408,6 @@ export class ClaudeStreamJsonClient {
               });
             }
             // Turn complete
-            const isError = event.subtype === "error" || event.is_error === true;
             this.input.onNotification("turn/completed", {
               sessionId: this.claudeSessionId,
               stopReason: event.stop_reason ?? (isError ? "error" : "end_turn"),
@@ -408,11 +428,29 @@ export class ClaudeStreamJsonClient {
       });
 
       child.on("error", (err) => {
+        this.input.onNotification("item/completed", {
+          sessionId: this.claudeSessionId ?? input.sessionId,
+          item: {
+            id: progressItemId,
+            type: "thinking",
+            text: "Claude 运行出错",
+            status: "failed",
+          },
+        });
         finish(err, undefined);
       });
 
       child.on("exit", (code, signal) => {
         if (!settled) {
+          this.input.onNotification("item/completed", {
+            sessionId: this.claudeSessionId ?? input.sessionId,
+            item: {
+              id: progressItemId,
+              type: "thinking",
+              text: this.pendingCancel ? "Claude 已停止" : "Claude 意外退出",
+              status: "failed",
+            },
+          });
           finish(
             new Error(`Claude exited unexpectedly (code=${code ?? "null"}, signal=${signal ?? "null"})`),
             undefined,