autosnippet 3.2.4 → 3.2.6

package/lib/external/mcp/handlers/task.js

@@ -1,14 +1,15 @@
 /**
- * MCP Handler — autosnippet_task (Task CRUD)
+ * MCP Handler — autosnippet_task (Unified Task & Decision Management)
  *
- * Operations: create / decompose / claim / close / fail / defer / progress
- *             ready / show / list / blocked / dep_add / dep_tree / stats
- *
- * Session entry point → autosnippet_ready
- * Decision management → autosnippet_decide
+ * Operations:
+ *   Session:   prime (session entry — loads decisions + ready tasks + stats)
+ *   Tasks:     create / ready / claim / close / fail / defer / progress
+ *              show / list / stats / blocked / decompose / dep_add / dep_tree
+ *   Decisions: record_decision / revise_decision / unpin_decision / list_decisions
  */
 
 import { envelope } from '../envelope.js';
+// guard is independent — no guardState dependency in task lifecycle
 
 /**
  * 统一入口
@@ -19,6 +20,10 @@ export async function taskHandler(ctx, args) {
   const taskService = ctx.container.get('taskGraphService');
 
   switch (args.operation) {
+    // ── Session ──
+    case 'prime':
+      return _prime(taskService, args);
+    // ── Task CRUD ──
     case 'create':
       return _create(taskService, args);
     case 'ready':
@@ -26,7 +31,7 @@ export async function taskHandler(ctx, args) {
     case 'claim':
       return _claim(taskService, args);
     case 'close':
-      return _close(taskService, args);
+      return _close(ctx, taskService, args);
     case 'fail':
       return _fail(taskService, args);
     case 'defer':
@@ -47,10 +52,19 @@ export async function taskHandler(ctx, args) {
       return _depTree(taskService, args);
     case 'stats':
       return _stats(taskService);
+    // ── Decisions ──
+    case 'record_decision':
+      return _recordDecision(taskService, args);
+    case 'revise_decision':
+      return _reviseDecision(taskService, args);
+    case 'unpin_decision':
+      return _unpinDecision(taskService, args);
+    case 'list_decisions':
+      return _listDecisions(taskService);
     default:
       return envelope({
         success: false,
-        message: `Unknown operation: ${args.operation}. Use autosnippet_ready for session context, autosnippet_decide for decisions.`,
+        message: `Unknown operation: ${args.operation}. Valid: prime, ready, create, claim, close, fail, defer, progress, decompose, dep_add, dep_tree, stats, list, record_decision, revise_decision, unpin_decision, list_decisions.`,
         meta: { tool: 'autosnippet_task' },
       });
   }
@@ -113,10 +127,11 @@ async function _claim(svc, args) {
 
 // ── close ──
 
-async function _close(svc, args) {
+async function _close(ctx, svc, args) {
   if (!args.id) {
     return envelope({ success: false, message: 'id is required', meta: { tool: 'autosnippet_task' } });
   }
+
   const { task, newlyReady } = await svc.close(args.id, args.reason || 'Completed');
   return envelope({
     success: true,
@@ -281,3 +296,162 @@ async function _stats(svc) {
     meta: { tool: 'autosnippet_task' },
   });
 }
+
+// ═══ Session (prime) ═══════════════════════════════════
+
+async function _prime(svc, args) {
+  const result = await svc.prime({
+    limit: args.limit || 10,
+    withKnowledge: args.withKnowledge !== false,
+  });
+
+  const decisionCount = (result.decisions || []).length;
+  const staleCount = (result.staleDecisions || []).length;
+  const decisionTitles = (result.decisions || []).map((d) => d.title).join('; ');
+  const statsLine = `${result.inProgress.length} in-progress, ${result.ready.length} ready, ${result.stats.total} total`;
+
+  // ── Behavioral Rules Reminder (survives compaction) ──
+  result._taskRules = {
+    reminder: [
+      '📋 TASK RULES (MANDATORY):',
+      '🔑 YOU are the task operator — user speaks naturally, you translate to task operations. NEVER tell user to run task commands.',
+      '• MUST prime on EVERY message BEFORE anything else',
+      '• MUST create task for non-trivial work (≥2 files OR ≥10 lines)',
+      '• MUST claim before coding, close when done with meaningful reason',
+      '• MUST handle unfinished tasks before starting new work (ask user: Continue/Defer/Abandon)',
+      '• NEVER skip prime, NEVER start new work with open in_progress tasks',
+      '• NEVER leave tasks in in_progress when session ends — close or defer ALL',
+      '• When in doubt → create a task. When idle → ready()',
+      '• Session end → close all tasks, defer incomplete, verify zero in_progress',
+    ].join('\n'),
+    translationHint: [
+      'User Says → You Run:',
+      '"fix bug"/"implement" → create→claim→code→close',
+      '"continue" → resume in-progress→close',
+      '"pause" → defer | "abandon" → fail | "break down" → decompose',
+      '"what\'s next" → ready() | "agreed" → record_decision',
+      'Quick question → No task. Just answer.',
+    ].join('\n'),
+  };
+
+  let message;
+  if (decisionCount > 0) {
+    const stalePart = staleCount > 0 ? ` ${staleCount} stale.` : '';
+    message = `⚠️ ${decisionCount} ACTIVE DECISION(S): [${decisionTitles}].${stalePart} ${statsLine}.`;
+  } else {
+    message = `${statsLine}.`;
+  }
+
+  // ── Resume Prompt: 有 inProgress 任务时，提示 Agent 让用户选择 ──
+  if (result.inProgress.length > 0) {
+    const taskList = result.inProgress.map((t) => {
+      const age = t.updatedAt
+        ? `${Math.floor((Date.now() / 1000 - t.updatedAt) / 86400)}d ago`
+        : '';
+      return `• **${t.id}** — ${t.title}${age ? ` (${age})` : ''}`;
+    }).join('\n');
+
+    result._resumePrompt = {
+      instruction: [
+        'There are unfinished tasks. You MUST present these options to the user BEFORE doing anything else:',
+        '',
+        '**Unfinished tasks:**',
+        taskList,
+        '',
+        'Ask the user to choose:',
+        '1. **Continue** — resume the unfinished task(s)',
+        '2. **Defer** — pause it and work on something else',
+        '3. **Abandon** — close/fail it and start fresh',
+        '',
+        'Wait for the user\'s answer. Do NOT auto-resume.',
+      ].join('\n'),
+      taskIds: result.inProgress.map((t) => t.id),
+    };
+
+    message += ` ⏸️ ${result.inProgress.length} unfinished task(s) — ask user before resuming.`;
+  }
+
+  return envelope({
+    success: true,
+    data: result,
+    message,
+    meta: { tool: 'autosnippet_task' },
+  });
+}
+
+// ═══ Decisions ═══════════════════════════════════════
+
+async function _recordDecision(svc, args) {
+  if (!args.title) {
+    return envelope({ success: false, message: 'title is required', meta: { tool: 'autosnippet_task' } });
+  }
+  if (!args.description) {
+    return envelope({ success: false, message: 'description is required', meta: { tool: 'autosnippet_task' } });
+  }
+  const { task, isDuplicate } = await svc.recordDecision({
+    title: args.title,
+    description: args.description,
+    rationale: args.rationale || '',
+    tags: args.tags || [],
+    relatedTaskId: args.relatedTaskId || null,
+  });
+  return envelope({
+    success: true,
+    data: task.toJSON(),
+    message: isDuplicate
+      ? `⚠ Decision already recorded: ${task.id}`
+      : `✅ Decision pinned: ${task.id} — "${args.title}"`,
+    meta: { tool: 'autosnippet_task' },
+  });
+}
+
+async function _reviseDecision(svc, args) {
+  if (!args.id) {
+    return envelope({ success: false, message: 'id of old decision is required', meta: { tool: 'autosnippet_task' } });
+  }
+  if (!args.title) {
+    return envelope({ success: false, message: 'title of new decision is required', meta: { tool: 'autosnippet_task' } });
+  }
+  if (!args.description) {
+    return envelope({ success: false, message: 'description of new decision is required', meta: { tool: 'autosnippet_task' } });
+  }
+  const result = await svc.reviseDecision({
+    oldDecisionId: args.id,
+    title: args.title,
+    description: args.description,
+    rationale: args.rationale || '',
+    reason: args.reason || '',
+  });
+  return envelope({
+    success: true,
+    data: {
+      newDecision: result.newDecision.toJSON(),
+      superseded: result.oldDecisionId,
+    },
+    message: `✅ Decision revised: ${result.oldDecisionId} → ${result.newDecision.id}`,
+    meta: { tool: 'autosnippet_task' },
+  });
+}
+
+async function _unpinDecision(svc, args) {
+  if (!args.id) {
+    return envelope({ success: false, message: 'id is required', meta: { tool: 'autosnippet_task' } });
+  }
+  const task = await svc.unpinDecision(args.id, args.reason || '');
+  return envelope({
+    success: true,
+    data: task.toJSON(),
+    message: `Decision ${args.id} unpinned and closed`,
+    meta: { tool: 'autosnippet_task' },
+  });
+}
+
+async function _listDecisions(svc) {
+  const decisions = await svc.list({ status: 'pinned', taskType: 'decision' }, { limit: 50 });
+  return envelope({
+    success: true,
+    data: decisions.map((d) => d.toJSON()),
+    message: `${decisions.length} active decision(s)`,
+    meta: { tool: 'autosnippet_task' },
+  });
+}

package/lib/external/mcp/tools.js

@@ -1,8 +1,8 @@
 /**
  * MCP 工具定义 — V3 整合版 (18 agent + 4 admin = 22 工具)
  *
- * 从 39 → 22 工具（参数路由合并同类工具 + 外部 Agent 冷启动新架构 + TaskGraph 三工具拆分）。
- * TaskGraph 拆分: autosnippet_ready + autosnippet_decide + autosnippet_task
+ * 从 39 → 22 工具（参数路由合并同类工具 + 外部 Agent 冷启动新架构 + TaskGraph 统一入口）。
+ * TaskGraph: autosnippet_task (统一入口，含 prime/decision/task CRUD)
  * 每个工具声明增加 tier 字段（agent / admin）。
  * tools.js 只包含 JSON Schema 声明 + Gateway 映射，不含业务逻辑。
  *
@@ -45,16 +45,7 @@ export const TOOL_GATEWAY_MAP = {
   autosnippet_submit_knowledge: { action: 'knowledge:create', resource: 'knowledge' },
   autosnippet_submit_knowledge_batch: { action: 'knowledge:create', resource: 'knowledge' },
   autosnippet_save_document: { action: 'knowledge:create', resource: 'knowledge' },
-  // decide 写操作（record/revise/unpin）
-  autosnippet_decide: {
-    resolver: (args) =>
-      ({
-        record: { action: 'task:create', resource: 'tasks' },
-        revise: { action: 'task:update', resource: 'tasks' },
-        unpin: { action: 'task:update', resource: 'tasks' },
-      })[args?.operation] || null, // list 只读
-  },
-  // task 写操作（create/claim/close/fail/defer/decompose/dep_add）
+  // task 写操作（create/claim/close/fail/defer/decompose/dep_add + decision 写操作）
   autosnippet_task: {
     resolver: (args) =>
       ({
@@ -66,7 +57,10 @@ export const TOOL_GATEWAY_MAP = {
         progress: { action: 'task:update', resource: 'tasks' },
         decompose: { action: 'task:create', resource: 'tasks' },
         dep_add: { action: 'task:update', resource: 'tasks' },
-      })[args?.operation] || null, // ready/show/list/blocked/dep_tree/stats 只读
+        record_decision: { action: 'task:create', resource: 'tasks' },
+        revise_decision: { action: 'task:update', resource: 'tasks' },
+        unpin_decision: { action: 'task:update', resource: 'tasks' },
+      })[args?.operation] || null, // prime/ready/show/list/blocked/dep_tree/stats/list_decisions 只读
   },
   // admin 工具
   autosnippet_enrich_candidates: { action: 'knowledge:update', resource: 'knowledge' },
@@ -216,32 +210,27 @@ export const TOOLS = [
     },
   },
 
-  // 6. Guard 检查（2 → 1）
+  // 6. Guard 检查（统一入口）
   {
     name: 'autosnippet_guard',
     tier: 'agent',
-    description: '代码规范检查。传 code=单文件检查，传 files[]=多文件批量审计（自动路由）。',
+    description:
+      '代码规范检查 & 质量门禁。\n' +
+      '• 无参数 → 自动从 git diff 检测增量文件并检查（编码后推荐用法）\n' +
+      '• files: ["path/to/file.m", ...] → 检查指定文件\n' +
+      '• code: "..." → 单文件内联检查\n' +
+      '每个 violation 内联 recipe 修复指南（doClause + coreCode），直接按指示修复后再次调用。',
     inputSchema: {
       type: 'object',
       properties: {
-        code: { type: 'string', description: '待检查代码（单文件模式，与 files 二选一）' },
-        language: { type: 'string', description: '编程语言' },
-        filePath: { type: 'string', description: '文件路径（单文件模式）' },
         files: {
           type: 'array',
-          items: {
-            type: 'object',
-            properties: { path: { type: 'string' }, content: { type: 'string' } },
-            required: ['path'],
-          },
-          description: '文件列表（批量模式，与 code 二选一）',
-        },
-        scope: {
-          type: 'string',
-          enum: ['file', 'target', 'project'],
-          default: 'project',
-          description: '审计范围（批量模式）',
+          items: { type: 'string' },
+          description: '待检查文件路径列表（string[]）。省略则自动从 git diff 检测增量文件。',
         },
+        code: { type: 'string', description: '待检查代码（单文件模式，与 files 二选一）' },
+        language: { type: 'string', description: '编程语言（单文件模式）' },
+        filePath: { type: 'string', description: '文件路径提示（单文件模式，用于语言检测）' },
       },
       required: [],
     },
@@ -538,68 +527,26 @@ export const TOOLS = [
     inputSchema: { type: 'object', properties: {}, required: [] },
   },
 
-  // 13. autosnippet_ready — Agent 会话入口（like beads_ready）
-  {
-    name: 'autosnippet_ready',
-    tier: 'agent',
-    description:
-      'Session entry point. Call FIRST at conversation start to load project context, active decisions, and available tasks.\n' +
-      'Returns: in-progress tasks, ready tasks (with knowledge context), pinned decisions, and stats.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        limit: { type: 'number', default: 10, description: 'Max ready tasks to return' },
-        withKnowledge: { type: 'boolean', default: true, description: 'Attach knowledge context to ready tasks' },
-      },
-      required: [],
-    },
-  },
-
-  // 14. autosnippet_decide — 决策管理
-  {
-    name: 'autosnippet_decide',
-    tier: 'agent',
-    description:
-      'Decision management. Record, revise or unpin project decisions that persist across conversations.\n' +
-      'Call record when you and user reach agreement. Decisions are shown in every autosnippet_ready call.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        operation: {
-          type: 'string',
-          enum: ['record', 'revise', 'unpin', 'list'],
-          description: 'record=pin new decision, revise=supersede old, unpin=close, list=show active',
-        },
-        title: { type: 'string', description: 'Decision title (record/revise)' },
-        description: { type: 'string', description: 'Decision description (record/revise)' },
-        rationale: { type: 'string', description: 'Why this decision (record/revise)' },
-        tags: { type: 'array', items: { type: 'string' }, description: 'Classification tags (record)' },
-        relatedTaskId: { type: 'string', description: 'Related task ID (record)' },
-        id: { type: 'string', description: 'Decision ID (revise/unpin)' },
-        reason: { type: 'string', description: 'Reason for revision/unpin' },
-      },
-      required: ['operation'],
-    },
-  },
-
-  // 15. autosnippet_task — 任务 CRUD
+  // 13. autosnippet_task — 统一任务管理（含 prime/decision/CRUD）
   {
     name: 'autosnippet_task',
     tier: 'agent',
     description:
-      'Task CRUD operations. Create tasks, claim work, close completed, track dependencies.\n' +
-      'For session context use autosnippet_ready. For decisions use autosnippet_decide.',
+      'Unified task & decision management. Includes session context (prime), task CRUD, and decision persistence.\n' +
+      'Call prime FIRST at every conversation start to load decisions + tasks + knowledge context.',
     inputSchema: {
       type: 'object',
       properties: {
         operation: {
           type: 'string',
           enum: [
-            'create', 'ready', 'claim', 'close', 'fail', 'defer',
+            'prime', 'ready',
+            'create', 'claim', 'close', 'fail', 'defer',
             'progress', 'show', 'list', 'stats',
             'blocked', 'decompose', 'dep_add', 'dep_tree',
+            'record_decision', 'revise_decision', 'unpin_decision', 'list_decisions',
           ],
-          description: 'Operation type',
+          description: 'prime=session entry (CALL FIRST) | ready=ready tasks | record_decision/revise_decision/unpin_decision/list_decisions=decision management | create/claim/close/fail/defer/progress/decompose=task CRUD',
         },
         title: { type: 'string', description: 'Task title (create)' },
         description: { type: 'string', description: 'Task description (create/progress)' },
@@ -612,8 +559,12 @@ export const TOOLS = [
           description: 'Task type (create)',
         },
         parentId: { type: 'string', description: 'Parent task ID (create subtask)' },
-        id: { type: 'string', description: 'Task ID (claim/close/fail/defer/show/dep_add/dep_tree/progress)' },
-        reason: { type: 'string', description: 'Reason (close/fail/defer)' },
+        id: { type: 'string', description: 'Task ID (claim/close/fail/defer/show/dep_add/dep_tree/progress/revise_decision/unpin_decision)' },
+        reason: { type: 'string', description: 'Reason (close/fail/defer/unpin_decision)' },
+        rationale: { type: 'string', description: 'Why this decision (record_decision/revise_decision)' },
+        tags: { type: 'array', items: { type: 'string' }, description: 'Classification tags (record_decision)' },
+        relatedTaskId: { type: 'string', description: 'Related task ID (record_decision)' },
+
         dependsOn: { type: 'string', description: 'Dependency target task ID (dep_add)' },
         depType: {
           type: 'string',

package/lib/http/routes/task.js

@@ -208,6 +208,57 @@ async function _prime(svc) {
   const decisionTitles = (result.decisions || []).map((d) => d.title).join('; ');
   const statsLine = `${result.inProgress.length} in-progress, ${result.ready.length} ready, ${result.stats.total} total`;
 
+  // ── Behavioral Rules Reminder (synced with MCP handler) ──
+  result._taskRules = {
+    reminder: [
+      '📋 TASK RULES (MANDATORY):',
+      '🔑 YOU are the task operator — user speaks naturally, you translate to task operations. NEVER tell user to run task commands.',
+      '• MUST prime on EVERY message BEFORE anything else',
+      '• MUST create task for non-trivial work (≥2 files OR ≥10 lines)',
+      '• MUST claim before coding, close when done with meaningful reason',
+      '• MUST handle unfinished tasks before starting new work (ask user: Continue/Defer/Abandon)',
+      '• NEVER skip prime, NEVER start new work with open in_progress tasks',
+      '• NEVER leave tasks in in_progress when session ends — close or defer ALL',
+      '• When in doubt → create a task. When idle → ready()',
+      '• Session end → close all tasks, defer incomplete, verify zero in_progress',
+    ].join('\n'),
+    translationHint: [
+      'User Says → You Run:',
+      '"fix bug"/"implement" → create→claim→code→close',
+      '"continue" → resume in-progress→close',
+      '"pause" → defer | "abandon" → fail | "break down" → decompose',
+      '"what\'s next" → ready() | "agreed" → record_decision',
+      'Quick question → No task. Just answer.',
+    ].join('\n'),
+  };
+
+  // ── Resume Prompt: 有 inProgress 任务时，提示 Agent 让用户选择 ──
+  if (result.inProgress.length > 0) {
+    const taskList = result.inProgress.map((t) => {
+      const age = t.updatedAt
+        ? `${Math.floor((Date.now() / 1000 - t.updatedAt) / 86400)}d ago`
+        : '';
+      return `• **${t.id}** — ${t.title}${age ? ` (${age})` : ''}`;
+    }).join('\n');
+
+    result._resumePrompt = {
+      instruction: [
+        'There are unfinished tasks. You MUST present these options to the user BEFORE doing anything else:',
+        '',
+        '**Unfinished tasks:**',
+        taskList,
+        '',
+        'Ask the user to choose:',
+        '1. **Continue** — resume the unfinished task(s)',
+        '2. **Defer** — pause it and work on something else',
+        '3. **Abandon** — close/fail it and start fresh',
+        '',
+        'Wait for the user\'s answer. Do NOT auto-resume.',
+      ].join('\n'),
+      taskIds: result.inProgress.map((t) => t.id),
+    };
+  }
+
   let message;
   if (decisionCount > 0) {
     const stalePart = staleCount > 0 ? ` ${staleCount} stale.` : '';
@@ -216,6 +267,10 @@ async function _prime(svc) {
     message = `${statsLine}.`;
   }
 
+  if (result.inProgress.length > 0) {
+    message += ` ⏸️ ${result.inProgress.length} unfinished task(s) — ask user before resuming.`;
+  }
+
   return {
     success: true,
     data: result,

package/lib/service/chat/AnalystAgent.js

@@ -74,7 +74,7 @@ const ANALYST_TOOLS = [
 ];
 
 // ──────────────────────────────────────────────────────────────────
-// Analyst 预算 — 自由探索，不需要 PhaseRouter
+// Analyst 预算 — 使用 analyst 策略（自由探索，无阶段约束）
 // ──────────────────────────────────────────────────────────────────
 
 const ANALYST_BUDGET = {
@@ -283,7 +283,7 @@ export class AnalystAgent {
       dimConfig,
       projectInfo,
       options.dimensionContext,
-      options.episodicMemory, // v4.0: EpisodicMemory 增强
+      options.memoryCoordinator?.getSessionStore(), // v5.0: SessionStore 提供跨维度上下文
       options.semanticMemory, // v4.1: ProjectSemanticMemory 历史记忆
       options.codeEntityGraph // Phase E: CodeEntityGraph 代码实体图谱
     );
@@ -308,24 +308,24 @@ export class AnalystAgent {
           budget: ANALYST_BUDGET,
           systemPromptOverride: ANALYST_SYSTEM_PROMPT,
           allowedTools: ANALYST_TOOLS,
-          disablePhaseRouter: true,
+          strategy: 'analyst',
           temperature: 0.4,
           dimensionMeta: {
             id: dimId,
             outputType: 'analysis',
             allowedKnowledgeTypes: dimConfig.allowedKnowledgeTypes || [],
           },
-          // v4.0: Agent Memory 注入
-          workingMemory: options.workingMemory || undefined,
-          episodicMemory: options.episodicMemory || undefined,
-          toolResultCache: options.toolResultCache || undefined,
+          // v5.0: 统一 MemoryCoordinator
+          memoryCoordinator: options.memoryCoordinator || undefined,
         });
 
-        // 构建 AnalysisReport/AnalysisArtifact
-        // v2: 当 WorkingMemory 可用时使用 buildAnalysisArtifact (包含 evidenceMap/findings/negativeSignals)
-        // v1: 回退到 buildAnalysisReport (仅 text + referencedFiles)
-        const report = options.workingMemory
-          ? buildAnalysisArtifact(result, dimId, this.#projectGraph, options.workingMemory)
+        // v5.0: 当有 MemoryCoordinator 时使用 ActiveContext 的 distill 结果
+        // 构建 AnalysisArtifact (包含 evidenceMap/findings/negativeSignals)
+        // 使用显式 scopeId 确保并行执行安全
+        const analystScopeId = `${dimId}:analyst`;
+        const ac = options.memoryCoordinator?.getActiveContext(analystScopeId);
+        const report = ac
+          ? buildAnalysisArtifact(result, dimId, this.#projectGraph, ac)
           : buildAnalysisReport(result, dimId, this.#projectGraph);
 
         // 附加推理链数据（如果 ChatAgent 返回了 ReasoningTrace）