@twinsearth/dsh-master 3.3.3 → 3.3.4

package/dist-host/dual/schema.js

@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (c) 2026 dsh-Master contributors — see LICENSE-CORE.
+// @ts-nocheck — host JS→TS 迁移阶段：运行时行为优先，类型注解逐步补齐。
+/** PM/PJM 共享的结构化契约。纯函数，不读写文件、不调用模型。 */
+export const ASSESSMENT_CATEGORIES = Object.freeze(['completed', 'unfinished', 'blocked', 'planned', 'conflicts', 'ambiguities']);
+export const PROJECT_SECTIONS = Object.freeze(['projectReview', 'steps', 'requirements', 'schedule', 'team', 'quality', 'closure']);
+const text = (value, fallback = '') => String(value ?? fallback).trim();
+const list = (value) => Array.isArray(value) ? value.map((item) => text(item)).filter(Boolean) : (text(value) ? [text(value)] : []);
+const records = (value) => Array.isArray(value) ? value.filter((item) => item && typeof item === 'object') : [];
+const error = (code, message, detail) => ({ ok: false, code, error: message, ...(detail === undefined ? {} : { detail }) });
+const positiveMinutes = (value, fallback = 30) => {
+    const n = Number(value);
+    return Number.isFinite(n) && n > 0 ? Math.min(10_080, Math.round(n)) : fallback;
+};
+function normalizeModules(value) {
+    return records(value).map((item, index) => ({
+        id: text(item.id, `module-${index + 1}`),
+        name: text(item.name, `模块 ${index + 1}`),
+        result: text(item.result ?? item.outcome),
+        architecture: text(item.architecture),
+        status: text(item.status, 'planned'),
+    })).filter((item) => item.name);
+}
+export function normalizePrd(input = {}, { id, now = Date.now() } = {}) {
+    const title = text(input.title);
+    const goal = text(input.goal);
+    if (!title)
+        return error('title-required', 'title is required');
+    if (!goal)
+        return error('goal-required', 'goal is required');
+    const prd = Object.freeze({
+        id: String(id),
+        title,
+        goal,
+        why: text(input.why, goal),
+        what: list(input.what),
+        architecture: text(input.architecture),
+        outcomes: list(input.outcomes),
+        modules: Object.freeze(normalizeModules(input.modules)),
+        priority: ['low', 'normal', 'high', 'critical'].includes(text(input.priority, 'normal')) ? text(input.priority, 'normal') : 'normal',
+        constraints: Object.freeze(list(input.constraints)),
+        acceptance: Object.freeze(list(input.acceptance)),
+        nonGoals: Object.freeze(list(input.nonGoals)),
+        assumptions: Object.freeze(list(input.assumptions)),
+        openQuestions: Object.freeze(list(input.openQuestions)),
+        requester: text(input.requester, 'user'),
+        status: 'draft',
+        createdAt: now,
+    });
+    return { ok: true, prd };
+}
+function normalizeAssessmentItems(category, value) {
+    const items = [];
+    for (const [index, raw] of records(value).entries()) {
+        const title = text(raw.title ?? raw.name);
+        if (!title)
+            return error(`${category}[${index}].title-required`, `${category}[${index}].title is required`);
+        const base = { id: text(raw.id, `${category}-${index + 1}`), title, detail: text(raw.detail ?? raw.description) };
+        if (category === 'completed') {
+            const evidence = list(raw.evidence);
+            // “已完成”必须有可复核证据；否则只能放 planned/unfinished，不能写 100%。
+            if (evidence.length === 0)
+                return error(`completed[${index}].evidence-required`, `completed item "${title}" requires file/test/report evidence`);
+            const progress = Number(raw.progress ?? 100);
+            items.push({ ...base, progress: Number.isFinite(progress) ? Math.max(0, Math.min(100, progress)) : 100, evidence });
+        }
+        else if (category === 'unfinished') {
+            items.push({ ...base, reason: text(raw.reason, '未说明'), nextStep: text(raw.nextStep ?? raw.plan), progress: Math.max(0, Math.min(99, Number(raw.progress ?? 0) || 0)) });
+        }
+        else if (category === 'blocked') {
+            items.push({ ...base, reason: text(raw.reason, '未说明'), blocker: text(raw.blocker ?? raw.reason, '未说明'), nextStep: text(raw.nextStep) });
+        }
+        else if (category === 'planned') {
+            items.push({ ...base, plan: text(raw.plan ?? raw.nextStep), estimateMinutes: raw.estimateMinutes === undefined ? null : positiveMinutes(raw.estimateMinutes), priority: text(raw.priority, 'normal') });
+        }
+        else if (category === 'conflicts') {
+            const options = records(raw.options).map((option) => ({ value: text(option.value), label: text(option.label), consequence: text(option.consequence) })).filter((option) => option.value && option.label);
+            items.push({ ...base, question: text(raw.question, title), options, currentInterpretation: text(raw.currentInterpretation) });
+        }
+        else {
+            items.push({ ...base, question: text(raw.question, title), currentInterpretation: text(raw.currentInterpretation), needsConfirmation: raw.needsConfirmation !== false });
+        }
+    }
+    return items;
+}
+export function normalizeAssessment(input = {}, { id, now = Date.now() } = {}) {
+    const title = text(input.title);
+    if (!title)
+        return error('title-required', 'assessment title is required');
+    const assessment = { id: String(id), prdId: text(input.prdId) || null, title, why: text(input.why), what: list(input.what), createdAt: now };
+    for (const category of ASSESSMENT_CATEGORIES) {
+        const normalized = normalizeAssessmentItems(category, input[category]);
+        if (!Array.isArray(normalized))
+            return normalized;
+        assessment[category] = Object.freeze(normalized.map((item) => Object.freeze(item)));
+    }
+    return { ok: true, assessment: Object.freeze(assessment) };
+}
+function normalizeTeam(value) {
+    return records(value).map((item, index) => ({
+        id: text(item.id, `owner-${index + 1}`),
+        role: text(item.role, 'developer'),
+        owner: text(item.owner, 'unassigned'),
+        responsibility: text(item.responsibility ?? item.scope),
+    }));
+}
+function normalizeSteps(value) {
+    if (!Array.isArray(value) || value.length === 0)
+        return error('steps-required', 'steps is required');
+    const steps = [];
+    for (const [index, raw] of value.entries()) {
+        const title = text(raw?.title);
+        const prompt = text(raw?.prompt);
+        if (!title)
+            return error(`steps[${index}].title-required`, `steps[${index}].title is required`);
+        if (!prompt)
+            return error(`steps[${index}].prompt-required`, `steps[${index}].prompt is required`);
+        steps.push({
+            id: text(raw.id, `step-${index + 1}`),
+            title,
+            prompt,
+            kind: text(raw.kind, 'development'),
+            owner: text(raw.owner, 'unassigned'),
+            where: text(raw.where, 'fork'),
+            estimateMinutes: positiveMinutes(raw.estimateMinutes),
+            dependsOn: list(raw.dependsOn),
+            acceptance: list(raw.acceptance),
+            status: 'pending',
+            fork: null,
+            summary: '',
+            evidence: [],
+            actualMinutes: null,
+        });
+    }
+    return steps;
+}
+export function normalizePlan(prd, input = {}, { id, now = Date.now() } = {}) {
+    if (!prd)
+        return error('prd-not-found', 'PRD not found');
+    const steps = normalizeSteps(input.steps);
+    if (!Array.isArray(steps))
+        return steps;
+    const totalEstimateMinutes = steps.reduce((sum, step) => sum + step.estimateMinutes, 0);
+    const plan = {
+        id: String(id),
+        prdId: prd.id,
+        title: text(input.title, `${prd.title} 项目计划`),
+        status: 'planned',
+        how: text(input.how),
+        where: text(input.where, 'fang fork / DSH Web / workspace'),
+        projectReview: list(input.projectReview ?? input.review),
+        requirements: list(input.requirements),
+        steps,
+        schedule: {
+            startAt: input.schedule?.startAt ? text(input.schedule.startAt) : null,
+            totalEstimateMinutes,
+            milestones: records(input.schedule?.milestones ?? input.milestones).map((item, index) => ({
+                id: text(item.id, `milestone-${index + 1}`),
+                title: text(item.title, `里程碑 ${index + 1}`),
+                owner: text(item.owner, 'unassigned'),
+                estimateMinutes: positiveMinutes(item.estimateMinutes),
+                dependsOn: list(item.dependsOn),
+            })),
+        },
+        team: normalizeTeam(input.team ?? input.who),
+        quality: {
+            tests: list(input.quality?.tests ?? input.tests),
+            deployment: list(input.quality?.deployment ?? input.deployment),
+            acceptance: list(input.quality?.acceptance ?? input.acceptance),
+        },
+        closure: { status: 'pending', summary: '', reviewReport: '', artifacts: [], acceptance: [], closedAt: null },
+        createdAt: now,
+        updatedAt: now,
+    };
+    return { ok: true, plan };
+}
+export function planProgress(plan) {
+    const steps = Array.isArray(plan?.steps) ? plan.steps : [];
+    const count = (status) => steps.filter((step) => step.status === status).length;
+    const total = steps.length;
+    const done = count('done');
+    const estimatedMinutes = steps.reduce((sum, step) => sum + (Number(step.estimateMinutes) || 0), 0);
+    const actualMinutes = steps.reduce((sum, step) => sum + (Number(step.actualMinutes) || 0), 0);
+    return {
+        total,
+        done,
+        running: count('running'),
+        failed: count('failed'),
+        pending: count('pending') + count('dispatching'),
+        percent: total === 0 ? 0 : Math.round((done / total) * 100),
+        estimatedMinutes,
+        actualMinutes,
+        canClose: total > 0 && done === total,
+    };
+}
+export function closePlan(plan, input = {}, now = Date.now()) {
+    const progress = planProgress(plan);
+    if (!progress.canClose)
+        return error('plan-not-ready', 'all steps must be done before project closure', { progress });
+    const summary = text(input.summary);
+    if (!summary)
+        return error('summary-required', 'closure summary is required');
+    plan.status = 'closed';
+    plan.updatedAt = now;
+    plan.closure = {
+        status: 'closed',
+        summary,
+        reviewReport: text(input.reviewReport),
+        artifacts: list(input.artifacts),
+        acceptance: list(input.acceptance),
+        closedAt: now,
+    };
+    return { ok: true, plan, closure: plan.closure, progress };
+}

package/dist-host/index.js

@@ -17,7 +17,7 @@
  * 协作只走服务键（见 kernel.mjs FANG_SERVICE）：房主不 import 瓮城代码；瓮城服务
  * 不可用时子插件必须 fail-closed，绝不本地降级执行。
  */
-import { FANG_CONTRACT_MIN, FANG_SERVICE, MASTER_VERSION, ROLE_MATRIX, ROW, SERVICE, SUBPLUGIN_CATALOG, bearerOf, detectRole, enabledOf, jsonResponse, masterError, readJsonBody, roleAllowed, safeGet, } from "./kernel.js";
+import { AGENT_CATALOG, FANG_CONTRACT_MIN, FANG_SERVICE, MASTER_VERSION, ROLE_MATRIX, ROW, SERVICE, SUBPLUGIN_CATALOG, bearerOf, detectRole, enabledOf, jsonResponse, masterError, readJsonBody, roleAllowed, safeGet, } from "./kernel.js";
 import { BRIDGE_PATH, filterEnv } from "./superagent/dispatch.js";
 import { createBridgeTokenManager } from "./superagent/bridge-tokens.js";
 export const name = 'dsh-master';
@@ -88,6 +88,22 @@ export function apply(ctx, config = {}) {
             blockedReason: active || allowed ? null : `role-not-allowed:${role}`,
         };
     });
+    /**
+     * 3.3.4：两个智能体的**可选择性**（不是“已激活”）。
+     * preset 的激活由 agentPresets 服务在会话创建时决定，这里只如实报告宿主是否有该服务。
+     */
+    const agentCards = () => {
+        const presets = safeGet(ctx, 'agentPresets');
+        const available = Boolean(presets) && typeof presets?.list === 'function';
+        return AGENT_CATALOG.map((entry) => ({
+            ...entry,
+            presetServiceAvailable: available,
+            selectable: available,
+            hint: available
+                ? '新会话创建时选择该 preset；已有会话不会被改变。'
+                : '宿主缺少 agentPresets 服务（DSH web bundle 才有），本 Host 无法选择该 preset。',
+        }));
+    };
     const service = {
         id: SERVICE.master,
         name: 'dsh-master',
@@ -135,6 +151,29 @@ export function apply(ctx, config = {}) {
                 uptimeMs: Date.now() - startedAt,
                 cooperation: cooperation(),
                 subplugins: catalog(),
+                /** 3.3.4：PM / PJM 智能体（Agent preset）清单；与子插件行分开报告。 */
+                agents: agentCards(),
+                /**
+                 * 3.3.4：智囊团只读摘要。dual-manager 未装配时给 null —— 不构造空壳假装成功。
+                 */
+                dual: (() => {
+                    const dual = safeGet(ctx, SERVICE.dual);
+                    if (!dual || typeof dual.status !== 'function')
+                        return null;
+                    try {
+                        const snapshot = dual.status();
+                        return {
+                            ok: snapshot.ok === true,
+                            agents: snapshot.agents ?? null,
+                            pm: snapshot.pm ?? null,
+                            pjm: snapshot.pjm ?? null,
+                            cooperation: snapshot.cooperation ?? null,
+                        };
+                    }
+                    catch {
+                        return null;
+                    }
+                })(),
                 roleMatrix: ROLE_MATRIX,
                 bridge: {
                     enabled: Boolean(String(config.bridgeToken ?? '').trim()) || bridgeTokens.describe().tokens.length > 0,

package/dist-host/kernel.js

@@ -7,7 +7,7 @@
  * 与瓮城 dsh-Fang 的协作只走 DSH 服务键，不 import fang 代码。
  */
 import crypto from 'node:crypto';
-export const MASTER_VERSION = '3.3.3';
+export const MASTER_VERSION = '3.3.4';
 export const FANG_CONTRACT_MIN = '3.1.14';
 export const SERVICE = Object.freeze({
     master: 'dshMaster',
@@ -57,6 +57,32 @@ export const ROW = Object.freeze({
     cost: 'master-cost-optimizer',
     dual: 'master-dual-manager',
 });
+/**
+ * 3.3.4：两个可被新会话选择的智能体（Agent preset，不是子插件行）。
+ *
+ * 与 ROLE_MATRIX 的区别：preset 决定“这个会话是谁”，角色矩阵决定“这一行在哪个角色里装配”。
+ * 两者都不改变对方；智能体自身不授予任何执行权限，工具边界写在 cordis.patch.yml 的 preset 里。
+ */
+export const AGENT_CATALOG = Object.freeze([
+    Object.freeze({
+        id: 'master-pm',
+        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/盘点；不执行、不派发、不发布。',
+    }),
+    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。',
+    }),
+]);
 export const ROLE = Object.freeze({ mother: 'mother', essence: 'essence', fork: 'fork' });
 /**
  * 角色矩阵：

package/dist-host/plugins/cost-optimizer.js

@@ -108,7 +108,7 @@ export function apply(ctx, config = {}) {
     };
     const service = {
         id: SERVICE.cost,
-        version: '3.3.3',
+        version: '3.3.4',
         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.3',
+                version: '3.3.4',
                 role,
                 mode: current.mode,
                 requestedMode: current.requestedMode,
@@ -396,7 +396,7 @@ export function apply(ctx, config = {}) {
                         doubleCountGuard: report.doubleCountGuard,
                     };
                 })(),
-                note: '3.3.3：系统层记账/预算/灰度/审计 + A1 工具输出紧凑化（默认 shadow）+ 瓮城回流出口（contract 1.1.1 真实投递，回执计数修复）；工具面 A2–A3 与决策复用 B1–B4 已接入（shadow 默认）；3.3.3 起角色矩阵母体全开、分身挂双主管。',
+                note: '3.3.4：系统层记账/预算/灰度/审计 + A1 工具输出紧凑化（默认 shadow）+ 瓮城回流出口（contract 1.1.1 真实投递，回执计数修复）；工具面 A2–A3 与决策复用 B1–B4 已接入（shadow 默认）；3.3.3 起角色矩阵母体全开、分身挂双主管；3.3.4 起内置 PM/PJM 两个智能体 preset。',
             };
         },
     };