jarvis-agent-factory 3.22.2 → 3.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jarvis-agent-factory",
-  "version": "3.22.2",
+  "version": "3.23.0",
   "description": "Jarvis Agent Factory CLI — 跨平台多智能体 AI 编程助手配置安装器 | Multi-agent AI coding assistant config installer for Claude Code / OpenCode / Codex",
   "keywords": [
     "jarvis",

package/src/engine/db.js

@@ -1,11 +1,16 @@
 import { DatabaseSync } from 'node:sqlite';
-import { join } from 'node:path';
+import { resolve } from 'node:path';
 import { existsSync, mkdirSync } from 'node:fs';
+import { homedir } from 'node:os';
 
-export function openDb(root) {
-  const dir = join(root, '.jarvis');
+/**
+ * 打开引擎数据库，固定存储在 ~/.jarvis/engine.db
+ * @returns {DatabaseSync}
+ */
+export function openDb() {
+  const dir = resolve(homedir(), '.jarvis');
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  const db = new DatabaseSync(join(dir, 'engine.db'));
+  const db = new DatabaseSync(resolve(dir, 'engine.db'));
   db.exec('PRAGMA journal_mode=WAL');
   db.exec('PRAGMA busy_timeout=5000');
   initSchema(db);
@@ -45,6 +50,20 @@ function initSchema(db) {
       updated_at TEXT NOT NULL
     );
   `);
+  // pipeline_runs: 每次 /jarvis 调用产生独立运行记录（Session Model B）
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS pipeline_runs (
+      id TEXT PRIMARY KEY,
+      session_id TEXT NOT NULL,
+      project TEXT NOT NULL,
+      pipeline_type TEXT NOT NULL DEFAULT 'full',
+      current_gate TEXT NOT NULL DEFAULT 'Gate A',
+      status TEXT NOT NULL DEFAULT 'active',
+      started_at TEXT NOT NULL,
+      completed_at TEXT
+    );
+    CREATE INDEX IF NOT EXISTS idx_pipeline_runs_session ON pipeline_runs(session_id, started_at DESC);
+  `);
   try { db.exec("ALTER TABLE agent_models ADD COLUMN effort TEXT NOT NULL DEFAULT 'high'"); } catch {}
 
   // ---- 迁移：修复旧 pipeline 表 CHECK(id=1) 约束 ----
@@ -113,14 +132,30 @@ function initSchema(db) {
 
   // ---- 旧列迁移（向后兼容） ----
   try { db.exec("ALTER TABLE sessions ADD COLUMN status TEXT DEFAULT 'active'"); } catch {}
+
+  // ---- 迁移旧 pipeline 数据为首条 pipeline_run ----
+  const existingRuns = db.prepare('SELECT COUNT(*) as cnt FROM pipeline_runs').get();
+  if (existingRuns.cnt === 0) {
+    const oldPipelines = db.prepare('SELECT * FROM pipeline').all();
+    for (const p of oldPipelines) {
+      if (!p.session_id) continue;
+      const runId = 'run_' + Date.now() + '_' + p.session_id.slice(-6);
+      db.prepare(`INSERT OR IGNORE INTO pipeline_runs (id, session_id, project, pipeline_type, current_gate, status, started_at)
+        VALUES (?, ?, ?, ?, ?, 'active', ?)`).run(
+        runId, p.session_id, p.project || 'jarvis', p.pipeline_type || 'full', p.current_gate || 'Gate A', p.started_at || new Date().toISOString()
+      );
+    }
+  }
 }
 
 // ---- Pipeline (per-session) ----
 export function getPipeline(db, sessionId) {
-  return db.prepare('SELECT * FROM pipeline WHERE session_id=?').get(sessionId || 'legacy');
+  if (!sessionId) return null;
+  return db.prepare('SELECT * FROM pipeline WHERE session_id=?').get(sessionId);
 }
 export function updatePipelineGate(db, sessionId, gate) {
-  db.prepare(`UPDATE pipeline SET current_gate=?, updated_at=datetime('now') WHERE session_id=?`).run(gate, sessionId || 'legacy');
+  if (!sessionId) throw new Error('session_id required');
+  db.prepare(`UPDATE pipeline SET current_gate=?, updated_at=datetime('now') WHERE session_id=?`).run(gate, sessionId);
 }
 /** @param {'full'|'frontend'|'backend'} pipelineType */
 export function initPipeline(db, sessionId, project, pipelineType = 'full') {
@@ -132,8 +167,9 @@ export function getAllPipelines(db) {
 
 // ---- Checkpoints (per-session) ----
 export function getCheckpoints(db, gate, sessionId) {
-  if (gate) return db.prepare('SELECT * FROM checkpoints WHERE gate=? AND session_id=?').all(gate, sessionId || 'legacy');
-  return db.prepare('SELECT * FROM checkpoints WHERE session_id=? ORDER BY passed_at').all(sessionId || 'legacy');
+  if (!sessionId) return [];
+  if (gate) return db.prepare('SELECT * FROM checkpoints WHERE gate=? AND session_id=?').all(gate, sessionId);
+  return db.prepare('SELECT * FROM checkpoints WHERE session_id=? ORDER BY passed_at').all(sessionId);
 }
 export function addCheckpoint(db, gate, advanceTo, sessionId) {
   db.prepare(`INSERT OR REPLACE INTO checkpoints (session_id, gate, passed_at, advance_to) VALUES (?, ?, datetime('now'), ?)`).run(sessionId, gate, advanceTo);
@@ -190,3 +226,56 @@ export function getAgentConfig(db) {
 export function setAgentModel(db, agentId, model, effort) {
   db.prepare(`INSERT OR REPLACE INTO agent_models (agent_id, model, effort, updated_at) VALUES (?, ?, ?, datetime('now'))`).run(agentId, model, effort || 'high');
 }
+
+// ---- Pipeline Runs（Session Model B）----
+
+/**
+ * 创建新的 pipeline run
+ * @param {DatabaseSync} db
+ * @param {string} sessionId
+ * @param {string} project
+ * @param {string} [pipelineType='full']
+ * @returns {string} runId
+ */
+export function createPipelineRun(db, sessionId, project, pipelineType = 'full') {
+  const id = 'run_' + Date.now();
+  db.prepare(`INSERT INTO pipeline_runs (id, session_id, project, pipeline_type, current_gate, status, started_at)
+    VALUES (?, ?, ?, ?, 'Gate A', 'active', datetime('now'))`).run(id, sessionId, project, pipelineType);
+  return id;
+}
+
+/** 获取指定 run */
+export function getPipelineRun(db, runId) {
+  return db.prepare('SELECT * FROM pipeline_runs WHERE id=?').get(runId);
+}
+
+/**
+ * 获取 session 的当前活跃 run（最新一条 status=active）
+ * @returns {object|undefined}
+ */
+export function getActiveRun(db, sessionId) {
+  return db.prepare("SELECT * FROM pipeline_runs WHERE session_id=? AND status='active' ORDER BY started_at DESC LIMIT 1").get(sessionId);
+}
+
+/**
+ * 获取 session 的所有 runs（按时间倒序）
+ * @returns {object[]}
+ */
+export function getSessionRuns(db, sessionId) {
+  return db.prepare('SELECT * FROM pipeline_runs WHERE session_id=? ORDER BY started_at DESC').all(sessionId);
+}
+
+/** 更新 run 的当前 Gate */
+export function updateRunGate(db, runId, gate) {
+  db.prepare("UPDATE pipeline_runs SET current_gate=? WHERE id=?").run(gate, runId);
+}
+
+/** 完成 run */
+export function completeRun(db, runId) {
+  db.prepare("UPDATE pipeline_runs SET status='completed', completed_at=datetime('now') WHERE id=?").run(runId);
+}
+
+/** 中止 run */
+export function abortRun(db, runId) {
+  db.prepare("UPDATE pipeline_runs SET status='aborted', completed_at=datetime('now') WHERE id=?").run(runId);
+}

package/src/engine/gates.js

@@ -81,7 +81,7 @@ export const GATE_CHECKS = {
 export const GATE_OPERATIONS = {
   'Gate A':    { allow: ['read','write_doc'],                            deny: ['write_code','spawn_impl','spawn_test','build','deploy'] },
   'Gate B':    { allow: ['read','write_doc'],                            deny: ['write_code','spawn_impl','spawn_test','build','deploy'] },
-  'Gate C':    { allow: ['read','write_doc','sweep_arch'],               deny: ['write_code','spawn_impl','spawn_test','build','deploy'] },
+  'Gate C':    { allow: ['read','write_doc','sweep_arch','write_code','spawn_impl'], deny: ['spawn_test','build','deploy'] },
   'Gate C1':   { allow: ['read','lint','build','fix'],                   deny: ['spawn_impl','spawn_test','deploy','write_code'] },
   'Gate C1.5': { allow: ['read','preview','fix'],                        deny: ['spawn_impl','spawn_test','build','deploy','write_code'] },
   'Gate C2':   { allow: ['read','spawn_test','fix'],                     deny: ['spawn_impl','deploy','write_code'] },

package/src/engine/server.js

@@ -4,12 +4,12 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
-import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync, copyFileSync } from 'node:fs';
 import { resolve, join } from 'node:path';
 import { homedir } from 'node:os';
 import { createServer } from 'node:net';
 import { createServer as createHttpServer } from 'node:http';
-import { openDb, getPipeline, initPipeline, getCheckpoints, addCheckpoint, updatePipelineGate, getSessions, getSession, addSession, heartbeatSession, removeSession, markStaleSessions, resumeSession, migrateSession, getAllPipelines, getAgentConfig, setAgentModel } from './db.js';
+import { openDb, getPipeline, initPipeline, getCheckpoints, addCheckpoint, updatePipelineGate, getSessions, getSession, addSession, heartbeatSession, removeSession, markStaleSessions, resumeSession, migrateSession, getAllPipelines, getAgentConfig, setAgentModel, createPipelineRun, getPipelineRun, getActiveRun, getSessionRuns, updateRunGate, completeRun } from './db.js';
 import { GATE_CHECKS, GATE_DIRS, AGENT_LIST, PIPELINE_DEFS, findGateArtifacts, formatGateDisplay, getPipelineGates, getPipelineName, getGateOperations, DEFAULT_PIPELINE } from './gates.js';
 import { getAgentsByPlatform, getPlatforms, getPlatformModels, getAgentList } from './agent-registry.js';
 import { setupApiRoutes } from '../web/routes.js';
@@ -17,7 +17,10 @@ import { setupApiRoutes } from '../web/routes.js';
 const PID_FILE = resolve(homedir(), '.jarvis', 'engine.pid');
 const DEFAULT_PORT = 3456;
 const DEFAULT_WEB_PORT = 3457;
-const SESSION_TIMEOUT = 600_000; // 10分钟超时，标记 inactive 而非删除
+const SESSION_TIMEOUT = 1_800_000; // 30分钟超时，标记 inactive 而非删除
+
+/** stdio 模式下 extra?.sessionId 为空，用此变量记录最近一次 session_join 的会话 ID */
+let _lastSessionId = null;
 
 /** 绑定地址：仅 IPv4 本地回环 */
 const BIND_HOST = '127.0.0.1';
@@ -57,12 +60,32 @@ export async function startEngine({ port = DEFAULT_PORT, projectRoot = '.', stdi
   if (!existsSync(pidDir)) mkdirSync(pidDir, { recursive: true });
   writeFileSync(PID_FILE, String(process.pid));
 
+  // 旧数据库迁移：从 <projectRoot>/.jarvis/ 移动到 ~/.jarvis/
+  const oldDbPath = resolve(root, '.jarvis', 'engine.db');
+  const newDbPath = resolve(homedir(), '.jarvis', 'engine.db');
+  if (existsSync(oldDbPath) && !existsSync(newDbPath)) {
+    copyFileSync(oldDbPath, newDbPath);
+    for (const suffix of ['-wal', '-shm']) {
+      const oldAux = oldDbPath + suffix;
+      const newAux = newDbPath + suffix;
+      if (existsSync(oldAux)) copyFileSync(oldAux, newAux);
+    }
+    console.log('  ✓  旧数据库已迁移: ' + oldDbPath + ' → ' + newDbPath);
+  }
+
   const app = new Hono();
   const mcpServer = new McpServer({ name: 'jarvis-engine', version: readPkgVersion() });
-  const db = openDb(root);
+  const db = openDb();
 
   // 心跳保活 + 过期标记
   setInterval(() => { markStaleSessions(db, SESSION_TIMEOUT); }, 30_000);
+  // 引擎内部自动心跳：每 5 分钟对所有 active 会话更新心跳，防止 stdio 模式下心跳丢失
+  setInterval(() => {
+    const activeSessions = getSessions(db, 'active');
+    for (const s of activeSessions) {
+      heartbeatSession(db, s.id);
+    }
+  }, 300_000);
 
   // ---- MCP Tools (不变) ----
   registerMcpTools(mcpServer, db, root);
@@ -146,7 +169,12 @@ function registerMcpTools(server, db, root) {
     },
     async ({ platform, resume_session_id, pipeline_type }, extra) => {
       const sid = extra?.sessionId || `s${Date.now()}`;
+      _lastSessionId = sid; // stdio 模式回退：记录最近会话
       const pt = pipeline_type || DEFAULT_PIPELINE;
+      // 白名单校验 pipeline_type，防止存储型 XSS
+      if (!['full', 'frontend', 'backend', 'lite'].includes(pt)) {
+        return resp({ error: `Invalid pipeline_type: ${pt}. Valid: full, frontend, backend, lite` });
+      }
       if (resume_session_id) {
         const old = getSession(db, resume_session_id);
         if (old) {
@@ -158,20 +186,23 @@ function registerMcpTools(server, db, root) {
       if (existing) {
         heartbeatSession(db, sid);
         const p = getPipeline(db, sid);
+        // Session Model B: 无活跃 run 时自动创建
+        const runId = getActiveRun(db, sid)?.id || createPipelineRun(db, sid, p?.project || root, p?.pipeline_type || pt);
         return resp({
           session_id: sid, platform: existing.platform,
           gate: p?.current_gate || 'Gate A',
           pipeline_type: p?.pipeline_type || DEFAULT_PIPELINE,
-          project: p?.project || root, resumed: false,
+          project: p?.project || root, run_id: runId, resumed: false,
         });
       }
       addSession(db, sid, platform || 'unknown', 'member');
       if (!getPipeline(db, sid)) initPipeline(db, sid, root, pt);
       const p = getPipeline(db, sid);
+      const runId = createPipelineRun(db, sid, p?.project || root, p?.pipeline_type || pt);
       return resp({
         session_id: sid, platform: platform || 'unknown',
         gate: p?.current_gate || 'Gate A',
-        pipeline_type: pt, project: p?.project || root,
+        pipeline_type: pt, project: p?.project || root, run_id: runId,
         message: '\u{1F195} 新会话已初始化，独立流水线已就绪。',
         resumed: !!resume_session_id,
       });
@@ -180,9 +211,17 @@ function registerMcpTools(server, db, root) {
   server.tool('session_heartbeat', '心跳保活。', {},
     async (_args, extra) => {
       const sid = extra?.sessionId;
-      if (!sid || !getSession(db, sid)) return resp({ error: 'Session not found.' });
-      heartbeatSession(db, sid);
-      return resp({ ok: true });
+      // stdio 模式下 extra?.sessionId 可能为空，查找最近活跃会话
+      if (sid && getSession(db, sid)) {
+        heartbeatSession(db, sid);
+        return resp({ ok: true, session_id: sid });
+      }
+      // 回退：更新所有 active 会话的心跳
+      const activeSessions = getSessions(db, 'active');
+      for (const s of activeSessions) {
+        heartbeatSession(db, s.id);
+      }
+      return resp({ ok: true, heartbeat_count: activeSessions.length });
     });
 
   server.tool('session_list', '列出所有活跃会话。', {}, async () => {
@@ -210,19 +249,24 @@ function registerMcpTools(server, db, root) {
   server.tool('pipeline_init', '【会话隔离】初始化当前会话流水线。',
     { project_name: z.string().optional(), pipeline_type: z.string().optional() },
     async ({ project_name, pipeline_type }, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
       const pt = pipeline_type || DEFAULT_PIPELINE;
+      // Session Model B: 创建新 run，同步更新 pipeline 快照
+      const runId = createPipelineRun(db, sid, project_name || root, pt);
       initPipeline(db, sid, project_name || root, pt);
       return resp({
-        ok: true, session_id: sid, pipeline_type: pt,
-        message: 'Pipeline initialized. Next: Gate A',
+        ok: true, session_id: sid, run_id: runId, pipeline_type: pt,
+        message: 'New pipeline run created. Next: Gate A',
         state: getPipeline(db, sid),
       });
     });
 
-  server.tool('pipeline_status', '【会话隔离】当前会话流水线状态。', {},
-    async (_args, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+  server.tool('pipeline_status', '【会话隔离】当前会话流水线状态。',
+    { run_id: z.string().optional() },
+    async ({ run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
       const p = getPipeline(db, sid);
       const pt = p?.pipeline_type || DEFAULT_PIPELINE;
       const gateList = getPipelineGates(pt);
@@ -236,12 +280,14 @@ function registerMcpTools(server, db, root) {
         };
       });
       const current = gates.find(g => !g.passed)?.gate || 'Complete';
+      const runId = run_id || getActiveRun(db, sid)?.id;
       return resp({
         session_id: sid, project: root, pipeline_type: pt,
         pipeline_name: getPipelineName(pt),
         current_gate: current,
         completed: gates.filter(g => g.passed).map(g => g.gate),
         gates,
+        run_id: runId,
         all_sessions: getSessions(db).map(s => ({
           id: s.id, gate: getPipeline(db, s.id)?.current_gate || '?',
         })),
@@ -250,27 +296,31 @@ function registerMcpTools(server, db, root) {
     });
 
   server.tool('gate_enforce', '【会话隔离·硬约束】验证Gate条件。',
-    { gate: z.string().optional() },
-    async ({ gate }, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+    { gate: z.string().optional(), run_id: z.string().optional() },
+    async ({ gate, run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const gateList = sessionGates(db, sid);
       const target = gate || getPipeline(db, sid)?.current_gate || gateList[0];
       const artifacts = findGateArtifacts(join(root, 'docs'), target);
       const checkpoints = getCheckpoints(db, target, sid);
       const allowed = artifacts.length > 0 || checkpoints.length > 0;
       return resp(allowed
-        ? { gate: target, allowed: true, session_id: sid, message: `${target} — proceed.` }
+        ? { gate: target, allowed: true, session_id: sid, run_id: runId, message: `${target} — proceed.` }
         : {
-            gate: target, allowed: false, session_id: sid,
+            gate: target, allowed: false, session_id: sid, run_id: runId,
             blocked_reasons: [artifacts.length ? '' : `No artifacts in docs/${GATE_DIRS[target] || '?'}/`].filter(Boolean),
             action_required: GATE_CHECKS[target]?.check || '',
           });
     });
 
   server.tool('advance_gate', '【会话隔离·硬约束】推进Gate。',
-    { gate: z.string() },
-    async ({ gate }, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+    { gate: z.string(), run_id: z.string().optional() },
+    async ({ gate, run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const p = getPipeline(db, sid);
       const gateList = sessionGates(db, sid);
       const cur = p?.current_gate || gateList[0];
@@ -283,8 +333,10 @@ function registerMcpTools(server, db, root) {
       if (artifacts.length === 0 && cps.length === 0) return resp({ allowed: false, error: `${cur} conditions NOT met.` });
       addCheckpoint(db, cur, gate, sid);
       updatePipelineGate(db, sid, gate);
+      // Session Model B: 同步更新 pipeline_runs 中的 current_gate
+      if (runId) updateRunGate(db, runId, gate);
       return resp({
-        allowed: true, session_id: sid, previous_gate: cur, current_gate: gate,
+        allowed: true, session_id: sid, run_id: runId, previous_gate: cur, current_gate: gate,
         next: gateList[ti + 1] || 'Complete',
         message: gateList[ti + 1] ? `Next: ${gateList[ti + 1]}` : 'Complete!',
       });
@@ -292,9 +344,11 @@ function registerMcpTools(server, db, root) {
 
   server.tool('gate_jump',
     '【lite模式·入口跳转】跳过无关Gate直接进入目标Gate。仅当pipeline_type为lite时可用。',
-    { gate: z.string().describe('目标Gate，如 Gate C / Gate D / Gate E') },
-    async ({ gate }, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+    { gate: z.string().describe('目标Gate，如 Gate C / Gate D / Gate E'), run_id: z.string().optional() },
+    async ({ gate, run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const p = getPipeline(db, sid);
       const pt = p?.pipeline_type || DEFAULT_PIPELINE;
       const def = PIPELINE_DEFS[pt];
@@ -303,15 +357,19 @@ function registerMcpTools(server, db, root) {
       const ti = gateList.indexOf(gate);
       if (ti === -1) return resp({ allowed: false, error: `未知 Gate: ${gate}。有效: ${gateList.join(', ')}` });
       updatePipelineGate(db, sid, gate);
+      if (runId) updateRunGate(db, runId, gate);
       return resp({
-        allowed: true, session_id: sid, pipeline_type: pt, entry_gate: gate,
+        allowed: true, session_id: sid, run_id: runId, pipeline_type: pt, entry_gate: gate,
         message: `已跳转至 ${gate}，跳过了 ${gateList.slice(0, ti).join(', ')}。剩余: ${gateList.slice(ti).join(' → ')}`,
       });
     });
 
-  server.tool('report_status', '【会话隔离】流水线完整报告。', {},
-    async (_args, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+  server.tool('report_status', '【会话隔离】流水线完整报告。',
+    { run_id: z.string().optional() },
+    async ({ run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const gateList = sessionGates(db, sid);
       const gates = gateList.map(g => ({
         gate: g, passed: getCheckpoints(db, g, sid).length > 0,
@@ -319,7 +377,7 @@ function registerMcpTools(server, db, root) {
       }));
       const completed = gates.filter(g => g.passed).length;
       return resp({
-        session_id: sid, project: root,
+        session_id: sid, project: root, run_id: runId,
         pipeline_type: getPipeline(db, sid)?.pipeline_type || DEFAULT_PIPELINE,
         progress: `${completed}/${gateList.length}`,
         current: gates.find(g => !g.passed)?.gate || 'Complete',
@@ -334,17 +392,20 @@ function registerMcpTools(server, db, root) {
         'spawn_impl', 'spawn_test', 'lint', 'build', 'preview',
         'review', 'audit', 'deploy', 'fix',
       ]).describe('要执行的操作类型'),
+      run_id: z.string().optional(),
     },
-    async ({ operation }, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+    async ({ operation, run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const p = getPipeline(db, sid);
       const gateList = sessionGates(db, sid);
       const cur = p?.current_gate || gateList[0];
       const ops = getGateOperations(cur);
       const allowed = ops.allow.includes(operation);
-      if (allowed) return resp({ allowed: true, gate: cur, operation, session_id: sid, message: `${operation} 在 ${cur} 允许执行` });
+      if (allowed) return resp({ allowed: true, gate: cur, operation, session_id: sid, run_id: runId, message: `${operation} 在 ${cur} 允许执行` });
       return resp({
-        allowed: false, gate: cur, operation, session_id: sid,
+        allowed: false, gate: cur, operation, session_id: sid, run_id: runId,
         blocked_reasons: [
           `操作 "${operation}" 在 ${cur} 不被允许`,
           `允许的操作: ${ops.allow.join(', ')}`,
@@ -357,9 +418,11 @@ function registerMcpTools(server, db, root) {
 
   server.tool('pipeline_guide',
     '【硬约束·流程指引】返回当前Gate的完整上下文：允许/禁止的操作、可生成的Agent类型、下一步行动指南。在不确定下一步做什么时调用。',
-    {},
-    async (_args, extra) => {
-      const sid = extra?.sessionId || 'legacy';
+    { run_id: z.string().optional() },
+    async ({ run_id }, extra) => {
+      const sid = extra?.sessionId || _lastSessionId;
+      if (!sid) return resp({ error: 'session_id required. Call session_join first.' });
+      const runId = run_id || getActiveRun(db, sid)?.id;
       const p = getPipeline(db, sid);
       const gateList = sessionGates(db, sid);
       const cur = p?.current_gate || gateList[0];
@@ -379,6 +442,7 @@ function registerMcpTools(server, db, root) {
         session_id: sid, gate: cur, gate_index: ci + 1, total_gates: gateList.length,
         pipeline_type: p?.pipeline_type || DEFAULT_PIPELINE,
         pipeline_name: getPipelineName(p?.pipeline_type || DEFAULT_PIPELINE),
+        run_id: runId,
         allowed_operations: ops.allow, forbidden_operations: ops.deny,
         agent_spawn: agentGuide[cur] || { can_spawn: [], note: '未知Gate' },
         gate_requirement: GATE_CHECKS[cur]?.check || '',

package/src/install.js

@@ -55,12 +55,11 @@ export async function install({ platform, target, pkgRoot, platforms, force, glo
   if (!destExists) mkdirSync(destRoot, { recursive: true });
 
   let totalFiles = 0, totalSkipped = 0;
-  const hashRoot = isGlobal ? globalTarget(platform) : destRoot;
   for (const bucket of INSTALL_BUCKETS) {
     const srcDir = join(srcRoot, bucket);
     const destDir = join(destRoot, bucket);
     if (!existsSync(srcDir)) continue;
-    const stats = mergeDir(srcDir, destDir, hashRoot);
+    const stats = mergeDir(srcDir, destDir);
     totalFiles += stats.files;
     totalSkipped += stats.skipped;
     const tag = existsSync(destDir) && stats.files > 0 ? '~' : '+';
@@ -214,16 +213,16 @@ function fileHash(filePath) {
   catch { return null; }
 }
 
-/** 加载/保存文件 hash 记录 */
-function loadHashes(root) {
-  const f = join(root, '.jarvis', 'file-hashes.json');
+/** 加载/保存文件 hash 记录，统一存储在 ~/.jarvis/file-hashes.json */
+function loadHashes() {
+  const f = resolve(homedir(), '.jarvis', 'file-hashes.json');
   try { return existsSync(f) ? JSON.parse(readFileSync(f, 'utf-8')) : {}; }
   catch { return {}; }
 }
-function saveHashes(root, hashes) {
-  const dir = join(root, '.jarvis');
+function saveHashes(hashes) {
+  const dir = resolve(homedir(), '.jarvis');
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(join(dir, 'file-hashes.json'), JSON.stringify(hashes, null, 2));
+  writeFileSync(resolve(dir, 'file-hashes.json'), JSON.stringify(hashes, null, 2));
 }
 
 /**
@@ -233,30 +232,29 @@ function saveHashes(root, hashes) {
  *   - 目标 hash == 旧源 hash → 用户未修改，安全覆盖
  *   - 目标 hash != 旧源 hash → 用户已修改，跳过
  */
-function mergeDir(src, dest, root) {
+function mergeDir(src, dest) {
   let files = 0, dirs = 0, skipped = 0;
   if (!existsSync(dest)) mkdirSync(dest, { recursive: true });
 
-  const hashes = root ? loadHashes(root) : {};
+  const hashes = loadHashes();
 
   for (const entry of readdirSync(src)) {
     if (SKIP_FILES.has(entry)) continue;
     if (entry.startsWith('.') || entry === 'node_modules') continue;
     const sp = join(src, entry), dp = join(dest, entry);
     if (statSync(sp).isDirectory()) {
-      const d = mergeDir(sp, dp, root);
+      const d = mergeDir(sp, dp);
       files += d.files; dirs += d.dirs + 1; skipped += d.skipped;
     } else {
-      const relPath = dp.replace(dest, '').replace(/\\/g, '/');
       const newHash = fileHash(sp);
 
       if (!existsSync(dp)) {
         // 新文件
         copyFileSync(sp, dp);
-        hashes[relPath] = newHash;
+        hashes[dp] = newHash;
         files++;
       } else {
-        const oldHash = hashes[relPath];
+        const oldHash = hashes[dp];
         const destHash = fileHash(dp);
 
         if (newHash === oldHash) {
@@ -265,7 +263,7 @@ function mergeDir(src, dest, root) {
         } else if (!oldHash || destHash === oldHash) {
           // 新安装或用户未修改 → 安全覆盖
           copyFileSync(sp, dp);
-          hashes[relPath] = newHash;
+          hashes[dp] = newHash;
           files++;
         } else {
           // 用户已修改目标文件 → 保留
@@ -275,7 +273,7 @@ function mergeDir(src, dest, root) {
     }
   }
 
-  if (root) saveHashes(root, hashes);
+  saveHashes(hashes);
   return { files, dirs, skipped };
 }
 

package/src/web/routes.js

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { readdirSync, existsSync } from 'node:fs';
 import { streamSSE } from 'hono/streaming';
-import { getPipeline, getCheckpoints, addCheckpoint, updatePipelineGate, getSessions, getAllPipelines, getAgentConfig, setAgentModel, resumeSession, markStaleSessions } from '../engine/db.js';
+import { getPipeline, getCheckpoints, addCheckpoint, updatePipelineGate, getSessions, getAllPipelines, getAgentConfig, setAgentModel, resumeSession, markStaleSessions, getSessionRuns } from '../engine/db.js';
 import { GATES, GATE_CHECKS, GATE_DIRS, AGENT_LIST, AVAILABLE_MODELS, findGateArtifacts, formatGateDisplay, getPipelineGates, getPipelineName, DEFAULT_PIPELINE } from '../engine/gates.js';
 import { getAgentList, getPlatformModels, getCategories, getAgentsByPlatform, getPlatforms } from '../engine/agent-registry.js';
 import { syncAgentFile } from '../engine/agent-fs.js';
@@ -58,7 +58,7 @@ export function setupApiRoutes(app, db, root) {
 
   // 引擎状态 + MCP 平台接入信息
   app.get('/api/status', (c) => {
-    markStaleSessions(db, 600_000);
+    markStaleSessions(db, 1_800_000); // 30min 超时，与 server.js SESSION_TIMEOUT 一致
     const sessions = getSessions(db, 'active');
     const connectedPlatforms = {};
     for (const p of ['claude', 'opencode', 'codex']) {
@@ -109,7 +109,8 @@ export function setupApiRoutes(app, db, root) {
   app.get('/api/gate/:gate/enforce', (c) => {
     const gate = c.req.param('gate').replace(/_/g, ' ');
     const artifacts = findGateArtifacts(getDocsDir(root), gate);
-    const sid = c.req.query('session_id') || (getSessions(db)[0]?.id);
+    const sid = c.req.query('session_id');
+    if (!sid) return c.json({ error: 'session_id query parameter required' }, 400);
     const checkpoints = getCheckpoints(db, gate, sid);
     const allowed = artifacts.length > 0 || checkpoints.length > 0;
     return c.json({
@@ -124,7 +125,8 @@ export function setupApiRoutes(app, db, root) {
 
   app.post('/api/gate/advance', async (c) => {
     const body = await c.req.json();
-    const sid = body.session_id || (getSessions(db)[0]?.id);
+    const sid = body.session_id;
+    if (!sid) return c.json({ error: 'session_id required in request body' }, 400);
     const pstate = getPipeline(db, sid);
     const pt = pstate?.pipeline_type || DEFAULT_PIPELINE;
     const gateList = getPipelineGates(pt);
@@ -153,7 +155,7 @@ export function setupApiRoutes(app, db, root) {
   });
 
   app.get('/api/sessions', (c) => {
-    markStaleSessions(db, 600_000);
+    markStaleSessions(db, 1_800_000); // 30min 超时，与 server.js SESSION_TIMEOUT 一致
     const sessions = getSessions(db).map(s => {
       const p = getPipeline(db, s.id);
       return {
@@ -179,6 +181,14 @@ export function setupApiRoutes(app, db, root) {
     return c.json({ ok: true, session_id: sid, status: 'active', gate: p?.current_gate || '?' });
   });
 
+  // Session Model B: 查询 session 的所有 pipeline runs
+  app.get('/api/pipeline-runs', (c) => {
+    const sessionId = c.req.query('session_id');
+    if (!sessionId) return c.json({ error: 'session_id query parameter required' }, 400);
+    const runs = getSessionRuns(db, sessionId);
+    return c.json({ runs, count: runs.length, session_id: sessionId });
+  });
+
   const EFFORTS = ['low', 'medium', 'high', 'xhigh', 'max'];
 
   app.get('/api/agents', (c) => {

package/src/web/views/pipeline.html

@@ -144,6 +144,26 @@
       </div>
     </div>
 
+    <!-- 历史 Runs 面板 -->
+    <div class="bg-white rounded-xl border border-slate-200 shadow-sm mb-8 overflow-hidden">
+      <div class="flex items-center justify-between px-6 py-4 cursor-pointer hover:bg-slate-50 transition-colors" onclick="toggleRunsPanel()">
+        <div class="flex items-center gap-3">
+          <i data-lucide="history" class="w-4 h-4 text-indigo-500"></i>
+          <h3 class="text-sm font-semibold text-slate-700">历史运行记录</h3>
+          <span class="text-[11px] text-slate-400 font-mono" id="runsCount">0 次运行</span>
+        </div>
+        <div class="flex items-center gap-2">
+          <span class="text-[10px] text-slate-400" id="runsToggleLabel">展开</span>
+          <i data-lucide="chevron-down" class="w-4 h-4 text-slate-400 transition-transform" id="runsToggleIcon"></i>
+        </div>
+      </div>
+      <div id="runsPanel" class="hidden border-t border-slate-100">
+        <div id="runsList" class="divide-y divide-slate-100 max-h-96 overflow-y-auto">
+          <p class="text-xs text-slate-400 text-center py-8 font-mono">请选择左侧会话查看运行记录</p>
+        </div>
+      </div>
+    </div>
+
     <!-- Gate 步骤列表 -->
     <div class="bg-white rounded-xl p-6 border border-slate-200 shadow-sm">
       <div class="flex items-center justify-between mb-1">
@@ -287,6 +307,9 @@ async function refresh() {
     selectedSession = sessionData.session_id;
   }
 
+  // 加载选中会话的历史 Runs
+  fetchPipelineRuns(selectedSession);
+
   const activeCount = allSessions.filter(s => s.status === 'active').length;
   document.getElementById('pipelineProject').textContent =
     '会话隔离模式 · ' + (allSessions.length || 0) + ' 个会话（' + activeCount + ' 活跃）· 每 5 秒自动刷新';
@@ -407,7 +430,7 @@ function renderSessions() {
   document.getElementById('sessionsList').innerHTML = filtered.map(s => {
     const isActive = s.id === selectedSession;
     const isInactive = s.status === 'inactive';
-    const isOnline = !isInactive && (Date.now() - s.heartbeat) < 120000;
+    const isOnline = !isInactive && (Date.now() - s.heartbeat) < 600000; // 10分钟
 
     let statusColor, statusLabel;
     if (isInactive) { statusColor = 'bg-amber-500'; statusLabel = '休眠'; }
@@ -448,8 +471,8 @@ async function resumeSession(sid) {
 }
 
 async function checkGate(gate) {
-  const sid = selectedSession ? '&session_id=' + selectedSession : '';
-  const d = await fetchAPI('/api/gate/' + gate.replace(/ /g, '_') + '/enforce' + sid);
+  if (!selectedSession) { toast('请先选择一个会话', false); return; }
+  const d = await fetchAPI('/api/gate/' + gate.replace(/ /g, '_') + '/enforce?session_id=' + selectedSession);
   if (!d) return;
   const info = GATE_INFO[gate] || {};
   toast(d.allowed
@@ -459,6 +482,7 @@ async function checkGate(gate) {
 }
 
 async function advanceGate(gate) {
+  if (!selectedSession) { toast('请先选择一个会话', false); return; }
   const resp = await fetch('/api/gate/advance', {
     method: 'POST', headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ gate, session_id: selectedSession })
@@ -486,6 +510,110 @@ function toast(msg, isSuccess) {
 function showHelp() { document.getElementById('helpModal').classList.remove('hidden'); document.getElementById('helpModal').classList.add('flex'); }
 function closeHelp() { document.getElementById('helpModal').classList.add('hidden'); document.getElementById('helpModal').classList.remove('flex'); }
 
+/**
+ * 展开/收起历史 Runs 面板
+ */
+function toggleRunsPanel() {
+  const panel = document.getElementById('runsPanel');
+  const icon = document.getElementById('runsToggleIcon');
+  const label = document.getElementById('runsToggleLabel');
+  if (panel.classList.contains('hidden')) {
+    panel.classList.remove('hidden');
+    icon.style.transform = 'rotate(180deg)';
+    label.textContent = '收起';
+  } else {
+    panel.classList.add('hidden');
+    icon.style.transform = 'rotate(0deg)';
+    label.textContent = '展开';
+  }
+}
+
+/**
+ * 获取指定会话的 Pipeline Runs 历史
+ * @param {string|null} sessionId - 会话 ID
+ */
+async function fetchPipelineRuns(sessionId) {
+  if (!sessionId) {
+    document.getElementById('runsList').innerHTML = '<p class="text-xs text-slate-400 text-center py-8 font-mono">请选择左侧会话查看运行记录</p>';
+    document.getElementById('runsCount').textContent = '0 次运行';
+    return;
+  }
+  try {
+    const resp = await fetch('/api/pipeline-runs?session_id=' + encodeURIComponent(sessionId));
+    if (!resp.ok) {
+      document.getElementById('runsList').innerHTML = '<p class="text-xs text-red-400 text-center py-8 font-mono">加载失败（HTTP ' + resp.status + '），请稍后重试</p>';
+      document.getElementById('runsCount').textContent = '---';
+      return;
+    }
+    const data = await resp.json();
+    if (!data || !Array.isArray(data.runs)) {
+      document.getElementById('runsList').innerHTML = '<p class="text-xs text-red-400 text-center py-8 font-mono">数据格式异常，请刷新页面重试</p>';
+      document.getElementById('runsCount').textContent = '---';
+      return;
+    }
+    renderRunsHistory(data);
+  } catch (_) {
+    // 网络错误或 JSON 解析失败
+    document.getElementById('runsList').innerHTML = '<p class="text-xs text-red-400 text-center py-8 font-mono">网络错误，无法加载运行记录</p>';
+    document.getElementById('runsCount').textContent = '---';
+  }
+}
+
+/**
+ * 渲染历史 Runs 列表
+ * @param {{ runs: Array, count: number }} runsData - API 返回的 runs 数据
+ */
+function renderRunsHistory(runsData) {
+  const runs = runsData.runs;
+  document.getElementById('runsCount').textContent = runs.length + ' 次运行';
+
+  if (runs.length === 0) {
+    document.getElementById('runsList').innerHTML = '<p class="text-xs text-slate-400 text-center py-8 font-mono">暂无运行记录</p>';
+    lucide.createIcons();
+    return;
+  }
+
+  /** 状态 → 视觉映射表 */
+  const STATUS_MAP = {
+    active:    { dotColor: 'bg-emerald-500', badgeClass: 'bg-emerald-50 text-emerald-700', label: '运行中' },
+    completed: { dotColor: 'bg-slate-400',   badgeClass: 'bg-slate-100 text-slate-600',     label: '已完成' },
+    aborted:   { dotColor: 'bg-red-500',      badgeClass: 'bg-red-50 text-red-700',          label: '已终止' },
+  };
+
+  document.getElementById('runsList').innerHTML = runs.map(function(run) {
+    const st = STATUS_MAP[run.status] || STATUS_MAP.active;
+    const isActive = run.status === 'active';
+    const shortRunId = (run.id || '').slice(0, 16) + '...';
+    const ptName = PIPELINE_NAMES[run.pipeline_type] || run.pipeline_type || '未知';
+    let dateText = '---';
+    if (run.started_at) {
+      try {
+        const d = new Date(run.started_at.replace(' ', 'T'));
+        dateText = d.toLocaleString('zh-CN', { month:'2-digit', day:'2-digit', hour:'2-digit', minute:'2-digit' });
+      } catch (_) {
+        // 日期解析失败时使用原始字符串，后端 datetime('now') 格式安全
+        dateText = run.started_at.replace(/[<>&"']/g, '');
+      }
+    }
+
+    return (
+      '<div class="flex items-center gap-4 px-6 py-3 hover:bg-slate-50/50 transition-colors ' +
+      (isActive ? 'bg-indigo-50/30 border-l-[3px] border-indigo-500' : 'border-l-[3px] border-transparent') + '">' +
+      '<div class="flex items-center gap-2 min-w-0">' +
+      '<span class="w-2 h-2 rounded-full flex-shrink-0 ' + st.dotColor + '"></span>' +
+      '<span class="text-xs font-mono text-slate-600 truncate" title="' + run.id + '">' + shortRunId + '</span>' +
+      '</div>' +
+      '<span class="text-[10px] font-medium bg-indigo-50 text-indigo-600 px-2 py-0.5 rounded flex-shrink-0">' + ptName + '</span>' +
+      '<span class="text-[11px] text-slate-500 flex-shrink-0 font-mono">' + (run.current_gate || '---') + '</span>' +
+      '<span class="text-[10px] text-slate-400 flex-shrink-0 ml-auto font-mono">' + dateText + '</span>' +
+      '<span class="text-[10px] font-medium px-2 py-0.5 rounded-full flex-shrink-0 ' + st.badgeClass + '">' + st.label + '</span>' +
+      '</div>'
+    );
+  }).join('');
+
+  lucide.createIcons();
+}
+
 // MCP 平台接入状态轮询
 async function loadMcpStatus(){
   try{