linkshell-cli 0.2.121 → 0.2.123

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

@@ -330,6 +330,50 @@ function textFromBlocks(blocks) {
         .filter(Boolean)
         .join("\n");
 }
+function contentBlocksFromValue(value) {
+    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) {
+    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) {
     return protocol === "codex-app-server" ||
         protocol === "claude-agent-sdk" ||
@@ -1713,8 +1757,11 @@ export class AgentWorkspaceProxy {
             if (agentSessionId && conversationId) {
                 this.conversationByAgentSessionId.set(agentSessionId, conversationId);
                 const conversation = this.conversations.get(conversationId);
-                if (conversation)
+                if (conversation) {
                     conversation.agentSessionId = agentSessionId;
+                    conversation.lastActivityAt = Date.now();
+                    this.emitConversation(conversation);
+                }
             }
             return;
         }
@@ -2058,28 +2105,33 @@ export class AgentWorkspaceProxy {
             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)
+        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");
     }
     handleSessionUpdate(params) {
         const raw = asRecord(params) ?? {};
         const nested = asRecord(raw.params) ?? {};
         const text = firstString(raw, ["delta", "text", "content", "message"]) ??
             firstString(nested, ["delta", "text", "content", "message"]);
-        if (!text)
+        const content = contentBlocksFromItem(raw);
+        if (!text && content.length === 0)
             return;
         const conversationId = this.conversationIdFromParams(raw) ?? this.fallbackConversationId();
         if (!conversationId)
@@ -2098,18 +2150,20 @@ export class AgentWorkspaceProxy {
             return;
         }
         const role = raw.role === "user" || raw.role === "system" ? raw.role : "assistant";
+        const blocks = content.length > 0 ? content : [{ type: "text", 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");
     }
     handleSemanticSystemItem(item, status, streaming) {
         const itemType = firstString(item, ["type"]);