codemini-cli 0.5.12 → 0.6.1

package/codemini-web/lib/runtime-bridge.js

@@ -47,21 +47,123 @@ function updateToolInSegments(segments, toolId, updater) {
   });
 }
 
-function appendTextSegment(segments, delta, isStreaming = true) {
-  const value = String(delta || '');
-  if (!value) return segments || [];
-  const current = Array.isArray(segments) ? segments : [];
+function appendTextSegment(segments, delta, isStreaming = true) {
+  const value = String(delta || '');
+  if (!value) return segments || [];
+  const current = Array.isArray(segments) ? segments : [];
   const last = current[current.length - 1];
   if (last?.type === 'text') {
     return [
       ...current.slice(0, -1),
       { ...last, text: `${last.text || ''}${value}`, isStreaming }
     ];
-  }
-  return [...current, { type: 'text', text: value, isStreaming }];
-}
-
-function createPlanStepUiMessage(event) {
+  }
+  return [...current, { type: 'text', text: value, isStreaming }];
+}
+
+function replaceTextSegment(segments, text, isStreaming = false) {
+  const value = String(text || '');
+  const current = Array.isArray(segments) ? segments : [];
+  const index = current.findLastIndex((seg) => seg?.type === 'text');
+  if (index === -1) return value ? [...current, { type: 'text', text: value, isStreaming }] : current;
+  return current.map((seg, i) => (
+    i === index ? { ...seg, text: value, isStreaming } : seg
+  ));
+}
+
+function appendThinkingSegment(segments, delta, isStreaming = true) {
+  const value = String(delta || '');
+  if (!value) return segments || [];
+  const current = Array.isArray(segments) ? segments : [];
+  const now = new Date().toISOString();
+  const nowMs = Date.parse(now);
+  const last = current[current.length - 1];
+  if (last?.type === 'thinking') {
+    const startedAt = last.startedAt || now;
+    return [
+      ...current.slice(0, -1),
+      {
+        ...last,
+        text: `${last.text || ''}${value}`,
+        isStreaming,
+        startedAt,
+        endedAt: isStreaming ? null : (last.endedAt || now),
+        durationMs: Math.max(Number(last.durationMs || 0), nowMs - Date.parse(startedAt))
+      }
+    ];
+  }
+  return [...current, { type: 'thinking', text: value, isStreaming, startedAt: now, endedAt: isStreaming ? null : now, durationMs: isStreaming ? 0 : null }];
+}
+
+function resolveThinkingDurationMs(seg, endedAt) {
+  const explicit = Number(seg?.durationMs);
+  const startMs = Date.parse(seg?.startedAt || '');
+  const endMs = Date.parse(seg?.endedAt || endedAt || '');
+  const measured = Number.isFinite(startMs) && Number.isFinite(endMs) ? Math.max(0, endMs - startMs) : null;
+  if (Number.isFinite(explicit) && measured != null) return Math.max(explicit, measured);
+  if (Number.isFinite(explicit)) return Math.max(0, explicit);
+  return measured;
+}
+
+function finishThinkingSegments(segments) {
+  const endedAt = new Date().toISOString();
+  return (Array.isArray(segments) ? segments : []).map((seg) => (
+    seg.type === 'thinking'
+      ? {
+          ...seg,
+          isStreaming: false,
+          endedAt: seg.endedAt || endedAt,
+          durationMs: resolveThinkingDurationMs(seg, endedAt)
+        }
+      : seg
+  ));
+}
+
+function getReasoningTextFromAssistantMessage(message = {}) {
+  if (typeof message.reasoning_content === 'string' && message.reasoning_content.trim()) {
+    return message.reasoning_content.trim();
+  }
+  if (!Array.isArray(message.reasoning_details)) return '';
+  return message.reasoning_details
+    .map((block) => {
+      if (!block || typeof block !== 'object') return '';
+      if (block.type === 'thinking') return block.thinking || block.text || '';
+      if (block.type === 'reasoning' || block.type === 'reasoning_content') return block.text || block.reasoning_content || '';
+      if (block.type === 'redacted_thinking') return '[redacted thinking]';
+      return '';
+    })
+    .filter(Boolean)
+    .join('\n\n')
+    .trim();
+}
+
+function hasThinkingSegment(segments) {
+  return (Array.isArray(segments) ? segments : []).some((seg) => seg.type === 'thinking' && String(seg.text || '').trim());
+}
+
+function normalizeUiUsage(usage) {
+  if (!usage || typeof usage !== 'object') return null;
+  const out = {};
+  for (const key of ['inputTokens', 'outputTokens', 'totalTokens', 'cachedInputTokens', 'cacheMissInputTokens', 'cacheWriteInputTokens', 'reasoningOutputTokens', 'requests']) {
+    const value = Number(usage?.[key]);
+    if (Number.isFinite(value)) out[key] = Math.max(0, Math.round(value));
+  }
+  return Object.keys(out).length ? out : null;
+}
+
+function mergeUiUsage(left, right) {
+  const a = normalizeUiUsage(left);
+  const b = normalizeUiUsage(right);
+  if (!a) return b;
+  if (!b) return a;
+  const out = {};
+  for (const key of ['inputTokens', 'outputTokens', 'totalTokens', 'cachedInputTokens', 'cacheMissInputTokens', 'cacheWriteInputTokens', 'reasoningOutputTokens', 'requests']) {
+    out[key] = Math.max(0, Math.round(Number(a[key] || 0) + Number(b[key] || 0)));
+  }
+  return out;
+}
+
+function createPlanStepUiMessage(event) {
   return {
     id: `plan-step-${event.step}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
     role: event.role || 'general',
@@ -204,50 +306,81 @@ export class RuntimeBridge {
         }
         break;
       }
-      case 'assistant:delta': {
-        const delta = stripPlanProgressText(event.text);
-        if (this.#uiActiveMsgId && delta) {
-          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-            ...message,
-            segments: appendTextSegment(message.segments, delta, true)
-          }));
-        }
-        break;
-      }
-      case 'assistant:response': {
-        if (this.#uiActiveMsgId && event.text) {
-          const text = stripPlanProgressText(event.text);
-          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-            ...message,
-            segments: text ? [{ type: 'text', text, isStreaming: false }] : message.segments
-          }));
-        }
-        break;
-      }
+      case 'assistant:delta': {
+        const delta = stripPlanProgressText(event.text);
+        if (this.#uiActiveMsgId && delta) {
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: appendTextSegment(finishThinkingSegments(message.segments), delta, true)
+          }));
+        }
+        break;
+      }
+      case 'assistant:reasoning_delta': {
+        if (this.#uiActiveMsgId && event.text) {
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: appendThinkingSegment(message.segments, event.text, true)
+          }));
+        }
+        break;
+      }
+      case 'assistant:response': {
+        const reasoningText = getReasoningTextFromAssistantMessage(event.assistantMessage);
+        if (this.#uiActiveMsgId && reasoningText) {
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: hasThinkingSegment(message.segments)
+              ? message.segments
+              : appendThinkingSegment(message.segments, reasoningText, false)
+          }));
+        }
+        if (this.#uiActiveMsgId && event.text) {
+          const text = stripPlanProgressText(event.text);
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: text
+              ? replaceTextSegment(finishThinkingSegments(message.segments), text, false)
+              : message.segments
+          }));
+        }
+        if (this.#uiActiveMsgId) {
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: finishThinkingSegments(message.segments),
+            usage: mergeUiUsage(message.usage, event.usage || event.assistantMessage?.usage) || message.usage || null
+          }));
+        }
+        break;
+      }
       case 'tool:start': {
-        if (this.#uiActiveMsgId) {
-          const toolCard = { id: event.id, name: event.name, arguments: event.arguments, status: 'running', durationMs: null, summary: '', result: '' };
-          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-            ...message,
-            segments: addToolToSegments(message.segments, toolCard)
-          }));
-        }
-        break;
-      }
-      case 'tool:end': {
-        if (this.#uiActiveMsgId) {
-          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-            ...message,
-            segments: updateToolInSegments(message.segments, event.id, (card) => ({
-              ...card,
-              status: 'done',
-              durationMs: event.durationMs,
-              summary: event.summary || card.summary
-            }))
-          }));
-        }
+        if (this.#uiActiveMsgId) {
+          const toolCard = { id: event.id, name: event.name, arguments: event.arguments, status: 'running', durationMs: null, summary: '', result: '' };
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            segments: addToolToSegments(finishThinkingSegments(message.segments), toolCard)
+          }));
+        }
         break;
       }
+      case 'tool:end': {
+        if (this.#uiActiveMsgId) {
+          this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+            ...message,
+            fileChanges: event.fileChange?.path
+              ? [...(Array.isArray(message.fileChanges) ? message.fileChanges : []), event.fileChange]
+              : (Array.isArray(message.fileChanges) ? message.fileChanges : []),
+            segments: updateToolInSegments(message.segments, event.id, (card) => ({
+              ...card,
+              status: 'done',
+              durationMs: event.durationMs,
+              summary: event.summary || card.summary,
+              ...(event.fileChange ? { fileChange: event.fileChange } : {})
+            }))
+          }));
+        }
+        break;
+      }
       case 'tool:result': {
         if (this.#uiActiveMsgId) {
           this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
@@ -379,12 +512,13 @@ export class RuntimeBridge {
       this.#recordUiEvent(event);
       this.#broadcast(event);
     }, options).then((result) => {
-      if (this.#uiActiveMsgId) {
-        this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-          ...message,
-          segments: message.segments.map((seg) => seg.type === 'text' ? { ...seg, isStreaming: false } : seg)
-        }));
-      }
+      if (this.#uiActiveMsgId) {
+        this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
+          ...message,
+          segments: finishThinkingSegments(message.segments)
+            .map((seg) => seg.type === 'text' ? { ...seg, isStreaming: false } : seg)
+        }));
+      }
       this.#uiActiveMsgId = null;
       this.#uiPlanStepIds = new Map();
       this.#broadcast({ type: 'submit:done', result: { type: result.type, aborted: result.aborted, text: result.text } });
@@ -474,17 +608,23 @@ export class RuntimeBridge {
     return messages
       .filter(m => m.role !== 'system')
       .map(m => ({
-        role: m.role,
-        content: typeof m.content === 'string' ? m.content : (Array.isArray(m.content) ? m.content.map(c => c.text || '').join('') : ''),
-        toolCalls: m.tool_calls || [],
+        role: m.role,
+        content: typeof m.content === 'string' ? m.content : (Array.isArray(m.content) ? m.content.map(c => c.text || '').join('') : ''),
+        reasoningContent: typeof m.reasoning_content === 'string' ? m.reasoning_content : '',
+        reasoningDetails: Array.isArray(m.reasoning_details) ? m.reasoning_details : [],
+        reasoningStartedAt: m.reasoning_started_at || null,
+        reasoningEndedAt: m.reasoning_ended_at || null,
+        reasoningDurationMs: Number.isFinite(Number(m.reasoning_duration_ms)) ? Number(m.reasoning_duration_ms) : null,
+        toolCalls: m.tool_calls || [],
         toolCallId: m.tool_call_id || null,
         toolSummary: m.role === 'tool' ? summarizeHistoricalToolMessage(m) : null,
         toolDurationMs: Number.isFinite(Number(m.tool_duration_ms)) ? Number(m.tool_duration_ms) : null,
         toolStatus: m.tool_status || null,
-        planTranscript: Array.isArray(m.plan_transcript) ? m.plan_transcript : null,
-        at: m.at || null
-      }));
-  }
+        planTranscript: Array.isArray(m.plan_transcript) ? m.plan_transcript : null,
+        usage: normalizeUiUsage(m.usage),
+        at: m.at || null
+      }));
+  }
 
   getSessionCompactMeta() {
     const compact = this.#runtime.getSessionCompact();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemini-cli",
-  "version": "0.5.12",
+  "version": "0.6.1",
   "description": "An extremely restrained coding + tasks CLI. Every platform. Every terminal. Minimal by design.",
   "keywords": [
     "cli",

package/src/core/agent-loop.js

@@ -252,13 +252,15 @@ function extractFileChange(toolName, result) {
     const isCreate = action === 'create';
     const added = Number(result.lines_added || 0);
     const removed = Number(result.lines_removed || 0);
-    return {
-      path: String(result.path || ''),
-      action: isCreate ? 'create' : 'edit',
-      linesAdded: added,
-      linesRemoved: removed
-    };
-  }
+    return {
+      path: String(result.path || ''),
+      action: isCreate ? 'create' : 'edit',
+      linesAdded: added,
+      linesRemoved: removed,
+      changedLine: Number(result.changed_line || 0),
+      diffPreview: String(result.diff_preview || '')
+    };
+  }
 
   return null;
 }
@@ -597,13 +599,13 @@ export async function runAgentLoop({
     const assistantText = completion.text || '';
     lastAssistantText = assistantText || lastAssistantText;
 
-    const assistantMessage = completion?.assistantMessage
-      ? {
-          ...completion.assistantMessage,
-          role: 'assistant',
-          content: completion.assistantMessage.content ?? completion?.content ?? assistantText
-        }
-      : { role: 'assistant', content: completion?.content ?? assistantText };
+    const assistantMessage = completion?.assistantMessage
+      ? {
+          ...completion.assistantMessage,
+          role: 'assistant',
+          content: completion.assistantMessage.content ?? completion?.content ?? assistantText
+        }
+      : { role: 'assistant', content: completion?.content ?? assistantText };
     if (!Array.isArray(assistantMessage.tool_calls) && toolCalls.length > 0) {
       assistantMessage.tool_calls = toolCalls.map((tc) => ({
         id: tc.id,
@@ -616,10 +618,11 @@ export async function runAgentLoop({
       onEvent({
         type: 'assistant:response',
         step: step + 1,
-        text: assistantText,
-        toolCalls: toolCalls.map((tc) => tc.name),
-        assistantMessage
-      });
+        text: assistantText,
+        toolCalls: toolCalls.map((tc) => tc.name),
+        usage: completion.usage || null,
+        assistantMessage
+      });
     }
 
     if (toolCalls.length === 0) {
@@ -710,10 +713,10 @@ export async function runAgentLoop({
             });
             approvalArgs = { ...args, _risk: evaluation.risk, _evaluation: evaluation };
             /* LLM says low-risk + allow → auto-approve, skip confirmation panel */
-            if (evaluation.risk === 'low' && evaluation.recommendation === 'allow') {
-              approvalResults.set(call.id, { approved: true, args: approvalArgs });
-              continue;
-            }
+            if (executionMode !== 'normal' && evaluation.risk === 'low' && evaluation.recommendation === 'allow') {
+              approvalResults.set(call.id, { approved: true, args: approvalArgs });
+              continue;
+            }
           } catch (_) {
             approvalArgs = { ...args, _risk: 'high', _evaluation: null };
           }