naiad-cli 0.2.51 → 0.2.56

package/extensions/naiad-extension.ts

@@ -282,6 +282,20 @@ export default function (pi: ExtensionAPI) {
           assistantMsg.content = textBlocks.map((b) => b.text).join("");
         }
 
+        // Round-trip thinking/reasoning blocks
+        const thinkingBlocks = msg.content.filter((b: any) => b.type === "thinking" && b.thinking?.trim());
+        if (thinkingBlocks.length > 0) {
+          // Prefer raw reasoning_details if stored (preserves structure for models that need it)
+          const rawDetails = thinkingBlocks.flatMap((b: any) => b.rawReasoningDetails || []);
+          if (rawDetails.length > 0) {
+            assistantMsg.reasoning_details = rawDetails;
+          } else {
+            // Fall back to flattened reasoning_content string
+            const reasoningText = thinkingBlocks.map((b: any) => b.thinking).join("\n");
+            assistantMsg.reasoning_content = reasoningText;
+          }
+        }
+
         const toolCalls = msg.content.filter((b): b is ToolCall => b.type === "toolCall");
         if (toolCalls.length > 0) {
           assistantMsg.tool_calls = toolCalls.map((tc) => ({
@@ -294,8 +308,9 @@ export default function (pi: ExtensionAPI) {
           }));
         }
 
-        // Skip empty assistant messages
-        if (assistantMsg.content === null && !assistantMsg.tool_calls) continue;
+        // Skip truly empty assistant messages (but keep thinking-only or tool-only)
+        const hasReasoning = assistantMsg.reasoning_details || assistantMsg.reasoning_content;
+        if (assistantMsg.content === null && !assistantMsg.tool_calls && !hasReasoning) continue;
         messages.push(assistantMsg);
       } else if (msg.role === "toolResult") {
         const textResult = msg.content
@@ -436,6 +451,13 @@ export default function (pi: ExtensionAPI) {
               toolCall: block as ToolCall,
               partial: output,
             });
+          } else if (block.type === "thinking") {
+            stream.push({
+              type: "thinking_end",
+              contentIndex: blockIndex(),
+              content: block.thinking,
+              partial: output,
+            });
           }
         };
 
@@ -471,6 +493,40 @@ export default function (pi: ExtensionAPI) {
                 }
               }
 
+              // Handle reasoning/thinking deltas FIRST (reasoning precedes content/tool_calls)
+              // OpenRouter normalized format: reasoning_details array
+              const reasoningDetails = choice.delta?.reasoning_details;
+              if (reasoningDetails && Array.isArray(reasoningDetails)) {
+                for (const detail of reasoningDetails) {
+                  const reasoningText = detail.text ?? detail.summary ?? "";
+                  if (!reasoningText) continue;
+
+                  if (!currentBlock || currentBlock.type !== "thinking") {
+                    finishCurrentBlock(currentBlock);
+                    currentBlock = { type: "thinking", thinking: "", rawReasoningDetails: [] };
+                    output.content.push(currentBlock);
+                    stream.push({ type: "thinking_start", contentIndex: blockIndex(), partial: output });
+                  }
+                  currentBlock.thinking += reasoningText;
+                  // Accumulate raw details verbatim for lossless round-tripping
+                  currentBlock.rawReasoningDetails.push(detail);
+                  stream.push({ type: "thinking_delta", contentIndex: blockIndex(), delta: reasoningText, partial: output });
+                }
+              }
+
+              // Legacy reasoning/reasoning_content string field (skip if array format already handled)
+              const reasoningStr = choice.delta?.reasoning ?? choice.delta?.reasoning_content;
+              if (!(reasoningDetails?.length > 0) && reasoningStr && typeof reasoningStr === "string") {
+                if (!currentBlock || currentBlock.type !== "thinking") {
+                  finishCurrentBlock(currentBlock);
+                  currentBlock = { type: "thinking", thinking: "" };
+                  output.content.push(currentBlock);
+                  stream.push({ type: "thinking_start", contentIndex: blockIndex(), partial: output });
+                }
+                currentBlock.thinking += reasoningStr;
+                stream.push({ type: "thinking_delta", contentIndex: blockIndex(), delta: reasoningStr, partial: output });
+              }
+
               // Handle text content delta
               const delta = choice.delta?.content;
               if (delta) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naiad-cli",
-  "version": "0.2.51",
+  "version": "0.2.56",
   "type": "module",
   "bin": {
     "naiad": "./dist/index.js"
@@ -12,6 +12,11 @@
   "engines": {
     "node": ">=20"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ericvanlare/Naiad2.0.git",
+    "directory": "mvp1/clients/cli"
+  },
   "publishConfig": {
     "access": "public"
   },