codemini-cli 0.6.3 → 0.6.4

package/src/core/chat-runtime.js

@@ -33,12 +33,21 @@ import { forgetMemory, listMemories, rememberMemory, searchMemories, captureToIn
 import { runDreamConsolidation } from './dream-consolidate.js';
 import { normalizePlanState } from './plan-state.js';
 import { countActiveTodos, normalizeTodos } from './todo-state.js';
-import {
-  attachReflectTargets,
-  buildReflectSkillDraft,
-  parseReflectScope,
-  writeReflectSkillDraft
-} from './reflect-skill.js';
+import {
+  attachReflectTargets,
+  buildReflectSkillDraft,
+  parseReflectScope,
+  writeReflectSkillDraft
+} from './reflect-skill.js';
+import {
+  beginGitOplogCapture,
+  captureGitOplogChanges,
+  createGitOplogChangeTracker,
+  listGitOplogChanges,
+  readGitOplogPatch,
+  undoGitOplogChange
+} from './git-oplog-change-tracker.js';
+import { createNonGitBackupManager } from './non-git-backup.js';
 
 const STREAM_SAVE_DEBOUNCE_MS = 120;
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
@@ -83,283 +92,283 @@ function slugify(input) {
   return base || 'untitled';
 }
 
-function nowStamp() {
-  return new Date().toISOString().replace(/[:.]/g, '-');
-}
-
-function numberFromPath(obj, pathParts) {
-  let current = obj;
-  for (const part of pathParts) {
-    if (!current || typeof current !== 'object') return null;
-    current = current[part];
-  }
-  const value = Number(current);
-  return Number.isFinite(value) ? Math.max(0, value) : null;
-}
-
-function firstFiniteNumber(obj, paths) {
-  for (const pathParts of paths) {
-    const value = numberFromPath(obj, pathParts);
-    if (value != null) return value;
-  }
-  return null;
-}
-
-function sumFiniteNumbers(obj, paths) {
-  let sum = 0;
-  let found = false;
-  for (const pathParts of paths) {
-    const value = numberFromPath(obj, pathParts);
-    if (value != null) {
-      sum += value;
-      found = true;
-    }
-  }
-  return found ? sum : null;
-}
-
-function collectRawUsage(usage) {
-  if (!usage || typeof usage !== 'object') return [];
-  if (Array.isArray(usage.raw)) {
-    return usage.raw
-      .filter((item) => item && typeof item === 'object')
-      .map((item) => ({ ...item }));
-  }
-  return [{ ...usage }];
-}
-
-export function normalizeModelUsage(usage) {
-  if (!usage || typeof usage !== 'object') return null;
-  const promptCacheHitTokens = firstFiniteNumber(usage, [
-    ['prompt_cache_hit_tokens'],
-    ['promptCacheHitTokens'],
-    ['cache_hit_tokens'],
-    ['cacheHitTokens']
-  ]);
-  const promptCacheMissTokens = firstFiniteNumber(usage, [
-    ['prompt_cache_miss_tokens'],
-    ['promptCacheMissTokens'],
-    ['cache_miss_tokens'],
-    ['cacheMissTokens']
-  ]);
-  const explicitInputTokens = firstFiniteNumber(usage, [
-    ['prompt_tokens'],
-    ['input_tokens'],
-    ['inputTokens'],
-    ['promptTokens'],
-    ['prompt_token_count'],
-    ['promptTokenCount'],
-    ['input_token_count'],
-    ['inputTokenCount'],
-    ['input_total_tokens'],
-    ['total_input_tokens'],
-    ['usage', 'prompt_tokens'],
-    ['usage', 'input_tokens'],
-    ['usage_metadata', 'prompt_token_count'],
-    ['usage_metadata', 'input_token_count'],
-    ['usageMetadata', 'promptTokenCount'],
-    ['usageMetadata', 'inputTokenCount'],
-    ['token_usage', 'prompt_tokens'],
-    ['token_usage', 'input_tokens'],
-    ['tokenUsage', 'promptTokens'],
-    ['tokenUsage', 'inputTokens'],
-    ['tokens', 'input_tokens'],
-    ['tokens', 'inputTokens'],
-    ['tokens', 'prompt_tokens'],
-    ['tokens', 'promptTokens'],
-    ['billed_units', 'input_tokens'],
-    ['billedUnits', 'inputTokens']
-  ]);
-  const cacheReadInputTokens = firstFiniteNumber(usage, [
-    ['cache_read_input_tokens'],
-    ['cacheReadInputTokens'],
-    ['cache_read_tokens'],
-    ['cacheReadTokens']
-  ]);
-  const outputTokens = firstFiniteNumber(usage, [
-    ['completion_tokens'],
-    ['output_tokens'],
-    ['outputTokens'],
-    ['completionTokens'],
-    ['completion_token_count'],
-    ['completionTokenCount'],
-    ['output_token_count'],
-    ['outputTokenCount'],
-    ['candidates_token_count'],
-    ['candidatesTokenCount'],
-    ['usage', 'completion_tokens'],
-    ['usage', 'output_tokens'],
-    ['usage_metadata', 'candidates_token_count'],
-    ['usage_metadata', 'output_token_count'],
-    ['usageMetadata', 'candidatesTokenCount'],
-    ['usageMetadata', 'outputTokenCount'],
-    ['token_usage', 'completion_tokens'],
-    ['token_usage', 'output_tokens'],
-    ['tokenUsage', 'completionTokens'],
-    ['tokenUsage', 'outputTokens'],
-    ['tokens', 'output_tokens'],
-    ['tokens', 'outputTokens'],
-    ['tokens', 'completion_tokens'],
-    ['tokens', 'completionTokens'],
-    ['billed_units', 'output_tokens'],
-    ['billedUnits', 'outputTokens']
-  ]);
-  const explicitTotal = firstFiniteNumber(usage, [
-    ['total_tokens'],
-    ['totalTokens'],
-    ['total_token_count'],
-    ['totalTokenCount'],
-    ['usage', 'total_tokens'],
-    ['usage_metadata', 'total_token_count'],
-    ['usageMetadata', 'totalTokenCount'],
-    ['token_usage', 'total_tokens'],
-    ['tokenUsage', 'totalTokens'],
-    ['tokens', 'total_tokens'],
-    ['tokens', 'totalTokens']
-  ]);
-  const cachedInputTokens = firstFiniteNumber(usage, [
-    ['prompt_tokens_details', 'cached_tokens'],
-    ['input_tokens_details', 'cached_tokens'],
-    ['promptTokensDetails', 'cachedTokens'],
-    ['inputTokensDetails', 'cachedTokens'],
-    ['cache_read_input_tokens'],
-    ['cacheReadInputTokens'],
-    ['cache_read_tokens'],
-    ['cacheReadTokens'],
-    ['cached_tokens'],
-    ['cachedTokens'],
-    ['cached_input_tokens'],
-    ['cachedInputTokens'],
-    ['cached_content_token_count'],
-    ['cachedContentTokenCount'],
-    ['usage', 'prompt_tokens_details', 'cached_tokens'],
-    ['usage', 'input_tokens_details', 'cached_tokens'],
-    ['usage_metadata', 'cached_content_token_count'],
-    ['usageMetadata', 'cachedContentTokenCount'],
-    ['token_usage', 'prompt_tokens_details', 'cached_tokens'],
-    ['tokenUsage', 'promptTokensDetails', 'cachedTokens'],
-    ['tokens', 'cached_tokens'],
-    ['tokens', 'cachedTokens'],
-    ['prompt_cache_hit_tokens'],
-    ['promptCacheHitTokens'],
-    ['cache_hit_tokens'],
-    ['cacheHitTokens']
-  ]);
-  const explicitCacheMissInputTokens = firstFiniteNumber(usage, [
-    ['prompt_cache_miss_tokens'],
-    ['promptCacheMissTokens'],
-    ['cache_miss_tokens'],
-    ['cacheMissTokens']
-  ]);
-  const cacheWriteInputTokens = firstFiniteNumber(usage, [
-    ['cache_creation_input_tokens'],
-    ['cacheCreationInputTokens'],
-    ['cache_write_input_tokens'],
-    ['cacheWriteInputTokens'],
-    ['cache_creation_tokens'],
-    ['cacheCreationTokens'],
-    ['usage', 'cache_creation_input_tokens'],
-    ['usage', 'cache_write_input_tokens'],
-    ['token_usage', 'cache_creation_input_tokens'],
-    ['tokenUsage', 'cacheCreationInputTokens']
-  ]) ?? sumFiniteNumbers(usage, [
-    ['cache_creation', 'ephemeral_5m_input_tokens'],
-    ['cache_creation', 'ephemeral_1h_input_tokens'],
-    ['cacheCreation', 'ephemeral5mInputTokens'],
-    ['cacheCreation', 'ephemeral1hInputTokens'],
-    ['usage', 'cache_creation', 'ephemeral_5m_input_tokens'],
-    ['usage', 'cache_creation', 'ephemeral_1h_input_tokens']
-  ]);
-  const hasAnthropicSplitCacheInput = explicitInputTokens != null
-    && (cacheReadInputTokens != null || cacheWriteInputTokens != null)
-    && promptCacheHitTokens == null;
-  const cacheMissInputTokens = explicitCacheMissInputTokens ?? (
-    hasAnthropicSplitCacheInput
-      ? Number(explicitInputTokens || 0) + Number(cacheWriteInputTokens || 0)
-      : null
-  );
-  const inputTokens = explicitInputTokens != null
-    ? Number(explicitInputTokens || 0)
-      + (hasAnthropicSplitCacheInput ? Number(cacheReadInputTokens || 0) + Number(cacheWriteInputTokens || 0) : 0)
-    : (
-      promptCacheHitTokens != null || promptCacheMissTokens != null
-        ? Number(promptCacheHitTokens || 0) + Number(promptCacheMissTokens || 0)
-        : null
-    );
-  const reasoningOutputTokens = firstFiniteNumber(usage, [
-    ['completion_tokens_details', 'reasoning_tokens'],
-    ['output_tokens_details', 'reasoning_tokens'],
-    ['completionTokensDetails', 'reasoningTokens'],
-    ['outputTokensDetails', 'reasoningTokens'],
-    ['reasoning_tokens'],
-    ['reasoningTokens'],
-    ['thoughts_token_count'],
-    ['thoughtsTokenCount'],
-    ['usage', 'completion_tokens_details', 'reasoning_tokens'],
-    ['usage_metadata', 'thoughts_token_count'],
-    ['usageMetadata', 'thoughtsTokenCount']
-  ]);
-  const totalTokens = explicitTotal ?? (
-    inputTokens != null || outputTokens != null
-      ? Number(inputTokens || 0) + Number(outputTokens || 0)
-      : null
-  );
-  if (
-    inputTokens == null &&
-    outputTokens == null &&
-    totalTokens == null &&
-    cachedInputTokens == null &&
-    cacheWriteInputTokens == null
-  ) {
-    return null;
-  }
-  return {
-    inputTokens: Math.round(inputTokens || 0),
-    outputTokens: Math.round(outputTokens || 0),
-    totalTokens: Math.round(totalTokens || 0),
-    cachedInputTokens: Math.round(cachedInputTokens || 0),
-    cacheMissInputTokens: Math.round(cacheMissInputTokens || 0),
-    cacheWriteInputTokens: Math.round(cacheWriteInputTokens || 0),
-    reasoningOutputTokens: Math.round(reasoningOutputTokens || 0),
-    requests: 1,
-    raw: collectRawUsage(usage)
-  };
-}
-
-function cloneModelUsage(usage) {
-  if (!usage || typeof usage !== 'object') return null;
-  return {
-    inputTokens: Math.max(0, Math.round(Number(usage.inputTokens || 0))),
-    outputTokens: Math.max(0, Math.round(Number(usage.outputTokens || 0))),
-    totalTokens: Math.max(0, Math.round(Number(usage.totalTokens || 0))),
-    cachedInputTokens: Math.max(0, Math.round(Number(usage.cachedInputTokens || 0))),
-    cacheMissInputTokens: Math.max(0, Math.round(Number(usage.cacheMissInputTokens || 0))),
-    cacheWriteInputTokens: Math.max(0, Math.round(Number(usage.cacheWriteInputTokens || 0))),
-    reasoningOutputTokens: Math.max(0, Math.round(Number(usage.reasoningOutputTokens || 0))),
-    requests: Math.max(0, Math.round(Number(usage.requests || 0))),
-    raw: Array.isArray(usage.raw) ? usage.raw.map((item) => ({ ...item })) : []
-  };
-}
-
-function mergeModelUsage(left, right) {
-  const a = cloneModelUsage(left);
-  const b = cloneModelUsage(right);
-  if (!a) return b;
-  if (!b) return a;
-  return {
-    inputTokens: a.inputTokens + b.inputTokens,
-    outputTokens: a.outputTokens + b.outputTokens,
-    totalTokens: a.totalTokens + b.totalTokens,
-    cachedInputTokens: a.cachedInputTokens + b.cachedInputTokens,
-    cacheMissInputTokens: a.cacheMissInputTokens + b.cacheMissInputTokens,
-    cacheWriteInputTokens: a.cacheWriteInputTokens + b.cacheWriteInputTokens,
-    reasoningOutputTokens: a.reasoningOutputTokens + b.reasoningOutputTokens,
-    requests: a.requests + b.requests,
-    raw: [...a.raw, ...b.raw]
-  };
-}
-
-function prioritizeByPreferredOrder(items, preferredOrder) {
+function nowStamp() {
+  return new Date().toISOString().replace(/[:.]/g, '-');
+}
+
+function numberFromPath(obj, pathParts) {
+  let current = obj;
+  for (const part of pathParts) {
+    if (!current || typeof current !== 'object') return null;
+    current = current[part];
+  }
+  const value = Number(current);
+  return Number.isFinite(value) ? Math.max(0, value) : null;
+}
+
+function firstFiniteNumber(obj, paths) {
+  for (const pathParts of paths) {
+    const value = numberFromPath(obj, pathParts);
+    if (value != null) return value;
+  }
+  return null;
+}
+
+function sumFiniteNumbers(obj, paths) {
+  let sum = 0;
+  let found = false;
+  for (const pathParts of paths) {
+    const value = numberFromPath(obj, pathParts);
+    if (value != null) {
+      sum += value;
+      found = true;
+    }
+  }
+  return found ? sum : null;
+}
+
+function collectRawUsage(usage) {
+  if (!usage || typeof usage !== 'object') return [];
+  if (Array.isArray(usage.raw)) {
+    return usage.raw
+      .filter((item) => item && typeof item === 'object')
+      .map((item) => ({ ...item }));
+  }
+  return [{ ...usage }];
+}
+
+export function normalizeModelUsage(usage) {
+  if (!usage || typeof usage !== 'object') return null;
+  const promptCacheHitTokens = firstFiniteNumber(usage, [
+    ['prompt_cache_hit_tokens'],
+    ['promptCacheHitTokens'],
+    ['cache_hit_tokens'],
+    ['cacheHitTokens']
+  ]);
+  const promptCacheMissTokens = firstFiniteNumber(usage, [
+    ['prompt_cache_miss_tokens'],
+    ['promptCacheMissTokens'],
+    ['cache_miss_tokens'],
+    ['cacheMissTokens']
+  ]);
+  const explicitInputTokens = firstFiniteNumber(usage, [
+    ['prompt_tokens'],
+    ['input_tokens'],
+    ['inputTokens'],
+    ['promptTokens'],
+    ['prompt_token_count'],
+    ['promptTokenCount'],
+    ['input_token_count'],
+    ['inputTokenCount'],
+    ['input_total_tokens'],
+    ['total_input_tokens'],
+    ['usage', 'prompt_tokens'],
+    ['usage', 'input_tokens'],
+    ['usage_metadata', 'prompt_token_count'],
+    ['usage_metadata', 'input_token_count'],
+    ['usageMetadata', 'promptTokenCount'],
+    ['usageMetadata', 'inputTokenCount'],
+    ['token_usage', 'prompt_tokens'],
+    ['token_usage', 'input_tokens'],
+    ['tokenUsage', 'promptTokens'],
+    ['tokenUsage', 'inputTokens'],
+    ['tokens', 'input_tokens'],
+    ['tokens', 'inputTokens'],
+    ['tokens', 'prompt_tokens'],
+    ['tokens', 'promptTokens'],
+    ['billed_units', 'input_tokens'],
+    ['billedUnits', 'inputTokens']
+  ]);
+  const cacheReadInputTokens = firstFiniteNumber(usage, [
+    ['cache_read_input_tokens'],
+    ['cacheReadInputTokens'],
+    ['cache_read_tokens'],
+    ['cacheReadTokens']
+  ]);
+  const outputTokens = firstFiniteNumber(usage, [
+    ['completion_tokens'],
+    ['output_tokens'],
+    ['outputTokens'],
+    ['completionTokens'],
+    ['completion_token_count'],
+    ['completionTokenCount'],
+    ['output_token_count'],
+    ['outputTokenCount'],
+    ['candidates_token_count'],
+    ['candidatesTokenCount'],
+    ['usage', 'completion_tokens'],
+    ['usage', 'output_tokens'],
+    ['usage_metadata', 'candidates_token_count'],
+    ['usage_metadata', 'output_token_count'],
+    ['usageMetadata', 'candidatesTokenCount'],
+    ['usageMetadata', 'outputTokenCount'],
+    ['token_usage', 'completion_tokens'],
+    ['token_usage', 'output_tokens'],
+    ['tokenUsage', 'completionTokens'],
+    ['tokenUsage', 'outputTokens'],
+    ['tokens', 'output_tokens'],
+    ['tokens', 'outputTokens'],
+    ['tokens', 'completion_tokens'],
+    ['tokens', 'completionTokens'],
+    ['billed_units', 'output_tokens'],
+    ['billedUnits', 'outputTokens']
+  ]);
+  const explicitTotal = firstFiniteNumber(usage, [
+    ['total_tokens'],
+    ['totalTokens'],
+    ['total_token_count'],
+    ['totalTokenCount'],
+    ['usage', 'total_tokens'],
+    ['usage_metadata', 'total_token_count'],
+    ['usageMetadata', 'totalTokenCount'],
+    ['token_usage', 'total_tokens'],
+    ['tokenUsage', 'totalTokens'],
+    ['tokens', 'total_tokens'],
+    ['tokens', 'totalTokens']
+  ]);
+  const cachedInputTokens = firstFiniteNumber(usage, [
+    ['prompt_tokens_details', 'cached_tokens'],
+    ['input_tokens_details', 'cached_tokens'],
+    ['promptTokensDetails', 'cachedTokens'],
+    ['inputTokensDetails', 'cachedTokens'],
+    ['cache_read_input_tokens'],
+    ['cacheReadInputTokens'],
+    ['cache_read_tokens'],
+    ['cacheReadTokens'],
+    ['cached_tokens'],
+    ['cachedTokens'],
+    ['cached_input_tokens'],
+    ['cachedInputTokens'],
+    ['cached_content_token_count'],
+    ['cachedContentTokenCount'],
+    ['usage', 'prompt_tokens_details', 'cached_tokens'],
+    ['usage', 'input_tokens_details', 'cached_tokens'],
+    ['usage_metadata', 'cached_content_token_count'],
+    ['usageMetadata', 'cachedContentTokenCount'],
+    ['token_usage', 'prompt_tokens_details', 'cached_tokens'],
+    ['tokenUsage', 'promptTokensDetails', 'cachedTokens'],
+    ['tokens', 'cached_tokens'],
+    ['tokens', 'cachedTokens'],
+    ['prompt_cache_hit_tokens'],
+    ['promptCacheHitTokens'],
+    ['cache_hit_tokens'],
+    ['cacheHitTokens']
+  ]);
+  const explicitCacheMissInputTokens = firstFiniteNumber(usage, [
+    ['prompt_cache_miss_tokens'],
+    ['promptCacheMissTokens'],
+    ['cache_miss_tokens'],
+    ['cacheMissTokens']
+  ]);
+  const cacheWriteInputTokens = firstFiniteNumber(usage, [
+    ['cache_creation_input_tokens'],
+    ['cacheCreationInputTokens'],
+    ['cache_write_input_tokens'],
+    ['cacheWriteInputTokens'],
+    ['cache_creation_tokens'],
+    ['cacheCreationTokens'],
+    ['usage', 'cache_creation_input_tokens'],
+    ['usage', 'cache_write_input_tokens'],
+    ['token_usage', 'cache_creation_input_tokens'],
+    ['tokenUsage', 'cacheCreationInputTokens']
+  ]) ?? sumFiniteNumbers(usage, [
+    ['cache_creation', 'ephemeral_5m_input_tokens'],
+    ['cache_creation', 'ephemeral_1h_input_tokens'],
+    ['cacheCreation', 'ephemeral5mInputTokens'],
+    ['cacheCreation', 'ephemeral1hInputTokens'],
+    ['usage', 'cache_creation', 'ephemeral_5m_input_tokens'],
+    ['usage', 'cache_creation', 'ephemeral_1h_input_tokens']
+  ]);
+  const hasAnthropicSplitCacheInput = explicitInputTokens != null
+    && (cacheReadInputTokens != null || cacheWriteInputTokens != null)
+    && promptCacheHitTokens == null;
+  const cacheMissInputTokens = explicitCacheMissInputTokens ?? (
+    hasAnthropicSplitCacheInput
+      ? Number(explicitInputTokens || 0) + Number(cacheWriteInputTokens || 0)
+      : null
+  );
+  const inputTokens = explicitInputTokens != null
+    ? Number(explicitInputTokens || 0)
+      + (hasAnthropicSplitCacheInput ? Number(cacheReadInputTokens || 0) + Number(cacheWriteInputTokens || 0) : 0)
+    : (
+      promptCacheHitTokens != null || promptCacheMissTokens != null
+        ? Number(promptCacheHitTokens || 0) + Number(promptCacheMissTokens || 0)
+        : null
+    );
+  const reasoningOutputTokens = firstFiniteNumber(usage, [
+    ['completion_tokens_details', 'reasoning_tokens'],
+    ['output_tokens_details', 'reasoning_tokens'],
+    ['completionTokensDetails', 'reasoningTokens'],
+    ['outputTokensDetails', 'reasoningTokens'],
+    ['reasoning_tokens'],
+    ['reasoningTokens'],
+    ['thoughts_token_count'],
+    ['thoughtsTokenCount'],
+    ['usage', 'completion_tokens_details', 'reasoning_tokens'],
+    ['usage_metadata', 'thoughts_token_count'],
+    ['usageMetadata', 'thoughtsTokenCount']
+  ]);
+  const totalTokens = explicitTotal ?? (
+    inputTokens != null || outputTokens != null
+      ? Number(inputTokens || 0) + Number(outputTokens || 0)
+      : null
+  );
+  if (
+    inputTokens == null &&
+    outputTokens == null &&
+    totalTokens == null &&
+    cachedInputTokens == null &&
+    cacheWriteInputTokens == null
+  ) {
+    return null;
+  }
+  return {
+    inputTokens: Math.round(inputTokens || 0),
+    outputTokens: Math.round(outputTokens || 0),
+    totalTokens: Math.round(totalTokens || 0),
+    cachedInputTokens: Math.round(cachedInputTokens || 0),
+    cacheMissInputTokens: Math.round(cacheMissInputTokens || 0),
+    cacheWriteInputTokens: Math.round(cacheWriteInputTokens || 0),
+    reasoningOutputTokens: Math.round(reasoningOutputTokens || 0),
+    requests: 1,
+    raw: collectRawUsage(usage)
+  };
+}
+
+function cloneModelUsage(usage) {
+  if (!usage || typeof usage !== 'object') return null;
+  return {
+    inputTokens: Math.max(0, Math.round(Number(usage.inputTokens || 0))),
+    outputTokens: Math.max(0, Math.round(Number(usage.outputTokens || 0))),
+    totalTokens: Math.max(0, Math.round(Number(usage.totalTokens || 0))),
+    cachedInputTokens: Math.max(0, Math.round(Number(usage.cachedInputTokens || 0))),
+    cacheMissInputTokens: Math.max(0, Math.round(Number(usage.cacheMissInputTokens || 0))),
+    cacheWriteInputTokens: Math.max(0, Math.round(Number(usage.cacheWriteInputTokens || 0))),
+    reasoningOutputTokens: Math.max(0, Math.round(Number(usage.reasoningOutputTokens || 0))),
+    requests: Math.max(0, Math.round(Number(usage.requests || 0))),
+    raw: Array.isArray(usage.raw) ? usage.raw.map((item) => ({ ...item })) : []
+  };
+}
+
+function mergeModelUsage(left, right) {
+  const a = cloneModelUsage(left);
+  const b = cloneModelUsage(right);
+  if (!a) return b;
+  if (!b) return a;
+  return {
+    inputTokens: a.inputTokens + b.inputTokens,
+    outputTokens: a.outputTokens + b.outputTokens,
+    totalTokens: a.totalTokens + b.totalTokens,
+    cachedInputTokens: a.cachedInputTokens + b.cachedInputTokens,
+    cacheMissInputTokens: a.cacheMissInputTokens + b.cacheMissInputTokens,
+    cacheWriteInputTokens: a.cacheWriteInputTokens + b.cacheWriteInputTokens,
+    reasoningOutputTokens: a.reasoningOutputTokens + b.reasoningOutputTokens,
+    requests: a.requests + b.requests,
+    raw: [...a.raw, ...b.raw]
+  };
+}
+
+function prioritizeByPreferredOrder(items, preferredOrder) {
   const source = Array.isArray(items) ? items : [];
   const priorities = new Map((Array.isArray(preferredOrder) ? preferredOrder : []).map((value, index) => [value, index]));
   return [...source].sort((left, right) => {
@@ -370,22 +379,22 @@ function prioritizeByPreferredOrder(items, preferredOrder) {
   });
 }
 
-function normalizeUiLocale(value) {
-  return String(value || '').toLowerCase().startsWith('en') ? 'en' : 'zh';
-}
-
-function formatLocalDateTimeSlug(date = new Date()) {
-  const value = date instanceof Date ? date : new Date(date);
-  const year = value.getFullYear();
-  const month = String(value.getMonth() + 1).padStart(2, '0');
-  const day = String(value.getDate()).padStart(2, '0');
-  const hour = String(value.getHours()).padStart(2, '0');
-  const minute = String(value.getMinutes()).padStart(2, '0');
-  const second = String(value.getSeconds()).padStart(2, '0');
-  return `${year}-${month}-${day}-${hour}-${minute}-${second}`;
-}
-
-function getCompletionCopy(language = 'zh') {
+function normalizeUiLocale(value) {
+  return String(value || '').toLowerCase().startsWith('en') ? 'en' : 'zh';
+}
+
+function formatLocalDateTimeSlug(date = new Date()) {
+  const value = date instanceof Date ? date : new Date(date);
+  const year = value.getFullYear();
+  const month = String(value.getMonth() + 1).padStart(2, '0');
+  const day = String(value.getDate()).padStart(2, '0');
+  const hour = String(value.getHours()).padStart(2, '0');
+  const minute = String(value.getMinutes()).padStart(2, '0');
+  const second = String(value.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day}-${hour}-${minute}-${second}`;
+}
+
+function getCompletionCopy(language = 'zh') {
   const lang = normalizeUiLocale(language);
   return {
     zh: {
@@ -428,7 +437,8 @@ function getCompletionCopy(language = 'zh') {
         'sdk.provider': '可选：openai-compatible | anthropic',
         'ui.language': '可选：zh | en',
         'ui.reply_language': '可选：zh | en',
-        'execution.mode': '可选：auto | normal | plan',
+        'execution.mode': '可选：normal | plan',
+        'execution.approval_mode': '可选：review | auto | full_access',
         'shell.default': '常用：bash | powershell',
         'policy.safe_mode': '可选：true | false',
         'policy.allowed_paths': 'JSON 数组，例如 ["D:\\\\shared"]',
@@ -460,7 +470,8 @@ function getCompletionCopy(language = 'zh') {
         commands: '列出 slash/自定义命令',
         status: '查看运行状态（mode/model/session）',
         model: '查看或切换模型',
-        mode: '设置执行模式：normal|auto|plan',
+        mode: '设置工作模式：normal|plan',
+        approval: '设置审阅权限：review|auto|full_access',
         compact: '压缩消息上下文',
         checkpoint: '创建/查看/加载检查点',
         spec: '在 .codemini/specs 中创建 spec',
@@ -483,7 +494,8 @@ function getCompletionCopy(language = 'zh') {
       generic: {
         configCommand: '配置命令',
         historyCommand: '历史会话命令',
-        modeCommand: '切换执行模式',
+        modeCommand: '切换工作模式',
+        approvalCommand: '切换审阅权限',
         checkpointCommand: '检查点命令',
         specCommand: '创建 spec 文件',
         planCommand: '规划命令',
@@ -541,7 +553,8 @@ function getCompletionCopy(language = 'zh') {
         'sdk.provider': 'options: openai-compatible | anthropic',
         'ui.language': 'options: zh | en',
         'ui.reply_language': 'options: zh | en',
-        'execution.mode': 'options: auto | normal | plan',
+        'execution.mode': 'options: normal | plan',
+        'execution.approval_mode': 'options: review | auto | full_access',
         'shell.default': 'common: bash | powershell',
         'policy.safe_mode': 'options: true | false',
         'policy.allowed_paths': 'JSON array, for example ["D:\\\\shared"]',
@@ -573,7 +586,8 @@ function getCompletionCopy(language = 'zh') {
         commands: 'list slash/custom commands',
         status: 'show runtime status (mode/model/session)',
         model: 'show or switch model',
-        mode: 'set execution mode: normal|auto|plan',
+        mode: 'set work mode: normal|plan',
+        approval: 'set approval mode: review|auto|full_access',
         compact: 'compress message context',
         checkpoint: 'create/list/load conversation checkpoints',
         spec: 'create a spec markdown file in .codemini/specs',
@@ -596,7 +610,8 @@ function getCompletionCopy(language = 'zh') {
       generic: {
         configCommand: 'config command',
         historyCommand: 'history command',
-        modeCommand: 'switch execution mode',
+        modeCommand: 'switch work mode',
+        approvalCommand: 'switch approval mode',
         checkpointCommand: 'checkpoint command',
         specCommand: 'create a spec file',
         planCommand: 'planning command',
@@ -2577,7 +2592,7 @@ function summarizePromptBudgetAudit(audit) {
   return `prompt budget: ${totalTokens}/${maxContextTokens} est tokens (${pct}%)${components ? `; ${components}` : ''}`;
 }
 
-function buildRuntimeStateSnapshot({ currentSession, config, model, executionMode, extraSession }) {
+function buildRuntimeStateSnapshot({ currentSession, config, model, executionMode, extraSession }) {
   const activeParentMessages = Array.isArray(currentSession?.compact?.view) && currentSession.compact.view.length > 0
     ? currentSession.compact.view
     : currentSession?.messages || [];
@@ -2588,11 +2603,12 @@ function buildRuntimeStateSnapshot({ currentSession, config, model, executionMod
   const contextUsagePct = maxContextTokens > 0 ? Math.min(100, Math.max(0, (currentContextTokens / maxContextTokens) * 100)) : 0;
   const planState = currentSession?.planState;
   const snapshot = {
-    sessionId: currentSession?.id || '',
-    sessionTitle: currentSession?.title || '',
-    messageCount: Array.isArray(currentSession?.messages) ? currentSession.messages.length : 0,
-    mode: executionMode || config.execution?.mode || 'normal',
-    sdkProvider: config.sdk?.provider || 'openai-compatible',
+    sessionId: currentSession?.id || '',
+    sessionTitle: currentSession?.title || '',
+    messageCount: Array.isArray(currentSession?.messages) ? currentSession.messages.length : 0,
+    mode: executionMode === 'auto' ? 'normal' : (executionMode || config.execution?.mode || 'normal'),
+    approvalMode: config.execution?.approval_mode || (executionMode === 'auto' ? 'auto' : 'review'),
+    sdkProvider: config.sdk?.provider || 'openai-compatible',
     agentRole: 'general',
     model: model || config.model?.name || '',
     mainModel: config.model?.name || '',
@@ -2939,10 +2955,13 @@ async function askModel({
   signal,
   allowedTools,
   maxSteps: maxStepsOverride,
-  skipAnalysisNudge = false,
-  compactedForModel: compactedInput = null,
-  onCompactedUpdate = null
-}) {
+  skipAnalysisNudge = false,
+  compactedForModel: compactedInput = null,
+  onCompactedUpdate = null,
+  changeTracker = null,
+  backupManager = null,
+  projectIsGit = Boolean(config?.runtime?.project_is_git)
+}) {
   let compacted = compactedInput;
   const modelInputText = typeof modelText === 'string' && modelText ? modelText : text;
   const maxContextTokens = effectiveMaxContextTokens(config);
@@ -3104,11 +3123,12 @@ async function askModel({
       scheduleSessionSave();
     },
     getPlanState: () => normalizePlanState(session.planState),
-    onPlanStateUpdate: (planState) => {
-      session.planState = normalizePlanState(planState);
-      scheduleSessionSave();
-    }
-  });
+    onPlanStateUpdate: (planState) => {
+      session.planState = normalizePlanState(planState);
+      scheduleSessionSave();
+    },
+    backupManager
+  });
 
   const filteredDefinitions = Array.isArray(allowedTools)
     ? definitions.filter((t) => allowedTools.includes(t.function?.name || t.name))
@@ -3147,38 +3167,45 @@ async function askModel({
 
   let activeAssistantIndex = -1;
   const pendingToolMeta = new Map();
-  const 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',
+  const 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',
       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 || '')
     };
   };
-  const fileChangeFingerprint = (change) => 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 || '')
+  const fileChangeFingerprint = (change) => 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 || '')
   });
-  const 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;
-    }
-    message.file_changes = [...existing, fileChange];
-  };
-  const attachToolMetaToSessionCall = (toolId, meta = {}) => {
+  const normalizeFileChanges = (changes) => (Array.isArray(changes) ? changes : [changes])
+    .map(normalizeFileChange)
+    .filter(Boolean);
+  const 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;
+    }
+    message.file_changes = [...existing, fileChange];
+  };
+  const attachToolMetaToSessionCall = (toolId, meta = {}) => {
     if (!toolId) return false;
     for (let i = session.messages.length - 1; i >= 0; i -= 1) {
       const msg = session.messages[i];
@@ -3188,11 +3215,14 @@ async function askModel({
       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(msg, fileChange);
       }
+      const fileChanges = normalizeFileChanges(meta.fileChanges && meta.fileChanges.length ? meta.fileChanges : fileChange);
+      if (fileChanges.length) call.fileChanges = fileChanges;
+      for (const change of fileChanges) appendUniqueFileChange(msg, change);
       msg.at = new Date().toISOString();
       return true;
     }
@@ -3204,64 +3234,64 @@ async function askModel({
       session.messages.push(stampedMessage('assistant', ''));
       activeAssistantIndex = session.messages.length - 1;
       if (persistSession) scheduleSessionSave();
-    } else if (event?.type === 'assistant:delta') {
-      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
-        const current = session.messages[activeAssistantIndex];
-        const now = new Date();
-        if (current.reasoning_started_at && !current.reasoning_ended_at) {
-          current.reasoning_ended_at = now.toISOString();
-          current.reasoning_duration_ms = Math.max(
-            Number(current.reasoning_duration_ms || 0),
-            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
-          );
-        }
-        current.content = `${current.content || ''}${event.text || ''}`;
-        current.at = now.toISOString();
-        if (persistSession) scheduleSessionSave();
-      }
-    } else if (event?.type === 'assistant:reasoning_delta') {
-      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
-        const current = session.messages[activeAssistantIndex];
-        const now = new Date();
-        if (!current.reasoning_started_at) current.reasoning_started_at = now.toISOString();
-        current.reasoning_content = `${current.reasoning_content || ''}${event.text || ''}`;
-        current.reasoning_duration_ms = Math.max(
-          0,
-          now.getTime() - Date.parse(current.reasoning_started_at)
-        );
-        current.at = now.toISOString();
-        if (persistSession) scheduleSessionSave();
-      }
-    } else if (event?.type === 'assistant:response') {
-      const eventUsage = normalizeModelUsage(event.usage || event.assistantMessage?.usage);
-      if (eventUsage) event.usage = eventUsage;
-      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
-        const current = session.messages[activeAssistantIndex];
-        const now = new Date();
-        current.content = event.assistantMessage?.content ?? event.text ?? current.content;
-        if (typeof event.assistantMessage?.reasoning_content === 'string' && event.assistantMessage.reasoning_content) {
-          current.reasoning_content = event.assistantMessage.reasoning_content;
-        }
+    } else if (event?.type === 'assistant:delta') {
+      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
+        const current = session.messages[activeAssistantIndex];
+        const now = new Date();
+        if (current.reasoning_started_at && !current.reasoning_ended_at) {
+          current.reasoning_ended_at = now.toISOString();
+          current.reasoning_duration_ms = Math.max(
+            Number(current.reasoning_duration_ms || 0),
+            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
+          );
+        }
+        current.content = `${current.content || ''}${event.text || ''}`;
+        current.at = now.toISOString();
+        if (persistSession) scheduleSessionSave();
+      }
+    } else if (event?.type === 'assistant:reasoning_delta') {
+      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
+        const current = session.messages[activeAssistantIndex];
+        const now = new Date();
+        if (!current.reasoning_started_at) current.reasoning_started_at = now.toISOString();
+        current.reasoning_content = `${current.reasoning_content || ''}${event.text || ''}`;
+        current.reasoning_duration_ms = Math.max(
+          0,
+          now.getTime() - Date.parse(current.reasoning_started_at)
+        );
+        current.at = now.toISOString();
+        if (persistSession) scheduleSessionSave();
+      }
+    } else if (event?.type === 'assistant:response') {
+      const eventUsage = normalizeModelUsage(event.usage || event.assistantMessage?.usage);
+      if (eventUsage) event.usage = eventUsage;
+      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
+        const current = session.messages[activeAssistantIndex];
+        const now = new Date();
+        current.content = event.assistantMessage?.content ?? event.text ?? current.content;
+        if (typeof event.assistantMessage?.reasoning_content === 'string' && event.assistantMessage.reasoning_content) {
+          current.reasoning_content = event.assistantMessage.reasoning_content;
+        }
         if (Array.isArray(event.assistantMessage?.reasoning_details) && event.assistantMessage.reasoning_details.length > 0) {
           current.reasoning_details = event.assistantMessage.reasoning_details;
         }
-        if (Array.isArray(event.assistantMessage?.tool_calls) && event.assistantMessage.tool_calls.length > 0) {
-          current.tool_calls = event.assistantMessage.tool_calls;
-        }
-        if (eventUsage) {
-          current.usage = mergeModelUsage(current.usage, eventUsage);
-        }
-        if ((current.reasoning_content || current.reasoning_details) && current.reasoning_started_at) {
-          current.reasoning_ended_at = current.reasoning_ended_at || now.toISOString();
-          current.reasoning_duration_ms = Math.max(
-            Number(current.reasoning_duration_ms || 0),
-            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
-          );
-        }
-        current.at = now.toISOString();
-        if (persistSession) scheduleSessionSave();
-      } else {
-        const assistantMessage = event.assistantMessage && typeof event.assistantMessage === 'object'
+        if (Array.isArray(event.assistantMessage?.tool_calls) && event.assistantMessage.tool_calls.length > 0) {
+          current.tool_calls = event.assistantMessage.tool_calls;
+        }
+        if (eventUsage) {
+          current.usage = mergeModelUsage(current.usage, eventUsage);
+        }
+        if ((current.reasoning_content || current.reasoning_details) && current.reasoning_started_at) {
+          current.reasoning_ended_at = current.reasoning_ended_at || now.toISOString();
+          current.reasoning_duration_ms = Math.max(
+            Number(current.reasoning_duration_ms || 0),
+            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
+          );
+        }
+        current.at = now.toISOString();
+        if (persistSession) scheduleSessionSave();
+      } else {
+        const assistantMessage = event.assistantMessage && typeof event.assistantMessage === 'object'
           ? event.assistantMessage
           : { content: event.text || '' };
         session.messages.push(stampedMessage('assistant', assistantMessage.content || event.text || '', {
@@ -3271,38 +3301,40 @@ async function askModel({
           ...(Array.isArray(assistantMessage.reasoning_details) && assistantMessage.reasoning_details.length > 0
             ? { reasoning_details: assistantMessage.reasoning_details }
             : {}),
-          ...(Array.isArray(assistantMessage.tool_calls) && assistantMessage.tool_calls.length > 0
-            ? { tool_calls: assistantMessage.tool_calls }
-            : {}),
-          ...(eventUsage ? { usage: eventUsage } : {})
-        }));
-        if (persistSession) scheduleSessionSave();
-      }
+          ...(Array.isArray(assistantMessage.tool_calls) && assistantMessage.tool_calls.length > 0
+            ? { tool_calls: assistantMessage.tool_calls }
+            : {}),
+          ...(eventUsage ? { usage: eventUsage } : {})
+        }));
+        if (persistSession) scheduleSessionSave();
+      }
       activeAssistantIndex = -1;
-    } else if (event?.type === 'tool:start') {
-      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
-        const current = session.messages[activeAssistantIndex];
-        const now = new Date();
-        if (current.reasoning_started_at && !current.reasoning_ended_at) {
-          current.reasoning_ended_at = now.toISOString();
-          current.reasoning_duration_ms = Math.max(
-            Number(current.reasoning_duration_ms || 0),
-            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
-          );
-          current.at = now.toISOString();
-          if (persistSession) scheduleSessionSave();
-        }
-      }
-    } else if (event?.type === 'tool:end' || event?.type === 'tool:error' || event?.type === 'tool:blocked') {
+    } else if (event?.type === 'tool:start') {
+      if (activeAssistantIndex >= 0 && session.messages[activeAssistantIndex]) {
+        const current = session.messages[activeAssistantIndex];
+        const now = new Date();
+        if (current.reasoning_started_at && !current.reasoning_ended_at) {
+          current.reasoning_ended_at = now.toISOString();
+          current.reasoning_duration_ms = Math.max(
+            Number(current.reasoning_duration_ms || 0),
+            Date.parse(current.reasoning_ended_at) - Date.parse(current.reasoning_started_at)
+          );
+          current.at = now.toISOString();
+          if (persistSession) scheduleSessionSave();
+        }
+      }
+    } else if (event?.type === 'tool:end' || event?.type === 'tool:error' || event?.type === 'tool:blocked') {
       const toolId = String(event.id || '');
       if (toolId) {
         const meta = {
           durationMs: Number.isFinite(Number(event.durationMs)) ? Number(event.durationMs) : undefined,
           summary: typeof event.summary === 'string' ? event.summary : '',
+          resultMeta: event.resultMeta && typeof event.resultMeta === 'object' ? event.resultMeta : null,
           fileChange: normalizeFileChange(event.fileChange),
+          fileChanges: normalizeFileChanges(event.fileChanges),
           status:
-            event.type === 'tool:error'
-              ? 'error'
+            event.type === 'tool:error'
+              ? 'error'
               : event.type === 'tool:blocked'
                 ? 'blocked'
                 : 'done'
@@ -3319,9 +3351,11 @@ async function askModel({
           ...(Number.isFinite(Number(meta.durationMs)) ? { tool_duration_ms: Number(meta.durationMs) } : {}),
           ...(meta.summary ? { tool_summary: meta.summary } : {}),
           ...(meta.status ? { tool_status: meta.status } : {}),
-          ...(meta.fileChange ? { tool_file_change: meta.fileChange } : {})
+          ...(meta.resultMeta ? { tool_result_meta: meta.resultMeta } : {}),
+          ...(meta.fileChange ? { tool_file_change: meta.fileChange } : {}),
+          ...(Array.isArray(meta.fileChanges) && meta.fileChanges.length ? { tool_file_changes: meta.fileChanges } : {})
         })
-      );
+      );
       pendingToolMeta.delete(toolId);
       if (persistSession) scheduleSessionSave();
     }
@@ -3341,17 +3375,25 @@ async function askModel({
     toolHandlers: filteredHandlers,
     initialMessages: toOpenAIMessages(compacted ?? session.messages),
     onEvent: wrappedAgentEvent,
-    executionMode: executionMode || config.execution?.mode || 'normal',
-    alwaysAllowTools:
+    executionMode: executionMode || config.execution?.mode || 'normal',
+    approvalMode: config.execution?.approval_mode || 'review',
+    projectIsGit: Boolean(projectIsGit || changeTracker?.enabled),
+    alwaysAllowTools:
       alwaysAllowTools || config.execution?.always_allow_tools || ['run', 'read', 'write'],
     toolResultMaxChars: config.context?.tool_result_max_chars || 12000,
     toolFormatters: formatters,
     deferredDefinitions: filteredDeferred,
     requestToolApproval,
-    signal,
-    skipAnalysisNudge,
-    config,
-    requestCompletion: async ({ messages, tools, model: selectedModel }) => {
+    signal,
+    skipAnalysisNudge,
+    config,
+    changeTracker: changeTracker?.enabled
+      ? {
+          begin: (meta) => beginGitOplogCapture(changeTracker, meta),
+          capture: (scope, meta) => captureGitOplogChanges(changeTracker, scope, meta)
+        }
+      : null,
+    requestCompletion: async ({ messages, tools, model: selectedModel }) => {
       let started = false;
       const startAssistantStream = () => {
         if (!started) {
@@ -3370,15 +3412,15 @@ async function askModel({
         timeoutMs: config.gateway.timeout_ms || 1800000,
         maxRetries: config.gateway.max_retries ?? 2,
         signal,
-        onTextDelta: (delta) => {
-          startAssistantStream();
-          wrappedAgentEvent({ type: 'assistant:delta', text: delta });
-        },
-        onReasoningDelta: (delta) => {
-          startAssistantStream();
-          wrappedAgentEvent({ type: 'assistant:reasoning_delta', text: delta });
-        },
-        onToolCallDelta: (toolCall) => {
+        onTextDelta: (delta) => {
+          startAssistantStream();
+          wrappedAgentEvent({ type: 'assistant:delta', text: delta });
+        },
+        onReasoningDelta: (delta) => {
+          startAssistantStream();
+          wrappedAgentEvent({ type: 'assistant:reasoning_delta', text: delta });
+        },
+        onToolCallDelta: (toolCall) => {
           startAssistantStream();
           wrappedAgentEvent({ type: 'assistant:tool_call_delta', toolCall });
         }
@@ -3505,7 +3547,7 @@ async function runSubAgentTask({
     }
     if (
       role !== 'summarizer' &&
-      ['assistant:start', 'assistant:delta', 'assistant:reasoning_delta', 'assistant:response', 'assistant:tool_call_delta'].includes(String(evt?.type || ''))
+      ['assistant:start', 'assistant:delta', 'assistant:reasoning_delta', 'assistant:response', 'assistant:tool_call_delta'].includes(String(evt?.type || ''))
     ) {
       return;
     }
@@ -3528,7 +3570,7 @@ async function runSubAgentTask({
     systemPrompt: subSystemPrompt,
     onAgentEvent: wrappedOnAgentEvent,
     persistSession: false,
-    executionMode: 'auto',
+    executionMode: 'normal',
     allowedTools: roleAllowedTools,
     skipAnalysisNudge: true,
     signal
@@ -3545,18 +3587,18 @@ async function runSubAgentTask({
   };
 }
 
-function buildPlanStepTranscript({ stepRecord, stepIndex, totalSteps, messages }) {
-  const toolCardsById = new Map();
-  const toolCards = [];
-  const source = Array.isArray(messages) ? messages : [];
-  let usage = null;
-
-  for (const msg of source) {
-    if (msg?.role === 'assistant' && msg.usage) {
-      usage = mergeModelUsage(usage, msg.usage);
-    }
-    if (msg?.role === 'assistant' && Array.isArray(msg.tool_calls)) {
-      for (const tc of msg.tool_calls) {
+function buildPlanStepTranscript({ stepRecord, stepIndex, totalSteps, messages }) {
+  const toolCardsById = new Map();
+  const toolCards = [];
+  const source = Array.isArray(messages) ? messages : [];
+  let usage = null;
+
+  for (const msg of source) {
+    if (msg?.role === 'assistant' && msg.usage) {
+      usage = mergeModelUsage(usage, msg.usage);
+    }
+    if (msg?.role === 'assistant' && Array.isArray(msg.tool_calls)) {
+      for (const tc of msg.tool_calls) {
         const id = String(tc?.id || `tool-${toolCards.length + 1}`);
         if (toolCardsById.has(id)) continue;
         const card = {
@@ -3595,12 +3637,12 @@ function buildPlanStepTranscript({ stepRecord, stepIndex, totalSteps, messages }
     total: totalSteps,
     role: stepRecord.role || 'general',
     title: stepRecord.title || '',
-    status: stepRecord.failed ? 'failed' : 'done',
-    summary: stepRecord.failed ? stepRecord.failureReason : trimInline(stepRecord.output || '', 160),
-    segments,
-    ...(usage ? { usage } : {})
-  };
-}
+    status: stepRecord.failed ? 'failed' : 'done',
+    summary: stepRecord.failed ? stepRecord.failureReason : trimInline(stepRecord.output || '', 160),
+    segments,
+    ...(usage ? { usage } : {})
+  };
+}
 
 async function executePlanWithSubAgents({
   planState,
@@ -4013,13 +4055,13 @@ function renderProjectRequirementsSectionContract(ignoredSections = []) {
   return lines.join('\n');
 }
 
-function buildProjectRequirementsSteps(renderedSkillPrompt, args = [], config = {}, reportSlug = formatLocalDateTimeSlug()) {
-  const options = parseProjectRequirementsOptions(args);
-  const userArgs = options.raw;
-  const requestedFocus = userArgs ? `User request/focus: ${userArgs}` : 'User request/focus: full workspace requirements report.';
-  const replyLanguageName = getReplyLanguageName(config);
-  const reportPath = `docs/requirements/${reportSlug}-project-requirements.html`;
-  const companionPath = `docs/requirements/${reportSlug}-project-requirements.md`;
+function buildProjectRequirementsSteps(renderedSkillPrompt, args = [], config = {}, reportSlug = formatLocalDateTimeSlug()) {
+  const options = parseProjectRequirementsOptions(args);
+  const userArgs = options.raw;
+  const requestedFocus = userArgs ? `User request/focus: ${userArgs}` : 'User request/focus: full workspace requirements report.';
+  const replyLanguageName = getReplyLanguageName(config);
+  const reportPath = `docs/requirements/${reportSlug}-project-requirements.html`;
+  const companionPath = `docs/requirements/${reportSlug}-project-requirements.md`;
   const reportContract = [
     requestedFocus,
     `Reply language: write generated report prose, UI labels inserted into the report, review notes, and final user-facing status in ${replyLanguageName} unless the user explicitly requested a different language. Do not translate REQUIREMENTS_* marker names or source code identifiers.`,
@@ -4341,11 +4383,11 @@ async function runProjectRequirementsPipeline({
   const options = parseProjectRequirementsOptions(parsedInput.args);
   const userFocus = options.raw;
   const goal = userFocus ? `project requirements report: ${userFocus}` : 'project requirements report';
-  const reportSlug = formatLocalDateTimeSlug();
-  const reportPath = `docs/requirements/${reportSlug}-project-requirements.html`;
-  const companionPath = `docs/requirements/${reportSlug}-project-requirements.md`;
-  const manifestPath = `docs/requirements/${reportSlug}-project-requirements.manifest.json`;
-  const steps = buildProjectRequirementsSteps(renderedSkillPrompt, parsedInput.args, config, reportSlug);
+  const reportSlug = formatLocalDateTimeSlug();
+  const reportPath = `docs/requirements/${reportSlug}-project-requirements.html`;
+  const companionPath = `docs/requirements/${reportSlug}-project-requirements.md`;
+  const manifestPath = `docs/requirements/${reportSlug}-project-requirements.manifest.json`;
+  const steps = buildProjectRequirementsSteps(renderedSkillPrompt, parsedInput.args, config, reportSlug);
   const planFile = await writeMarkdownInProjectDir(
     'plans',
     'project-requirements-pipeline',
@@ -4655,10 +4697,10 @@ export async function createChatRuntime({
     currentSession.model = model;
   }
   const baseSystemPrompt = systemPrompt;
-  let executionMode = config.execution?.mode || 'normal';
-  if (hasPendingPlanApproval(currentSession)) {
-    executionMode = 'plan';
-  }
+  let executionMode = config.execution?.mode === 'auto' ? 'normal' : (config.execution?.mode || 'normal');
+  if (hasPendingPlanApproval(currentSession)) {
+    executionMode = 'plan';
+  }
   let compactState = null;
   const normalizeCompactThreshold = (value, fallback = 60) => {
     const num = Number(value);
@@ -4670,10 +4712,10 @@ export async function createChatRuntime({
     compactState.threshold = normalizeCompactThreshold(config.context?.preflight_trigger_pct, 60);
   };
   const syncRuntimeFromConfig = async ({ model: nextModel } = {}) => {
-    const configuredMode = String(config.execution?.mode || 'normal');
-    executionMode = hasPendingPlanApproval(currentSession)
-      ? 'plan'
-      : (['normal', 'auto', 'plan'].includes(configuredMode) ? configuredMode : 'normal');
+    const configuredMode = String(config.execution?.mode || 'normal');
+    executionMode = hasPendingPlanApproval(currentSession)
+      ? 'plan'
+      : (['normal', 'plan'].includes(configuredMode) ? configuredMode : 'normal');
     syncCompactStateFromConfig();
 
     const resolvedModel = String(nextModel || '').trim();
@@ -4686,15 +4728,29 @@ export async function createChatRuntime({
     }
   };
   const commands = await loadCommandsAndSkills();
-  const reloadCommandsAndSkills = async () => {
-    const next = await loadCommandsAndSkills();
-    commands.clear();
-    for (const [name, command] of next.entries()) {
-      commands.set(name, command);
-    }
-  };
-
-  // Set up tool result store under session directory
+  const reloadCommandsAndSkills = async () => {
+    const next = await loadCommandsAndSkills();
+    commands.clear();
+    for (const [name, command] of next.entries()) {
+      commands.set(name, command);
+    }
+  };
+  let changeTracker = await createGitOplogChangeTracker({
+    workspaceRoot: process.cwd(),
+    sessionId: currentSession.id
+  });
+  let backupManager = changeTracker?.enabled
+    ? null
+    : await createNonGitBackupManager({
+        workspaceRoot: process.cwd(),
+        sessionId: currentSession.id
+      }).catch(() => null);
+  config.runtime = {
+    ...(config.runtime || {}),
+    project_is_git: Boolean(changeTracker?.enabled)
+  };
+
+  // Set up tool result store under session directory
   const sessionResultsDir = path.join(getSessionsDir(), String(currentSession.id));
   setResultDir(sessionResultsDir);
   compactState = {
@@ -4762,7 +4818,8 @@ export async function createChatRuntime({
     'model.fast_name',
     'ui.language',
     'ui.reply_language',
-    'execution.mode',
+    'execution.mode',
+    'execution.approval_mode',
     'shell.default',
     'sdk.provider',
     'gateway.timeout_ms',
@@ -4798,9 +4855,10 @@ export async function createChatRuntime({
     '/memory',
     '/capture',
     '/inbox',
-    '/dream',
-    '/mode',
-    '/plan',
+    '/dream',
+    '/mode',
+    '/approval',
+    '/plan',
     '/history',
     '/checkpoint',
     '/agents',
@@ -4819,7 +4877,8 @@ export async function createChatRuntime({
       { name: 'commands', description: completionCopy.commands.commands },
       { name: 'status', description: completionCopy.commands.status },
       { name: 'model', description: completionCopy.commands.model },
-      { name: 'mode', description: completionCopy.commands.mode },
+      { name: 'mode', description: completionCopy.commands.mode },
+      { name: 'approval', description: completionCopy.commands.approval },
       { name: 'compact', description: completionCopy.commands.compact },
       { name: 'checkpoint', description: completionCopy.commands.checkpoint },
       { name: 'spec', description: completionCopy.commands.spec },
@@ -4869,7 +4928,8 @@ export async function createChatRuntime({
 
   const historyTemplates = ['/history list', '/history current', '/history resume <session_id>'];
   const memoryTemplates = ['/memory list <scope>', '/memory search <scope> <query>', '/memory forget <scope> <id>'];
-  const modeTemplates = ['/mode normal', '/mode auto', '/mode plan'];
+  const modeTemplates = ['/mode normal', '/mode plan'];
+  const approvalTemplates = ['/approval review', '/approval auto', '/approval full_access'];
   const modelTemplates = ['/model current', '/model main', '/model fast', '/model set <name>'];
   const checkpointTemplates = [
     '/checkpoint create <name>',
@@ -4888,7 +4948,8 @@ export async function createChatRuntime({
     ...configTemplates,
     ...memoryTemplates,
     ...historyTemplates,
-    ...modeTemplates,
+    ...modeTemplates,
+    ...approvalTemplates,
     ...modelTemplates,
     ...checkpointTemplates,
     ...specTemplates,
@@ -4936,7 +4997,8 @@ export async function createChatRuntime({
       'config',
       'memory',
       'compact',
-      'mode',
+      'mode',
+      'approval',
       'model',
       'checkpoint',
       'plan',
@@ -4956,7 +5018,8 @@ export async function createChatRuntime({
     }
     for (const template of memoryTemplates) registerSuggestion(template, completionCopy.generic.memoryCommand);
     for (const template of historyTemplates) registerSuggestion(template, completionCopy.generic.historyCommand);
-    for (const template of modeTemplates) registerSuggestion(template, completionCopy.generic.modeCommand);
+    for (const template of modeTemplates) registerSuggestion(template, completionCopy.generic.modeCommand);
+    for (const template of approvalTemplates) registerSuggestion(template, completionCopy.generic.approvalCommand);
     for (const template of modelTemplates) registerSuggestion(template, completionCopy.generic.modelCommand || completionCopy.commands.model);
     for (const template of checkpointTemplates) registerSuggestion(template, completionCopy.generic.checkpointCommand);
     for (const template of specTemplates) registerSuggestion(template, completionCopy.generic.specCommand);
@@ -5061,15 +5124,24 @@ export async function createChatRuntime({
       }
       return materializeSuggestions(modelTemplates);
     }
-    if (commandPart === 'mode') {
-      if (tokens.length === 1 || (tokens.length === 2 && !hasTrailingSpace)) {
-        const sub = tokens[1] || '';
-        return ['normal', 'auto', 'plan']
-          .filter((m) => m.startsWith(sub))
-          .map((m) => registerSuggestion(`/mode ${m}`, completionCopy.generic.modeCommand));
-      }
-      return materializeSuggestions(modeTemplates);
-    }
+    if (commandPart === 'mode') {
+      if (tokens.length === 1 || (tokens.length === 2 && !hasTrailingSpace)) {
+        const sub = tokens[1] || '';
+        return ['normal', 'plan']
+          .filter((m) => m.startsWith(sub))
+          .map((m) => registerSuggestion(`/mode ${m}`, completionCopy.generic.modeCommand));
+      }
+      return materializeSuggestions(modeTemplates);
+    }
+    if (commandPart === 'approval') {
+      if (tokens.length === 1 || (tokens.length === 2 && !hasTrailingSpace)) {
+        const sub = tokens[1] || '';
+        return ['review', 'auto', 'full_access']
+          .filter((m) => m.startsWith(sub))
+          .map((m) => registerSuggestion(`/approval ${m}`, completionCopy.generic.approvalCommand));
+      }
+      return materializeSuggestions(approvalTemplates);
+    }
     if (commandPart === 'checkpoint') {
       if (tokens.length <= 2 && !hasTrailingSpace) {
         const sub = tokens[1] || '';
@@ -5384,10 +5456,10 @@ export async function createChatRuntime({
     // 每次提交创建新的 AbortController，替代旧的
     activeAbortController = new AbortController();
     const { signal } = activeAbortController;
-    const activeReplySystemPrompt = await buildActiveSystemPrompt();
-    const parsedInput = parseInput(line);
-    const readOnlyCodeWiki = options?.readOnlyCodeWiki === true;
-    const codeWikiGenerate = options?.codeWikiGenerate === true;
+    const activeReplySystemPrompt = await buildActiveSystemPrompt();
+    const parsedInput = parseInput(line);
+    const readOnlyCodeWiki = options?.readOnlyCodeWiki === true;
+    const codeWikiGenerate = options?.codeWikiGenerate === true;
     const maybeAutoDreamFromRuntime = async () => {
       const threshold = Number(config?.memory?.auto_dream_threshold ?? 10);
       if (!(threshold > 0)) return null;
@@ -5421,7 +5493,7 @@ export async function createChatRuntime({
       }
     };
     try {
-      if (!readOnlyCodeWiki && !codeWikiGenerate && shouldPersistInputHistory(parsedInput)) {
+      if (!readOnlyCodeWiki && !codeWikiGenerate && shouldPersistInputHistory(parsedInput)) {
         await appendInputHistory(line);
       }
     } catch {
@@ -5449,7 +5521,7 @@ export async function createChatRuntime({
         systemPrompt: readOnlySystemPrompt,
         onAgentEvent,
         requestToolApproval: activeRequestToolApproval,
-        executionMode: 'auto',
+        executionMode: 'normal',
         alwaysAllowTools: CODEWIKI_READ_ONLY_TOOLS,
         allowedTools: CODEWIKI_READ_ONLY_TOOLS,
         persistSession: false,
@@ -5488,13 +5560,13 @@ export async function createChatRuntime({
           text: 'Commands: /help /exit /new /stop /commands /status /model /mode /compact /checkpoint /spec /plan /yes /no /edit /reject /agents /config /memory /capture /inbox /dream /reflect /history /debug /retry /<custom> !<shell>'
         };
       }
-      if (parsedInput.command === 'status') {
-        const todoCount = countActiveTodos(currentSession.todos);
-        return {
-          type: 'system',
-          text: `mode=${executionMode} | role=general | model=${model || config.model.name} | max_ctx=${effectiveMaxContextTokens(config)} | session=${currentSession.id} | todos=${todoCount}`
-        };
-      }
+      if (parsedInput.command === 'status') {
+        const todoCount = countActiveTodos(currentSession.todos);
+        return {
+          type: 'system',
+          text: `mode=${executionMode} | approval=${config.execution?.approval_mode || 'review'} | role=general | model=${model || config.model.name} | max_ctx=${effectiveMaxContextTokens(config)} | session=${currentSession.id} | todos=${todoCount}`
+        };
+      }
       if (parsedInput.command === 'model') {
         const sub = String(parsedInput.args[0] || 'current').trim().toLowerCase();
         const mainModel = resolveDefaultModel(config);
@@ -5520,21 +5592,36 @@ export async function createChatRuntime({
         await saveSession(currentSession);
         return { type: 'system', text: `Model switched to: ${model}` };
       }
-      if (parsedInput.command === 'mode') {
-        const next = (parsedInput.args[0] || '').trim().toLowerCase();
-        if (!next) {
-          return { type: 'system', text: `Current mode: ${executionMode} (available: normal|auto|plan)` };
-        }
-        if (!['normal', 'auto', 'plan'].includes(next)) {
-          return { type: 'system', text: 'Usage: /mode <normal|auto|plan>' };
-        }
-        executionMode = next;
-        await setConfigValue('execution.mode', next);
-        config = await loadConfig();
-        const text = `Execution mode set to: ${next}`;
-        await persistLocalExchange(line, text);
-        return { type: 'system', text };
-      }
+      if (parsedInput.command === 'mode') {
+        const next = (parsedInput.args[0] || '').trim().toLowerCase();
+        if (!next) {
+          return { type: 'system', text: `Current work mode: ${executionMode} (available: normal|plan)` };
+        }
+        if (!['normal', 'plan'].includes(next)) {
+          return { type: 'system', text: 'Usage: /mode <normal|plan>' };
+        }
+        executionMode = next;
+        await setConfigValue('execution.mode', next);
+        config = await loadConfig();
+        const text = `Work mode set to: ${next}`;
+        await persistLocalExchange(line, text);
+        return { type: 'system', text };
+      }
+      if (parsedInput.command === 'approval') {
+        const raw = (parsedInput.args[0] || '').trim().toLowerCase().replace(/-/g, '_');
+        const next = raw === 'full' ? 'full_access' : raw;
+        if (!next) {
+          return { type: 'system', text: `Current approval mode: ${config.execution?.approval_mode || 'review'} (available: review|auto|full_access)` };
+        }
+        if (!['review', 'auto', 'full_access'].includes(next)) {
+          return { type: 'system', text: 'Usage: /approval <review|auto|full_access>' };
+        }
+        await setConfigValue('execution.approval_mode', next);
+        config = await loadConfig();
+        const text = `Approval mode set to: ${next}`;
+        await persistLocalExchange(line, text);
+        return { type: 'system', text };
+      }
       if (parsedInput.command === 'yes') {
         if (hasPendingReflectSkill(currentSession)) {
           const state = { ...currentSession.planState };
@@ -5551,7 +5638,7 @@ export async function createChatRuntime({
             workspaceRoot: process.cwd()
           });
           currentSession.planState = null;
-          executionMode = 'auto';
+          executionMode = 'normal';
           if (onAgentEvent) onAgentEvent({ type: 'reflect:approval_cleared' });
           await reloadCommandsAndSkills();
           const text = `Reflect skill written and loaded: /${written.draft.name}\nPath: ${written.filePath}`;
@@ -5577,7 +5664,7 @@ export async function createChatRuntime({
         currentSession.planState = null;
         if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
         await removePlanFileIfPresent(planState);
-        executionMode = 'auto';
+        executionMode = 'normal';
         await persistAssistantExchange(line, result.sessionText || result.text || '', {
           includeUser: false,
           extra: Array.isArray(result.transcript) ? { plan_transcript: result.transcript } : {}
@@ -5652,7 +5739,7 @@ export async function createChatRuntime({
       if (parsedInput.command === 'no') {
         if (hasPendingReflectSkill(currentSession)) {
           currentSession.planState = null;
-          executionMode = 'auto';
+          executionMode = 'normal';
           if (onAgentEvent) onAgentEvent({ type: 'reflect:approval_cleared' });
           const text = 'Reflect skill draft discarded.';
           await persistLocalExchange(line, text, { includeUser: false });
@@ -5661,7 +5748,7 @@ export async function createChatRuntime({
         if (hasPendingPlanApproval(currentSession)) {
           currentSession.planState = null;
           if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
-          executionMode = 'auto';
+          executionMode = 'normal';
           const text = 'Pending plan rejected and cleared.';
           await persistLocalExchange(line, text, { includeUser: false });
           return { type: 'system', text };
@@ -5676,7 +5763,7 @@ export async function createChatRuntime({
         currentSession.planState = null;
         if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
         await removePlanFileIfPresent(planState);
-        executionMode = 'auto';
+        executionMode = 'normal';
         const text = 'Pending plan rejected and cleared.';
         await persistLocalExchange(line, text);
         return { type: 'system', text };
@@ -5826,7 +5913,7 @@ export async function createChatRuntime({
           currentSession.planState = null;
           if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
           await removePlanFileIfPresent(planState);
-          executionMode = 'auto';
+          executionMode = 'normal';
           await persistAssistantExchange(line, result.sessionText || result.text || '', {
             includeUser: false,
             extra: Array.isArray(result.transcript) ? { plan_transcript: result.transcript } : {}
@@ -6273,14 +6360,14 @@ export async function createChatRuntime({
         return { type: 'system', text: rows.join('\n') };
       }
 
-      let custom = commands.get(parsedInput.command);
-      if (!custom) {
-        await reloadCommandsAndSkills();
-        custom = commands.get(parsedInput.command);
-        if (!custom) {
-          return { type: 'system', text: `Unknown slash command: /${parsedInput.command}` };
-        }
-      }
+      let custom = commands.get(parsedInput.command);
+      if (!custom) {
+        await reloadCommandsAndSkills();
+        custom = commands.get(parsedInput.command);
+        if (!custom) {
+          return { type: 'system', text: `Unknown slash command: /${parsedInput.command}` };
+        }
+      }
       if (custom.metadata.type === 'skill' && !isSkillEnabled(config, custom.name, custom)) {
         return { type: 'system', text: `Skill is disabled: ${custom.name}` };
       }
@@ -6373,7 +6460,7 @@ export async function createChatRuntime({
         activeSubSession = null;
         currentSession.planState = null;
         if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
-        executionMode = 'auto';
+        executionMode = 'normal';
         await persistAssistantExchange(line, result.sessionText || result.text || '', {
           includeUser: false,
           extra: Array.isArray(result.transcript) ? { plan_transcript: result.transcript } : {}
@@ -6388,7 +6475,7 @@ export async function createChatRuntime({
       if (isRejectPlanText(parsedInput.text)) {
         currentSession.planState = null;
         if (onAgentEvent) onAgentEvent({ type: 'plan:approval_cleared' });
-        executionMode = 'auto';
+        executionMode = 'normal';
         const text = 'Pending plan rejected and cleared.';
         await persistLocalExchange(line, text);
         return { type: 'system', text };
@@ -6582,11 +6669,13 @@ export async function createChatRuntime({
       systemPrompt: routedSystemPrompt,
       onAgentEvent,
       requestToolApproval: activeRequestToolApproval,
-      executionMode,
-      signal,
-      compactedForModel,
-      onCompactedUpdate: setCompactedView
-    });
+      executionMode,
+      signal,
+      compactedForModel,
+      onCompactedUpdate: setCompactedView,
+      changeTracker,
+      backupManager
+    });
     await saveDirectMemoryPrompt(expandedText);
     await captureUserPromptForDream(expandedText);
     return { type: 'assistant', text: result.text, aborted: !!result.aborted };
@@ -6606,25 +6695,39 @@ export async function createChatRuntime({
     },
     consumeStartupEvents: () => startupEvents.splice(0, startupEvents.length),
     getInputHistory: () => loadInputHistory(),
-    getCurrentSessionId: () => currentSession.id,
-    getSessionMessages: () => currentSession.messages || [],
-    getSessionCompact: () => currentSession.compact || null,
+    getCurrentSessionId: () => currentSession.id,
+    getSessionMessages: () => currentSession.messages || [],
+    getSessionCompact: () => currentSession.compact || null,
+    getChangeSets: () => listGitOplogChanges(changeTracker),
+    getChangeSetPatch: (id) => readGitOplogPatch(changeTracker, id),
+    undoChangeSet: (id) => undoGitOplogChange(changeTracker, id),
     reloadConfig: async (options = {}) => {
       config = await loadConfig();
+      config.runtime = {
+        ...(config.runtime || {}),
+        project_is_git: Boolean(changeTracker?.enabled)
+      };
       await syncRuntimeFromConfig(options);
       return config;
+    },
+    reloadCommandsAndSkills: async () => {
+      await reloadCommandsAndSkills();
+      return true;
+    },
+    setExecutionMode: async (next) => {
+      if (!['normal', 'plan'].includes(next)) return false;
+      executionMode = next;
+      await setConfigValue('execution.mode', next);
+      config = await loadConfig();
+      return true;
     },
-    reloadCommandsAndSkills: async () => {
-      await reloadCommandsAndSkills();
+    setApprovalMode: async (next) => {
+      const normalized = String(next || '').toLowerCase().replace(/-/g, '_');
+      if (!['review', 'auto', 'full_access'].includes(normalized)) return false;
+      await setConfigValue('execution.approval_mode', normalized);
+      config = await loadConfig();
       return true;
     },
-    setExecutionMode: async (next) => {
-      if (!['normal', 'auto', 'plan'].includes(next)) return false;
-      executionMode = next;
-      await setConfigValue('execution.mode', next);
-      config = await loadConfig();
-      return true;
-    },
     setRequestToolApproval: (handler) => {
       activeRequestToolApproval = typeof handler === 'function' ? handler : null;
       return true;