kanna-code 0.17.0 → 0.19.0

package/src/shared/tools.test.ts

@@ -96,4 +96,69 @@ describe("hydrateToolResult", () => {
 
     expect(hydrateToolResult(tool, "line 1\nline 2")).toBe("line 1\nline 2")
   })
+
+  test("hydrates read image results with canonical image blocks intact", () => {
+    const tool = normalizeToolCall({
+      toolName: "Read",
+      toolId: "tool-image",
+      input: { file_path: "/tmp/example.png" },
+    })
+
+    expect(hydrateToolResult(tool, {
+      content: [
+        {
+          type: "text",
+          text: "Read image file [image/png]\n[Image: original 10x10, displayed at 10x10.]",
+        },
+        {
+          type: "image",
+          data: "ZmFrZS1pbWFnZS1kYXRh",
+          mimeType: "image/png",
+        },
+      ],
+    })).toEqual({
+      content: "Read image file [image/png]\n[Image: original 10x10, displayed at 10x10.]",
+      blocks: [
+        {
+          type: "text",
+          text: "Read image file [image/png]\n[Image: original 10x10, displayed at 10x10.]",
+        },
+        {
+          type: "image",
+          data: "ZmFrZS1pbWFnZS1kYXRh",
+          mimeType: "image/png",
+        },
+      ],
+    })
+  })
+
+  test("hydrates Claude read image results with source.base64 into canonical image blocks", () => {
+    const tool = normalizeToolCall({
+      toolName: "Read",
+      toolId: "tool-image-claude",
+      input: { file_path: "/tmp/example.png" },
+    })
+
+    expect(hydrateToolResult(tool, {
+      content: [
+        {
+          type: "image",
+          source: {
+            type: "base64",
+            data: "ZmFrZS1pbWFnZS1kYXRh",
+            media_type: "image/png",
+          },
+        },
+      ],
+    })).toEqual({
+      content: "",
+      blocks: [
+        {
+          type: "image",
+          data: "ZmFrZS1pbWFnZS1kYXRh",
+          mimeType: "image/png",
+        },
+      ],
+    })
+  })
 })

package/src/shared/tools.ts

@@ -203,6 +203,72 @@ function parseJsonValue(value: unknown): unknown {
   }
 }
 
+type ReadStructuredTextBlock = {
+  type: "text"
+  text: string
+}
+
+type ReadStructuredImageBlock = {
+  type: "image"
+  data: string
+  mimeType?: string
+}
+
+function normalizeReadBlocks(value: unknown): Array<ReadStructuredTextBlock | ReadStructuredImageBlock> {
+  const blocks = (
+    value
+    && typeof value === "object"
+    && "content" in value
+    && Array.isArray((value as { content?: unknown }).content)
+  )
+    ? (value as { content: unknown[] }).content
+    : Array.isArray(value)
+      ? value
+      : []
+
+  const normalized: Array<ReadStructuredTextBlock | ReadStructuredImageBlock> = []
+
+  for (const block of blocks) {
+    if (!block || typeof block !== "object" || !("type" in block)) {
+      continue
+    }
+
+    if (block.type === "text" && typeof block.text === "string") {
+      normalized.push({ type: "text", text: block.text })
+      continue
+    }
+
+    if (block.type === "image") {
+      if ("data" in block && typeof block.data === "string") {
+        normalized.push({
+          type: "image",
+          data: block.data,
+          mimeType: typeof block.mimeType === "string" ? block.mimeType : undefined,
+        })
+        continue
+      }
+
+      if (
+        "source" in block
+        && block.source
+        && typeof block.source === "object"
+        && "type" in block.source
+        && block.source.type === "base64"
+        && "data" in block.source
+        && typeof block.source.data === "string"
+      ) {
+        normalized.push({
+          type: "image",
+          data: block.source.data,
+          mimeType: typeof block.source.media_type === "string" ? block.source.media_type : undefined,
+        })
+      }
+    }
+  }
+
+  return normalized
+}
+
 export function hydrateToolResult(tool: NormalizedToolCall, raw: unknown): HydratedToolCall["result"] {
   const parsed = parseJsonValue(raw)
 
@@ -241,6 +307,16 @@ export function hydrateToolResult(tool: NormalizedToolCall, raw: unknown): Hydra
       if (typeof parsed === "string") {
         return parsed
       }
+      const blocks = normalizeReadBlocks(parsed)
+      if (blocks.length > 0) {
+        return {
+          content: blocks
+            .flatMap((block) => block.type === "text" ? [block.text] : [])
+            .join(""),
+          blocks,
+        } satisfies ReadFileToolResult
+      }
+
       const record = asRecord(parsed)
       return {
         content: typeof record?.content === "string" ? record.content : JSON.stringify(parsed, null, 2),

package/src/shared/types.ts

@@ -3,6 +3,25 @@ export const PROTOCOL_VERSION = 1 as const
 
 export type AgentProvider = "claude" | "codex"
 
+export type AttachmentKind = "image" | "file"
+
+export interface ChatAttachment {
+  id: string
+  kind: AttachmentKind
+  displayName: string
+  absolutePath: string
+  relativePath: string
+  contentUrl: string
+  mimeType: string
+  size: number
+}
+
+export interface InternalUserAttachmentsData {
+  userText: string
+  attachments: ChatAttachment[]
+  llmHintText: string
+}
+
 export interface ProviderModelOption {
   id: string
   label: string
@@ -173,6 +192,7 @@ export interface SidebarChatRow {
   chatId: string
   title: string
   status: KannaStatus
+  unread: boolean
   localPath: string
   provider: AgentProvider | null
   lastMessageAt?: number
@@ -378,6 +398,7 @@ export interface ToolResultEntry extends TranscriptEntryBase {
 export interface UserPromptEntry extends TranscriptEntryBase {
   kind: "user_prompt"
   content: string
+  attachments?: ChatAttachment[]
 }
 
 export interface SystemInitEntry extends TranscriptEntryBase {
@@ -501,8 +522,20 @@ export type HydratedBashToolCall =
 export type HydratedWebSearchToolCall =
   HydratedToolCallBase<"web_search", WebSearchToolCall["input"], unknown>
 
+export interface ReadFileTextBlock {
+  type: "text"
+  text: string
+}
+
+export interface ReadFileImageBlock {
+  type: "image"
+  data: string
+  mimeType?: string
+}
+
 export interface ReadFileToolResult {
   content: string
+  blocks?: Array<ReadFileTextBlock | ReadFileImageBlock>
 }
 
 export type HydratedReadFileToolCall =
@@ -540,7 +573,7 @@ export type HydratedToolCall =
   | HydratedUnknownToolCall
 
 export type HydratedTranscriptMessage =
-  | ({ kind: "user_prompt"; content: string; id: string; messageId?: string; timestamp: string; hidden?: boolean })
+  | ({ kind: "user_prompt"; content: string; attachments?: ChatAttachment[]; id: string; messageId?: string; timestamp: string; hidden?: boolean })
   | ({ kind: "system_init"; model: string; tools: string[]; agents: string[]; slashCommands: string[]; mcpServers: McpServerInfo[]; provider: AgentProvider; id: string; messageId?: string; timestamp: string; hidden?: boolean; debugRaw?: string })
   | ({ kind: "account_info"; accountInfo: AccountInfo; id: string; messageId?: string; timestamp: string; hidden?: boolean })
   | ({ kind: "assistant_text"; text: string; id: string; messageId?: string; timestamp: string; hidden?: boolean })