codemini-cli 0.2.9 → 0.3.1

package/src/core/chat-runtime.js

@@ -1518,7 +1518,7 @@ async function askModel({
 
   const projectContextSnippet = await buildProjectContextSnippet(process.cwd(), text).catch(() => '');
   const effectiveSystemPrompt = projectContextSnippet
-    ? `${systemPrompt}\n\n${projectContextSnippet}\n\nUse this project context as lightweight guidance. Prefer tools for fresh verification before assuming details.`
+    ? `${systemPrompt}\n\n${projectContextSnippet}\n\nUse this project context as lightweight guidance. Query the project index before broad globs or reading many files, then use targeted reads for fresh verification.`
     : systemPrompt;
 
   const { definitions, handlers, formatters, deferredDefinitions } = getBuiltinTools({
@@ -1586,8 +1586,15 @@ async function askModel({
     toolFormatters: formatters,
     deferredDefinitions,
     requestCompletion: async ({ messages, tools, model: selectedModel }) => {
-      if (onAgentEvent) onAgentEvent({ type: 'assistant:start' });
-      return createChatCompletionStream({
+      let started = false;
+      const startAssistantStream = () => {
+        if (!started && onAgentEvent) {
+          started = true;
+          onAgentEvent({ type: 'assistant:start' });
+        }
+      };
+
+      const result = await createChatCompletionStream({
         baseUrl: config.gateway.base_url,
         apiKey: config.gateway.api_key,
         model: selectedModel,
@@ -1596,12 +1603,20 @@ async function askModel({
         timeoutMs: config.gateway.timeout_ms || 90000,
         maxRetries: config.gateway.max_retries ?? 2,
         onTextDelta: (delta) => {
+          startAssistantStream();
           if (onAgentEvent) onAgentEvent({ type: 'assistant:delta', text: delta });
         },
         onToolCallDelta: (toolCall) => {
+          startAssistantStream();
           if (onAgentEvent) onAgentEvent({ type: 'assistant:tool_call_delta', toolCall });
         }
       });
+
+      if (!started && !result?.incomplete && (result?.text || result?.toolCalls?.length)) {
+        startAssistantStream();
+      }
+
+      return result;
     }
   });
 
@@ -2297,7 +2312,6 @@ export async function createChatRuntime({
   };
 
   const submit = async (line, onAgentEvent) => {
-    const activeBaseSystemPrompt = buildSystemPromptWithReplyLanguage(baseSystemPrompt, config);
     const activeReplySystemPrompt = await buildSystemPromptWithSoul(baseSystemPrompt, config);
     try {
       await appendInputHistory(line);
@@ -2471,7 +2485,7 @@ export async function createChatRuntime({
             topic,
             config,
             model,
-            systemPrompt: activeBaseSystemPrompt
+            systemPrompt: activeReplySystemPrompt
           });
         } catch (err) {
           content = buildSpecTemplate(topic);
@@ -2498,7 +2512,7 @@ export async function createChatRuntime({
             session: currentSession,
             config,
             model,
-            systemPrompt: activeBaseSystemPrompt,
+            systemPrompt: activeReplySystemPrompt,
             onAgentEvent,
             sessionId: currentSession.id
           });
@@ -2562,7 +2576,7 @@ export async function createChatRuntime({
               specPath,
               config,
               model,
-              systemPrompt: activeBaseSystemPrompt
+              systemPrompt: activeReplySystemPrompt
             });
           } catch (err) {
             planContent = buildPlanTemplate(specTitle);
@@ -2615,7 +2629,7 @@ export async function createChatRuntime({
             parentSession: currentSession,
             config,
             model,
-            systemPrompt: activeBaseSystemPrompt,
+            systemPrompt: activeReplySystemPrompt,
             onAgentEvent
           });
           const text = `[sub-agent:${role}]\n${output.text || output}`;
@@ -2827,7 +2841,7 @@ export async function createChatRuntime({
           session: currentSession,
           config,
           model,
-          systemPrompt: activeBaseSystemPrompt,
+          systemPrompt: activeReplySystemPrompt,
           onAgentEvent,
           executionMode
         });
@@ -2909,7 +2923,7 @@ export async function createChatRuntime({
         session: currentSession,
         config,
         model,
-        systemPrompt: activeBaseSystemPrompt,
+        systemPrompt: activeReplySystemPrompt,
         onAgentEvent,
         sessionId: currentSession.id
       });

package/src/core/constants.js

@@ -0,0 +1,171 @@
+/**
+ * 项目级共享常量。
+ * 所有需要在多个模块间复用的目录集、扩展名集、语言映射等统一在此定义。
+ */
+
+// ─── 工具遍历跳过的目录（glob / list / grep 等）─────────────────────
+export const TOOL_SKIP_DIRS = new Set([
+  '.git',
+  'node_modules',
+  '.codemini',
+  '.codemini-global',
+  'dist',
+  'coverage'
+]);
+
+// ─── 项目索引跳过的目录（更宽，包含构建产物和临时目录）──────────────
+export const INDEX_SKIP_DIRS = new Set([
+  '.git',
+  'node_modules',
+  '.codemini',
+  '.codemini-project',
+  '.codemini-global',
+  'dist',
+  'coverage',
+  'sessions',
+  'tmp',
+  'temp',
+  '.cache',
+  '.turbo',
+  '.next',
+  'build',
+  'out',
+  'logs',
+  'artifacts'
+]);
+
+// ─── 文本扩展名 ──────────────────────────────────────────────────────
+export const TEXT_EXTENSIONS = new Set([
+  '.js',
+  '.jsx',
+  '.ts',
+  '.tsx',
+  '.json',
+  '.md',
+  '.mjs',
+  '.cjs',
+  '.py',
+  '.rb',
+  '.go',
+  '.rs',
+  '.java',
+  '.cs',
+  '.css',
+  '.scss',
+  '.html',
+  '.yml',
+  '.yaml',
+  '.sh',
+  '.ps1',
+  '.c',
+  '.h',
+  '.cpp',
+  '.cc',
+  '.cxx',
+  '.hpp',
+  '.hh',
+  '.bash',
+  '.php'
+]);
+
+// ─── 源码扩展名（用于项目索引）──────────────────────────────────────
+export const SOURCE_EXTENSIONS = new Set([
+  '.js', '.jsx', '.mjs', '.cjs', '.ts', '.tsx', '.py', '.go',
+  '.c', '.h', '.cpp', '.cc', '.cxx', '.hpp', '.hh',
+  '.sh', '.bash', '.java', '.rs', '.cs', '.php', '.rb'
+]);
+
+// ─── 需要写入守卫的代码扩展名 ───────────────────────────────────────
+export const CODE_WRITE_GUARD_EXTENSIONS = new Set([
+  '.js',
+  '.jsx',
+  '.ts',
+  '.tsx',
+  '.mjs',
+  '.cjs',
+  '.py',
+  '.rb',
+  '.go',
+  '.rs',
+  '.java',
+  '.cs',
+  '.css',
+  '.scss',
+  '.html',
+  '.sh',
+  '.ps1'
+]);
+
+// ─── 扩展名 -> 语言（标准化） ────────────────────────────────────────
+export const EXTENSION_LANGUAGE_MAP = {
+  '.js': 'js',
+  '.jsx': 'js',
+  '.mjs': 'js',
+  '.cjs': 'js',
+  '.ts': 'ts',
+  '.tsx': 'tsx',
+  '.py': 'python',
+  '.go': 'go',
+  '.c': 'c',
+  '.h': 'c',
+  '.cpp': 'cpp',
+  '.cc': 'cpp',
+  '.cxx': 'cpp',
+  '.hpp': 'cpp',
+  '.hh': 'cpp',
+  '.java': 'java',
+  '.rs': 'rust',
+  '.cs': 'csharp',
+  '.php': 'php',
+  '.rb': 'ruby',
+  '.sh': 'bash',
+  '.bash': 'bash'
+};
+
+// ─── 语言别名 -> 标准语言名 ──────────────────────────────────────────
+export const LANGUAGE_ALIASES = {
+  javascript: 'js',
+  js: 'js',
+  jsx: 'js',
+  typescript: 'ts',
+  ts: 'ts',
+  tsx: 'tsx',
+  python: 'python',
+  py: 'python',
+  go: 'go',
+  c: 'c',
+  cpp: 'cpp',
+  'c++': 'cpp',
+  bash: 'bash',
+  sh: 'bash',
+  shell: 'bash',
+  java: 'java',
+  rust: 'rust',
+  rs: 'rust',
+  csharp: 'csharp',
+  'c#': 'csharp',
+  cs: 'csharp',
+  php: 'php',
+  ruby: 'ruby',
+  rb: 'ruby'
+};
+
+// ─── 工具 schema 用的语言 -> 文件类型列表 ─────────────────────────────
+export const LANGUAGE_FILE_TYPES = {
+  js: ['js', 'jsx', 'mjs', 'cjs'],
+  ts: ['ts', 'tsx'],
+  py: ['py'],
+  python: ['py'],
+  md: ['md'],
+  json: ['json'],
+  css: ['css', 'scss'],
+  html: ['html'],
+  java: ['java'],
+  csharp: ['cs'],
+  cs: ['cs'],
+  go: ['go'],
+  rust: ['rs'],
+  ruby: ['rb'],
+  shell: ['sh', 'ps1'],
+  yaml: ['yml', 'yaml']
+};

package/src/core/crypto-utils.js

@@ -0,0 +1,18 @@
+/**
+ * 共享加密工具函数。
+ * 统一 sha1 / sha256 的实现，避免在各模块中重复定义。
+ */
+
+import crypto from 'node:crypto';
+
+export function sha1(input) {
+  return crypto.createHash('sha1').update(String(input || '')).digest('hex');
+}
+
+export function sha256(input) {
+  return crypto.createHash('sha256').update(String(input || '')).digest('hex');
+}
+
+export function sha256Prefixed(input) {
+  return `sha256:${sha256(input)}`;
+}

package/src/core/default-system-prompt.js

@@ -14,8 +14,8 @@ If the user mentions a project-relative path like src/app.ts, resolve it from ${
 
 1. File discovery then read
 User: compare the auth flow
-Assistant: first locate the relevant files
-Tool: glob({"pattern":"src/**/*auth*.ts"})
+Assistant: first narrow the search with the project index
+Tool: query_project_index({"query":"auth flow","path":"src","max_results":3})
 Tool: read({"file_path":"${cwd}/src/auth/service.ts"})
 
 2. Targeted search then exact text edit

package/src/core/project-index.js

@@ -1,9 +1,10 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import crypto from 'node:crypto';
 import { getFileIndexPath, getProjectIndexDir, getProjectMapPath, getProjectWorkspaceDir } from './paths.js';
+import { INDEX_SKIP_DIRS as SKIP_DIRS, SOURCE_EXTENSIONS, EXTENSION_LANGUAGE_MAP } from './constants.js';
+import { sha1 } from './crypto-utils.js';
+import { BoundedCache } from './bounded-cache.js';
 
-const SKIP_DIRS = new Set(['.git', 'node_modules', '.codemini', '.codemini-project', '.codemini-global', 'dist', 'coverage']);
 const PROJECT_MARKER_FILES = new Set([
   'package.json',
   'tsconfig.json',
@@ -19,22 +20,11 @@ const PROJECT_MARKER_FILES = new Set([
   'Makefile',
   '.gitignore'
 ]);
-const SOURCE_EXTENSIONS = new Set([
-  '.js', '.jsx', '.mjs', '.cjs', '.ts', '.tsx', '.py', '.go', '.c', '.h', '.cpp', '.cc', '.cxx', '.hpp', '.hh',
-  '.sh', '.bash', '.java', '.rs', '.cs', '.php', '.rb'
-]);
-const LANGUAGE_BY_EXT = {
-  '.js': 'js', '.jsx': 'jsx', '.mjs': 'js', '.cjs': 'js', '.ts': 'ts', '.tsx': 'tsx', '.py': 'python',
-  '.go': 'go', '.c': 'c', '.h': 'c', '.cpp': 'cpp', '.cc': 'cpp', '.cxx': 'cpp', '.hpp': 'cpp', '.hh': 'cpp',
-  '.sh': 'bash', '.bash': 'bash', '.java': 'java', '.rs': 'rust', '.cs': 'csharp', '.php': 'php', '.rb': 'ruby'
-};
 
-const initCache = new Map();
-const PROJECT_CONTEXT_MAX_FILES = 6;
+const LANGUAGE_BY_EXT = EXTENSION_LANGUAGE_MAP;
 
-function sha1(input) {
-  return crypto.createHash('sha1').update(String(input || '')).digest('hex');
-}
+const initCache = new BoundedCache({ maxSize: 32, ttlMs: 10 * 60 * 1000 });
+const PROJECT_CONTEXT_MAX_FILES = 6;
 
 function clipList(values, max = 32) {
   return [...new Set((Array.isArray(values) ? values : []).filter(Boolean))].slice(0, max);
@@ -115,9 +105,9 @@ function gitignorePatternToRegex(pattern) {
   return new RegExp(`^${regexBody}$`);
 }
 
-async function readGitignoreRules(cwd) {
+async function readIgnoreFileRules(cwd, fileName) {
   try {
-    const raw = await fs.readFile(path.join(cwd, '.gitignore'), 'utf8');
+    const raw = await fs.readFile(path.join(cwd, fileName), 'utf8');
     return raw
       .split(/\r?\n/)
       .map((line) => line.trim())
@@ -143,6 +133,18 @@ async function readGitignoreRules(cwd) {
   }
 }
 
+async function readProjectIgnoreRules(cwd) {
+  const [gitignoreRules, llmignoreRules] = await Promise.all([
+    readIgnoreFileRules(cwd, '.gitignore'),
+    readIgnoreFileRules(cwd, '.llmignore')
+  ]);
+  return {
+    gitignoreRules,
+    llmignoreRules,
+    combinedRules: [...gitignoreRules, ...llmignoreRules]
+  };
+}
+
 function matchesGitignoreRule(rule, relativePath, isDirectory) {
   if (!rule || !relativePath) return false;
   if (rule.dirOnly && !isDirectory) return false;
@@ -212,17 +214,17 @@ async function findNearestIndexedProjectRoot(startDir, workspaceRoot) {
   return null;
 }
 
-async function walkFiles(cwd, start = cwd, out = [], gitignoreRules = []) {
+async function walkFiles(cwd, start = cwd, out = [], ignoreRules = []) {
   const entries = await fs.readdir(start, { withFileTypes: true });
   for (const entry of entries) {
     const absolutePath = path.join(start, entry.name);
     const relativePath = rel(cwd, absolutePath);
     if (entry.isDirectory()) {
-      if (shouldIgnorePath(relativePath, true, gitignoreRules)) continue;
-      await walkFiles(cwd, absolutePath, out, gitignoreRules);
+      if (shouldIgnorePath(relativePath, true, ignoreRules)) continue;
+      await walkFiles(cwd, absolutePath, out, ignoreRules);
       continue;
     }
-    if (shouldIgnorePath(relativePath, false, gitignoreRules)) continue;
+    if (shouldIgnorePath(relativePath, false, ignoreRules)) continue;
     out.push(absolutePath);
   }
   return out;
@@ -298,12 +300,12 @@ async function scanProject(cwd) {
       workspaceKind,
       projectMap: null,
       fileIndex: null,
-      gitignoreRules: []
+      ignoreRules: []
     };
   }
 
-  const gitignoreRules = await readGitignoreRules(cwd);
-  const allFiles = await walkFiles(cwd, cwd, [], gitignoreRules);
+  const { gitignoreRules, llmignoreRules, combinedRules } = await readProjectIgnoreRules(cwd);
+  const allFiles = await walkFiles(cwd, cwd, [], combinedRules);
   const relativeFiles = allFiles.map((filePath) => rel(cwd, filePath));
   const sourceFiles = allFiles.filter((filePath) => SOURCE_EXTENSIONS.has(path.extname(filePath).toLowerCase()));
 
@@ -362,13 +364,14 @@ async function scanProject(cwd) {
       frameworkHints,
       directories,
       gitignoreEnabled: gitignoreRules.length > 0,
+      llmignoreEnabled: llmignoreRules.length > 0,
       updatedAt: new Date().toISOString()
     },
     fileIndex: {
       updatedAt: new Date().toISOString(),
       files
     },
-    gitignoreRules
+    ignoreRules: combinedRules
   };
 }
 
@@ -417,7 +420,7 @@ export async function refreshIndexedFile(cwd = process.cwd(), relativePath = '')
   const projectRoot = await findProjectRootFromFile(cwd, relativePath);
   if (!projectRoot) return null;
   const fileIndexPath = getFileIndexPath(projectRoot);
-  const gitignoreRules = await readGitignoreRules(projectRoot);
+  const { combinedRules } = await readProjectIgnoreRules(projectRoot);
   const absolutePath = path.join(cwd, relativePath);
   const stat = await safeStat(absolutePath);
   let action = 'updated';
@@ -426,7 +429,7 @@ export async function refreshIndexedFile(cwd = process.cwd(), relativePath = '')
   const files = Array.isArray(current.files) ? [...current.files] : [];
   const index = files.findIndex((entry) => entry.file === projectRelativePath);
 
-  if (shouldIgnorePath(projectRelativePath, Boolean(stat?.isDirectory?.()), gitignoreRules)) {
+  if (shouldIgnorePath(projectRelativePath, Boolean(stat?.isDirectory?.()), combinedRules)) {
     if (index >= 0) files.splice(index, 1);
     action = 'removed';
   } else if (!stat || !stat.isFile()) {
@@ -508,3 +511,99 @@ export async function buildProjectContextSnippet(cwd = process.cwd(), userText =
   const snippet = trimMultiline(lines.join('\n'));
   return snippet;
 }
+
+export async function queryProjectIndex(cwd = process.cwd(), args = {}) {
+  const indexedRoot = await findNearestIndexedProjectRoot(cwd, cwd);
+  if (!indexedRoot) {
+    return {
+      query: String(args?.query || '').trim(),
+      project_root: '',
+      project_map: null,
+      matches: []
+    };
+  }
+
+  const projectMap = await safeReadJson(getProjectMapPath(indexedRoot), null);
+  const fileIndex = await safeReadJson(getFileIndexPath(indexedRoot), null);
+  const query = String(args?.query || '').trim();
+  const pathPrefix = normalizeRelativePath(args?.path || args?.path_prefix || '');
+  const languageFilter = String(args?.language || '').trim().toLowerCase();
+  const maxResults = Math.max(1, Math.min(20, Number(args?.max_results || 8) || 8));
+  const files = Array.isArray(fileIndex?.files) ? fileIndex.files : [];
+  const tokens = tokenizeQuery(query);
+
+  const matches = [];
+  for (const entry of files) {
+    const relativePath = String(entry?.file || '');
+    if (!relativePath) continue;
+    if (pathPrefix && !relativePath.startsWith(pathPrefix)) continue;
+    if (languageFilter && String(entry?.language || '').toLowerCase() !== languageFilter) continue;
+
+    let score = 0;
+    const reasons = [];
+    const fileText = relativePath.toLowerCase();
+    for (const token of tokens) {
+      if (!token) continue;
+      if (fileText.includes(token)) {
+        score += 5;
+        reasons.push(`path:${token}`);
+      }
+      if ((entry.exports || []).some((value) => String(value).toLowerCase() === token)) {
+        score += 4;
+        reasons.push(`export:${token}`);
+      }
+      if ((entry.functions || []).some((value) => String(value).toLowerCase().includes(token))) {
+        score += 4;
+        reasons.push(`function:${token}`);
+      }
+      if ((entry.classes || []).some((value) => String(value).toLowerCase().includes(token))) {
+        score += 4;
+        reasons.push(`class:${token}`);
+      }
+      if ((entry.imports || []).some((value) => String(value).toLowerCase().includes(token))) {
+        score += 2;
+        reasons.push(`import:${token}`);
+      }
+    }
+
+    if (!query) {
+      if ((projectMap?.entryCandidates || []).includes(relativePath)) score += 3;
+      if ((projectMap?.importantFiles || []).includes(relativePath)) score += 2;
+      if (String(relativePath).startsWith('src/')) score += 1;
+    }
+
+    if (score <= 0 && query) continue;
+    matches.push({
+      file: relativePath,
+      language: entry.language || 'text',
+      score,
+      reasons: clipList(reasons, 8),
+      exports: clipList(entry.exports || [], 6),
+      functions: clipList(entry.functions || [], 6),
+      classes: clipList(entry.classes || [], 6),
+      imports: clipList(entry.imports || [], 6)
+    });
+  }
+
+  matches.sort((left, right) => right.score - left.score || String(left.file).localeCompare(String(right.file)));
+
+  return {
+    query,
+    project_root: indexedRoot,
+    project_map: projectMap
+      ? {
+          workspace_kind: projectMap.workspaceKind || 'project',
+          languages: clipList(projectMap.languages || [], 8),
+          package_managers: clipList(projectMap.packageManagers || [], 8),
+          important_files: clipList(projectMap.importantFiles || [], 8),
+          source_roots: clipList(projectMap.sourceRoots || [], 8),
+          test_roots: clipList(projectMap.testRoots || [], 8),
+          entry_candidates: clipList(projectMap.entryCandidates || [], 8),
+          framework_hints: clipList(projectMap.frameworkHints || [], 8),
+          gitignore_enabled: Boolean(projectMap.gitignoreEnabled),
+          llmignore_enabled: Boolean(projectMap.llmignoreEnabled)
+        }
+      : null,
+    matches: matches.slice(0, maxResults)
+  };
+}

package/src/core/provider/openai-compatible.js

@@ -145,13 +145,15 @@ function buildFinalStreamResult(text, toolCallsByIndex, usage, messages) {
       arguments: tc.arguments || '{}'
     }))
     .filter((tc) => tc.name);
+  const normalizedText = String(text || '').trim();
 
-  if (!text && toolCalls.length === 0) {
+  if (!normalizedText && toolCalls.length === 0) {
     if (hasTrailingToolContext(messages)) {
       return {
         text: '',
         toolCalls: [],
-        usage
+        usage,
+        incomplete: true
       };
     }
     throw new Error('Gateway stream returned empty assistant response');
@@ -160,7 +162,8 @@ function buildFinalStreamResult(text, toolCallsByIndex, usage, messages) {
   return {
     text,
     toolCalls,
-    usage
+    usage,
+    incomplete: false
   };
 }
 
@@ -246,8 +249,17 @@ export async function createChatCompletion({
     name: tc.function?.name,
     arguments: normalizeIncomingToolCallArguments(tc.function?.arguments)
   }));
+  const normalizedText = String(text || '').trim();
 
-  if (!text && toolCalls.length === 0) {
+  if (!normalizedText && toolCalls.length === 0) {
+    if (hasTrailingToolContext(messages)) {
+      return {
+        text: '',
+        toolCalls: [],
+        usage: data?.usage || null,
+        incomplete: true
+      };
+    }
     throw new Error('Gateway returned empty assistant response');
   }
 

package/src/core/shell-profile.js

@@ -123,6 +123,7 @@ export function getShellSystemPrompt(value) {
 # Using your tools
 
 ALWAYS prefer dedicated tools over raw shell commands:
+- Use query_project_index first for broad repository understanding. It combines project-map metadata with indexed file symbols so you can narrow candidates before reading source files
 - Use read to inspect files — NEVER use cat, head, or tail via run. read returns content directly by default; demo-style shapes like {file_path:"src/app.ts"}, {path:"src/app.ts:10-40"}, or {file_path:"src/app.ts", offset:10, limit:30} are accepted
 - Use grep to search file contents — NEVER use grep or rg via run
 - Use glob to find files by pattern — NEVER use find via run
@@ -141,6 +142,7 @@ For services: use start_service to launch, list_services/get_service_status/get_
 Some tools are loaded on demand. If a needed tool is not listed, call tool_search first to load it.
 
 Common tool call patterns:
+- Query the project index first: {query:"login auth flow", path:"src", max_results:5}
 - Read a file: {path:"src/app.ts"} or {file_path:"src/app.ts", offset:20, limit:40}
 - Read a specific range inline: {path:"src/app.ts:20-60"}
 - Search text: {pattern:"loginUser", path:"src"} or {query:"loginUser", directory:"src"}
@@ -158,6 +160,8 @@ Common tool call patterns:
 - Before substantial tool work, send a short progress update to the user about what you are about to inspect or do
 - Do not jump straight into tools without a brief user-facing note when the task is actionable
 - Search or read before editing unless the exact target is already known
+- For broad or ambiguous requests, query_project_index before large globs or reading many files
+- Do not read files one by one after a wide glob when query_project_index can narrow the candidates first
 - If a command or tool is blocked or fails, inspect the error and retry with allowed commands or tools
 - For AST-scoped edits, if edit rejects due to missing or stale ast_target, fix arguments and retry
 - Do not claim filesystem access is impossible unless search/read tools also fail

package/src/core/soul.js

@@ -51,7 +51,8 @@ export async function buildSystemPromptWithSoul(baseSystemPrompt, config = {}) {
   const guard = [
     '[Soul guard]',
     'Apply this soul to response tone only.',
-    'Response tone only: do not change plans, code, tests, file formats, or technical decisions.'
+    'Response tone only: do not change plans, code, tests, file formats, or technical decisions.',
+    'This tone directive has HIGH priority. Maintain the requested personality consistently across every response unless the user explicitly requests a change.'
   ].join('\n');
-  return `${String(promptWithReplyLanguage || '').trim()}\n\n${guard}\n\n${soulPrompt}`.trim();
+  return `${soulPrompt}\n\n${guard}\n\n${String(promptWithReplyLanguage || '').trim()}`.trim();
 }