codemini-cli 0.6.2 → 0.6.4

package/package.json

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

package/src/core/agent-loop.js

@@ -236,7 +236,7 @@ async function checkAutoDreamThreshold(config) {
 
 // ─── Exported helpers ────────────────────────────────────────────────
 
-function extractFileChange(toolName, result) {
+function extractFileChange(toolName, result) {
   if (!result || typeof result !== 'object') return null;
   const FILE_TOOLS = new Set(['edit', 'write', 'delete']);
   if (!FILE_TOOLS.has(toolName)) return null;
@@ -252,56 +252,90 @@ 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,
-      changedLine: Number(result.changed_line || 0),
-      diffPreview: String(result.diff_preview || '')
-    };
-  }
+    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;
+}
 
-  return null;
-}
-
 function normalizeFileChange(change) {
-  if (!change || typeof change !== 'object') return null;
-  const path = String(change.path || '').trim();
-  if (!path) return null;
-  const action = String(change.action || '').trim();
-  return {
-    path,
-    action: action === 'create' || action === 'delete' ? action : 'edit',
+  if (!change || typeof change !== 'object') return null;
+  const path = String(change.path || '').trim();
+  if (!path) return null;
+  const action = String(change.action || '').trim();
+  return {
+    path,
+    action: action === 'create' || action === 'delete' ? action : 'edit',
     linesAdded: Number(change.linesAdded || 0),
     linesRemoved: Number(change.linesRemoved || 0),
     changedLine: Number(change.changedLine || 0),
-    diffPreview: String(change.diffPreview || '')
+    diffPreview: String(change.diffPreview || ''),
+    changeSetId: String(change.changeSetId || ''),
+    patchRef: String(change.patchRef || '')
   };
 }
-
-function fileChangeFingerprint(change) {
-  return JSON.stringify({
-    path: change.path,
-    action: change.action,
-    linesAdded: Number(change.linesAdded || 0),
-    linesRemoved: Number(change.linesRemoved || 0),
-    changedLine: Number(change.changedLine || 0),
-    diffPreview: String(change.diffPreview || '')
+
+function fileChangeFingerprint(change) {
+  return JSON.stringify({
+    path: change.path,
+    action: change.action,
+    linesAdded: Number(change.linesAdded || 0),
+    linesRemoved: Number(change.linesRemoved || 0),
+    changedLine: Number(change.changedLine || 0),
+    diffPreview: String(change.diffPreview || ''),
+    changeSetId: String(change.changeSetId || ''),
+    patchRef: String(change.patchRef || '')
   });
 }
-
+
 function appendUniqueFileChange(message, fileChange) {
-  const existing = Array.isArray(message.file_changes) ? message.file_changes : [];
-  const nextKey = fileChangeFingerprint(fileChange);
-  if (existing.some((change) => fileChangeFingerprint(normalizeFileChange(change) || {}) === nextKey)) {
-    message.file_changes = existing;
-    return;
-  }
+  const existing = Array.isArray(message.file_changes) ? message.file_changes : [];
+  const nextKey = fileChangeFingerprint(fileChange);
+  if (existing.some((change) => fileChangeFingerprint(normalizeFileChange(change) || {}) === nextKey)) {
+    message.file_changes = existing;
+    return;
+  }
   message.file_changes = [...existing, fileChange];
 }
-
-export const trimInline = _trimInline;
+
+function normalizeFileChanges(changes) {
+  return (Array.isArray(changes) ? changes : [changes])
+    .map(normalizeFileChange)
+    .filter(Boolean);
+}
+
+function extractToolResultMeta(toolName, result) {
+  if (!result || typeof result !== 'object') return null;
+  if (!['edit', 'write', 'delete'].includes(String(toolName || ''))) return null;
+  const meta = {};
+  for (const key of [
+    'path',
+    'action',
+    'changed_line',
+    'lines_added',
+    'lines_removed',
+    'backupPath',
+    'backupRelativePath',
+    'backupCreated',
+    'backupReused',
+    'backupSkipped',
+    'backupError',
+    'backupReason',
+    'non_git_backup'
+  ]) {
+    if (result[key] !== undefined && result[key] !== null && result[key] !== '') meta[key] = result[key];
+  }
+  return Object.keys(meta).length ? meta : null;
+}
+
+export const trimInline = _trimInline;
 
 function normalizeAssistantText(value) {
   return String(value || '').trim();
@@ -537,7 +571,7 @@ function formatToolResult(toolResult, toolName, args, toolFormatters, toolResult
 
 // ─── Main agent loop ────────────────────────────────────────────────
 
-export async function runAgentLoop({
+export async function runAgentLoop({
   systemPrompt,
   userPrompt,
   model,
@@ -547,16 +581,19 @@ export async function runAgentLoop({
   maxSteps = 8,
   initialMessages = [],
   onEvent,
-  executionMode = 'auto',
+  executionMode = 'normal',
+  approvalMode = 'review',
+  projectIsGit = false,
   alwaysAllowTools = [],
   requestToolApproval,
   toolResultMaxChars = 12000,
   toolFormatters = {},
   deferredDefinitions = {},
-  signal,
-  skipAnalysisNudge = false,
-  config = {}
-}) {
+  signal,
+  skipAnalysisNudge = false,
+  config = {},
+  changeTracker = null
+}) {
   const messages = [];
   if (systemPrompt) {
     messages.push({ role: 'system', content: systemPrompt });
@@ -579,7 +616,7 @@ export async function runAgentLoop({
   const activeTools = [...toolDefinitions];
 
   async function maybeRunAutoDream(stepNumber = 0, { force = false } = {}) {
-    if (executionMode === 'plan') return;
+    if ((executionMode === 'auto' ? 'normal' : executionMode) === 'plan') return;
     const interval = Math.max(1, Number(config?.memory?.auto_dream_check_interval_steps || 20));
     const normalizedStep = Math.max(1, Number(stepNumber || 1));
     if (!force && lastAutoDreamCheckStep > 0 && normalizedStep - lastAutoDreamCheckStep < interval) return;
@@ -635,13 +672,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,
@@ -654,11 +691,11 @@ export async function runAgentLoop({
       onEvent({
         type: 'assistant:response',
         step: step + 1,
-        text: assistantText,
-        toolCalls: toolCalls.map((tc) => tc.name),
-        usage: completion.usage || null,
-        assistantMessage
-      });
+        text: assistantText,
+        toolCalls: toolCalls.map((tc) => tc.name),
+        usage: completion.usage || null,
+        assistantMessage
+      });
     }
 
     if (toolCalls.length === 0) {
@@ -687,7 +724,14 @@ export async function runAgentLoop({
 
     pendingSummaryNudges = 0;
 
-    if (executionMode === 'plan') {
+    const workMode = executionMode === 'auto' ? 'normal' : executionMode;
+    const normalizedApprovalMode = ['review', 'auto', 'full_access'].includes(String(approvalMode || '').toLowerCase())
+      ? String(approvalMode || '').toLowerCase()
+      : executionMode === 'auto'
+        ? 'auto'
+        : 'review';
+
+    if (workMode === 'plan') {
       const plannedLines = callsToPlanSummary(toolCalls);
       finalText = [
         assistantText || '',
@@ -713,17 +757,21 @@ export async function runAgentLoop({
     });
 
     // Approval checks first — must be done synchronously before any execution
-    const approvalResults = new Map();
-    for (const { call, toolName, displayName, args } of callsWithMeta) {
-      let approved = true;
-      let approvalArgs = args;
-      let preflightErrorContent = '';
-      const isSafeModeRun = toolName === 'run'
-        && config?.policy?.safe_mode !== false
-        && requiresApprovalEvaluation(args?.command || '', config?.shell?.default);
-      const needsApproval = toolName === 'delete' || isSafeModeRun
-        || (executionMode === 'normal' && !alwaysAllowSet.has(toolName));
-      if (needsApproval) {
+    const approvalResults = new Map();
+    for (const { call, toolName, displayName, args } of callsWithMeta) {
+      let approved = true;
+      let approvalArgs = args;
+      let preflightErrorContent = '';
+      const isSafeModeRun = toolName === 'run'
+        && config?.policy?.safe_mode !== false
+        && requiresApprovalEvaluation(args?.command || '', config?.shell?.default);
+      const isFileWriteTool = toolName === 'edit' || toolName === 'write' || toolName === 'delete';
+      const needsApproval = normalizedApprovalMode === 'full_access'
+        ? false
+        : normalizedApprovalMode === 'auto'
+          ? ((!projectIsGit && isFileWriteTool) || isSafeModeRun)
+          : (toolName === 'delete' || isSafeModeRun || !alwaysAllowSet.has(toolName));
+      if (needsApproval) {
         approved = false;
         const handler = toolHandlers[toolName];
         if (toolName === 'delete' && typeof handler?.prepareApproval === 'function') {
@@ -749,10 +797,10 @@ export async function runAgentLoop({
             });
             approvalArgs = { ...args, _risk: evaluation.risk, _evaluation: evaluation };
             /* LLM says low-risk + allow → auto-approve, skip confirmation panel */
-            if (executionMode !== 'normal' && evaluation.risk === 'low' && evaluation.recommendation === 'allow') {
-              approvalResults.set(call.id, { approved: true, args: approvalArgs });
-              continue;
-            }
+            if (normalizedApprovalMode !== 'review' && evaluation.risk === 'low' && evaluation.recommendation === 'allow') {
+              approvalResults.set(call.id, { approved: true, args: approvalArgs });
+              continue;
+            }
           } catch (_) {
             approvalArgs = { ...args, _risk: 'high', _evaluation: null };
           }
@@ -862,9 +910,16 @@ export async function runAgentLoop({
         };
       }
 
-      let toolResult;
-      try {
-        toolResult = await handler(effectiveArgs);
+      let captureScope = null;
+      if (!isReadOnly && changeTracker && typeof changeTracker.begin === 'function') {
+        try {
+          captureScope = await changeTracker.begin({ toolName, args: effectiveArgs });
+        } catch {}
+      }
+
+      let toolResult;
+      try {
+        toolResult = await handler(effectiveArgs);
       } catch (error) {
         const durationMs = Date.now() - startedAt;
         const message = error instanceof Error ? error.message : String(error);
@@ -885,13 +940,42 @@ export async function runAgentLoop({
         };
       }
 
-      const durationMs = Date.now() - startedAt;
-      const summary = summarizeToolResult(toolResult);
-      /* 提取文件改动统计 */
-      const fileChange = extractFileChange(toolName, toolResult);
-      if (onEvent) {
-        onEvent({ type: 'tool:end', name: displayName, id: call.id, arguments: effectiveArgs, durationMs, summary, fileChange });
-      }
+      const durationMs = Date.now() - startedAt;
+      const summary = summarizeToolResult(toolResult);
+      const resultMeta = extractToolResultMeta(toolName, toolResult);
+      /* 提取文件改动统计 */
+      const declaredFileChange = extractFileChange(toolName, toolResult);
+      let fileChanges = [];
+      let fileChange = null;
+      if (!isReadOnly && changeTracker && typeof changeTracker.capture === 'function' && captureScope) {
+        try {
+          const captured = await changeTracker.capture(captureScope, {
+            toolName,
+            toolCallId: call.id,
+            summary,
+            args: effectiveArgs,
+            declaredFileChanges: normalizeFileChanges(declaredFileChange)
+          });
+          const capturedChanges = normalizeFileChanges(captured);
+          if (capturedChanges.length) {
+            fileChanges = capturedChanges;
+            fileChange = fileChanges[0] || null;
+          }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          if (onEvent) {
+            onEvent({
+              type: 'system_tool:error',
+              id: `change-oplog-${call.id}`,
+              name: 'change_oplog',
+              summary: message
+            });
+          }
+        }
+      }
+      if (onEvent) {
+        onEvent({ type: 'tool:end', name: displayName, id: call.id, arguments: effectiveArgs, durationMs, summary, fileChange, fileChanges, resultMeta });
+      }
 
       // Auto-capture non-throwing tool failures (e.g. shell non-zero exit)
       if (toolResult && typeof toolResult === 'object') {
@@ -928,7 +1012,7 @@ export async function runAgentLoop({
       // P0: Persist to disk if still large
       formatted = await storeResultIfNeeded(call.id, formatted, toolResult);
 
-      return { callId: call.id, content: formatted, durationMs, summary, status: 'done', fileChange };
+      return { callId: call.id, content: formatted, durationMs, summary, status: 'done', fileChange, fileChanges, resultMeta };
     }
 
     // Separate read-only and write calls, preserving order
@@ -972,15 +1056,17 @@ export async function runAgentLoop({
         continue;
       }
 
-      attachToolCallSessionMeta(assistantMessage, call.id, { durationMs: entry.durationMs, summary: entry.summary || '', status: entry.status || 'done', fileChange: entry.fileChange });
+      attachToolCallSessionMeta(assistantMessage, call.id, { durationMs: entry.durationMs, summary: entry.summary || '', status: entry.status || 'done', fileChange: entry.fileChange, fileChanges: entry.fileChanges, resultMeta: entry.resultMeta });
       messages.push({
-        role: 'tool',
-        tool_call_id: call.id,
-        content: entry.content,
-        tool_duration_ms: entry.durationMs,
+        role: 'tool',
+        tool_call_id: call.id,
+        content: entry.content,
+        tool_duration_ms: entry.durationMs,
         tool_summary: entry.summary || '',
         tool_status: entry.status || 'done',
-        ...(entry.fileChange ? { tool_file_change: entry.fileChange } : {})
+        ...(entry.resultMeta ? { tool_result_meta: entry.resultMeta } : {}),
+        ...(entry.fileChange ? { tool_file_change: entry.fileChange } : {}),
+        ...(Array.isArray(entry.fileChanges) && entry.fileChanges.length > 0 ? { tool_file_changes: entry.fileChanges } : {})
       });
       if (onEvent) {
         onEvent({ type: 'tool:result', name: displayName, id: call.id, arguments: args, content: entry.content });
@@ -1017,16 +1103,21 @@ function callsToPlanSummary(toolCalls = []) {
     });
 }
 
-function attachToolCallSessionMeta(assistantMessage, callId, meta = {}) {
-  if (!assistantMessage || !Array.isArray(assistantMessage.tool_calls)) return;
-  const call = assistantMessage.tool_calls.find((tc) => String(tc?.id || '') === String(callId || ''));
-  if (!call) return;
-  if (Number.isFinite(Number(meta.durationMs))) call.durationMs = Number(meta.durationMs);
+function attachToolCallSessionMeta(assistantMessage, callId, meta = {}) {
+  if (!assistantMessage || !Array.isArray(assistantMessage.tool_calls)) return;
+  const call = assistantMessage.tool_calls.find((tc) => String(tc?.id || '') === String(callId || ''));
+  if (!call) return;
+  if (Number.isFinite(Number(meta.durationMs))) call.durationMs = Number(meta.durationMs);
   if (typeof meta.summary === 'string' && meta.summary.trim()) call.summary = meta.summary.trim();
   if (typeof meta.status === 'string' && meta.status.trim()) call.status = meta.status.trim();
+  if (meta.resultMeta && typeof meta.resultMeta === 'object') call.resultMeta = meta.resultMeta;
   const fileChange = normalizeFileChange(meta.fileChange);
   if (fileChange) {
     call.fileChange = fileChange;
-    appendUniqueFileChange(assistantMessage, fileChange);
+  }
+  const fileChanges = normalizeFileChanges(meta.fileChanges && meta.fileChanges.length ? meta.fileChanges : fileChange);
+  if (fileChanges.length) {
+    call.fileChanges = fileChanges;
+    for (const change of fileChanges) appendUniqueFileChange(assistantMessage, change);
   }
 }