@rowansenne/workflow-run 0.21.2 → 0.22.0

package/workflow/scripts/resolve.mjs

@@ -68,7 +68,8 @@ export function docnexusConnected(root) {
 
 export function resolveTemplate(root, skill, id) {
   const meta = skillMeta(skill);
-  const t = meta?.templates.find((x) => x.id === id);
+  if (!meta) return { ok: false, error: 'unknown', message: `skill「${skill}」没有安装（${rel(root, SKILLS_DIR)} 下找不到 ${skill}/skill.json）；重跑安装并在 --skills 里带上它` };
+  const t = meta.templates.find((x) => x.id === id);
   if (!t) return { ok: false, error: 'unknown', message: `skill「${skill}」没有登记模板「${id}」（见 ${skill}/skill.json 的 templates）` };
   const lib = path.join(docnexusRoot(root), 'docnexus', 'library', 'templates', skill, id);
   const project = path.join(root, TEMPLATES_DIR, skill, id);
@@ -195,8 +196,8 @@ export function status(root) {
       categories: Object.fromEntries(skillMetas().map((m) => [m.name, resolveCategory(root, m.name)]).filter(([, c]) => c.ok).map(([n, c]) => [n, c.category])),
       how: dn ? '缺模板时运行 npx @rowansenne/workflow-run seed-templates' : '重跑 npx @rowansenne/workflow-run 并加 --with-docnexus',
     },
-    // 产物位置：项目里（默认）或独立文档仓库（workflow/references/requirements.md）
-    artifacts: (() => { const L = layout(root); return { mode: L.mode, ok: L.ok, ...(L.mode === 'repo' ? { repo: L.repo_rel, project: L.project, commit_prompt: L.commit_prompt } : { dir: 'workflow-run/docs/requirements' }), how: L.ok ? null : L.hint }; })(),
+    // 产物位置：项目里（默认）或独立文档仓库，两种都是 docs/requirements/<需求>/<项目>/（workflow/references/requirements.md）
+    artifacts: (() => { const L = layout(root); return { mode: L.mode, ok: L.ok, dir: 'workflow-run/docs/requirements', project: L.project, ...(L.mode === 'repo' ? { repo: L.repo_rel, commit_prompt: L.commit_prompt } : {}), how: L.ok ? null : L.hint }; })(),
     // 代码图谱：可用时读代码、查调用链与影响面优先用它（见 workflow/references/codegraph.md）
     codegraph: codegraphStatus(root),
     database: {

package/workflow/scripts/view.mjs

@@ -12,16 +12,17 @@ import path from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { collect, KINDS } from './artifacts.mjs';
-import { requirements, repoRequirements, layout, parseDocnexus } from './requirement.mjs';
+import { repoRequirements, layout, parseDocnexus, REQ_DIR } from './requirement.mjs';
 import { parseReview, parseDelivery, captureState, buildReport } from './report.mjs';
 
 const DEFAULT_OUT = 'workflow-run/tmp/view/index.html';
 
 // 页面数据：按需求分组
 export function viewData(root) {
-  // 文档仓库模式：连同其他项目（服务）的产物一起看，一个需求下按项目区分
+  // 连同其他项目（服务）的产物一起看，一个需求下按项目区分（文档仓库里常见；两种模式目录结构相同）
   const L = layout(root);
-  const metas = new Map(L.mode === 'repo' ? repoRequirements(root, L).map((r) => [r.slug, { name: r.name, dir: null, branches: [...new Set(r.projects.flatMap((p) => p.meta.branches ?? []))], meta: r.projects.find((p) => p.project === L.project)?.meta ?? r.projects[0]?.meta ?? {} }]) : requirements(root, L).map((r) => [r.slug, r]));
+  const reqDirOf = (slug) => (L.mode === 'repo' ? `${L.repo_name}:docs/requirements/${slug}` : `${REQ_DIR}/${slug}`);
+  const metas = new Map(repoRequirements(root, L).map((r) => [r.slug, { name: r.name, dir: reqDirOf(r.slug), branches: [...new Set(r.projects.flatMap((p) => p.meta.branches ?? []))], meta: r.projects.find((p) => p.project === L.project)?.meta ?? r.projects[0]?.meta ?? {} }]));
   const groups = new Map();
   for (const a of collect(root, { allProjects: true })) {
     const id = a.requirement ? `req:${a.requirement}` : `branch:${a.branch ?? '（无分支）'}`;
@@ -29,7 +30,7 @@ export function viewData(root) {
       const m = a.requirement ? metas.get(a.requirement) : null;
       groups.set(id, {
         id, name: m?.name ?? (a.requirement ?? a.branch ?? '（无分支）'),
-        dir: m?.dir ?? (a.requirement && L.mode === 'repo' ? `${L.repo_name}:docs/requirements/${a.requirement}` : null), named_by: m?.meta?.named_by ?? null, branches: new Set(m?.branches ?? []), projects: new Set(), artifacts: [],
+        dir: m?.dir ?? (a.requirement ? reqDirOf(a.requirement) : null), named_by: m?.meta?.named_by ?? null, branches: new Set(m?.branches ?? []), projects: new Set(), artifacts: [],
       });
     }
     const g = groups.get(id);