c0de-agent 1.9.0 → 1.11.0

package/dist/cli/index.js

@@ -1,17 +1,21 @@
 #!/usr/bin/env node
 // src/cli/index.ts — c0de CLI bin entry.
+import { mkdirSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { parseArgs } from 'node:util';
 import { loadConfig } from '../core/config.js';
 import { createDB, migrateDB } from '../db/index.js';
+import { acquireDevDbLock, releaseDevDbLock, resolveDbDir } from '../server/server.js';
 import { runAcpCommand } from './commands/acp.js';
+import { runAuthCommand } from './commands/auth.js';
 import { runChatCommand } from './commands/chat.js';
 import { runConfigCommand } from './commands/config.js';
 import { runInitCommand } from './commands/init.js';
 import { runPluginCommand } from './commands/plugin.js';
 import { runServeCommand } from './commands/serve.js';
+import { runSessionsCommand } from './commands/sessions.js';
 import { runUpdateCommand } from './commands/update.js';
 import { buildAgentDeps } from './deps.js';
+import { parseCommand } from './parser.js';
 const COMMANDS = [
     {
         name: 'chat',
@@ -20,6 +24,7 @@ const COMMANDS = [
             { name: 'model', type: 'string' },
             { name: 'format', type: 'string' },
             { name: 'yes', type: 'boolean', short: 'y' },
+            { name: 'continue', type: 'string' },
         ],
     },
     {
@@ -47,6 +52,16 @@ const COMMANDS = [
         description: 'List or enable plugins.',
         options: [],
     },
+    {
+        name: 'auth',
+        description: 'Manage authorized devices (list / revoke / reset).',
+        options: [],
+    },
+    {
+        name: 'sessions',
+        description: 'Manage CLI/web sessions (list / delete).',
+        options: [],
+    },
     {
         name: 'acp',
         description: 'Run in Agent Client Protocol mode (editor integration).',
@@ -58,6 +73,67 @@ const COMMANDS = [
         options: [{ name: 'apply', type: 'boolean' }],
     },
 ];
+/** 判别持久库错误是否为「库被其它 c0de 进程占用」的锁冲突特征（读 server.ts 确认）：
+ *  - acquireDevDbLock 对 live lock 抛出的 "Database is locked by another c0de process (PID …)"；
+ *  - PGLite 单写者 WASM 崩溃 RuntimeError "Aborted()"（serve 未持锁但占用 dataDir 时的兜底特征）。
+ *  其余错误（磁盘故障、迁移失败等）不属于锁冲突，不得误报 serve。 */
+function isDbLockConflict(err) {
+    if (!(err instanceof Error))
+        return false;
+    if (err.message.includes('Database is locked by another c0de process'))
+        return true;
+    return err.name === 'RuntimeError' && /abort/i.test(err.message);
+}
+/** 封装 agent 依赖生命周期：加载配置 → 建库迁移 → 组装 deps → 使用后关库。
+ *  chat / acp 两个命令复用同一套逻辑（此前在 dispatch 中各写一份）。
+ *  数据库优先用全局 dataDir 持久库（会话可恢复，--continue 可用）；
+ *  仅当错误是锁冲突特征（dataDir 被 serve 实例占用）时退化为内存库并 stderr 提示，
+ *  其它持久库错误如实上抛（main 统一打印 + 非零退出）；
+ *  带 --continue 时内存库不含历史会话，直接报错退出而非误导性的 session not found。 */
+async function withAgentDeps(cwd, opts, fn) {
+    const config = await loadConfig(cwd);
+    const dataDir = resolveDbDir();
+    let db;
+    let holdLock = false;
+    try {
+        mkdirSync(dataDir, { recursive: true });
+        acquireDevDbLock(dataDir);
+        holdLock = true;
+        db = await createDB({ driver: 'pglite', dataDir });
+        await migrateDB(db);
+    }
+    catch (err) {
+        if (holdLock)
+            releaseDevDbLock(dataDir);
+        holdLock = false;
+        if (!isDbLockConflict(err))
+            throw err;
+        if (opts.requirePersistent) {
+            throw new Error('c0de serve 正在运行并占用会话库。请通过 Web UI 管理会话，或停止 serve 后重试。');
+        }
+        if (opts.continueSessionId) {
+            throw new Error(`无法续聊会话 ${opts.continueSessionId}：持久库被 c0de serve 占用，内存模式无法续聊。\n` +
+                `请停止 serve 后重试，或去掉 --continue 开启新会话。`);
+        }
+        process.stderr.write('[c0de] ⚠ c0de serve 正在运行：本次对话为临时模式，消息与工具调用不会保存。\n' +
+            '       停止 serve 后重试可持久化，或直接使用浏览器界面。\n');
+        db = await createDB({ driver: 'pglite' });
+        await migrateDB(db);
+    }
+    try {
+        const deps = await buildAgentDeps(config, {
+            db,
+            cwd,
+            ...(opts.strategy ? { permissionStrategy: opts.strategy } : {}),
+        });
+        await fn(config, deps);
+    }
+    finally {
+        await db.close();
+        if (holdLock)
+            releaseDevDbLock(dataDir);
+    }
+}
 async function dispatch(argv, overrides = {}) {
     const [command, ...rest] = argv;
     const name = command ?? 'serve';
@@ -68,16 +144,7 @@ async function dispatch(argv, overrides = {}) {
     const spec = COMMANDS.find((c) => c.name === name);
     if (!spec)
         throw new Error(`cli: unknown command "${name}"`);
-    const { values, positionals } = parseArgs({
-        options: Object.fromEntries((spec.options ?? []).map((o) => [
-            o.name,
-            { type: o.type, ...(o.short ? { short: o.short } : {}) },
-        ])),
-        args: rest,
-        allowPositionals: true,
-        strict: true,
-    });
-    const args = { options: values, positionals };
+    const args = parseCommand(spec, rest);
     const cwd = process.cwd();
     switch (name) {
         case 'serve': {
@@ -85,21 +152,13 @@ async function dispatch(argv, overrides = {}) {
             return;
         }
         case 'chat': {
-            const config = await loadConfig(cwd);
-            const db = await createDB({ driver: 'pglite' });
-            await migrateDB(db);
-            try {
-                // --yes / -y 显式放行写操作；否则按 config.permission.defaultMode 决定（默认 safe）。
-                const deps = await buildAgentDeps(config, {
-                    db,
-                    cwd,
-                    ...(args.options.yes ? { permissionStrategy: 'full-auto' } : {}),
-                });
-                await runChatCommand({ args, config, deps });
-            }
-            finally {
-                await db.close();
-            }
+            // --yes / -y 显式放行写操作；否则按 config.permission.defaultMode 决定（默认 safe）。
+            const strategy = args.options.yes ? 'full-auto' : undefined;
+            const continueId = args.options.continue;
+            await withAgentDeps(cwd, {
+                ...(strategy ? { strategy } : {}),
+                ...(continueId ? { continueSessionId: continueId } : {}),
+            }, (config, deps) => runChatCommand({ args, config, deps }));
             return;
         }
         case 'init': {
@@ -114,18 +173,18 @@ async function dispatch(argv, overrides = {}) {
             await runPluginCommand({ args, cwd });
             return;
         }
+        case 'auth': {
+            await runAuthCommand({ args });
+            return;
+        }
+        case 'sessions': {
+            // 需要持久库列出/清理会话；serve 运行时内存库不含数据，直接失败而不是列空表。
+            await withAgentDeps(cwd, { requirePersistent: true }, (_config, deps) => runSessionsCommand({ args, db: deps.db }));
+            return;
+        }
         case 'acp': {
-            const config = await loadConfig(cwd);
-            const db = await createDB({ driver: 'pglite' });
-            await migrateDB(db);
-            try {
-                // ACP 非交互：所有工具放行（编辑器侧自行控制执行授权）。
-                const deps = await buildAgentDeps(config, { db, cwd, permissionStrategy: 'full-auto' });
-                await runAcpCommand({ config, deps });
-            }
-            finally {
-                await db.close();
-            }
+            // ACP 非交互：所有工具放行（编辑器侧自行控制执行授权）。
+            await withAgentDeps(cwd, { strategy: 'full-auto' }, (config, deps) => runAcpCommand({ config, deps }));
             return;
         }
         case 'update': {

package/dist/cli/modes/print.d.ts

@@ -5,12 +5,14 @@ type PrintOptions = {
     model?: string;
     format?: 'text' | 'json';
     maxTokens?: number;
+    /** 续接已有会话（--continue）：加载该会话历史作为上下文。 */
+    sessionId?: string;
     /** 事件观察回调（CLI 用于把 tool/thinking 写到 stderr）。 */
     onEvent?: (event: AgentEvent) => void;
 };
 /** 从事件流累积 assistant 文本。纯函数。 */
 declare function collectAssistantText(events: AgentEvent[]): string;
-/** Print 模式：临时会话 → agent → 收集文本 → 返回。 */
+/** Print 模式：临时会话（或 --continue 指定会话）→ agent → 收集文本 → 返回。 */
 declare function runPrintMode(config: Config, message: string, deps: LoopDeps, opts?: PrintOptions): Promise<string>;
 export type { PrintOptions };
 export { collectAssistantText, runPrintMode };

package/dist/cli/modes/print.js

@@ -1,5 +1,7 @@
 import { createAgent, runAgent } from '../../core/agent.js';
-import { createSession } from '../../session/session.js';
+import { resolveRoute } from '../../llm/registry.js';
+import { createSession, getSession } from '../../session/session.js';
+import { resolveEnabledToolNames } from '../../tools/index.js';
 /** 从事件流累积 assistant 文本。纯函数。 */
 function collectAssistantText(events) {
     let text = '';
@@ -9,16 +11,41 @@ function collectAssistantText(events) {
     }
     return text;
 }
-/** Print 模式：临时会话 → agent → 收集文本 → 返回。 */
+/** sessions.id 为 uuid 列：非 uuid 的 --continue 输入会让 PG 直接抛原始
+ *  "invalid input syntax for type uuid" SQL 错误。前置校验统一转译为
+ *  「session not found」（与不存在的会话同语义），不泄漏 SQL 原文。 */
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/** Print 模式：临时会话（或 --continue 指定会话）→ agent → 收集文本 → 返回。 */
 async function runPrintMode(config, message, deps, opts = {}) {
-    const session = await createSession(deps.db, 'cli-print');
+    let session;
+    if (opts.sessionId) {
+        if (!UUID_PATTERN.test(opts.sessionId))
+            throw new Error(`session not found: ${opts.sessionId}`);
+        const existing = await getSession(deps.db, opts.sessionId);
+        if (!existing)
+            throw new Error(`session not found: ${opts.sessionId}`);
+        session = existing;
+    }
+    else {
+        session = await createSession(deps.db, 'cli-print', undefined, undefined, 'cli');
+    }
     const agentConfig = {
         provider: config.defaultProvider,
         model: opts.model ?? config.defaultModel,
-        tools: config.tools.enabled,
+        // 工具集：enabled 非空 → enabled ∩ registered；空 → 全部 registered（disabled 已在 registry 层过滤）。
+        tools: resolveEnabledToolNames(deps.toolRegistry, config),
         plugins: config.plugins.enabled,
         ...(opts.maxTokens !== undefined ? { maxTokens: opts.maxTokens } : {}),
     };
+    // P3：首跑友好报错——未配置 provider 时不再让底层 NoRoute 异常裸抛，
+    // 给出与 Web 端一致的引导（c0de serve → 设置 → Provider）。
+    try {
+        resolveRoute(deps.llmRegistry, agentConfig.provider, agentConfig.model);
+    }
+    catch {
+        throw new Error('未配置可用的 AI 服务。请运行 `c0de serve` 并在「设置 → Provider」中添加 API 服务并测试连接，' +
+            '或使用 `c0de config set` 配置 providers。');
+    }
     const state = await createAgent(session, agentConfig, deps);
     const events = [];
     for await (const event of runAgent(state, [{ _tag: 'text', text: message }], deps)) {

package/dist/core/agent.js

@@ -1,12 +1,11 @@
+import { resolveRoute } from '../llm/registry.js';
 import { appendMessage, getMessages } from '../session/message.js';
 import { getLLMSegments } from '../session/session.js';
 import { generateId } from '../shared/index.js';
-import { listTools } from '../tools/registry.js';
 import { getLatestTodoPhasesFromMessages } from '../tools/builtin/todo.js';
-import { estimateBudget } from './context.js';
-import { createTokenBudget } from './context.js';
+import { listTools } from '../tools/registry.js';
+import { createTokenBudget, estimateBudget } from './context.js';
 import { agentLoop } from './loop.js';
-import { resolveRoute } from '../llm/registry.js';
 import { DEFAULT_SESSION_TITLE, generateSessionTitle } from './title.js';
 async function createAgent(session, config, deps) {
     const messages = await getMessages(deps.db, session.id);

package/dist/core/config-path.d.ts

@@ -0,0 +1,9 @@
+/** 按 a.b.c 点路径从对象取值；找不到抛错。 */
+declare function getByPath(obj: unknown, path: string): unknown;
+/** 按 a.b.c 点路径写值（创建中间对象）。 */
+declare function setByPath(obj: Record<string, unknown>, path: string, value: unknown): void;
+/** 把字符串解析为合适的标量类型。 */
+declare function coerce(value: string): unknown;
+/** 构造 a.b.c → { a: { b: { c: value } } } 的 patch 对象。 */
+declare function setPathPatch(path: string, value: unknown): Record<string, unknown>;
+export { coerce, getByPath, setByPath, setPathPatch };

package/dist/core/config-path.js

@@ -0,0 +1,48 @@
+// 配置点路径（a.b.c）读写工具：CLI `config set/get` 与斜杠 `/config` 共用。
+/** 按 a.b.c 点路径从对象取值；找不到抛错。 */
+function getByPath(obj, path) {
+    const parts = path.split('.');
+    let cur = obj;
+    for (const p of parts) {
+        if (cur === null || typeof cur !== 'object')
+            throw new Error(`config: key "${path}" not found`);
+        cur = cur[p];
+        if (cur === undefined)
+            throw new Error(`config: key "${path}" not found`);
+    }
+    return cur;
+}
+/** 按 a.b.c 点路径写值（创建中间对象）。 */
+function setByPath(obj, path, value) {
+    const parts = path.split('.');
+    let cur = obj;
+    for (let i = 0; i < parts.length - 1; i++) {
+        const k = parts[i];
+        const next = cur[k];
+        cur[k] = (next !== null && typeof next === 'object' ? next : {});
+        cur = cur[k];
+    }
+    cur[parts[parts.length - 1]] = value;
+}
+/** 把字符串解析为合适的标量类型。 */
+function coerce(value) {
+    if (value === 'true')
+        return true;
+    if (value === 'false')
+        return false;
+    if (/^-?\d+(\.\d+)?$/.test(value))
+        return Number(value);
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return value;
+    }
+}
+/** 构造 a.b.c → { a: { b: { c: value } } } 的 patch 对象。 */
+function setPathPatch(path, value) {
+    const root = {};
+    setByPath(root, path, value);
+    return root;
+}
+export { coerce, getByPath, setByPath, setPathPatch };

package/dist/core/config.d.ts

@@ -1,7 +1,32 @@
 import type { AgentsConfig, CompactionConfig, Config, MCPServerConfig, PermissionConfig, SecurityConfig, ToolMetricsConfig, UpdateConfig, WebSearchConfig } from '../shared/types/config.js';
 declare const DEFAULT_CONFIG: Config;
 declare function mergeConfig(...configs: (Partial<Config> | undefined)[]): Config;
+/**
+ * 读取 global/project 两个作用域的**原始文件内容**（不经 DEFAULT 合并）。
+ * 供配置持久化使用：写回某个作用域时只落该作用域应有的键，
+ * 避免把合并结果（含默认值与另一作用域的配置）整体序列化进文件。
+ */
+declare function loadConfigScopes(projectDir?: string): {
+    global: Partial<Config> | undefined;
+    project: Partial<Config> | undefined;
+};
+/**
+ * 把 patch 应用到某个作用域的原始配置（scoped patch，null=删除）：
+ * - 深合并：嵌套普通对象递归合并，数组整体替换（providers 等列表语义）；
+ * - 值为 undefined 的键跳过；
+ * - 值为 null 的键从结果中**删除**——作用域内取消覆盖，回落到另一作用域/默认值。
+ *   Config 各字段均无合法的 null 值（可选字段用 undefined），null 作为「unset」标记是安全的。
+ * 不注入默认值。CLI config set / 服务端 PATCH /api/config 共用。
+ */
+declare function applyScopedPatch(base: Record<string, unknown> | undefined, patch: Record<string, unknown>): Record<string, unknown>;
+/**
+ * 不注入默认值的深合并：仅合并传入对象的自有键。
+ * 数组整体替换（providers 等列表语义）；嵌套普通对象递归合并。
+ * 用于「patch 合并进某个作用域的原始文件」后再写盘。
+ */
+declare function mergeRaw(...cfgs: (Record<string, unknown> | undefined)[]): Record<string, unknown>;
+/** 把 raw JSON 写回指定作用域配置文件（不含默认值）。 */
+declare function saveConfigScoped(scope: 'global' | 'project', projectDir: string | undefined, data: Record<string, unknown>): Promise<void>;
 declare function loadConfig(projectDir?: string): Promise<Config>;
-declare function saveConfig(config: Config, scope: 'global' | 'project', projectDir?: string): Promise<void>;
 export type { AgentsConfig, CompactionConfig, Config, MCPServerConfig, PermissionConfig, SecurityConfig, ToolMetricsConfig, UpdateConfig, WebSearchConfig, };
-export { DEFAULT_CONFIG, loadConfig, mergeConfig, saveConfig };
+export { applyScopedPatch, DEFAULT_CONFIG, loadConfig, loadConfigScopes, mergeConfig, mergeRaw, saveConfigScoped, };

package/dist/core/config.js

@@ -16,19 +16,18 @@ const DEFAULT_CONFIG = {
         keepRecentTokens: 4000,
         midTurnEnabled: false,
     },
-    tools: {
-        enabled: ['read', 'write', 'edit', 'glob', 'grep', 'bash', 'todo', 'websearch'],
-        disabled: [],
-    },
+    // enabled 为空 = 启用全部注册工具（registry 层过滤 disabled）。
+    // 非空 = 默认工具集。CLI print 与 Web chat 统一经 resolveEnabledToolNames 解析。
+    tools: { enabled: [], disabled: [] },
     plugins: { enabled: [] },
     mcpServers: [],
     slashCommands: { enabled: ['/compact', '/model', '/clear', '/help', '/fork', '/config'] },
     toolMetrics: { enabled: true, threshold: 0.8, minSamples: 5 },
-    security: { authEnabled: false, allowedOrigins: [] },
+    security: { authEnabled: true, allowedOrigins: [] },
     websearch: { provider: 'auto' },
     agents: { dir: '.c0de/agents', subagentConcurrency: 3 },
     permission: { defaultMode: 'default' },
-    update: { enabled: true, intervalMs: 60 * 60 * 1000, initialDelayMs: 10_000, autoApply: false },
+    update: { enabled: true, intervalMs: 60 * 60 * 1000, initialDelayMs: 10_000 },
     theme: 'system',
     locale: 'en',
 };
@@ -69,20 +68,91 @@ function readJsonIfExists(path) {
         return undefined;
     }
 }
-async function loadConfig(projectDir) {
+/**
+ * 读取 global/project 两个作用域的**原始文件内容**（不经 DEFAULT 合并）。
+ * 供配置持久化使用：写回某个作用域时只落该作用域应有的键，
+ * 避免把合并结果（含默认值与另一作用域的配置）整体序列化进文件。
+ */
+function loadConfigScopes(projectDir) {
     const globalPath = join(homedir(), GLOBAL_CONFIG_DIR, CONFIG_FILENAME);
     const projectPath = join(projectDir ?? process.cwd(), '.c0de', CONFIG_FILENAME);
-    const global = readJsonIfExists(globalPath);
-    const project = readJsonIfExists(projectPath);
-    return mergeConfig(global, project);
+    return { global: readJsonIfExists(globalPath), project: readJsonIfExists(projectPath) };
+}
+/**
+ * 把 patch 应用到某个作用域的原始配置（scoped patch，null=删除）：
+ * - 深合并：嵌套普通对象递归合并，数组整体替换（providers 等列表语义）；
+ * - 值为 undefined 的键跳过；
+ * - 值为 null 的键从结果中**删除**——作用域内取消覆盖，回落到另一作用域/默认值。
+ *   Config 各字段均无合法的 null 值（可选字段用 undefined），null 作为「unset」标记是安全的。
+ * 不注入默认值。CLI config set / 服务端 PATCH /api/config 共用。
+ */
+function applyScopedPatch(base, patch) {
+    const result = { ...(base ?? {}) };
+    for (const [key, val] of Object.entries(patch)) {
+        if (val === undefined)
+            continue;
+        if (val === null) {
+            delete result[key];
+            continue;
+        }
+        const current = result[key];
+        if (typeof val === 'object' &&
+            !Array.isArray(val) &&
+            current !== null &&
+            typeof current === 'object' &&
+            !Array.isArray(current)) {
+            result[key] = applyScopedPatch(current, val);
+        }
+        else {
+            result[key] = val;
+        }
+    }
+    return result;
 }
-async function saveConfig(config, scope, projectDir) {
+/**
+ * 不注入默认值的深合并：仅合并传入对象的自有键。
+ * 数组整体替换（providers 等列表语义）；嵌套普通对象递归合并。
+ * 用于「patch 合并进某个作用域的原始文件」后再写盘。
+ */
+function mergeRaw(...cfgs) {
+    const result = {};
+    for (const cfg of cfgs) {
+        if (!cfg)
+            continue;
+        for (const [key, val] of Object.entries(cfg)) {
+            if (val === undefined)
+                continue;
+            const current = result[key];
+            if (val !== null &&
+                typeof val === 'object' &&
+                !Array.isArray(val) &&
+                current !== null &&
+                typeof current === 'object' &&
+                !Array.isArray(current)) {
+                result[key] = mergeRaw(current, val);
+            }
+            else {
+                result[key] = val;
+            }
+        }
+    }
+    return result;
+}
+/** 把 raw JSON 写回指定作用域配置文件（不含默认值）。 */
+async function saveConfigScoped(scope, projectDir, data) {
     const dir = scope === 'global'
         ? join(homedir(), GLOBAL_CONFIG_DIR)
         : join(projectDir ?? process.cwd(), '.c0de');
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
     const path = join(dir, CONFIG_FILENAME);
-    writeFileSync(path, JSON.stringify(config, null, 2), 'utf-8');
+    writeFileSync(path, JSON.stringify(data, null, 2), 'utf-8');
+}
+async function loadConfig(projectDir) {
+    const globalPath = join(homedir(), GLOBAL_CONFIG_DIR, CONFIG_FILENAME);
+    const projectPath = join(projectDir ?? process.cwd(), '.c0de', CONFIG_FILENAME);
+    const global = readJsonIfExists(globalPath);
+    const project = readJsonIfExists(projectPath);
+    return mergeConfig(global, project);
 }
-export { DEFAULT_CONFIG, loadConfig, mergeConfig, saveConfig };
+export { applyScopedPatch, DEFAULT_CONFIG, loadConfig, loadConfigScopes, mergeConfig, mergeRaw, saveConfigScoped, };

package/dist/core/index.d.ts

@@ -1,7 +1,7 @@
 export { abortAgent, createAgent, getAgentStatus, isAgentPaused, pauseAgent, resumeAgent, runAgent, } from './agent.js';
 export { createSummarizer, runCompaction } from './compact.js';
 export type { CompactionConfig, Config, MCPServerConfig } from './config.js';
-export { DEFAULT_CONFIG, loadConfig, mergeConfig, saveConfig } from './config.js';
+export { DEFAULT_CONFIG, loadConfig, mergeConfig } from './config.js';
 export { calibrateEstimate, createTokenBudget, estimateBudget, fitToBudget, shouldCompact, } from './context.js';
 export { agentLoop } from './loop.js';
 export { buildSystemPrompt } from './prompt.js';

package/dist/core/index.js

@@ -2,7 +2,7 @@
 // steering, slash commands, and compaction bridge.
 export { abortAgent, createAgent, getAgentStatus, isAgentPaused, pauseAgent, resumeAgent, runAgent, } from './agent.js';
 export { createSummarizer, runCompaction } from './compact.js';
-export { DEFAULT_CONFIG, loadConfig, mergeConfig, saveConfig } from './config.js';
+export { DEFAULT_CONFIG, loadConfig, mergeConfig } from './config.js';
 export { calibrateEstimate, createTokenBudget, estimateBudget, fitToBudget, shouldCompact, } from './context.js';
 export { agentLoop } from './loop.js';
 export { buildSystemPrompt } from './prompt.js';

package/dist/core/loop.js

@@ -3,6 +3,7 @@ import { resolveRoute } from '../llm/registry.js';
 import { detectProjectInfo } from '../project/detect.js';
 import { entriesToChatMessages, getSessionContext } from '../session/context.js';
 import { getMessages } from '../session/message.js';
+import { updateSessionLastRun } from '../session/session.js';
 import { estimateTokens } from '../session/token.js';
 import { calibrateEstimate, createTokenBudget, estimateBudget } from './context.js';
 import { runCompactionIfNeeded } from './loop/compaction.js';
@@ -69,15 +70,24 @@ export async function* agentLoop(state, deps) {
             return;
         }
         if (state.status._tag === 'paused') {
-            state.status = { _tag: 'running', turnCount: turn };
+            // 暂停点：上一轮原子操作（工具执行批次）已完成。
+            // 持久化 paused 状态供热更新/重启后恢复，随后阻塞等待 resume。
+            state.pauseYielded = false;
             yield { _tag: 'status_change', status: state.status };
+            await updateSessionLastRun(deps.db, state.session.id, {
+                status: 'paused',
+                agentName: state.config.agentName,
+                provider: state.config.provider,
+                model: state.config.model,
+                startedAt: state.lastRunStartedAt ?? Date.now(),
+            }).catch(() => { });
             await waitForResume(state);
-            if (state.status._tag !== 'running')
-                return;
+            if (state.status._tag === 'paused')
+                return; // 等待期间被 abort 等终结
         }
         state.status = { _tag: 'running', turnCount: turn };
         const steering = drainSteering(state);
-        const { entries, snapshots } = await getSessionContext(deps.db, state.session.id);
+        const { entries, snapshots } = await getSessionContext(deps.db, state.session.id, deps.cwd);
         let chatMessages = entriesToChatMessages(entries, snapshots);
         // steering 消息必须插入到最后一条 user 消息之前（而非末尾 push），
         // 使 notice 在相关 user 消息的同一 turn 生效。