codemini-cli 0.6.3 → 0.6.4

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

@@ -47,177 +47,177 @@ 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 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 toCodeWikiGenerateProgress(event) {
-  if (!event?.type) return null;
-  const now = new Date().toISOString();
-  if (event.type === 'plan:steps') {
-    return {
-      type: 'codewiki:generate_progress',
-      phase: 'steps',
-      timestamp: now,
-      steps: (Array.isArray(event.steps) ? event.steps : []).map((step, index) => ({
-        index: Number(step.index || index + 1),
-        title: step.title || '',
-        role: step.role || 'general',
-        status: step.status || 'pending'
-      }))
-    };
-  }
-  if (event.type === 'plan:step_start') {
-    return {
-      type: 'codewiki:generate_progress',
-      phase: 'step_start',
-      timestamp: now,
-      step: Number(event.step || 0),
-      total: Number(event.total || 0),
-      role: event.role || 'general',
-      title: event.title || '',
-      status: 'running'
-    };
-  }
-  if (event.type === 'plan:step_done' || event.type === 'plan:progress') {
-    return {
-      type: 'codewiki:generate_progress',
-      phase: event.type === 'plan:step_done' ? 'step_done' : 'step_progress',
-      timestamp: now,
-      step: Number(event.step || 0),
-      total: Number(event.total || 0),
-      role: event.role || 'general',
-      title: event.title || '',
-      status: event.status || (event.type === 'plan:step_done' ? 'done' : 'running'),
-      summary: event.summary || ''
-    };
-  }
-  if (event.type === 'skill:start' || event.type === 'skill:end' || event.type === 'skill:error') {
-    return {
-      type: 'codewiki:generate_progress',
-      phase: event.type.replace('skill:', 'skill_'),
-      timestamp: now,
-      name: event.name || 'project-requirements',
-      status: event.type === 'skill:error' ? 'failed' : event.type === 'skill:end' ? 'done' : 'running',
-      summary: event.summary || ''
-    };
-  }
-  return null;
-}
-
-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 toCodeWikiGenerateProgress(event) {
+  if (!event?.type) return null;
+  const now = new Date().toISOString();
+  if (event.type === 'plan:steps') {
+    return {
+      type: 'codewiki:generate_progress',
+      phase: 'steps',
+      timestamp: now,
+      steps: (Array.isArray(event.steps) ? event.steps : []).map((step, index) => ({
+        index: Number(step.index || index + 1),
+        title: step.title || '',
+        role: step.role || 'general',
+        status: step.status || 'pending'
+      }))
+    };
+  }
+  if (event.type === 'plan:step_start') {
+    return {
+      type: 'codewiki:generate_progress',
+      phase: 'step_start',
+      timestamp: now,
+      step: Number(event.step || 0),
+      total: Number(event.total || 0),
+      role: event.role || 'general',
+      title: event.title || '',
+      status: 'running'
+    };
+  }
+  if (event.type === 'plan:step_done' || event.type === 'plan:progress') {
+    return {
+      type: 'codewiki:generate_progress',
+      phase: event.type === 'plan:step_done' ? 'step_done' : 'step_progress',
+      timestamp: now,
+      step: Number(event.step || 0),
+      total: Number(event.total || 0),
+      role: event.role || 'general',
+      title: event.title || '',
+      status: event.status || (event.type === 'plan:step_done' ? 'done' : 'running'),
+      summary: event.summary || ''
+    };
+  }
+  if (event.type === 'skill:start' || event.type === 'skill:end' || event.type === 'skill:error') {
+    return {
+      type: 'codewiki:generate_progress',
+      phase: event.type.replace('skill:', 'skill_'),
+      timestamp: now,
+      name: event.name || 'project-requirements',
+      status: event.type === 'skill:error' ? 'failed' : event.type === 'skill:end' ? 'done' : 'running',
+      summary: event.summary || ''
+    };
+  }
+  return null;
+}
+
+function createPlanStepUiMessage(event) {
   return {
     id: `plan-step-${event.step}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
     role: event.role || 'general',
@@ -360,81 +360,86 @@ export class RuntimeBridge {
         }
         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 '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(finishThinkingSegments(message.segments), toolCard)
-          }));
-        }
+        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) {
+          const eventChanges = Array.isArray(event.fileChanges) && event.fileChanges.length
+            ? event.fileChanges
+            : (event.fileChange?.path ? [event.fileChange] : []);
           this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
             ...message,
-            fileChanges: event.fileChange?.path
-              ? [...(Array.isArray(message.fileChanges) ? message.fileChanges : []), event.fileChange]
+            fileChanges: eventChanges.length
+              ? [...(Array.isArray(message.fileChanges) ? message.fileChanges : []), ...eventChanges]
               : (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 } : {})
+              ...(event.resultMeta ? { resultMeta: event.resultMeta } : {}),
+              ...(event.fileChange ? { fileChange: event.fileChange } : {}),
+              ...(eventChanges.length ? { fileChanges: eventChanges } : {})
             }))
           }));
         }
-        break;
-      }
+        break;
+      }
       case 'tool:result': {
         if (this.#uiActiveMsgId) {
           this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
@@ -548,7 +553,7 @@ export class RuntimeBridge {
     return this.#runtime.consumeStartupEvents();
   }
 
-  handleSubmit(line, options = {}) {
+  handleSubmit(line, options = {}) {
     if (this.#busy) return { error: true, message: 'A request is already in progress' };
     this.#resetUiTranscriptIfSessionChanged();
     const trimmed = String(line || '').trim();
@@ -566,13 +571,13 @@ export class RuntimeBridge {
       this.#recordUiEvent(event);
       this.#broadcast(event);
     }, options).then((result) => {
-      if (this.#uiActiveMsgId) {
-        this.#updateUiMessage(this.#uiActiveMsgId, (message) => ({
-          ...message,
-          segments: finishThinkingSegments(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 } });
@@ -587,39 +592,39 @@ export class RuntimeBridge {
       this.#busy = false;
       this.#broadcastRuntimeState();
     });
-    return { accepted: true };
-  }
-
-  handleCodeWikiGenerate(line) {
-    if (this.#busy) return { error: true, message: 'A request is already in progress' };
-    this.#busy = true;
-    this.#broadcastRuntimeState();
-    const emitProgress = (event) => {
-      const progress = toCodeWikiGenerateProgress(event);
-      if (progress) this.#broadcast(progress);
-    };
-    this.#runtime.submit(line, emitProgress, { codeWikiGenerate: true }).then((result) => {
-      this.#broadcast({
-        type: 'codewiki:generate_done',
-        result: {
-          type: result?.type || 'assistant',
-          aborted: !!result?.aborted,
-          text: result?.text || ''
-        }
-      });
-    }).catch((err) => {
-      this.#broadcast({
-        type: 'codewiki:generate_error',
-        message: err?.message || 'CodeWiki generation failed'
-      });
-    }).finally(() => {
-      this.#busy = false;
-      this.#broadcastRuntimeState();
-    });
-    return { accepted: true };
-  }
-
-  async handleCodeWikiAsk(line, onEvent = null) {
+    return { accepted: true };
+  }
+
+  handleCodeWikiGenerate(line) {
+    if (this.#busy) return { error: true, message: 'A request is already in progress' };
+    this.#busy = true;
+    this.#broadcastRuntimeState();
+    const emitProgress = (event) => {
+      const progress = toCodeWikiGenerateProgress(event);
+      if (progress) this.#broadcast(progress);
+    };
+    this.#runtime.submit(line, emitProgress, { codeWikiGenerate: true }).then((result) => {
+      this.#broadcast({
+        type: 'codewiki:generate_done',
+        result: {
+          type: result?.type || 'assistant',
+          aborted: !!result?.aborted,
+          text: result?.text || ''
+        }
+      });
+    }).catch((err) => {
+      this.#broadcast({
+        type: 'codewiki:generate_error',
+        message: err?.message || 'CodeWiki generation failed'
+      });
+    }).finally(() => {
+      this.#busy = false;
+      this.#broadcastRuntimeState();
+    });
+    return { accepted: true };
+  }
+
+  async handleCodeWikiAsk(line, onEvent = null) {
     if (this.#busy) return { error: true, message: 'A request is already in progress' };
     this.#busy = true;
     const emit = (event) => {
@@ -652,27 +657,34 @@ export class RuntimeBridge {
     return this.#runtime.abort();
   }
 
-  async setExecutionMode(mode) {
-    if (this.#busy) return false;
-    const ok = await this.#runtime.setExecutionMode(mode);
-    if (ok) this.#broadcast({ type: 'mode:changed', mode, ...this.getState() });
-    return ok;
-  }
-
-  async reloadConfig(options = {}) {
-    return this.#runtime.reloadConfig?.(options);
-  }
-
-  async reloadCommandsAndSkills() {
-    const ok = await this.#runtime.reloadCommandsAndSkills?.();
-    if (ok) this.#broadcastRuntimeState();
+  async setExecutionMode(mode) {
+    if (this.#busy) return false;
+    const ok = await this.#runtime.setExecutionMode(mode);
+    if (ok) this.#broadcast({ type: 'mode:changed', mode, ...this.getState() });
     return ok;
   }
 
-  handleApproval(id, approved) {
-    return this.#approval.resolve(id, approved);
+  async setApprovalMode(mode) {
+    if (this.#busy) return false;
+    const ok = await this.#runtime.setApprovalMode?.(mode);
+    if (ok) this.#broadcast({ type: 'approval-mode:changed', approvalMode: mode, ...this.getState() });
+    return ok;
   }
 
+  async reloadConfig(options = {}) {
+    return this.#runtime.reloadConfig?.(options);
+  }
+
+  async reloadCommandsAndSkills() {
+    const ok = await this.#runtime.reloadCommandsAndSkills?.();
+    if (ok) this.#broadcastRuntimeState();
+    return ok;
+  }
+
+  handleApproval(id, approved) {
+    return this.#approval.resolve(id, approved);
+  }
+
   getState() {
     const state = this.#runtime.getRuntimeState();
     const serializableState = typeof state?.toJSON === 'function' ? state.toJSON() : state;
@@ -691,33 +703,50 @@ 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('') : ''),
-        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 || [],
-        fileChanges: Array.isArray(m.file_changes) ? m.file_changes : [],
-        toolCallId: m.tool_call_id || null,
-        toolSummary: m.role === 'tool' ? summarizeHistoricalToolMessage(m) : null,
+        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 || [],
+        fileChanges: Array.isArray(m.file_changes) ? m.file_changes : [],
+        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,
+        toolResultMeta: m.tool_result_meta || null,
         toolFileChange: m.tool_file_change || null,
+        toolFileChanges: Array.isArray(m.tool_file_changes) ? m.tool_file_changes : [],
         planTranscript: Array.isArray(m.plan_transcript) ? m.plan_transcript : null,
         usage: normalizeUiUsage(m.usage),
         at: m.at || null
       }));
   }
 
-  getSessionCompactMeta() {
+  getSessionCompactMeta() {
     const compact = this.#runtime.getSessionCompact();
     if (!compact) return null;
     return { boundaryIndex: compact.boundaryIndex, mode: compact.mode, timestamp: compact.timestamp };
-  }
-
-  async getUiMessages() {
+  }
+
+  getChangeSets() {
+    return this.#runtime.getChangeSets?.() || [];
+  }
+
+  getChangeSetPatch(id) {
+    return this.#runtime.getChangeSetPatch?.(id) || '';
+  }
+
+  async undoChangeSet(id) {
+    if (this.#busy) return { error: true, message: 'A request is already in progress' };
+    const result = await this.#runtime.undoChangeSet?.(id);
+    this.#broadcast({ type: 'change:undone', result });
+    return result || { error: true, message: 'Git change oplog is not available' };
+  }
+
+  async getUiMessages() {
     this.#resetUiTranscriptIfSessionChanged();
     if (this.#uiMessages.length > 0) return this.#uiMessages;
     const sessionId = this.getSessionId();