codemini-cli 0.6.2 → 0.6.4

package/src/core/paths.js

@@ -1,123 +1,123 @@
-import os from 'node:os';
-import path from 'node:path';
-
-const GLOBAL_APP_DIR = 'codemini-global';
-const PROJECT_APP_DIR = '.codemini';
-const PROJECT_INDEX_DIR = '.codemini';
-
-export function getBaseConfigDir() {
-  if (process.env.CODEMINI_GLOBAL_DIR) {
-    return process.env.CODEMINI_GLOBAL_DIR;
-  }
-
-  if (process.platform === 'win32') {
-    const appData = process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
-    return path.join(appData, GLOBAL_APP_DIR);
-  }
-
-  if (process.platform === 'darwin') {
-    return path.join(os.homedir(), 'Library', 'Preferences', GLOBAL_APP_DIR);
-  }
-
-  if (process.env.XDG_CONFIG_HOME) {
-    return path.join(process.env.XDG_CONFIG_HOME, GLOBAL_APP_DIR);
-  }
-
-  return path.join(process.cwd(), '.codemini-global');
-}
-
-export function getLegacyConfigDir() {
-  return getBaseConfigDir();
-}
-
-export function getConfigFilePath() {
-  return path.join(getBaseConfigDir(), 'config.json');
-}
-
-export function getSessionsDir() {
-  return path.join(getBaseConfigDir(), 'sessions');
-}
-
-export function getSkillsDir() {
-  return path.join(getBaseConfigDir(), 'skills');
-}
-
-export function getSkillRegistryPath() {
-  return path.join(getBaseConfigDir(), 'skill-registry.json');
-}
-
-export function getCommandsDir() {
-  return path.join(getBaseConfigDir(), 'commands');
-}
-
-export function getMemoryDir() {
-  return path.join(getBaseConfigDir(), 'memory');
-}
-
-export function getInputHistoryFilePath() {
-  return path.join(getBaseConfigDir(), 'input-history.json');
-}
-
-export function getProjectWorkspaceDir(cwd = process.cwd()) {
-  return path.join(cwd, PROJECT_APP_DIR);
-}
-
-export function getProjectCommandsDir(cwd = process.cwd()) {
-  return path.join(getProjectWorkspaceDir(cwd), 'commands');
-}
-
-export function getProjectSkillsDir(cwd = process.cwd()) {
-  return path.join(getProjectWorkspaceDir(cwd), 'skills');
-}
-
-export function getProjectSpecsDir(cwd = process.cwd(), sessionId = '') {
-  return sessionId
-    ? path.join(getProjectWorkspaceDir(cwd), 'specs', String(sessionId))
-    : path.join(getProjectWorkspaceDir(cwd), 'specs');
-}
-
-export function getProjectPlansDir(cwd = process.cwd(), sessionId = '') {
-  return sessionId
-    ? path.join(getProjectWorkspaceDir(cwd), 'plans', String(sessionId))
-    : path.join(getProjectWorkspaceDir(cwd), 'plans');
-}
-
-export function getProjectCheckpointsDir(cwd = process.cwd()) {
-  return path.join(getProjectWorkspaceDir(cwd), 'checkpoints');
-}
-
-export function getProjectTasksDir(cwd = process.cwd()) {
-  return path.join(getProjectWorkspaceDir(cwd), 'tasks');
-}
-
-export function getProjectLegacyTasksFilePath(cwd = process.cwd()) {
-  return path.join(getProjectWorkspaceDir(cwd), 'tasks.json');
-}
-
-export function getProjectMapPath(cwd = process.cwd()) {
-  return path.join(cwd, PROJECT_INDEX_DIR, 'project-map.json');
-}
-
-export function getFileIndexPath(cwd = process.cwd()) {
-  return path.join(cwd, PROJECT_INDEX_DIR, 'file-index.json');
-}
-
-export function getProjectIndexDir(cwd = process.cwd()) {
-  return path.join(cwd, PROJECT_INDEX_DIR);
-}
-
-export function getProjectMemoryDir(cwd = process.cwd()) {
-  return path.join(getProjectIndexDir(cwd), 'memory');
-}
-
-export function getInboxDir() {
-  return path.join(getMemoryDir(), 'inbox');
-}
-
-export function getArchiveDir() {
-  return path.join(getMemoryDir(), 'archive');
-}
-
-export function getDreamAuditDir() {
-  return path.join(getMemoryDir(), 'audit');
-}
+import os from 'node:os';
+import path from 'node:path';
+
+const GLOBAL_APP_DIR = 'codemini-global';
+const PROJECT_APP_DIR = '.codemini';
+const PROJECT_INDEX_DIR = '.codemini';
+
+export function getBaseConfigDir() {
+  if (process.env.CODEMINI_GLOBAL_DIR) {
+    return process.env.CODEMINI_GLOBAL_DIR;
+  }
+
+  if (process.platform === 'win32') {
+    const appData = process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
+    return path.join(appData, GLOBAL_APP_DIR);
+  }
+
+  if (process.platform === 'darwin') {
+    return path.join(os.homedir(), 'Library', 'Preferences', GLOBAL_APP_DIR);
+  }
+
+  if (process.env.XDG_CONFIG_HOME) {
+    return path.join(process.env.XDG_CONFIG_HOME, GLOBAL_APP_DIR);
+  }
+
+  return path.join(process.cwd(), '.codemini-global');
+}
+
+export function getLegacyConfigDir() {
+  return getBaseConfigDir();
+}
+
+export function getConfigFilePath() {
+  return path.join(getBaseConfigDir(), 'config.json');
+}
+
+export function getSessionsDir() {
+  return path.join(getBaseConfigDir(), 'sessions');
+}
+
+export function getSkillsDir() {
+  return path.join(getBaseConfigDir(), 'skills');
+}
+
+export function getSkillRegistryPath() {
+  return path.join(getBaseConfigDir(), 'skill-registry.json');
+}
+
+export function getCommandsDir() {
+  return path.join(getBaseConfigDir(), 'commands');
+}
+
+export function getMemoryDir() {
+  return path.join(getBaseConfigDir(), 'memory');
+}
+
+export function getInputHistoryFilePath() {
+  return path.join(getBaseConfigDir(), 'input-history.json');
+}
+
+export function getProjectWorkspaceDir(cwd = process.cwd()) {
+  return path.join(cwd, PROJECT_APP_DIR);
+}
+
+export function getProjectCommandsDir(cwd = process.cwd()) {
+  return path.join(getProjectWorkspaceDir(cwd), 'commands');
+}
+
+export function getProjectSkillsDir(cwd = process.cwd()) {
+  return path.join(getProjectWorkspaceDir(cwd), 'skills');
+}
+
+export function getProjectSpecsDir(cwd = process.cwd(), sessionId = '') {
+  return sessionId
+    ? path.join(getProjectWorkspaceDir(cwd), 'specs', String(sessionId))
+    : path.join(getProjectWorkspaceDir(cwd), 'specs');
+}
+
+export function getProjectPlansDir(cwd = process.cwd(), sessionId = '') {
+  return sessionId
+    ? path.join(getProjectWorkspaceDir(cwd), 'plans', String(sessionId))
+    : path.join(getProjectWorkspaceDir(cwd), 'plans');
+}
+
+export function getProjectCheckpointsDir(cwd = process.cwd()) {
+  return path.join(getProjectWorkspaceDir(cwd), 'checkpoints');
+}
+
+export function getProjectTasksDir(cwd = process.cwd()) {
+  return path.join(getProjectWorkspaceDir(cwd), 'tasks');
+}
+
+export function getProjectLegacyTasksFilePath(cwd = process.cwd()) {
+  return path.join(getProjectWorkspaceDir(cwd), 'tasks.json');
+}
+
+export function getProjectMapPath(cwd = process.cwd()) {
+  return path.join(cwd, PROJECT_INDEX_DIR, 'project-map.json');
+}
+
+export function getFileIndexPath(cwd = process.cwd()) {
+  return path.join(cwd, PROJECT_INDEX_DIR, 'file-index.json');
+}
+
+export function getProjectIndexDir(cwd = process.cwd()) {
+  return path.join(cwd, PROJECT_INDEX_DIR);
+}
+
+export function getProjectMemoryDir(cwd = process.cwd()) {
+  return path.join(getProjectIndexDir(cwd), 'memory');
+}
+
+export function getInboxDir() {
+  return path.join(getMemoryDir(), 'inbox');
+}
+
+export function getArchiveDir() {
+  return path.join(getMemoryDir(), 'archive');
+}
+
+export function getDreamAuditDir() {
+  return path.join(getMemoryDir(), 'audit');
+}

package/src/core/session-store.js

@@ -17,7 +17,7 @@ function createSessionId() {
   return `${ts}-${rand}`;
 }
 
-function sanitizeToolCall(tc, index) {
+function sanitizeToolCall(tc, index) {
   const id = String(tc?.id || `tc-${index + 1}`);
   const fnName = String(tc?.function?.name || tc?.name || '').trim();
   const fnArgsRaw = tc?.function?.arguments ?? tc?.arguments ?? '{}';
@@ -31,58 +31,67 @@ function sanitizeToolCall(tc, index) {
       arguments: fnArgs
     }
   };
-  if (Number.isFinite(Number(tc?.durationMs))) out.durationMs = Number(tc.durationMs);
+  if (Number.isFinite(Number(tc?.durationMs))) out.durationMs = Number(tc.durationMs);
   if (typeof tc?.summary === 'string' && tc.summary.trim()) out.summary = tc.summary.trim();
   if (typeof tc?.status === 'string' && tc.status.trim()) out.status = tc.status.trim();
+  if (tc?.resultMeta && typeof tc.resultMeta === 'object' && !Array.isArray(tc.resultMeta)) {
+    out.resultMeta = { ...tc.resultMeta };
+  }
   const fileChange = sanitizeFileChange(tc?.fileChange);
   if (fileChange) out.fileChange = fileChange;
+  if (Array.isArray(tc?.fileChanges)) {
+    const fileChanges = tc.fileChanges.map(sanitizeFileChange).filter(Boolean);
+    if (fileChanges.length > 0) out.fileChanges = fileChanges;
+  }
   return out;
 }
-
-function sanitizeFileChange(change) {
-  if (!change || typeof change !== 'object') return null;
-  const filePath = String(change.path || '').trim();
-  if (!filePath) return null;
-  const action = String(change.action || '').trim();
-  return {
-    path: filePath,
-    action: action === 'create' || action === 'delete' ? action : 'edit',
+
+function sanitizeFileChange(change) {
+  if (!change || typeof change !== 'object') return null;
+  const filePath = String(change.path || '').trim();
+  if (!filePath) return null;
+  const action = String(change.action || '').trim();
+  return {
+    path: filePath,
+    action: action === 'create' || action === 'delete' ? action : 'edit',
     linesAdded: Math.max(0, Math.round(Number(change.linesAdded || 0))),
     linesRemoved: Math.max(0, Math.round(Number(change.linesRemoved || 0))),
     changedLine: Math.max(0, Math.round(Number(change.changedLine || 0))),
-    diffPreview: String(change.diffPreview || '')
+    diffPreview: String(change.diffPreview || ''),
+    changeSetId: String(change.changeSetId || ''),
+    patchRef: String(change.patchRef || '')
   };
 }
 
-function normalizeWhitespace(value) {
-  return String(value || '').replace(/\s+/g, ' ').trim();
-}
-
-function sanitizeUsage(usage) {
-  if (!usage || typeof usage !== 'object') return null;
-  const out = {};
-  const copyNumber = (from, to = from) => {
-    const value = Number(usage?.[from]);
-    if (Number.isFinite(value)) out[to] = Math.max(0, Math.round(value));
-  };
-  copyNumber('inputTokens');
-  copyNumber('outputTokens');
-  copyNumber('totalTokens');
-  copyNumber('cachedInputTokens');
-  copyNumber('cacheMissInputTokens');
-  copyNumber('cacheWriteInputTokens');
-  copyNumber('reasoningOutputTokens');
-  copyNumber('requests');
-  if (Array.isArray(usage.raw) && usage.raw.length > 0) {
-    out.raw = usage.raw.filter((item) => item && typeof item === 'object').map((item) => ({ ...item }));
-  } else if (usage.raw && typeof usage.raw === 'object') {
-    out.raw = [{ ...usage.raw }];
-  }
-  return Object.keys(out).length ? out : null;
-}
-
-function stripMarkdown(value) {
-  return normalizeWhitespace(value)
+function normalizeWhitespace(value) {
+  return String(value || '').replace(/\s+/g, ' ').trim();
+}
+
+function sanitizeUsage(usage) {
+  if (!usage || typeof usage !== 'object') return null;
+  const out = {};
+  const copyNumber = (from, to = from) => {
+    const value = Number(usage?.[from]);
+    if (Number.isFinite(value)) out[to] = Math.max(0, Math.round(value));
+  };
+  copyNumber('inputTokens');
+  copyNumber('outputTokens');
+  copyNumber('totalTokens');
+  copyNumber('cachedInputTokens');
+  copyNumber('cacheMissInputTokens');
+  copyNumber('cacheWriteInputTokens');
+  copyNumber('reasoningOutputTokens');
+  copyNumber('requests');
+  if (Array.isArray(usage.raw) && usage.raw.length > 0) {
+    out.raw = usage.raw.filter((item) => item && typeof item === 'object').map((item) => ({ ...item }));
+  } else if (usage.raw && typeof usage.raw === 'object') {
+    out.raw = [{ ...usage.raw }];
+  }
+  return Object.keys(out).length ? out : null;
+}
+
+function stripMarkdown(value) {
+  return normalizeWhitespace(value)
     .replace(/```[\s\S]*?```/g, ' ')
     .replace(/`([^`]*)`/g, '$1')
     .replace(/\[([^\]]+)\]\([^)]+\)/g, '$1')
@@ -111,56 +120,63 @@ function sanitizeMessage(msg) {
   };
 
   if (typeof msg?.model_content === 'string' && msg.model_content) out.model_content = msg.model_content;
-  if (msg?.tool_call_id) out.tool_call_id = String(msg.tool_call_id);
-  if (Number.isFinite(Number(msg?.tool_duration_ms))) out.tool_duration_ms = Number(msg.tool_duration_ms);
+  if (msg?.tool_call_id) out.tool_call_id = String(msg.tool_call_id);
+  if (Number.isFinite(Number(msg?.tool_duration_ms))) out.tool_duration_ms = Number(msg.tool_duration_ms);
   if (typeof msg?.tool_summary === 'string' && msg.tool_summary.trim()) out.tool_summary = msg.tool_summary.trim();
   if (typeof msg?.tool_status === 'string' && msg.tool_status.trim()) out.tool_status = msg.tool_status.trim();
+  if (msg?.tool_result_meta && typeof msg.tool_result_meta === 'object' && !Array.isArray(msg.tool_result_meta)) {
+    out.tool_result_meta = { ...msg.tool_result_meta };
+  }
   const toolFileChange = sanitizeFileChange(msg?.tool_file_change);
   if (toolFileChange) out.tool_file_change = toolFileChange;
-  if (typeof msg?.name === 'string' && msg.name.trim()) out.name = msg.name.trim();
-  if (typeof msg?.at === 'string' && msg.at.trim()) out.at = msg.at;
-  if (typeof msg?.reasoning_content === 'string' && msg.reasoning_content) {
-    out.reasoning_content = msg.reasoning_content;
-  }
-  if (typeof msg?.reasoning_started_at === 'string' && msg.reasoning_started_at.trim()) {
-    out.reasoning_started_at = msg.reasoning_started_at;
-  }
-  if (typeof msg?.reasoning_ended_at === 'string' && msg.reasoning_ended_at.trim()) {
-    out.reasoning_ended_at = msg.reasoning_ended_at;
-  }
-  if (Number.isFinite(Number(msg?.reasoning_duration_ms))) {
-    out.reasoning_duration_ms = Math.max(0, Math.round(Number(msg.reasoning_duration_ms)));
+  if (Array.isArray(msg?.tool_file_changes)) {
+    const toolFileChanges = msg.tool_file_changes.map(sanitizeFileChange).filter(Boolean);
+    if (toolFileChanges.length > 0) out.tool_file_changes = toolFileChanges;
   }
-  if (Array.isArray(msg?.reasoning_details) && msg.reasoning_details.length > 0) {
+  if (typeof msg?.name === 'string' && msg.name.trim()) out.name = msg.name.trim();
+  if (typeof msg?.at === 'string' && msg.at.trim()) out.at = msg.at;
+  if (typeof msg?.reasoning_content === 'string' && msg.reasoning_content) {
+    out.reasoning_content = msg.reasoning_content;
+  }
+  if (typeof msg?.reasoning_started_at === 'string' && msg.reasoning_started_at.trim()) {
+    out.reasoning_started_at = msg.reasoning_started_at;
+  }
+  if (typeof msg?.reasoning_ended_at === 'string' && msg.reasoning_ended_at.trim()) {
+    out.reasoning_ended_at = msg.reasoning_ended_at;
+  }
+  if (Number.isFinite(Number(msg?.reasoning_duration_ms))) {
+    out.reasoning_duration_ms = Math.max(0, Math.round(Number(msg.reasoning_duration_ms)));
+  }
+  if (Array.isArray(msg?.reasoning_details) && msg.reasoning_details.length > 0) {
     out.reasoning_details = msg.reasoning_details
       .filter((detail) => detail && typeof detail === 'object')
       .map((detail) => ({ ...detail }));
   }
 
-  if (Array.isArray(msg?.tool_calls)) {
-    const toolCalls = msg.tool_calls.map(sanitizeToolCall).filter(Boolean);
-    if (toolCalls.length > 0) out.tool_calls = toolCalls;
-  }
-  if (Array.isArray(msg?.file_changes)) {
-    const fileChanges = msg.file_changes.map(sanitizeFileChange).filter(Boolean);
-    if (fileChanges.length > 0) out.file_changes = fileChanges;
-  }
-  const usage = sanitizeUsage(msg?.usage);
-  if (usage) out.usage = usage;
-
-  if (Array.isArray(msg?.plan_transcript)) {
-    out.plan_transcript = msg.plan_transcript
-      .filter((entry) => entry && typeof entry === 'object')
-      .map((entry) => {
-        const { usage, ...rest } = entry;
-        const cleanUsage = sanitizeUsage(usage);
-        return {
-          ...rest,
-          ...(cleanUsage ? { usage: cleanUsage } : {}),
-          segments: Array.isArray(entry.segments) ? entry.segments : []
-        };
-      });
-  }
+  if (Array.isArray(msg?.tool_calls)) {
+    const toolCalls = msg.tool_calls.map(sanitizeToolCall).filter(Boolean);
+    if (toolCalls.length > 0) out.tool_calls = toolCalls;
+  }
+  if (Array.isArray(msg?.file_changes)) {
+    const fileChanges = msg.file_changes.map(sanitizeFileChange).filter(Boolean);
+    if (fileChanges.length > 0) out.file_changes = fileChanges;
+  }
+  const usage = sanitizeUsage(msg?.usage);
+  if (usage) out.usage = usage;
+
+  if (Array.isArray(msg?.plan_transcript)) {
+    out.plan_transcript = msg.plan_transcript
+      .filter((entry) => entry && typeof entry === 'object')
+      .map((entry) => {
+        const { usage, ...rest } = entry;
+        const cleanUsage = sanitizeUsage(usage);
+        return {
+          ...rest,
+          ...(cleanUsage ? { usage: cleanUsage } : {}),
+          segments: Array.isArray(entry.segments) ? entry.segments : []
+        };
+      });
+  }
 
   return out;
 }
@@ -319,6 +335,25 @@ async function writeSessionIndex(index) {
   await fs.rename(tempPath, filePath);
 }
 
+async function removeSessionIndexEntry(sessionId, removedFileNames = []) {
+  try {
+    const id = String(sessionId || '').trim();
+    const removed = new Set(removedFileNames.map((name) => String(name || '').trim()).filter(Boolean));
+    const index = await readSessionIndex();
+    if (!index) return false;
+    const files = Array.isArray(index.files)
+      ? index.files.filter((entry) => !removed.has(String(entry?.name || '')))
+      : [];
+    const sessions = Array.isArray(index.sessions)
+      ? index.sessions.filter((entry) => String(entry?.id || '').trim() !== id)
+      : [];
+    await writeSessionIndex({ files, sessions });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function rebuildSessionIndex(fileMeta = null) {
   const files = await listSessionFiles();
   const sessionsById = new Map();
@@ -460,37 +495,51 @@ export async function deleteSession(sessionId) {
     throw new Error('Invalid session id');
   }
 
-  const files = await listSessionFiles();
   const targets = new Set();
-  for (const file of files) {
-    const fileId = sessionIdFromFileName(path.basename(file));
-    if (fileId === id) {
-      targets.add(file);
-      continue;
-    }
-    try {
-      const parsed = file.endsWith(SESSION_JSONL_EXT) ? await loadLatestJsonlObject(file) : await tryReadJson(file);
-      if (String(parsed?.id || '').trim() === id) targets.add(file);
-    } catch {}
-  }
-
-  let removed = 0;
   const fallbackTargets = [
     sessionPathById(id, SESSION_JSONL_EXT),
     sessionPathById(id, SESSION_LEGACY_EXT)
   ];
-  for (const file of [...targets, ...fallbackTargets]) {
+  for (const file of fallbackTargets) targets.add(file);
+
+  let removed = 0;
+  const removedFileNames = [];
+  for (const file of targets) {
     try {
       await fs.unlink(file);
       removed += 1;
+      removedFileNames.push(path.basename(file));
     } catch (error) {
       if (error?.code !== 'ENOENT') throw error;
     }
   }
+
+  if (removed === 0) {
+    const files = await listSessionFiles();
+    for (const file of files) {
+      try {
+        const parsed = file.endsWith(SESSION_JSONL_EXT) ? await loadLatestJsonlObject(file) : await tryReadJson(file);
+        if (String(parsed?.id || '').trim() === id) targets.add(file);
+      } catch {}
+    }
+    for (const file of targets) {
+      try {
+        await fs.unlink(file);
+        removed += 1;
+        removedFileNames.push(path.basename(file));
+      } catch (error) {
+        if (error?.code !== 'ENOENT') throw error;
+      }
+    }
+  }
+
   if (removed > 0) {
-    try {
-      await rebuildSessionIndex();
-    } catch {}
+    const updated = await removeSessionIndexEntry(id, removedFileNames);
+    if (!updated) {
+      try {
+        await rebuildSessionIndex();
+      } catch {}
+    }
   }
   return { removed };
 }