mocode-ai 1.2.3 → 1.2.5

package/dist/tools/builtins/memory-save.js

@@ -1,10 +1,12 @@
 import { saveEntry } from '../../memory/store.js';
+import { addTriple } from '../../memory/graph.js';
 // ---------- memory_save ----------
 // 存一条长期记忆(跨会话)。启动只把标题/摘要注入索引(几百 token);详情按需 memory_search 取。
 // 撞库(name→id 已存在)拒绝,引导用 memory_update。
+// 可选 links:把本条记忆挂进知识图谱(memory-graph.json)——src 省略时默认以记忆 name 为主实体。
 export const memorySaveTool = {
     name: 'memory_save',
-    description: 'Save a cross-session long-term memory entry. Store only non-obvious, useful facts/decisions/pitfalls. Title enters the startup index; retrieve body via memory_search.',
+    description: 'Save a cross-session long-term memory entry. Store only non-obvious, useful facts/decisions/pitfalls. Title enters the startup index; retrieve body via memory_search. Optionally attach knowledge-graph links (triples) to relate this memory to entities.',
     risk: 'confirm',
     parameters: {
         type: 'object',
@@ -23,6 +25,20 @@ export const memorySaveTool = {
                 enum: ['project', 'global'],
                 description: 'Store at project level (<cwd>/.mocode/) or global (~/.mocode/), default project',
             },
+            links: {
+                type: 'array',
+                description: 'Optional knowledge-graph triples relating this memory to entities, e.g. [{"src":"mocode","relation":"depends_on","dst":"JSONL store"}]. src defaults to the memory name when omitted.',
+                items: {
+                    type: 'object',
+                    properties: {
+                        src: { type: 'string', description: 'Source entity name (defaults to the memory name)' },
+                        relation: { type: 'string', description: 'Relation, snake_case, e.g. depends_on / decided_by / conflicts_with' },
+                        dst: { type: 'string', description: 'Target entity name' },
+                        fact: { type: 'string', description: 'Optional one-line statement for the edge' },
+                    },
+                    required: ['relation', 'dst'],
+                },
+            },
         },
         required: ['name', 'summary', 'body'],
     },
@@ -37,16 +53,37 @@ export const memorySaveTool = {
         if (!body)
             return '错误:缺少 body。';
         const type = typeof args.type === 'string' ? args.type : undefined;
+        const scope = args.scope === 'global' ? 'global' : 'project';
         const r = saveEntry({
             name,
             summary,
             body,
             type,
             pinned: args.pinned === true,
-            scope: args.scope === 'global' ? 'global' : 'project',
+            scope,
         });
-        if (r.ok)
-            return `已保存记忆 [${r.id}] "${name}"(下次启动进索引)。`;
-        return `已存在同名记忆 [${r.exists}]。改用 memory_update(id="${r.exists}", …) 更新,或换一个 name。`;
+        if (!r.ok) {
+            return `已存在同名记忆 [${r.exists}]。改用 memory_update(id="${r.exists}", …) 更新,或换一个 name。`;
+        }
+        // 知识图谱挂边:容错——图失败不影响记忆保存结果
+        const links = Array.isArray(args.links) ? args.links : [];
+        let linked = 0;
+        for (const l of links) {
+            if (!l || typeof l !== 'object')
+                continue;
+            const link = l;
+            const tr = addTriple({
+                src: typeof link.src === 'string' && link.src.trim() ? link.src : name,
+                relation: typeof link.relation === 'string' ? link.relation : '',
+                dst: typeof link.dst === 'string' ? link.dst : '',
+                fact: typeof link.fact === 'string' ? link.fact : undefined,
+                sourceEntry: r.id,
+                scope,
+            });
+            if (tr.ok)
+                linked++;
+        }
+        const linkNote = links.length > 0 ? `;知识图谱挂边 ${linked}/${links.length}` : '';
+        return `已保存记忆 [${r.id}] "${name}"(下次启动进索引)${linkNote}。`;
     },
 };

package/dist/tools/builtins/memory-search.js

@@ -1,10 +1,13 @@
 import { searchEntries } from '../../memory/store.js';
+import { searchGraph } from '../../memory/graph.js';
 // ---------- memory_search ----------
-// 关键词搜记忆正文(多词子串匹配,name 权重最高)。命中即 bump recallCount(遗忘衰减依据)。
+// 唯一记忆搜索入口:关键词搜记忆正文(多词子串匹配,name 权重最高)+ 知识图谱事实段
+// (命中实体的 active 边)。命中条目即 bump recallCount(遗忘衰减依据)。
 // 结果走 capToolResultForHistory 的放宽上限(同 use_skill,保正文完整)。
+const GRAPH_FACTS_LIMIT = 10;
 export const memorySearchTool = {
     name: 'memory_search',
-    description: 'Search memory entries by keyword (substring match), returning full body.',
+    description: 'Search memory entries by keyword (substring match), returning full body. Also surfaces knowledge-graph facts (active edges) for entities matching the query.',
     parameters: {
         type: 'object',
         properties: {
@@ -33,10 +36,28 @@ export const memorySearchTool = {
                 : undefined,
             limit: typeof args.limit === 'number' ? args.limit : undefined,
         });
-        if (r.length === 0)
-            return `(无匹配记忆:query="${query}")`;
-        return r
+        const entryText = r
             .map((e) => `# [${e.id}] ${e.name} (${e.type}, recalled ${e.recallCount})\nsummary: ${e.summary}\n\n${e.body}`)
             .join('\n\n---\n\n');
+        // 知识图谱事实段:命中实体的 active 边(容错:图坏了不连累条目搜索)。
+        let graphText = '';
+        try {
+            const g = searchGraph(query, 8);
+            if (g.edges.length > 0) {
+                const lines = g.edges
+                    .slice(0, GRAPH_FACTS_LIMIT)
+                    .map((e) => `${e.src} --[${e.relation}]--> ${e.dst}${e.fact ? ` (${e.fact})` : ''}`);
+                const more = g.edges.length > GRAPH_FACTS_LIMIT ? `\n…(共 ${g.edges.length} 条,其余用 memory_graph action=neighbors 展开)` : '';
+                graphText = `\n\n## 知识图谱事实\n${lines.join('\n')}${more}`;
+            }
+        }
+        catch {
+            // 静默:图谱段是增强,失败只降级为纯条目结果
+        }
+        if (!entryText && !graphText)
+            return `(无匹配记忆:query="${query}")`;
+        if (!entryText)
+            return `(无匹配记忆条目,但图谱有命中)\n${graphText.trimStart()}`;
+        return entryText + graphText;
     },
 };

package/dist/tools/builtins/run-skill.js

@@ -0,0 +1,42 @@
+import { runSkill } from '../../skills/runner.js';
+// ---------- run_skill ----------
+// 唯一新增的常驻工具(L2-①):把某个 skill 作为隔离工作流(fork 子 agent)执行并返回摘要。
+// 无论装 100 个还是 1000 个 skill,常驻工具表只多这 1 个。上下文 / 工具面 / 副作用 / 中断
+// 全部由 spawnAgent 现成能力承接(设计 §3.4)。
+export const runSkillTool = {
+    name: 'run_skill',
+    description: 'Execute a skill as an isolated workflow (forked sub-agent) and return its summary. ' +
+        'Use for skills marked [fork] in the skill list. Args are rendered into the skill body.',
+    parameters: {
+        type: 'object',
+        properties: {
+            name: {
+                type: 'string',
+                description: 'Name of the skill to execute (see the skill list in the system prompt).',
+            },
+            args: {
+                type: 'object',
+                description: 'Arguments rendered into the skill body ($ARGUMENTS, $1..$9). Optional.',
+            },
+            context: {
+                type: 'string',
+                description: 'Optional extra context/facts to inject into the sub-agent (authoritative; not rediscovered).',
+            },
+        },
+        required: ['name'],
+    },
+    risk: 'confirm',
+    capabilities: {
+        effect: 'process',
+        concurrency: 'serial',
+        delegatesResourceLocks: true, // 与 sub-agent 一致:锁由内层工具取,避免父子自锁
+        supportsAbort: true,
+    },
+    async execute(args, ctx) {
+        return runSkill({
+            name: String(args.name ?? ''),
+            args: args.args,
+            context: typeof args.context === 'string' ? args.context : undefined,
+        }, ctx);
+    },
+};

package/dist/tools/builtins/use-skill.js

@@ -1,10 +1,21 @@
-import { getSkillBody } from '../../skills/index.js';
+import { findSkill } from '../../skills/index.js';
+import { renderSkillBody, readSkillFile } from '../../skills/runner.js';
+import { activateSkill } from '../../skills/activation.js';
 // ---------- use_skill ----------
 // 模型按需加载某 skill 的 SKILL.md 正文(渐进式披露第②层)。
 // 系统提示里已列出可用 skill 的 name + description(何时用),模型据此决定调用。
+//
+// 设计 §3.3 升级:
+//  - args:渲染 $ARGUMENTS / $1..$9 / ${SKILL_DIR}
+//  - file:读 skill 目录内附属文件(L2 披露,jail 约束)
+//  - context: fork 的 skill 不返回正文,改为引导调 run_skill(隔离白做才是真隔离)
+//  - inline skill 成功加载后激活会话级工具面约束(allowed/disallowed-tools)
+const MAX_SKILL_FILE = 200_000;
 export const useSkillTool = {
     name: 'use_skill',
-    description: 'Load the full SKILL.md instructions for a given skill. See the skill list in the system prompt for when to use each.',
+    description: 'Load the full SKILL.md instructions for a given skill. See the skill list in the system prompt for when to use each. ' +
+        'Supports args (renders $ARGUMENTS / $1.. / ${SKILL_DIR}) and file (reads a bundled reference file). ' +
+        'For skills marked [fork], this returns a guide to call run_skill instead of loading the body inline.',
     parameters: {
         type: 'object',
         properties: {
@@ -12,16 +23,43 @@ export const useSkillTool = {
                 type: 'string',
                 description: 'Name of the skill to load (see the skill list in the system prompt, or the /skills command)',
             },
+            args: {
+                type: 'object',
+                description: 'Arguments rendered into the skill body ($ARGUMENTS, $1..$9). Optional.',
+            },
+            file: {
+                type: 'string',
+                description: 'Optional bundled file inside the skill directory to read (e.g. references/api.md). Subject to jail bounds.',
+            },
         },
         required: ['name'],
     },
-    async execute(args) {
+    async execute(args, ctx) {
         const name = String(args.name ?? '').trim();
         if (!name)
             return '错误:缺少 skill 名。用 /skills 查看可用 skill 列表。';
-        const body = getSkillBody(name);
-        if (body === null)
+        const skill = findSkill(name);
+        if (!skill)
             return `错误:未找到 skill "${name}"。用 /skills 查看可用 skill 列表。`;
+        // fork skill:不把正文读进主上下文,引导走 run_skill。
+        if (skill.context === 'fork') {
+            return (`# Skill: ${name}\n\n` +
+                `该 skill 以隔离工作流(fork)形式执行。请勿在此加载其正文——调用 ` +
+                `\`run_skill({ name: "${name}"${Object.keys(args.args ?? {}).length ? ', args: {...}' : ''} })\` ` +
+                `即可在隔离子 agent 中执行并返回摘要。`);
+        }
+        // file 优先:L2 渐进式披露
+        if (typeof args.file === 'string' && args.file.trim()) {
+            const content = readSkillFile(skill, args.file.trim(), MAX_SKILL_FILE);
+            if (content === null)
+                return `错误:无法读取 skill "${name}" 的文件 "${args.file}"(不存在 / 越界 / 过大)。`;
+            return `# Skill: ${name} · ${args.file}\n\n${content}`;
+        }
+        const body = await renderSkillBody(skill, args.args, ctx?.signal);
+        if (body === null)
+            return `错误:未找到 skill "${name}" 的正文。用 /skills 查看可用 skill 列表。`;
+        // 激活 inline skill 的工具面约束(allowed/disallowed),本轮内生效。
+        activateSkill(skill);
         return `# Skill: ${name}\n\n${body}`;
     },
 };

package/dist/tools/constants.js

@@ -1,5 +1,6 @@
 /** 工具共享的截断 / 上限 / 忽略规则。 */
 import { isMemoryEnabled, isSubAgentEnabled, isFrontendToolsEnabled } from '../config/index.js';
+import { getActiveSkill } from '../skills/activation.js';
 export const MAX_FILE_LINES = 2000;
 export const MAX_OUTPUT = 20000;
 export const MAX_RESULTS = 100;
@@ -22,6 +23,11 @@ export const DECAY_DAYS = 30;
 export const GC_DAYS = 90;
 /** memory_search 结果(召回的记忆正文)的放宽上限:指令性内容,中截破坏语义,对齐 use_skill。 */
 export const MAX_MEMORY_RESULT = 64000;
+// ── 知识图谱层(memory-graph.json,单 scope 容量)──────────────────────────
+/** 单 scope 实体封顶:超限先清孤儿实体(无 active 边相连),仍超则拒绝新建。 */
+export const MAX_GRAPH_ENTITIES = 500;
+/** 单 scope 边封顶:超限先清已失效边,仍超则拒绝新边。 */
+export const MAX_GRAPH_EDGES = 2000;
 // .codegraph:codegraph 索引目录(codegraph.db 是 SQLite 二进制 + daemon.log),
 // grep/glob 扫它无意义且会产出数 KB 的超长「行」,污染 TUI 展开渲染。
 export const IGNORE = ['**/node_modules/**', '**/.git/**', '**/.codegraph/**'];
@@ -55,7 +61,9 @@ export const PLAN_DISABLED_TOOLS = new Set([
     'memory_save',
     'memory_update',
     'memory_forget',
+    'memory_graph', // 混合工具(add 写图),plan 只读模式整体屏蔽
     'sub-agent',
+    'run_skill', // fork 子 agent 执行面;plan 模式不应派生子工作流
 ]);
 /**
  * 按当前 isMemoryEnabled() 现算 plan 模式应屏蔽的工具。
@@ -89,5 +97,11 @@ export function getRuntimeDisabledTools() {
         for (const name of FRONTEND_TOOLS)
             disabled.add(name);
     }
+    // inline skill 激活态的 disallowed-tools:即便模型幻觉调用也执行不了(设计 §3.6)。
+    const active = getActiveSkill();
+    if (active?.disallowed) {
+        for (const name of active.disallowed)
+            disabled.add(name);
+    }
     return disabled;
 }

package/dist/ui/layout.js

@@ -1361,8 +1361,8 @@ function composeSpinnerLine(status, cols) {
         leadW = 1 + 1 + displayWidth(status.status) + (elapsed ? 1 + displayWidth(elapsed) : 0);
     }
     else if (spinning) {
-        // 运行态心跳帧(流式输出中):帧 + 生成中 + 走时
-        const label = '生成中';
+        // 运行态心跳帧(流式输出中 / 命令态如 /rollback /compact /resume):帧 + 状态文字(优先)或生成中(兜底) + 走时
+        const label = status.status || '生成中';
         const ePart = elapsed ? ` ${ui.dim}${elapsed}${ui.reset}` : '';
         lead = `${ui.bold}${ui.accent}${RUNNING_FRAMES[runningFrame]}${ui.reset} ${ui.dim}${label}${ui.reset}${ePart}`;
         leadW = 1 + 1 + displayWidth(label) + (elapsed ? 1 + displayWidth(elapsed) : 0);

package/dist/ui/theme.js

@@ -29,7 +29,7 @@ const DEFAULT = {
     brightCyan: '\x1B[38;2;86;182;194m',
     brightMagenta: '\x1B[38;2;198;120;221m',
     accent: '\x1B[38;2;86;182;194m', // 与 cyan 同源(One Dark):logo/标题/输入框顶线/选中项统一承载
-    userBg: '\x1B[48;2;44;49;60m', // One Dark current-line bg,深色终端上微妙可辨
+    userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
     // diff 行底色:One Dark bg #282c34 上加 ~14% 亮度的对应色,够辨识但不刺眼
     addBg: '\x1B[48;2;44;62;42m', // 偏暗绿(One Dark green(152,195,121)暗化)
     delBg: '\x1B[48;2;62;38;42m', // 偏暗红(One Dark red(224,108,117)暗化)
@@ -54,7 +54,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;42;161;152m',
         brightMagenta: '\x1B[38;2;108;113;196m',
         accent: '\x1B[38;2;38;139;210m', // Solarized blue:浅底下更醒目的强调
-        userBg: '\x1B[48;2;238;232;213m',
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:Solarized Light base2(238,232,213)上贴同色族浅 tint,
         // 比直接用 base1 更柔,跟深 fg(red/green)对比充足
         addBg: '\x1B[48;2;220;235;205m',
@@ -72,7 +72,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;147;161;161m',
         brightMagenta: '\x1B[38;2;108;113;196m',
         accent: '\x1B[38;2;42;161;152m', // Solarized cyan(深底版):暗底上跳出
-        userBg: '\x1B[48;2;7;54;66m',
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:Solarized Dark base03(0,43,54)上加对应色族暗 tint
         addBg: '\x1B[48;2;20;50;38m',
         delBg: '\x1B[48;2;55;30;30m',
@@ -89,7 +89,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;142;192;124m',
         brightMagenta: '\x1B[38;2;211;134;155m',
         accent: '\x1B[38;2;250;189;47m', // Gruvbox yellow(主题色)
-        userBg: '\x1B[48;2;40;40;40m',
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:Gruvbox dark bg(40,40,40)上贴暗 bg0_a 风格
         addBg: '\x1B[48;2;40;55;30m',
         delBg: '\x1B[48;2;70;35;30m',
@@ -106,7 +106,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;136;192;208m',
         brightMagenta: '\x1B[38;2;180;142;173m',
         accent: '\x1B[38;2;136;192;208m', // Nord 浅冰蓝(主题色)
-        userBg: '\x1B[48;2;67;76;94m',
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:Nord polar night(46,52,64)上贴对应色族暗 tint
         addBg: '\x1B[48;2;46;66;52m',
         delBg: '\x1B[48;2;72;46;52m',
@@ -126,7 +126,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;160;220;220m',
         brightMagenta: '\x1B[38;2;245;165;215m',
         accent: '\x1B[38;2;255;170;60m', // 南瓜橙(主题主色:logo/标题/输入框顶线/选中项)
-        userBg: '\x1B[48;2;55;42;32m', // 暖深棕(略亮于 #231c16 背景)
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:暖深棕底上贴对应色族暗 tint,跟 fg 配对柔和可辨
         addBg: '\x1B[48;2;55;70;35m',
         delBg: '\x1B[48;2;78;42;32m',
@@ -145,7 +145,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;170;220;220m',
         brightMagenta: '\x1B[38;2;250;160;200m',
         accent: '\x1B[38;2;230;90;150m', // 玫粉(主题主色)
-        userBg: '\x1B[48;2;50;32;46m', // 深紫底
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:深紫底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏紫红
         addBg: '\x1B[48;2;50;60;42m',
         delBg: '\x1B[48;2;75;40;52m',
@@ -164,7 +164,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;140;230;210m',
         brightMagenta: '\x1B[38;2;210;170;230m',
         accent: '\x1B[38;2;80;210;140m', // 翡翠绿(主题主色)
-        userBg: '\x1B[48;2;18;42;34m', // 深绿底
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:深绿底贴对应色族暗 tint,绿暗化偏深绿、红暗化偏暗红
         addBg: '\x1B[48;2;30;55;40m',
         delBg: '\x1B[48;2;60;40;40m',
@@ -183,7 +183,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;170;210;200m',
         brightMagenta: '\x1B[38;2;240;180;210m',
         accent: '\x1B[38;2;255;200;80m', // 琥珀金黄(主题主色)
-        userBg: '\x1B[48;2;43;31;14m', // 深棕底(比 orange 略浅,避免撞色)
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:深棕底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏暗棕红
         addBg: '\x1B[48;2;50;55;25m',
         delBg: '\x1B[48;2;70;40;28m',
@@ -202,7 +202,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;180;230;230m',
         brightMagenta: '\x1B[38;2;210;180;250m',
         accent: '\x1B[38;2;180;150;230m', // 薰衣草紫(主题主色)
-        userBg: '\x1B[48;2;31;26;46m', // 深紫底(比 rose 更冷)
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:深紫底贴对应色族暗 tint,绿暗化偏冷绿、红暗化偏冷紫红
         addBg: '\x1B[48;2;38;46;42m',
         delBg: '\x1B[48;2;60;40;55m',
@@ -221,7 +221,7 @@ const THEMES = {
         brightCyan: '\x1B[38;2;170;225;215m',
         brightMagenta: '\x1B[38;2;250;170;210m',
         accent: '\x1B[38;2;255;120;100m', // 珊瑚红(主题主色)
-        userBg: '\x1B[48;2;42;22;20m', // 深棕红底
+        userBg: '\x1B[48;2;72;78;90m', // 统一灰白用户消息底(黑底终端可见)
         // diff 行底色:深棕红底贴对应色族暗 tint,绿暗化偏橄榄、红暗化偏暗棕红
         addBg: '\x1B[48;2;50;55;30m',
         delBg: '\x1B[48;2;75;32;30m',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocode-ai",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 16 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {