claude-code-rust 0.9.0 → 0.10.0

package/agent-sdk/dist/bridge/message_handlers.js

@@ -1,13 +1,14 @@
 import { asRecordOrNull } from "./shared.js";
 import { toPermissionMode, buildModeState } from "./commands.js";
-import { writeEvent, emitSessionUpdate, emitConnectEvent, refreshSessionsList } from "./events.js";
+import { writeEvent, emitSessionUpdate, emitConnectEvent, emitSessionReplacedEvent, } from "./events.js";
 import { TOOL_RESULT_TYPES, unwrapToolUseResult } from "./tooling.js";
-import { emitToolCall, emitPlanIfTodoWrite, emitToolResultUpdate, finalizeOpenToolCalls, emitToolProgressUpdate, emitToolSummaryUpdate, ensureToolCallVisible, resolveTaskToolUseId, taskProgressText, } from "./tool_calls.js";
+import { emitToolCall, emitToolCallUpdate, emitPlanIfTodoWrite, emitToolResultUpdate, finalizeOpenToolCalls, emitToolProgressUpdate, emitToolSummaryUpdate, ensureToolCallVisible, resolveTaskToolUseId, taskProgressText, } from "./tool_calls.js";
 import { emitAuthRequired, classifyTurnErrorKind, emitFastModeUpdateIfChanged } from "./error_classification.js";
 import { mapAvailableAgentsFromNames, emitAvailableAgentsIfChanged, refreshAvailableAgents } from "./agents.js";
 import { buildRateLimitUpdate, numberField } from "./state_parsing.js";
 import { looksLikeAuthRequired } from "./auth.js";
 import { updateSessionId } from "./session_lifecycle.js";
+import { bridgeLogger, LOG_TARGETS } from "./logger.js";
 export function textFromPrompt(command) {
     const chunks = command.chunks ?? [];
     return chunks
@@ -20,6 +21,77 @@ export function textFromPrompt(command) {
         .filter((part) => part.length > 0)
         .join("");
 }
+/** MIME types supported by the Anthropic Vision API.
+ *  NOTE: Keep in sync with `SUPPORTED_IMAGE_MIME_TYPES` in
+ *  `src/app/clipboard_image.rs`. */
+const SUPPORTED_IMAGE_MIME_TYPES = new Set([
+    "image/png",
+    "image/jpeg",
+    "image/gif",
+    "image/webp",
+]);
+/** Fast check that a string looks like valid base64 (non-empty, correct charset & padding). */
+function isValidBase64(data) {
+    if (!data)
+        return false;
+    const clean = data.replace(/\s/g, "");
+    if (clean.length % 4 !== 0)
+        return false;
+    // Padding ('=') must only appear at the end and be at most 2 characters.
+    return /^[A-Za-z0-9+/]+={0,2}$/.test(clean);
+}
+/**
+ * Build a content array from prompt chunks, supporting both text and image blocks.
+ * Returns the Anthropic API content block format expected by MessageParam.
+ */
+export function contentFromPrompt(command) {
+    const chunks = command.chunks ?? [];
+    const content = [];
+    for (const chunk of chunks) {
+        if (chunk.kind === "text") {
+            const text = typeof chunk.value === "string" ? chunk.value : "";
+            if (text.trim()) {
+                content.push({ type: "text", text });
+            }
+        }
+        else if (chunk.kind === "image") {
+            const val = chunk.value && typeof chunk.value === "object" ? chunk.value : null;
+            if (!val)
+                continue;
+            const data = typeof val.data === "string" ? val.data : "";
+            const mimeType = typeof val.mime_type === "string" ? val.mime_type : "image/png";
+            if (!SUPPORTED_IMAGE_MIME_TYPES.has(mimeType)) {
+                bridgeLogger.warn({
+                    target: LOG_TARGETS.BRIDGE_PROTOCOL,
+                    eventName: "prompt_image_skipped",
+                    message: "skipping unsupported prompt image type",
+                    outcome: "skipped",
+                    fields: { mime_type: mimeType },
+                });
+                continue;
+            }
+            if (!isValidBase64(data)) {
+                bridgeLogger.warn({
+                    target: LOG_TARGETS.BRIDGE_PROTOCOL,
+                    eventName: "prompt_image_skipped",
+                    message: "skipping prompt image with invalid base64 data",
+                    outcome: "skipped",
+                    fields: { mime_type: mimeType, reason: "invalid_base64" },
+                });
+                continue;
+            }
+            content.push({
+                type: "image",
+                source: {
+                    type: "base64",
+                    media_type: mimeType,
+                    data,
+                },
+            });
+        }
+    }
+    return content;
+}
 export function handleTaskSystemMessage(session, subtype, msg) {
     if (subtype !== "task_started" && subtype !== "task_progress" && subtype !== "task_notification") {
         return;
@@ -35,28 +107,18 @@ export function handleTaskSystemMessage(session, subtype, msg) {
     }
     const toolCall = ensureToolCallVisible(session, toolUseId, "Agent", {});
     if (toolCall.status === "pending") {
-        toolCall.status = "in_progress";
-        emitSessionUpdate(session.sessionId, {
-            type: "tool_call_update",
-            tool_call_update: { tool_call_id: toolUseId, fields: { status: "in_progress" } },
-        });
+        emitToolCallUpdate(session, toolUseId, { status: "in_progress" }, "progress");
     }
     if (subtype === "task_started") {
         const description = typeof msg.description === "string" ? msg.description : "";
         if (!description) {
             return;
         }
-        emitSessionUpdate(session.sessionId, {
-            type: "tool_call_update",
-            tool_call_update: {
-                tool_call_id: toolUseId,
-                fields: {
-                    status: "in_progress",
-                    raw_output: description,
-                    content: [{ type: "content", content: { type: "text", text: description } }],
-                },
-            },
-        });
+        emitToolCallUpdate(session, toolUseId, {
+            status: "in_progress",
+            raw_output: description,
+            content: [{ type: "content", content: { type: "text", text: description } }],
+        }, "task_started");
         return;
     }
     if (subtype === "task_progress") {
@@ -64,17 +126,11 @@ export function handleTaskSystemMessage(session, subtype, msg) {
         if (!progress) {
             return;
         }
-        emitSessionUpdate(session.sessionId, {
-            type: "tool_call_update",
-            tool_call_update: {
-                tool_call_id: toolUseId,
-                fields: {
-                    status: "in_progress",
-                    raw_output: progress,
-                    content: [{ type: "content", content: { type: "text", text: progress } }],
-                },
-            },
-        });
+        emitToolCallUpdate(session, toolUseId, {
+            status: "in_progress",
+            raw_output: progress,
+            content: [{ type: "content", content: { type: "text", text: progress } }],
+        }, "task_progress");
         return;
     }
     const status = typeof msg.status === "string" ? msg.status : "";
@@ -85,11 +141,7 @@ export function handleTaskSystemMessage(session, subtype, msg) {
         fields.raw_output = summary;
         fields.content = [{ type: "content", content: { type: "text", text: summary } }];
     }
-    emitSessionUpdate(session.sessionId, {
-        type: "tool_call_update",
-        tool_call_update: { tool_call_id: toolUseId, fields },
-    });
-    toolCall.status = finalStatus;
+    emitToolCallUpdate(session, toolUseId, fields, "task_notification");
     if (taskId) {
         session.taskToolUseIds.delete(taskId);
     }
@@ -257,20 +309,7 @@ export function handleSdkMessage(session, message) {
                 emitConnectEvent(session);
             }
             else if (previousSessionId !== session.sessionId) {
-                const historyUpdates = session.resumeUpdates;
-                writeEvent({
-                    event: "session_replaced",
-                    session_id: session.sessionId,
-                    cwd: session.cwd,
-                    model_name: session.model,
-                    available_models: session.availableModels,
-                    mode: session.mode ? buildModeState(session.mode) : null,
-                    ...(historyUpdates && historyUpdates.length > 0
-                        ? { history_updates: historyUpdates }
-                        : {}),
-                });
-                session.resumeUpdates = undefined;
-                refreshSessionsList();
+                emitSessionReplacedEvent(session);
             }
             else {
                 if (session.model !== previousModelName) {