codemini-cli 0.5.4 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemini-cli",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Coding CLI optimized for small-model workflows and Windows PowerShell",
   "keywords": [
     "cli",
@@ -29,7 +29,10 @@
     "test": "node --test tests/*.test.js",
     "build:web": "npm install --prefix codemini-web && npm run build --prefix codemini-web",
     "prepack": "npm run build:web",
-    "pack:offline": "npm pack"
+    "pack:offline": "npm pack",
+    "bump:patch": "npm version patch --no-git-tag-version",
+    "bump:minor": "npm version minor --no-git-tag-version",
+    "bump:major": "npm version major --no-git-tag-version"
   },
   "files": [
     "bin",
@@ -37,6 +40,7 @@
     "codemini-web/server.js",
     "codemini-web/lib",
     "codemini-web/dist",
+    "codemini-web/codemini_logo.png",
     "souls",
     "templates",
     "skills",

package/src/cli.js

@@ -4,9 +4,7 @@ import { handleConfig } from './commands/config.js';
 import { handleDoctor } from './commands/doctor.js';
 import { handleSkill } from './commands/skill.js';
 import { handleWeb } from './commands/web.js';
-import pkg from '../package.json' with { type: 'json' };
-
-const VERSION = pkg.version;
+import { VERSION } from './core/version.js';
 
 function printHelp() {
   console.log(`codemini ${VERSION}

package/src/commands/chat.js

@@ -4,7 +4,7 @@ import { loadConfig } from '../core/config-store.js';
 import { createChatRuntime } from '../core/chat-runtime.js';
 import { buildDefaultSystemPrompt } from '../core/default-system-prompt.js';
 import { resolveSession } from '../core/session-store.js';
-import pkg from '../../package.json' with { type: 'json' };
+import { VERSION } from '../core/version.js';
 
 function parseChatArgs(args) {
   const parsed = {
@@ -175,7 +175,7 @@ export async function handleChat(args) {
         language: config.ui?.language || 'zh',
         shellName: config.shell?.default || 'powershell',
         safeMode: config.policy?.safe_mode !== false,
-        version: pkg.version
+        version: VERSION
       })
     );
 

package/src/core/chat-runtime.js

@@ -21,7 +21,9 @@ import {
   compactMessagesLocally,
   estimateMessagesTokens,
   microCompactMessages,
-  parseCompactArgs
+  parseCompactArgs,
+  buildTranscriptForLLM,
+  COMPACT_SUMMARY_PROMPT
 } from './context-compact.js';
 import { getReplyLanguage, getReplyLanguageName } from './reply-language.js';
 import { composeSystemPrompt } from './system-prompt-composer.js';
@@ -64,6 +66,15 @@ function toOpenAIMessages(sessionMessages) {
   return mapped;
 }
 
+function translateCompactBoundaryToOriginal(sourceIsCompacted, compactMeta, compactBoundaryIndex) {
+  const boundary = Number(compactBoundaryIndex);
+  if (!Number.isFinite(boundary)) return undefined;
+  if (!sourceIsCompacted) return Math.max(0, boundary);
+  const previousBoundary = Number(compactMeta?.boundaryIndex);
+  if (!Number.isFinite(previousBoundary)) return Math.max(0, boundary);
+  return Math.max(0, previousBoundary + Math.max(0, boundary - 1));
+}
+
 function slugify(input) {
   const base = String(input || '')
     .toLowerCase()
@@ -2392,6 +2403,33 @@ async function generateSessionTitle({ userText, assistantText = '', config, sign
   }
 }
 
+function createCompactSummaryGenerator(config, signal) {
+  return async (olderMessages) => {
+    const latestConfig = await loadConfig().catch(() => config);
+    const effectiveConfig = latestConfig || config;
+    const fastModel = resolveFastModel(effectiveConfig);
+    if (!fastModel) throw new Error('No fast model');
+    const transcript = buildTranscriptForLLM(olderMessages);
+    const result = await createChatCompletion({
+      sdkProvider: effectiveConfig.sdk?.provider,
+      baseUrl: effectiveConfig.gateway.base_url,
+      apiKey: effectiveConfig.gateway.api_key,
+      model: fastModel,
+      messages: [
+        { role: 'system', content: COMPACT_SUMMARY_PROMPT },
+        { role: 'user', content: transcript.slice(0, 12000) }
+      ],
+      tools: [],
+      timeoutMs: Math.min(Number(effectiveConfig.gateway?.timeout_ms || 30000), 60000),
+      maxRetries: 0,
+      signal
+    });
+    const text = result?.text?.trim();
+    if (!text) throw new Error('Empty summary');
+    return text;
+  };
+}
+
 function estimatePromptTokensForRequest(sessionMessages, userText = '') {
   const tokenMsgs = [
     ...(Array.isArray(sessionMessages) ? sessionMessages : []),
@@ -2630,14 +2668,21 @@ async function askModel({
       }
     }
     if (needsMacro) {
-      const macroSource = compacted ?? compactSource;
-      const auto = compactMessagesLocally(macroSource, {
+      const sourceIsCompacted = Boolean(compacted);
+      const macroSource = compacted ?? session.messages;
+      const auto = await compactMessagesLocally(macroSource, {
         mode: preflightPct >= hardPct ? 'aggressive' : 'conservative',
-        force: true
+        force: true,
+        generateSummary: createCompactSummaryGenerator(config, signal)
       });
       if (auto.changed) {
         compacted = auto.compacted.map((m) => ({ ...m, at: new Date().toISOString() }));
-        if (onCompactedUpdate) onCompactedUpdate(compacted, { boundaryIndex: auto.boundaryIndex, mode: preflightPct >= hardPct ? 'aggressive' : 'conservative' });
+        if (onCompactedUpdate) {
+          onCompactedUpdate(compacted, {
+            boundaryIndex: translateCompactBoundaryToOriginal(sourceIsCompacted, session.compact, auto.boundaryIndex),
+            mode: preflightPct >= hardPct ? 'aggressive' : 'conservative'
+          });
+        }
         if (onAgentEvent) {
           onAgentEvent({
             type: 'compact:auto',
@@ -2699,8 +2744,13 @@ async function askModel({
     const shouldGenerateTitle = !session.messages.some((msg) => msg?.role === 'user');
     const modelExtra =
       typeof modelText === 'string' && modelText && modelText !== text ? { model_content: modelText } : {};
-    session.messages.push(stampedMessage('user', text, modelExtra));
-    if (!shouldGenerateTitle) {
+    const userMessage = stampedMessage('user', text, modelExtra);
+    session.messages.push(userMessage);
+    if (compacted) {
+      compacted.push({ ...userMessage });
+      if (onCompactedUpdate) onCompactedUpdate(compacted);
+    }
+    if (shouldReplaceSessionTitle(session.title)) {
       session.title = deriveSessionTitle(session.messages);
     }
     session.model = model || config.model.name;
@@ -2949,18 +2999,26 @@ async function askModel({
         }
       }
     }
+    session.model = model || config.model.name;
+    session.mode = executionMode || config.execution?.mode || 'normal';
+    await flushScheduledSave();
+    await saveSession(session);
+    // Generate a better title asynchronously after saving
     if (shouldReplaceSessionTitle(session.title)) {
-      session.title = await generateSessionTitle({
+      const titleSessionId = session.id;
+      generateSessionTitle({
         userText: text,
         assistantText: loopResult.text || '',
         config,
         signal
-      });
+      }).then(async (generatedTitle) => {
+        if (generatedTitle && generatedTitle !== session.title) {
+          session.title = generatedTitle;
+          await saveSession(session);
+          onTitleUpdateCallback?.(titleSessionId, generatedTitle);
+        }
+      }).catch(() => {});
     }
-    session.model = model || config.model.name;
-    session.mode = executionMode || config.execution?.mode || 'normal';
-    await flushScheduledSave();
-    await saveSession(session);
     try {
       await pruneSessions(config.sessions || {});
     } catch {
@@ -4140,6 +4198,7 @@ export async function createChatRuntime({
     session.projectDir = process.cwd();
   }
   let activeRequestToolApproval = typeof requestToolApproval === 'function' ? requestToolApproval : null;
+  let onTitleUpdateCallback = null;
   const startupEvents = [];
   const initialIndex = await initializeProjectIndex(process.cwd()).catch(() => null);
   if (initialIndex?.summary) {
@@ -4205,9 +4264,16 @@ export async function createChatRuntime({
   const setCompactedView = (view, meta = {}) => {
     compactedForModel = view;
     currentSession.compact = view
-      ? { view, timestamp: new Date().toISOString(), ...meta }
+      ? { ...(currentSession.compact || {}), view, timestamp: new Date().toISOString(), ...meta }
       : null;
   };
+  const appendSessionMessage = (message) => {
+    currentSession.messages.push(message);
+    if (compactedForModel) {
+      compactedForModel.push({ ...message });
+      setCompactedView(compactedForModel);
+    }
+  };
   let historyIdCache = [currentSession.id];
   let historySessionCache = [
     {
@@ -4682,10 +4748,10 @@ export async function createChatRuntime({
 
   const persistLocalExchange = async (userText, systemText, { includeUser = true } = {}) => {
     if (includeUser && userText) {
-      currentSession.messages.push(stampedMessage('user', userText));
+      appendSessionMessage(stampedMessage('user', userText));
     }
     if (systemText) {
-      currentSession.messages.push(stampedMessage('system', systemText));
+      appendSessionMessage(stampedMessage('system', systemText));
     }
     if (shouldReplaceSessionTitle(currentSession.title)) {
       currentSession.title = deriveSessionTitle(currentSession.messages);
@@ -4697,26 +4763,34 @@ export async function createChatRuntime({
 
   const persistAssistantExchange = async (userText, assistantText, { includeUser = true, extra = {} } = {}) => {
     if (includeUser && userText) {
-      currentSession.messages.push(stampedMessage('user', userText));
+      appendSessionMessage(stampedMessage('user', userText));
     }
     if (assistantText) {
-      currentSession.messages.push(stampedMessage('assistant', assistantText, extra));
+      appendSessionMessage(stampedMessage('assistant', assistantText, extra));
     }
+    currentSession.model = model || config.model.name;
+    currentSession.mode = executionMode || config.execution?.mode || 'normal';
+    await saveSession(currentSession);
+    // Generate a better title asynchronously after saving
     if (shouldReplaceSessionTitle(currentSession.title)) {
-      currentSession.title = await generateSessionTitle({
+      const titleSessionId = currentSession.id;
+      generateSessionTitle({
         userText,
         assistantText,
         config
-      });
+      }).then(async (generatedTitle) => {
+        if (generatedTitle && generatedTitle !== currentSession.title) {
+          currentSession.title = generatedTitle;
+          await saveSession(currentSession);
+          onTitleUpdateCallback?.(titleSessionId, generatedTitle);
+        }
+      }).catch(() => {});
     }
-    currentSession.model = model || config.model.name;
-    currentSession.mode = executionMode || config.execution?.mode || 'normal';
-    await saveSession(currentSession);
   };
 
   const persistUserExchange = async (userText) => {
     if (!userText) return;
-    currentSession.messages.push(stampedMessage('user', userText));
+    appendSessionMessage(stampedMessage('user', userText));
     if (shouldReplaceSessionTitle(currentSession.title)) {
       currentSession.title = deriveSessionTitle(currentSession.messages);
     }
@@ -5691,7 +5765,9 @@ export async function createChatRuntime({
           return { type: 'system', text: report };
         }
 
-        const result = compactMessagesLocally(compactSource, { mode: compactState.mode, force: true });
+        const sourceIsCompacted = Boolean(compactedForModel);
+        const macroSource = compactedForModel ?? currentSession.messages;
+        const result = await compactMessagesLocally(macroSource, { mode: compactState.mode, force: true, generateSummary: createCompactSummaryGenerator(config, null) });
         if (!result.changed) {
           return { type: 'system', text: 'Nothing to compact yet' };
         }
@@ -5704,7 +5780,10 @@ export async function createChatRuntime({
 
         setCompactedView(
           result.compacted.map((m) => ({ ...m, at: new Date().toISOString() })),
-          { boundaryIndex: result.boundaryIndex, mode: compactState.mode }
+          {
+            boundaryIndex: translateCompactBoundaryToOriginal(sourceIsCompacted, currentSession.compact, result.boundaryIndex),
+            mode: compactState.mode
+          }
         );
         await captureCompactSummary({
           summary: result.summary,
@@ -5923,10 +6002,12 @@ export async function createChatRuntime({
         }
         // Phase 1: macro compact if still over threshold
         if (needsMacro) {
-          const macroSource = compactedForModel ?? compactSource;
-          const autoResult = compactMessagesLocally(macroSource, {
+          const sourceIsCompacted = Boolean(compactedForModel);
+          const macroSource = compactedForModel ?? currentSession.messages;
+          const autoResult = await compactMessagesLocally(macroSource, {
             mode: compactState.mode,
-            force: true
+            force: true,
+            generateSummary: createCompactSummaryGenerator(config, null)
           });
           if (autoResult.changed) {
             setCompactedView(
@@ -5934,7 +6015,14 @@ export async function createChatRuntime({
                 ...m,
                 at: new Date().toISOString()
               })),
-              { boundaryIndex: autoResult.boundaryIndex, mode: compactState.mode }
+              {
+                boundaryIndex: translateCompactBoundaryToOriginal(
+                  sourceIsCompacted,
+                  currentSession.compact,
+                  autoResult.boundaryIndex
+                ),
+                mode: compactState.mode
+              }
             );
             await captureCompactSummary({
               summary: autoResult.summary,
@@ -6062,6 +6150,9 @@ export async function createChatRuntime({
       activeRequestToolApproval = typeof handler === 'function' ? handler : null;
       return true;
     },
+    setOnTitleUpdate: (cb) => {
+      onTitleUpdateCallback = typeof cb === 'function' ? cb : null;
+    },
     dispose: async () => {
       if (typeof disposeTools === 'function') {
         await disposeTools();

package/src/core/context-compact.js

@@ -39,6 +39,103 @@ function modeToKeepRecent(mode) {
   return 6;
 }
 
+function getToolCallId(call) {
+  return String(call?.id || '').trim();
+}
+
+function getMessageToolCallIds(message) {
+  if (!Array.isArray(message?.tool_calls)) return [];
+  return message.tool_calls.map(getToolCallId).filter(Boolean);
+}
+
+function toolResultNote(message) {
+  const text = textFromContent(message?.content);
+  let parsed;
+  try { parsed = JSON.parse(text); } catch { parsed = null; }
+  const summary = parsed && typeof parsed === 'object'
+    ? summarizeToolResult(parsed)
+    : text.replace(/\s+/g, ' ').trim();
+  const clipped = summary.length > 600 ? `${summary.slice(0, 597)}...` : summary;
+  return `[Compacted orphan tool result]\n${clipped || 'No content'}`;
+}
+
+function expandRecentStartToToolBoundary(messages, start) {
+  let adjusted = Math.max(0, Math.min(start, messages.length));
+  while (adjusted > 0 && messages[adjusted]?.role === 'tool') {
+    adjusted -= 1;
+  }
+  if (
+    adjusted > 0 &&
+    messages[adjusted]?.role !== 'assistant' &&
+    messages[adjusted + 1]?.role === 'tool'
+  ) {
+    adjusted += 1;
+  }
+  return adjusted;
+}
+
+function sanitizeRecentMessagesForModel(messages) {
+  const out = [];
+  let activeAssistantIndex = -1;
+  let expectedToolIds = new Set();
+  let matchedToolIds = new Set();
+
+  const finalizeActiveAssistant = () => {
+    if (activeAssistantIndex < 0) return;
+    const assistant = out[activeAssistantIndex];
+    if (!Array.isArray(assistant?.tool_calls)) {
+      activeAssistantIndex = -1;
+      expectedToolIds = new Set();
+      matchedToolIds = new Set();
+      return;
+    }
+    const toolCalls = assistant.tool_calls.filter((call) => matchedToolIds.has(getToolCallId(call)));
+    if (toolCalls.length > 0) {
+      out[activeAssistantIndex] = { ...assistant, tool_calls: toolCalls };
+    } else {
+      const { tool_calls, ...rest } = assistant;
+      out[activeAssistantIndex] = rest;
+    }
+    activeAssistantIndex = -1;
+    expectedToolIds = new Set();
+    matchedToolIds = new Set();
+  };
+
+  for (const message of messages) {
+    if (!message || typeof message !== 'object') continue;
+    if (message.role === 'assistant') {
+      finalizeActiveAssistant();
+      const clone = { ...message };
+      out.push(clone);
+      const ids = getMessageToolCallIds(clone);
+      if (ids.length > 0) {
+        activeAssistantIndex = out.length - 1;
+        expectedToolIds = new Set(ids);
+        matchedToolIds = new Set();
+      }
+      continue;
+    }
+
+    if (message.role === 'tool') {
+      const id = String(message.tool_call_id || '').trim();
+      if (id && expectedToolIds.has(id)) {
+        out.push({ ...message });
+        matchedToolIds.add(id);
+        continue;
+      }
+      finalizeActiveAssistant();
+      out.push({ role: 'assistant', content: toolResultNote(message), at: message.at });
+      continue;
+    }
+
+    finalizeActiveAssistant();
+    out.push({ ...message });
+  }
+
+  finalizeActiveAssistant();
+  return out;
+}
+
 function buildLocalSummary(messages) {
   const goal = [];
   const constraints = [];
@@ -103,6 +200,50 @@ function buildLocalSummary(messages) {
   return lines.join('\n').trim();
 }
 
+/**
+ * Build a conversation transcript from messages for LLM summarization input.
+ * Includes structured metadata (tool calls, file changes) alongside the text.
+ */
+export function buildTranscriptForLLM(messages) {
+  const parts = [];
+  for (const msg of messages) {
+    const text = textFromContent(msg.content).replace(/\s+/g, ' ').trim();
+    if (!text && !Array.isArray(msg.tool_calls) && msg.role !== 'user') continue;
+    if (msg.role === 'user') {
+      parts.push(`[User]\n${text.slice(0, 600)}`);
+    } else if (msg.role === 'assistant') {
+      let block = `[Assistant]\n${text.slice(0, 600)}`;
+      if (Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
+        const toolNames = msg.tool_calls.map(tc => tc.function?.name || tc.name || 'tool').join(', ');
+        block += `\n[Called tools: ${toolNames}]`;
+      }
+      parts.push(block);
+    } else if (msg.role === 'tool') {
+      let parsed;
+      try { parsed = JSON.parse(text); } catch { parsed = null; }
+      if (parsed && typeof parsed === 'object') {
+        const summary = summarizeToolResult(parsed);
+        parts.push(`[Tool Result]\n${summary.slice(0, 400)}`);
+      } else {
+        parts.push(`[Tool Result]\n${text.slice(0, 300)}`);
+      }
+    }
+  }
+  return parts.join('\n\n');
+}
+
+export const COMPACT_SUMMARY_PROMPT = `Summarize the following conversation into a structured context summary that preserves all critical information for continuing the task. Be thorough and specific.
+
+Include:
+- The user's goal and requirements
+- Key decisions made and reasoning
+- Files that were read, modified, or created (with paths)
+- Current progress and what remains
+- Any errors encountered and how they were resolved
+- Important constraints or conventions discovered
+
+Write in the same language as the conversation. Be concise but do not omit important details.`;
+
 /**
  * Micro-compact: in-place clearing of old tool result content.
  * Does NOT change message count or order — only replaces tool result text
@@ -151,7 +292,7 @@ export function microCompactMessages(messages, { keepRecent = 5, enabled = true
   return { messages: result, changed: true, tokensSaved };
 }
 
-export function compactMessagesLocally(messages, { mode = 'default', force = false } = {}) {
+export async function compactMessagesLocally(messages, { mode = 'default', force = false, generateSummary = null } = {}) {
   const keepRecent = modeToKeepRecent(mode);
   if (!Array.isArray(messages) || messages.length <= 1) {
     return {
@@ -167,12 +308,23 @@ export function compactMessagesLocally(messages, { mode = 'default', force = fal
     };
   }
 
-  const older = messages.slice(0, Math.max(0, messages.length - keepRecent));
-  const recent = messages.slice(Math.max(0, messages.length - keepRecent));
-  const summary = buildLocalSummary(older);
-  const compacted = [{ role: 'assistant', content: summary }, ...recent];
+  const recentStart = expandRecentStartToToolBoundary(messages, Math.max(0, messages.length - keepRecent));
+  const older = messages.slice(0, recentStart);
+  const recent = sanitizeRecentMessagesForModel(messages.slice(recentStart));
+
+  let summary;
+  if (typeof generateSummary === 'function') {
+    try {
+      summary = await generateSummary(older);
+    } catch {
+      summary = buildLocalSummary(older);
+    }
+  } else {
+    summary = buildLocalSummary(older);
+  }
 
-  const boundaryIndex = Math.max(0, messages.length - keepRecent);
+  const compacted = [{ role: 'assistant', content: summary }, ...recent];
+  const boundaryIndex = recentStart;
 
   return {
     compacted,

package/src/core/fff-adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { LANGUAGE_FILE_TYPES } from './constants.js';
+import { getPackageInfo } from './version.js';
 
 const DEFAULT_COMMAND = 'fff-mcp';
 const DEFAULT_TIMEOUT_MS = 15_000;
@@ -109,10 +110,7 @@ class FffMcpClient {
     await this.sendRequest('initialize', {
       protocolVersion: '2024-11-05',
       capabilities: {},
-      clientInfo: {
-        name: 'codemini-cli',
-        version: '0.5.4'
-      }
+      clientInfo: getPackageInfo()
     });
     this.sendNotification('notifications/initialized', {});
   }
@@ -383,4 +381,3 @@ export function createFffAdapter({ workspaceRoot, config }) {
     }
   };
 }
-

package/src/core/version.js

@@ -0,0 +1,11 @@
+import pkg from '../../package.json' with { type: 'json' };
+
+export const PACKAGE_NAME = pkg.name || 'codemini-cli';
+export const VERSION = pkg.version;
+
+export function getPackageInfo() {
+  return {
+    name: PACKAGE_NAME,
+    version: VERSION
+  };
+}