@twinsearth/dsh-master 3.3.4 → 3.3.5

package/src/engine/safe-update.ts

@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 dsh-Master contributors — see LICENSE-CORE.
+// @ts-nocheck
+
+/**
+ * 快照 → 更新 → 冒烟 → 失败回滚（PluginSafeUpdater 的可编译实现）。
+ *
+ * 关键设计：**不假装有 VM**。执行能力由调用方注入一个 `executor`：
+ *
+ *   executor.snapshot(name)            → 建快照
+ *   executor.restore(name)             → 回滚到快照
+ *   executor.run(argv, options)        → 跑一条命令，返回 { ok, stdout, stderr, code }
+ *
+ * 房主本身没有 vm-sandbox；真实接入要么由瓮城的 VM 层提供 executor，
+ * 要么由宿主进程管理器提供。这里只保证**顺序、门禁与回滚语义**正确。
+ */
+
+function asString(value) { return String(value ?? '').trim() }
+
+function executorOf(input) {
+  const executor = input && typeof input === 'object' ? input.executor : null
+  if (!executor || typeof executor.snapshot !== 'function' || typeof executor.restore !== 'function' || typeof executor.run !== 'function') {
+    return null
+  }
+  return executor
+}
+
+/**
+ * @param {{
+ *   executor?: {snapshot:Function, restore:Function, run:Function},
+ *   snapshotName?: string,
+ *   update?: string[],        // 更新命令 argv
+ *   smoke?: string[],         // 冒烟命令 argv（可选）
+ *   restart?: string[],       // 回滚后重启命令 argv（可选）
+ *   now?: () => number,
+ * }} input
+ */
+export async function runSafeUpdate(input = {}) {
+  const executor = executorOf(input)
+  if (!executor) {
+    return { ok: false, code: 'executor-required', error: 'an executor with snapshot/restore/run is required; no VM is assumed' }
+  }
+  const now = typeof input.now === 'function' ? input.now : () => Date.now()
+  const snapshotName = asString(input.snapshotName) || `pre-update-${now()}`
+  const steps = []
+  const record = (step, detail) => { steps.push({ step, at: now(), ...detail }) }
+
+  // 1. 快照是硬前置：拿不到快照就不允许更新，否则失败时无法回滚。
+  try {
+    const snapshot = await executor.snapshot(snapshotName)
+    if (snapshot && snapshot.ok === false) {
+      record('snapshot', { ok: false, detail: snapshot })
+      return { ok: false, code: 'snapshot-failed', error: 'snapshot failed; refusing to update', snapshotName, steps }
+    }
+    record('snapshot', { ok: true })
+  } catch (error) {
+    record('snapshot', { ok: false, error: String(error?.message ?? error) })
+    return { ok: false, code: 'snapshot-threw', error: String(error?.message ?? error), snapshotName, steps }
+  }
+
+  const rollback = async (reason, detail) => {
+    record('rollback-start', { reason })
+    let restored = null
+    try { restored = await executor.restore(snapshotName) } catch (error) { restored = { ok: false, error: String(error?.message ?? error) } }
+    record('restore', { ok: restored?.ok !== false, detail: restored })
+    if (Array.isArray(input.restart) && input.restart.length > 0) {
+      try {
+        const restarted = await executor.run(input.restart, { phase: 'restart' })
+        record('restart', { ok: restarted?.ok !== false, detail: restarted })
+      } catch (error) {
+        record('restart', { ok: false, error: String(error?.message ?? error) })
+      }
+    }
+    return { ok: false, code: reason, error: detail, snapshotName, steps, rolledBack: restored?.ok !== false }
+  }
+
+  // 2. 更新
+  const update = Array.isArray(input.update) && input.update.length > 0 ? input.update : null
+  if (!update) return await rollback('update-command-required', 'update argv is required')
+  try {
+    const updated = await executor.run(update, { phase: 'update' })
+    if (updated && updated.ok === false) {
+      record('update', { ok: false, detail: updated })
+      return await rollback('update-failed', 'update command failed')
+    }
+    record('update', { ok: true })
+  } catch (error) {
+    record('update', { ok: false, error: String(error?.message ?? error) })
+    return await rollback('update-threw', String(error?.message ?? error))
+  }
+
+  // 3. 冒烟（可选但推荐）：不通过同样回滚，绝不“更新成功但起不来”。
+  if (Array.isArray(input.smoke) && input.smoke.length > 0) {
+    try {
+      const smoke = await executor.run(input.smoke, { phase: 'smoke' })
+      if (smoke && smoke.ok === false) {
+        record('smoke', { ok: false, detail: smoke })
+        return await rollback('smoke-failed', 'smoke test failed after update')
+      }
+      record('smoke', { ok: true })
+    } catch (error) {
+      record('smoke', { ok: false, error: String(error?.message ?? error) })
+      return await rollback('smoke-threw', String(error?.message ?? error))
+    }
+  }
+
+  return { ok: true, code: 'updated', snapshotName, steps, rolledBack: false }
+}
+
+/**
+ * 组合使用：切指针 + 健康检查 + 失败回滚。适合蓝绿切换后的验证。
+ * 指针切换成功但健康检查失败时，把指针切回旧目标。
+ */
+export async function switchAndVerify(input = {}) {
+  const { readPointer, switchWithRollback } = await import('./atomic-switch.ts')
+  const { probeHealth } = await import('./health-probe.ts')
+  // 先记住旧目标：健康检查失败时要切回它，而不是切到“刚切过去的新目标”。
+  const previous = await readPointer({ linkPath: input.linkPath, fs: input.fs })
+  const switched = await switchWithRollback({
+    linkPath: input.linkPath,
+    targetDir: input.targetDir,
+    fs: input.fs,
+    platform: input.platform,
+    now: input.now,
+  })
+  if (!switched.ok) return { ok: false, code: switched.code, error: switched.error, switch: switched, health: null, previous }
+  const health = await probeHealth({
+    url: input.healthUrl,
+    fetchImpl: input.fetchImpl,
+    timeoutMs: input.timeoutMs,
+    intervalMs: input.intervalMs,
+    maxAttempts: input.maxAttempts,
+    now: input.now,
+    sleepImpl: input.sleepImpl,
+  })
+  if (health.ok) return { ok: true, code: 'switched-and-healthy', switch: switched, health, previous }
+  if (!previous.ok || !previous.resolved) {
+    return { ok: false, code: 'health-failed-after-switch', switch: switched, health, previous, rollback: null }
+  }
+  const back = await switchWithRollback({
+    linkPath: input.linkPath,
+    targetDir: previous.resolved,
+    fs: input.fs,
+    platform: input.platform,
+    now: input.now,
+  }).catch((error) => ({ ok: false, error: String(error?.message ?? error) }))
+  return { ok: false, code: 'health-failed-after-switch', switch: switched, health, previous, rollback: back }
+}

package/src/index.ts

@@ -38,14 +38,19 @@ import {
   safeGet,
   tokenEquals,
 } from './kernel.ts'
+import { randomBytes } from 'node:crypto'
+
 import { BRIDGE_PATH, filterEnv } from './superagent/dispatch.ts'
 import { createBridgeTokenManager } from './superagent/bridge-tokens.ts'
+import { attachCommandCenterChannel, CHANNEL_PATH } from './channel/server.ts'
 
 export const name = 'dsh-master'
 export const inject = []
 
 /** 状态路由（Client UI 读取；只读、非敏感、loopback-only 由宿主 webServer 保证）。 */
 export const STATUS_ROUTE = '/dsh-master/api/status'
+/** 3.3.5：智囊团只读快照（交接/计划/反馈/复核）。 */
+export const DUAL_ROUTE = '/dsh-master/api/dual'
 
 /**
  * 房主核心 apply。
@@ -123,8 +128,80 @@ export function apply(ctx, config = {}) {
     }))
   }
 
-  const service = {
-    id: SERVICE.master,
+  /**
+   * 3.3.5：智囊团只读快照（面板数据源）。
+   * 只暴露“谁在等什么”，不暴露 token、不提供写入口；dual 未装配时给 available:false。
+   */
+  const dualSnapshot = () => {
+    const dual = safeGet(ctx, SERVICE.dual)
+    if (!dual || typeof dual.status !== 'function') {
+      return { ok: true, available: false, reason: 'dual-service-unavailable', updatedAt: Date.now(), handoffs: [], plans: [], feedbacks: [], reviews: [], loop: null }
+    }
+    const safe = (fn, fallback) => { try { return fn() } catch { return fallback } }
+    const handoffs = safe(() => dual.pm.listHandoffs().items, [])
+    const plans = safe(() => dual.pjm.listPlans().items, [])
+    const feedbacks = safe(() => dual.pjm.listFeedback().items, [])
+    const reviews = safe(() => dual.pm.listReviews().items, [])
+    return {
+      ok: true,
+      available: true,
+      updatedAt: Date.now(),
+      agents: { pm: 'master-pm', pjm: 'master-pjm' },
+      loop: safe(() => dual.status().loop, null),
+      handoffs: handoffs.map((item) => ({
+        id: item.id,
+        prdId: item.prdId,
+        title: item.title,
+        status: item.status,
+        reason: item.reason ?? null,
+        openQuestions: (item.openQuestions ?? []).slice(0, 10),
+        acceptance: (item.acceptance ?? []).slice(0, 10),
+        planId: item.planId ?? null,
+        preparedAt: item.preparedAt ?? null,
+      })),
+      plans: plans.map((plan) => {
+        const progress = safe(() => dual.pjm.progress(plan.id).progress, null)
+        const lastReport = Array.isArray(plan.reports) && plan.reports.length > 0 ? plan.reports.at(-1) : null
+        return {
+          id: plan.id,
+          prdId: plan.prdId,
+          title: plan.title,
+          status: plan.status,
+          handoffId: plan.handoffId ?? null,
+          progress,
+          lastReport: lastReport ? { status: lastReport.status, summary: lastReport.summary, blocker: lastReport.blocker ?? null, at: lastReport.at } : null,
+          pmReview: plan.pmReview ?? null,
+          feedbackId: plan.feedbackId ?? null,
+        }
+      }),
+      feedbacks: feedbacks.map((item) => ({
+        id: item.id,
+        planId: item.planId,
+        prdId: item.prdId ?? null,
+        createdAt: item.createdAt ?? null,
+        summary: String(item.summary ?? '').slice(0, 500),
+        metrics: item.metrics ?? null,
+        openIssues: (item.openIssues ?? []).slice(0, 10),
+      })),
+      reviews: reviews.map((review) => ({
+        id: review.id,
+        feedbackId: review.feedbackId,
+        planId: review.planId,
+        verdict: review.verdict,
+        createdAt: review.createdAt ?? null,
+        failed: (review.acceptanceChecks ?? []).filter((check) => check.met !== true).map((check) => check.criterion),
+      })),
+    }
+  }
+
+  /**
+   * 智能体通道 token（3.3.5）：每次加载随机生成；只读 status 暴露给同源面板。
+   * 跨站页面由 Origin 校验挡住；token 只是纵深防御，不是唯一门槛。
+   */
+  const channelToken = String(config.channelToken ?? '').trim() || randomBytes(24).toString('hex')
+  const safeOrigin = (fn) => { try { return String(fn() ?? '') } catch { return '' } }
+
+  const service = {    id: SERVICE.master,
     name: 'dsh-master',
     version: MASTER_VERSION,
     role,
@@ -187,6 +264,8 @@ export function apply(ctx, config = {}) {
             }
           } catch { return null }
         })(),
+        /** 3.3.5：智囊团 WebSocket 通道（同源面板用；chat 目前返回具名缺口）。 */
+        channel: { path: CHANNEL_PATH, token: channelToken },
         roleMatrix: ROLE_MATRIX,
         bridge: {
           enabled: Boolean(String(config.bridgeToken ?? '').trim()) || bridgeTokens.describe().tokens.length > 0,
@@ -234,6 +313,30 @@ export function apply(ctx, config = {}) {
         } catch (error) {
           logWarn(`[dsh-master] status route registration failed: ${String(error?.message ?? error)}`)
         }
+        // v3.3.5：智囊团只读数据源（交接 / 计划 / 反馈 / 复核）。无写口、无 token。
+        try {
+          webServer.register({
+            kind: 'exact',
+            path: DUAL_ROUTE,
+            method: 'GET',
+            handler: async (req, res) => jsonResponse(res, 200, dualSnapshot()),
+          })
+        } catch (error) {
+          logWarn(`[dsh-master] dual route registration failed: ${String(error?.message ?? error)}`)
+        }
+        // v3.3.5：智囊团 WebSocket 通道（双向；当前只推快照，chat 返回具名缺口）。
+        try {
+          const channel = attachCommandCenterChannel({
+            webServer,
+            token: channelToken,
+            dualSnapshot,
+            allowedOrigin: safeOrigin(() => webServer.getOrigin?.()),
+            logger: { info: logWarn, warn: logWarn, error: logWarn },
+          })
+          logWarn(`[dsh-master] command-center channel: ${channel.attached ? channel.path : `not attached (${channel.reason})`}`)
+        } catch (error) {
+          logWarn(`[dsh-master] command-center channel failed: ${String(error?.message ?? error)}`)
+        }
         // v3.2.3：原身 Router → 母体 forker 的跨进程派发桥。
         try {
           webServer.register({

package/src/kernel.ts

@@ -10,7 +10,7 @@
 
 import crypto from 'node:crypto'
 
-export const MASTER_VERSION = '3.3.4'
+export const MASTER_VERSION = '3.3.5'
 export const FANG_CONTRACT_MIN = '3.1.14'
 
 export const SERVICE = Object.freeze({
@@ -75,18 +75,18 @@ export const AGENT_CATALOG = Object.freeze([
     preset: 'master-pm',
     name: '产品经理（PM）',
     nameEn: 'Product Manager',
-    responsibilities: ['需求澄清与选择题请示', 'WHY/WHAT 与 PRD', '六类现状盘点（证据驱动）'],
-    tools: ['pm_create_prd', 'pm_create_assessment', 'pm_write_prd', 'pm_list_prds'],
-    boundary: '只读代码与文档 + 向用户提问 + 写 PRD/盘点；不执行、不派发、不发布。',
+    responsibilities: ['需求澄清与选择题请示', 'WHY/WHAT 与 PRD', '六类现状盘点（证据驱动）', '交接给 PJM', '复核/复盘/总结'],
+    tools: ['pm_create_prd', 'pm_create_assessment', 'pm_write_prd', 'pm_list_prds', 'pm_handoff_to_pjm', 'pm_review_feedback', 'pm_pipeline', 'pm_next_action'],
+    boundary: '只读代码与文档 + 向用户提问 + 写 PRD/盘点/复核；不执行、不派发、不发布。',
   }),
   Object.freeze({
     id: 'master-pjm',
     preset: 'master-pjm',
     name: '项目经理（PJM）',
     nameEn: 'Project Manager',
-    responsibilities: ['WBS 与七类项目管理', '隔离派发与节点汇总', '测试/交付/验收与结案'],
-    tools: ['pjm_create_plan', 'pjm_dispatch_step', 'pjm_complete_step', 'pjm_project_status', 'pjm_write_project', 'pjm_close_project'],
-    boundary: '只读代码 + 计划/派发/汇报；派发必须经 fangForker.spawn，无 forker 即 fail-closed。',
+    responsibilities: ['WBS 与七类项目管理', '接单与隔离派发', '节点自反馈', '测试/交付/验收与结案'],
+    tools: ['pjm_create_plan', 'pjm_take_handoff', 'pjm_dispatch_step', 'pjm_complete_step', 'pjm_project_status', 'pjm_check_step', 'pjm_report', 'pjm_submit_feedback', 'pjm_write_project', 'pjm_close_project', 'pjm_next_action'],
+    boundary: '只读代码 + 计划/派发/反馈；派发必须经 fangForker.spawn，无 forker 即 fail-closed；不替 PM 决定需求。',
   }),
 ])
 

package/src/plugins/cost-optimizer.ts

@@ -117,7 +117,7 @@ export function apply(ctx, config = {}) {
 
   const service = {
     id: SERVICE.cost,
-    version: '3.3.4',
+    version: '3.3.5',
     role,
     get mode() {
       return system.policy.describe().mode
@@ -354,7 +354,7 @@ export function apply(ctx, config = {}) {
       return {
         ok: true,
         id: 'cost-optimizer',
-        version: '3.3.4',
+        version: '3.3.5',
         role,
         mode: current.mode,
         requestedMode: current.requestedMode,
@@ -396,7 +396,7 @@ export function apply(ctx, config = {}) {
             doubleCountGuard: report.doubleCountGuard,
           }
         })(),
-        note: '3.3.4：系统层记账/预算/灰度/审计 + A1 工具输出紧凑化（默认 shadow）+ 瓮城回流出口（contract 1.1.1 真实投递，回执计数修复）；工具面 A2–A3 与决策复用 B1–B4 已接入（shadow 默认）；3.3.3 起角色矩阵母体全开、分身挂双主管；3.3.4 起内置 PM/PJM 两个智能体 preset。',
+        note: '3.3.5：系统层记账/预算/灰度/审计 + A1 工具输出紧凑化（默认 shadow）+ 瓮城回流出口（contract 1.1.1 真实投递，回执计数修复）；工具面 A2–A3 与决策复用 B1–B4 已接入（shadow 默认）；3.3.3 起角色矩阵母体全开、分身挂双主管；3.3.4 起内置 PM/PJM 两个智能体 preset；3.3.5 起补齐引擎原语、可中断 LLM 流、WS 通道与流式管线。',
       }
     },
   }

package/src/plugins/dual-manager.ts

@@ -31,8 +31,9 @@ import {
   roleAllowed,
   safeGet,
 } from '../kernel.ts'
-import { closePlan, normalizeAssessment, normalizePlan, normalizePrd, planProgress } from '../dual/schema.ts'
-import { renderAssessmentDocument, renderClosureDocument, renderPrdDocument, renderProjectDocument } from '../dual/documents.ts'
+import { closePlan, acceptHandoff, normalizeAssessment, normalizeFeedback, normalizeHandoff, normalizePlan, normalizePrd, normalizeReview, planProgress } from '../dual/schema.ts'
+import { renderAssessmentDocument, renderClosureDocument, renderPrdDocument, renderProjectDocument, renderReviewDocument } from '../dual/documents.ts'
+import { nextPjmAction, nextPmAction } from '../dual/orchestrator.ts'
 
 export const name = 'dsh-master-dual-manager'
 export const inject = ['dshMaster']
@@ -61,9 +62,15 @@ export function apply(ctx, config = {}) {
   const newPrdId = createIdFactory('prd')
   const newAssessmentId = createIdFactory('review')
   const newPlanId = createIdFactory('plan')
+  const newHandoffId = createIdFactory('handoff')
+  const newFeedbackId = createIdFactory('feedback')
+  const newReviewId = createIdFactory('pmreview')
   const prds = new Map()
   const assessments = new Map()
   const plans = new Map()
+  const handoffs = new Map()
+  const feedbacks = new Map()
+  const reviews = new Map()
 
   const decisionCenter = () => safeGet(ctx, FANG_SERVICE.decisionCenter)
   const forker = () => {
@@ -141,6 +148,100 @@ export function apply(ctx, config = {}) {
       if (!assessment) return masterError('assessment-not-found', 'Assessment not found', { id: String(id ?? '') })
       return await writeWorkspaceDocument(agent, path.join('docs', 'pm', `REVIEW-${id}.md`), renderAssessmentDocument(assessment))
     },
+    /** 闭环第一步：PM 把 PRD（+盘点）打成交接包；open questions / 冲突未清则不给 ready。 */
+    createHandoff(prdId, input = {}) {
+      const prd = prds.get(String(prdId ?? ''))
+      if (!prd) return masterError('prd-not-found', 'PRD not found', { id: String(prdId ?? '') })
+      const assessmentId = String(input.assessmentId ?? '').trim()
+      const assessment = assessmentId ? assessments.get(assessmentId) : null
+      if (assessmentId && !assessment) return masterError('assessment-not-found', 'Assessment not found', { id: assessmentId })
+      const made = normalizeHandoff(prd, assessment, { ...input, prdId: prd.id }, { id: newHandoffId() })
+      if (!made.ok) return made
+      handoffs.set(made.handoff.id, made.handoff)
+      return { ...made, ready: made.handoff.status === 'ready', reason: made.handoff.reason }
+    },
+    getHandoff(id) {
+      const handoff = handoffs.get(String(id ?? ''))
+      return handoff ? { ok: true, handoff } : masterError('handoff-not-found', 'Handoff not found', { id: String(id ?? '') })
+    },
+    listHandoffs() {
+      return { ok: true, items: [...handoffs.values()] }
+    },
+    /** 闭环第三步：PM 复核 PJM 反馈（逐条验收 + 复盘 + 总结），结论必须与验收一致。 */
+    reviewFeedback(feedbackId, input = {}) {
+      const feedback = feedbacks.get(String(feedbackId ?? ''))
+      if (!feedback) return masterError('feedback-not-found', 'Feedback not found', { id: String(feedbackId ?? '') })
+      const made = normalizeReview(feedback, { ...input, feedbackId: feedback.id }, { id: newReviewId() })
+      if (!made.ok) return made
+      reviews.set(made.review.id, made.review)
+      const plan = plans.get(feedback.planId)
+      const handoff = [...handoffs.values()].find((item) => item.planId === feedback.planId) ?? null
+      if (plan) {
+        plan.pmReview = Object.freeze({
+          reviewId: made.review.id,
+          verdict: made.review.verdict,
+          accepted: made.review.verdict === 'accepted',
+          reviewedAt: made.review.createdAt,
+        })
+        // 结案后仍保留事实，只标注“是否被 PM 接受”；不伪造重新开场。
+        plan.updatedAt = Date.now()
+      }
+      return { ok: true, review: made.review, planAccepted: made.review.verdict === 'accepted', handoffId: handoff?.id ?? null }
+    },
+    getReview(id) {
+      const review = reviews.get(String(id ?? ''))
+      return review ? { ok: true, review } : masterError('pm-review-not-found', 'Review not found', { id: String(id ?? '') })
+    },
+    listReviews() {
+      return { ok: true, items: [...reviews.values()] }
+    },
+    /** 闭环状态：一个 PRD 走到哪一步（交接/计划/反馈/复核）。 */
+    pipeline(prdId) {
+      const prd = prds.get(String(prdId ?? ''))
+      if (!prd) return masterError('prd-not-found', 'PRD not found', { id: String(prdId ?? '') })
+      const handoff = [...handoffs.values()].filter((item) => item.prdId === prd.id).at(-1) ?? null
+      const plan = handoff?.planId ? plans.get(handoff.planId) ?? null : [...plans.values()].filter((item) => item.prdId === prd.id).at(-1) ?? null
+      const feedback = plan ? [...feedbacks.values()].filter((item) => item.planId === plan.id).at(-1) ?? null : null
+      const review = feedback ? [...reviews.values()].filter((item) => item.feedbackId === feedback.id).at(-1) ?? null : null
+      const stage = review
+        ? (review.verdict === 'accepted' ? 'accepted' : 'changes-requested')
+        : feedback ? 'feedback-submitted'
+          : plan ? (plan.status === 'closed' ? 'closed-without-feedback' : 'planning')
+            : handoff ? (handoff.status === 'ready' ? 'handoff-ready' : 'needs-clarification')
+              : 'drafted'
+      return {
+        ok: true,
+        prdId: prd.id,
+        stage,
+        handoffId: handoff?.id ?? null,
+        handoffStatus: handoff?.status ?? null,
+        planId: plan?.id ?? null,
+        planStatus: plan?.status ?? null,
+        feedbackId: feedback?.id ?? null,
+        reviewId: review?.id ?? null,
+        verdict: review?.verdict ?? null,
+      }
+    },
+    /** 闭环第三步落盘：复核 + 复盘 + 总结文档。 */
+    async writeReview(reviewId, { agent } = {}) {
+      const review = reviews.get(String(reviewId ?? ''))
+      if (!review) return masterError('pm-review-not-found', 'Review not found', { id: String(reviewId ?? '') })
+      const feedback = feedbacks.get(review.feedbackId) ?? null
+      const handoff = feedback ? [...handoffs.values()].find((item) => item.planId === review.planId) ?? null : null
+      const markdown = renderReviewDocument(review, { feedback, handoff })
+      return await writeWorkspaceDocument(agent, path.join('docs', 'pm', `REVIEW-${review.id}.md`), markdown)
+    },
+    /** 编排建议：PM 下一步该做什么（纯推荐，不产生副作用）。 */
+    nextAction(prdId) {
+      const prd = prds.get(String(prdId ?? ''))
+      if (!prd) return masterError('prd-not-found', 'PRD not found', { id: String(prdId ?? '') })
+      const assessment = [...assessments.values()].filter((item) => item.prdId === prd.id).at(-1) ?? null
+      const handoff = [...handoffs.values()].filter((item) => item.prdId === prd.id).at(-1) ?? null
+      const plan = handoff?.planId ? plans.get(handoff.planId) ?? null : null
+      const feedback = plan ? [...feedbacks.values()].filter((item) => item.planId === plan.id).at(-1) ?? null : null
+      const review = feedback ? [...reviews.values()].filter((item) => item.feedbackId === feedback.id).at(-1) ?? null : null
+      return { ok: true, prdId: prd.id, ...nextPmAction({ prd, assessment, handoff, feedback, review }), pipeline: pm.pipeline(prd.id) }
+    },
     /** 歧义澄清：复用瓮城决策中心，返回 ticket 或明确的 unavailable。 */
     async askUser({ question, context = '', options = [], level = 'yellow' } = {}) {
       const q = String(question ?? '').trim()
@@ -166,15 +267,112 @@ export function apply(ctx, config = {}) {
   }
 
   const pjm = {
-    /** PRD → 七类项目计划与可调度 WBS。 */
+    /** PRD → 七类项目计划与可调度 WBS；给 handoffId 时同时完成接单。 */
     plan(prdId, input = {}) {
       const prd = prds.get(String(prdId ?? ''))
       if (!prd) return masterError('prd-not-found', 'PRD not found', { id: String(prdId ?? '') })
+      const handoffId = String(input.handoffId ?? '').trim()
+      const handoff = handoffId ? handoffs.get(handoffId) : null
+      if (handoffId && !handoff) return masterError('handoff-not-found', 'Handoff not found', { id: handoffId })
+      if (handoff && handoff.status === 'needs-clarification') {
+        return masterError('handoff-not-ready', 'PM must resolve open questions before PJM plans', { reason: handoff.reason, openQuestions: handoff.openQuestions })
+      }
+      if (handoff && handoff.prdId !== prd.id) return masterError('handoff-prd-mismatch', 'Handoff belongs to a different PRD', { handoffId, prdId: prd.id })
       const made = normalizePlan(prd, input, { id: newPlanId() })
       if (!made.ok) return made
       plans.set(made.plan.id, made.plan)
+      if (handoff) {
+        const accepted = acceptHandoff(handoff, { planId: made.plan.id })
+        if (!accepted.ok) return { ...accepted, plan: made.plan }
+        made.plan.handoffId = handoff.id
+      }
       return made
     },
+    /** 接单（独立调用）：只有 ready 的交接包能被接走。 */
+    takeHandoff(handoffId, input = {}) {
+      const handoff = handoffs.get(String(handoffId ?? ''))
+      if (!handoff) return masterError('handoff-not-found', 'Handoff not found', { id: String(handoffId ?? '') })
+      return acceptHandoff(handoff, { planId: input.planId })
+    },
+    listHandoffs() {
+      return { ok: true, items: [...handoffs.values()] }
+    },
+    /** 节点自反馈：执行中随时可报，不等到最后；blocked 必须写原因。 */
+    report(planId, input = {}) {
+      const plan = plans.get(String(planId ?? ''))
+      if (!plan) return masterError('plan-not-found', 'Plan not found', { id: String(planId ?? '') })
+      const summary = String(input.summary ?? '').trim()
+      if (!summary) return missing('summary')
+      const status = ['progress', 'blocked', 'done'].includes(String(input.status)) ? String(input.status) : 'progress'
+      if (status === 'blocked' && !String(input.blocker ?? input.reason ?? '').trim()) {
+        return masterError('blocker-required', 'a blocked report must name the blocker')
+      }
+      plan.reports = Array.isArray(plan.reports) ? plan.reports : []
+      plan.reports.push(Object.freeze({
+        stepId: String(input.stepId ?? '') || null,
+        status,
+        summary,
+        blocker: String(input.blocker ?? input.reason ?? '').trim() || null,
+        evidence: Array.isArray(input.evidence) ? input.evidence.map(String).filter(Boolean) : [],
+        at: Date.now(),
+      }))
+      plan.updatedAt = Date.now()
+      return { ok: true, planId: plan.id, status, reports: plan.reports.length, progress: planProgress(plan) }
+    },
+    /** 项目级自反馈：计划全部步骤完成后提交给 PM 复核。 */
+    submitFeedback(planId, input = {}) {
+      const plan = plans.get(String(planId ?? ''))
+      if (!plan) return masterError('plan-not-found', 'Plan not found', { id: String(planId ?? '') })
+      const prd = prds.get(plan.prdId) ?? null
+      const handoff = [...handoffs.values()].find((item) => item.planId === plan.id) ?? null
+      const made = normalizeFeedback(plan, prd, { ...input, planId: plan.id, handoffId: handoff?.id ?? input.handoffId }, { id: newFeedbackId() })
+      if (!made.ok) return made
+      feedbacks.set(made.feedback.id, made.feedback)
+      plan.feedbackId = made.feedback.id
+      return { ...made, handoffId: handoff?.id ?? null }
+    },
+    listFeedback() {
+      return { ok: true, items: [...feedbacks.values()] }
+    },
+    /** 单步状态：房主没有 VM 作业队列，这里报的是派发/执行/汇报的真实状态。 */
+    checkStep(planId, stepId) {
+      const plan = plans.get(String(planId ?? ''))
+      if (!plan) return masterError('plan-not-found', 'Plan not found', { id: String(planId ?? '') })
+      const step = plan.steps.find((item) => item.id === String(stepId ?? ''))
+      if (!step) return masterError('step-not-found', 'Step not found', { id: String(stepId ?? '') })
+      const reports = (Array.isArray(plan.reports) ? plan.reports : []).filter((report) => !report.stepId || report.stepId === step.id)
+      return {
+        ok: true,
+        planId: plan.id,
+        stepId: step.id,
+        title: step.title,
+        status: step.status,
+        owner: step.owner ?? null,
+        where: step.where ?? null,
+        estimateMinutes: step.estimateMinutes ?? null,
+        actualMinutes: step.actualMinutes ?? null,
+        summary: step.summary ?? null,
+        evidence: step.evidence ?? [],
+        acceptance: step.acceptance ?? [],
+        fork: step.fork ?? null,
+        reports: reports.slice(-5),
+        note: 'no-vm-jobs: 房主经 fangForker 派发隔离执行体，没有 vm_job_submit / vm_job_status 这类作业队列',
+      }
+    },
+    /** 编排建议：PJM 下一步该做什么（纯推荐，不产生副作用）。 */
+    nextAction(planId) {
+      const plan = plans.get(String(planId ?? ''))
+      if (!plan) return masterError('plan-not-found', 'Plan not found', { id: String(planId ?? '') })
+      const handoff = [...handoffs.values()].find((item) => item.planId === plan.id)
+        ?? [...handoffs.values()].filter((item) => item.prdId === plan.prdId).at(-1)
+        ?? null
+      const feedback = [...feedbacks.values()].filter((item) => item.planId === plan.id).at(-1) ?? null
+      return { ok: true, planId: plan.id, ...nextPjmAction({ handoff, plan, feedback }), progress: planProgress(plan) }
+    },
+    getFeedback(id) {
+      const feedback = feedbacks.get(String(id ?? ''))
+      return feedback ? { ok: true, feedback } : masterError('feedback-not-found', 'Feedback not found', { id: String(id ?? '') })
+    },
     getPlan(id) {
       const plan = plans.get(String(id ?? ''))
       return plan ? { ok: true, plan } : masterError('plan-not-found', 'Plan not found', { id: String(id ?? '') })
@@ -287,8 +485,15 @@ export function apply(ctx, config = {}) {
         version: MASTER_VERSION,
         role,
         agents: { pm: 'master-pm', pjm: 'master-pjm' },
-        pm: { prds: prds.size, assessments: assessments.size },
-        pjm: { plans: plans.size, closed: [...plans.values()].filter((plan) => plan.status === 'closed').length },
+        pm: { prds: prds.size, assessments: assessments.size, handoffs: handoffs.size, reviews: reviews.size },
+        pjm: { plans: plans.size, closed: [...plans.values()].filter((plan) => plan.status === 'closed').length, feedbacks: feedbacks.size },
+        loop: {
+          pendingHandoffs: [...handoffs.values()].filter((item) => item.status !== 'accepted').length,
+          acceptedHandoffs: [...handoffs.values()].filter((item) => item.status === 'accepted').length,
+          awaitingReview: [...feedbacks.values()].filter((item) => ![...reviews.values()].some((review) => review.feedbackId === item.id)).length,
+          accepted: [...reviews.values()].filter((review) => review.verdict === 'accepted').length,
+          changesRequested: [...reviews.values()].filter((review) => review.verdict === 'changes-requested').length,
+        },
         cooperation: {
           decisionCenter: Boolean(decisionCenter()),
           forker: Boolean(forker()),
@@ -301,7 +506,7 @@ export function apply(ctx, config = {}) {
   master.registerSubplugin({
     id: 'dual-manager',
     name: 'dsh-master-dual-manager',
-    capabilities: ['pm-prd', 'pm-assessment', 'pm-document', 'pm-ask-user', 'pjm-plan', 'pjm-dispatch', 'pjm-progress', 'pjm-close'],
+    capabilities: ['pm-prd', 'pm-assessment', 'pm-document', 'pm-ask-user', 'pm-handoff', 'pm-review', 'pjm-plan', 'pjm-dispatch', 'pjm-progress', 'pjm-close', 'pjm-feedback'],
     description: 'PM/PJM 双智能体共享服务；master-pm 与 master-pjm preset 复用此服务',
   })
   return service