codeblog-app 1.6.4 → 1.6.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "codeblog-app",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "CLI client for CodeBlog — the forum where AI writes the posts",
   "type": "module",
   "license": "MIT",

package/src/ai/chat.ts

@@ -35,64 +35,95 @@ export namespace AIChat {
     onToolResult?: (name: string, result: unknown) => void
   }
 
-  // Convert our simple messages to CoreMessage[] for AI SDK
-  // Only user/assistant text messages — tool history is handled by maxSteps internally
-  function toCoreMessages(messages: Message[]): CoreMessage[] {
-    return messages
-      .filter((m) => m.role === "user" || m.role === "assistant")
-      .map((m) => ({ role: m.role as "user" | "assistant", content: m.content }))
-  }
-
   export async function stream(messages: Message[], callbacks: StreamCallbacks, modelID?: string, signal?: AbortSignal) {
     const model = await AIProvider.getModel(modelID)
     log.info("streaming", { model: modelID || AIProvider.DEFAULT_MODEL, messages: messages.length })
 
-    const coreMessages = toCoreMessages(messages)
+    // Build history: only user/assistant text (tool context is added per-step below)
+    const history: CoreMessage[] = messages
+      .filter((m) => m.role === "user" || m.role === "assistant")
+      .map((m) => ({ role: m.role as "user" | "assistant", content: m.content }))
     let full = ""
 
-    const result = streamText({
-      model,
-      system: SYSTEM_PROMPT,
-      messages: coreMessages,
-      tools: chatTools,
-      maxSteps: 5,
-      abortSignal: signal,
-    })
-
-    try {
-      for await (const part of result.fullStream) {
-        if (signal?.aborted) break
-        switch (part.type) {
-          case "text-delta": {
-            const delta = (part as any).text ?? (part as any).textDelta ?? ""
-            if (delta) { full += delta; callbacks.onToken?.(delta) }
-            break
-          }
-          case "tool-call": {
-            const input = (part as any).input ?? (part as any).args
-            callbacks.onToolCall?.(part.toolName, input)
-            break
-          }
-          case "tool-result": {
-            const output = (part as any).output ?? (part as any).result ?? {}
-            const name = (part as any).toolName
-            callbacks.onToolResult?.(name, output)
-            break
-          }
-          case "error": {
-            const msg = part.error instanceof Error ? part.error.message : String(part.error)
-            log.error("stream part error", { error: msg })
-            callbacks.onError?.(part.error instanceof Error ? part.error : new Error(msg))
-            break
+    for (let step = 0; step < 5; step++) {
+      if (signal?.aborted) break
+
+      const result = streamText({
+        model,
+        system: SYSTEM_PROMPT,
+        messages: history,
+        tools: chatTools,
+        maxSteps: 1,
+        abortSignal: signal,
+      })
+
+      const calls: Array<{ id: string; name: string; input: unknown; output: unknown }> = []
+
+      try {
+        for await (const part of result.fullStream) {
+          if (signal?.aborted) break
+          switch (part.type) {
+            case "text-delta": {
+              const delta = (part as any).text ?? (part as any).textDelta ?? ""
+              if (delta) { full += delta; callbacks.onToken?.(delta) }
+              break
+            }
+            case "tool-call": {
+              const input = (part as any).input ?? (part as any).args
+              callbacks.onToolCall?.(part.toolName, input)
+              calls.push({ id: part.toolCallId, name: part.toolName, input, output: undefined })
+              break
+            }
+            case "tool-result": {
+              const output = (part as any).output ?? (part as any).result ?? {}
+              const name = (part as any).toolName
+              callbacks.onToolResult?.(name, output)
+              const match = calls.find((c) => c.name === name && c.output === undefined)
+              if (match) match.output = output
+              break
+            }
+            case "error": {
+              const msg = part.error instanceof Error ? part.error.message : String(part.error)
+              log.error("stream part error", { error: msg })
+              callbacks.onError?.(part.error instanceof Error ? part.error : new Error(msg))
+              break
+            }
           }
         }
+      } catch (err) {
+        const error = err instanceof Error ? err : new Error(String(err))
+        log.error("stream error", { error: error.message })
+        if (callbacks.onError) callbacks.onError(error)
+        else throw error
+        return full
       }
-    } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err))
-      log.error("stream error", { error: error.message })
-      if (callbacks.onError) callbacks.onError(error)
-      else throw error
-      return full
+
+      if (calls.length === 0) break
+
+      // AI SDK v6 ModelMessage format:
+      // AssistantModelMessage with ToolCallPart uses "input"
+      // ToolModelMessage with ToolResultPart uses "output: { type: 'json', value }"
+      history.push({
+        role: "assistant",
+        content: calls.map((c) => ({
+          type: "tool-call" as const,
+          toolCallId: c.id,
+          toolName: c.name,
+          input: c.input,
+        })),
+      } as CoreMessage)
+
+      history.push({
+        role: "tool",
+        content: calls.map((c) => ({
+          type: "tool-result" as const,
+          toolCallId: c.id,
+          toolName: c.name,
+          output: { type: "json" as const, value: c.output ?? {} },
+        })),
+      } as CoreMessage)
+
+      log.info("tool step done", { step, tools: calls.map((c) => c.name) })
     }
 
     callbacks.onFinish?.(full || "(No response)")