codemini-cli 0.3.4 → 0.3.6

package/src/core/session-store.js

@@ -4,6 +4,8 @@ import { getSessionsDir } from './paths.js';
 import { normalizeTodos } from './todo-state.js';
 
 const ALLOWED_ROLES = new Set(['system', 'user', 'assistant', 'tool']);
+const SESSION_LEGACY_EXT = '.json';
+const SESSION_JSONL_EXT = '.jsonl';
 
 function createSessionId() {
   const ts = new Date().toISOString().replace(/[:.]/g, '-');
@@ -41,6 +43,14 @@ function sanitizeMessage(msg) {
   if (msg?.tool_call_id) out.tool_call_id = String(msg.tool_call_id);
   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 (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);
@@ -93,25 +103,85 @@ function sanitizeSession(session, fallbackId = '') {
   return out;
 }
 
+function sessionPathById(sessionId, ext = SESSION_JSONL_EXT) {
+  return path.join(getSessionsDir(), `${sessionId}${ext}`);
+}
+
+function sessionIdFromFileName(fileName) {
+  if (fileName.endsWith(SESSION_JSONL_EXT)) return fileName.slice(0, -SESSION_JSONL_EXT.length);
+  if (fileName.endsWith(SESSION_LEGACY_EXT)) return fileName.slice(0, -SESSION_LEGACY_EXT.length);
+  return '';
+}
+
+function summarizeParsedSession(parsed, filePath) {
+  const id = parsed.id || sessionIdFromFileName(path.basename(filePath));
+  const updatedAt = parsed.updatedAt || parsed.createdAt || '';
+  const latestMessage = Array.isArray(parsed.messages) ? parsed.messages.at(-1) : null;
+  const preview = latestMessage?.content ? String(latestMessage.content).replace(/\s+/g, ' ').slice(0, 80) : '';
+  return {
+    id,
+    updatedAt,
+    messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0,
+    preview
+  };
+}
+
+async function tryReadJson(filePath) {
+  const raw = await fs.readFile(filePath, 'utf8');
+  return JSON.parse(raw);
+}
+
+async function loadLatestJsonlObject(filePath) {
+  const raw = await fs.readFile(filePath, 'utf8');
+  const lines = String(raw || '')
+    .split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean);
+  for (let i = lines.length - 1; i >= 0; i -= 1) {
+    try {
+      return JSON.parse(lines[i]);
+    } catch {
+      continue;
+    }
+  }
+  throw new Error(`No valid JSONL record found: ${filePath}`);
+}
+
+async function loadSessionPayload(sessionId) {
+  const jsonlPath = sessionPathById(sessionId, SESSION_JSONL_EXT);
+  let jsonlError = null;
+  try {
+    return await loadLatestJsonlObject(jsonlPath);
+  } catch (error) {
+    if (error?.code !== 'ENOENT') jsonlError = error;
+  }
+  const legacyPath = sessionPathById(sessionId, SESSION_LEGACY_EXT);
+  try {
+    return await tryReadJson(legacyPath);
+  } catch (error) {
+    if (jsonlError) throw jsonlError;
+    throw error;
+  }
+}
+
 export async function createSession() {
   const sessionId = createSessionId();
   const dir = getSessionsDir();
   await fs.mkdir(dir, { recursive: true });
-  const filePath = path.join(dir, `${sessionId}.json`);
+  const filePath = sessionPathById(sessionId, SESSION_JSONL_EXT);
   const payload = {
     id: sessionId,
     createdAt: new Date().toISOString(),
     updatedAt: new Date().toISOString(),
     messages: []
   };
-  await fs.writeFile(filePath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
+  await fs.writeFile(filePath, `${JSON.stringify(payload)}\n`, 'utf8');
   return payload;
 }
 
 export async function loadSession(sessionId) {
-  const filePath = path.join(getSessionsDir(), `${sessionId}.json`);
-  const raw = await fs.readFile(filePath, 'utf8');
-  return sanitizeSession(JSON.parse(raw), sessionId);
+  const parsed = await loadSessionPayload(sessionId);
+  return sanitizeSession(parsed, sessionId);
 }
 
 export async function saveSession(session) {
@@ -119,8 +189,8 @@ export async function saveSession(session) {
   await fs.mkdir(dir, { recursive: true });
   const normalized = sanitizeSession(session);
   normalized.updatedAt = new Date().toISOString();
-  const filePath = path.join(dir, `${normalized.id}.json`);
-  await fs.writeFile(filePath, `${JSON.stringify(normalized, null, 2)}\n`, 'utf8');
+  const filePath = sessionPathById(normalized.id, SESSION_JSONL_EXT);
+  await fs.appendFile(filePath, `${JSON.stringify(normalized)}\n`, 'utf8');
 }
 
 export async function resolveSession(sessionId) {
@@ -135,31 +205,25 @@ export async function listSessions(limit = 30) {
   await fs.mkdir(dir, { recursive: true });
   const entries = await fs.readdir(dir, { withFileTypes: true });
   const files = entries
-    .filter((e) => e.isFile() && e.name.endsWith('.json'))
+    .filter((e) => e.isFile() && (e.name.endsWith(SESSION_JSONL_EXT) || e.name.endsWith(SESSION_LEGACY_EXT)))
     .map((e) => path.join(dir, e.name));
 
-  const sessions = [];
+  const sessionsById = new Map();
   for (const file of files) {
     try {
-      const raw = await fs.readFile(file, 'utf8');
-      const parsed = JSON.parse(raw);
-      const id = parsed.id || path.basename(file, '.json');
-      const updatedAt = parsed.updatedAt || parsed.createdAt || '';
-      const latestMessage = Array.isArray(parsed.messages) ? parsed.messages.at(-1) : null;
-      const preview = latestMessage?.content
-        ? String(latestMessage.content).replace(/\s+/g, ' ').slice(0, 80)
-        : '';
-      sessions.push({
-        id,
-        updatedAt,
-        messageCount: Array.isArray(parsed.messages) ? parsed.messages.length : 0,
-        preview
-      });
+      const parsed = file.endsWith(SESSION_JSONL_EXT) ? await loadLatestJsonlObject(file) : await tryReadJson(file);
+      const summary = summarizeParsedSession(parsed, file);
+      if (!summary.id) continue;
+      const existing = sessionsById.get(summary.id);
+      if (!existing || String(summary.updatedAt) > String(existing.updatedAt)) {
+        sessionsById.set(summary.id, summary);
+      }
     } catch {
       continue;
     }
   }
 
+  const sessions = Array.from(sessionsById.values());
   sessions.sort((a, b) => String(b.updatedAt).localeCompare(String(a.updatedAt)));
   return sessions.filter((s) => Number(s.messageCount || 0) > 0).slice(0, limit);
 }
@@ -187,8 +251,9 @@ export async function pruneSessions(policy = {}) {
   const entries = await fs.readdir(dir, { withFileTypes: true });
   let removed = 0;
   for (const e of entries) {
-    if (!e.isFile() || !e.name.endsWith('.json')) continue;
-    const id = path.basename(e.name, '.json');
+    if (!e.isFile()) continue;
+    const id = sessionIdFromFileName(e.name);
+    if (!id) continue;
     if (keepIds.has(id)) continue;
     try {
       await fs.unlink(path.join(dir, e.name));

package/src/core/shell-profile.js

@@ -61,6 +61,7 @@ const SHELL_PROFILES = {
     shell: 'bash',
     label: 'bash',
     command_allowlist: [
+      'cd',
       'rg',
       'find',
       'grep',
@@ -73,6 +74,22 @@ const SHELL_PROFILES = {
       'ls',
       'cat',
       'sed',
+      'head',
+      'tail',
+      'wc',
+      'test',
+      'sort',
+      'uniq',
+      'cut',
+      'tr',
+      'xargs',
+      'basename',
+      'dirname',
+      'paste',
+      'echo',
+      'sleep',
+      'true',
+      'false',
       'cp',
       'mv',
       'mkdir',
@@ -144,13 +161,14 @@ Use update_todos with these rules:
 
 Some tools are loaded on demand through tool_search. Common examples:
 - glob for pattern-based file lookup
-- ast_query and read_ast_node for AST-scoped edits
-- generate_diff and patch for explicit diff workflows
+- ast_query and read_ast_node for advanced AST-scoped reads and edits
 - list_background_tasks, get_background_task, and stop_background_task for managing long-running background commands
 - remember_user, remember_global, remember_project, list_memory, search_memory, and forget_memory for persistent memory operations
 
-For structural code edits (functions, classes, methods), load the AST tools and use the AST-first workflow:
-tool_search("ast_query") → ast_query → read_ast_node → edit with ast_target and kind=replace_block.
+For structural code edits (functions, classes, methods), prefer AST-scoped reads before editing:
+- Common one-shot workflow: read(path, query=..., capture_name=...) → edit with symbol or ast_target
+- If you already have ast_target: read(ast_target=...) → edit with ast_target
+- Advanced multi-step workflow: tool_search("ast_query") → ast_query → read_ast_node → edit with ast_target and kind=replace_block
 Fall back to plain grep/read/edit only when AST is not appropriate.
 
 For background commands: use run to launch. If you need management tools that are not currently visible, load list_background_tasks/get_background_task/stop_background_task with tool_search. Prefer reading the returned output_file with read instead of asking for a separate logs tool.
@@ -192,8 +210,10 @@ Common tool call patterns:
 
 # Tone and style
 
-- Be concise. Go straight to the point
-- Do not restate what the user said
+- Keep answers compact and easy to scan
+- Lead with the answer or next action, not scene-setting
+- Do not restate the user's request unless a brief restatement prevents ambiguity
 - When referencing code, use file_path:line_number format
+- Keep technical wording, commands, paths, and error details exact
 - Only use emojis if the user explicitly requests it`;
 }

package/src/core/string-utils.js

@@ -0,0 +1,37 @@
+/**
+ * 共享字符串/路径工具函数。
+ * 统一 trimInline、路径标准化、escapeRegex 等多处重复实现。
+ */
+
+/**
+ * 将字符串截断到指定长度，超出时添加省略号。
+ * 会先将空白折叠为单个空格再截断。
+ */
+export function trimInline(value, maxLen = 72) {
+  const s = String(value || '').replace(/\s+/g, ' ').trim();
+  if (!s) return '';
+  if (s.length <= maxLen) return s;
+  return `${s.slice(0, maxLen - 3)}...`;
+}
+
+/**
+ * 将路径中的反斜杠替换为正斜杠，并去掉开头的 "./" 前缀。
+ * 用于统一 Windows / Unix 路径格式。
+ */
+export function normalizePath(value) {
+  return String(value || '').replace(/\\/g, '/').replace(/^\.\/+/, '');
+}
+
+/**
+ * 将路径标准化为相对路径格式：反斜杠→正斜杠，去掉 "./" 和开头的 "/"。
+ */
+export function normalizeRelativePath(value) {
+  return String(value || '').replace(/\\/g, '/').replace(/^\.\/+/, '').replace(/^\/+/, '');
+}
+
+/**
+ * 转义正则表达式中的特殊字符。
+ */
+export function escapeRegex(value) {
+  return String(value || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}