@gobing-ai/spur 0.3.60 → 0.3.61

package/spur.js

@@ -37592,6 +37592,18 @@ function resolveHistoryRefreshTrigger(config3) {
   const parsed = HistoryRefreshConfigSchema.parse(config3?.history?.refresh ?? {});
   return { onCompletion: parsed.on_completion, debounceMs: parsed.debounce_ms };
 }
+function misplacedGlobalKeys(parsed) {
+  const misplaced = [];
+  for (const key of PROJECT_SHAPED_GLOBAL_KEYS) {
+    if (key in parsed)
+      misplaced.push(key);
+  }
+  const agent = parsed.agent;
+  if (typeof agent === "object" && agent !== null && "team" in agent) {
+    misplaced.push("agent.team");
+  }
+  return misplaced;
+}
 function parseEnvBoolean(value) {
   if (value === undefined || value === "")
     return;
@@ -37620,7 +37632,7 @@ function buildConfigFromEnv(env = process.env) {
     }
   });
 }
-var SPUR_ENV_VARS, SPUR_LOG_LEVELS, DEFAULT_TASKS_DIR = "docs/tasks", DEFAULT_FEATURES_DIR = "docs/features", DEFAULT_DATABASE_URL = ".spur/spur.db", IN_MEMORY_DATABASE_URL = ":memory:", folderConfigSchema, tasksConfigSchema, featuresConfigSchema, EXECUTOR_CAPABILITY_TIERS, executorCapabilityTierSchema, AGENT_ROLE_NAMES, DEFAULT_AGENT_ROLES, AgentExecutorConfigSchema, AgentRoleConfigSchema, AGENT_ID_REGEX, TeamMemberConfigSchema, TeamConfigSchema, AgentOutputConfigSchema, AgentConfigSchema, RulesConfigSchema, WorkflowsConfigSchema, WorkflowConfigSchema, RedactionConfigSchema, HistoryRefreshConfigSchema, HistoryConfigSchema, spurConfigSchema, configSchema2;
+var SPUR_ENV_VARS, SPUR_LOG_LEVELS, DEFAULT_TASKS_DIR = "docs/tasks", DEFAULT_FEATURES_DIR = "docs/features", DEFAULT_DATABASE_URL = ".spur/spur.db", IN_MEMORY_DATABASE_URL = ":memory:", folderConfigSchema, tasksConfigSchema, featuresConfigSchema, EXECUTOR_CAPABILITY_TIERS, executorCapabilityTierSchema, AGENT_ROLE_NAMES, DEFAULT_AGENT_ROLES, AgentExecutorConfigSchema, AgentRoleConfigSchema, AGENT_ID_REGEX, TeamMemberConfigSchema, TeamConfigSchema, AgentOutputConfigSchema, AgentConfigSchema, RulesConfigSchema, WorkflowsConfigSchema, WorkflowConfigSchema, RedactionConfigSchema, HistoryRefreshConfigSchema, HistoryConfigSchema, spurConfigSchema, PROJECT_SHAPED_GLOBAL_KEYS, configSchema2;
 var init_src = __esm(() => {
   init_zod();
   init_finding_codes();
@@ -37661,7 +37673,7 @@ var init_src = __esm(() => {
   executorCapabilityTierSchema = exports_external.preprocess((value) => {
     if (value === undefined || value === null)
       return;
-    return normalizeExecutorTier(value);
+    return typeof value === "string" ? normalizeExecutorTier(value) : value;
   }, exports_external.enum(EXECUTOR_CAPABILITY_TIERS).optional());
   AGENT_ROLE_NAMES = ["scribe", "coder", "reviewer", "planner"];
   DEFAULT_AGENT_ROLES = new Map([
@@ -37858,6 +37870,7 @@ var init_src = __esm(() => {
     tasks: tasksConfigSchema.optional(),
     features: featuresConfigSchema.optional()
   });
+  PROJECT_SHAPED_GLOBAL_KEYS = ["name", "bootstrap", "rules", "redaction", "tasks", "features"];
   configSchema2 = exports_external.object({
     database: exports_external.object({
       url: exports_external.string().default(DEFAULT_DATABASE_URL)
@@ -39523,7 +39536,9 @@ function walk(dir, relPrefix, filter = /\.(ya?ml|json)$/i) {
 function isDroppedFromProjectSeed(rel) {
   if (rel === BUNDLED_GLOBAL_CONFIG)
     return true;
-  if (rel.startsWith("templates/task/"))
+  if (rel.startsWith("templates/"))
+    return true;
+  if (rel.startsWith("workflows/"))
     return true;
   if (rel.startsWith("plugins/"))
     return true;
@@ -39676,6 +39691,9 @@ async function readRawYamlLayer(configPath, kind) {
     throw new Error(`Failed to parse ${kind} config ${configPath}: ${error51.message}`);
   }
 }
+function parseConfigYaml2(text3) {
+  return $parse(text3) ?? {};
+}
 function isPlainObject6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -39718,21 +39736,20 @@ function mergeByKeyIdentity(globalItems, projectItems, identityOf, segments) {
   const indexByIdentity = new Map;
   for (const item of globalItems) {
     const identity4 = identityOf(item);
-    if (identity4 === undefined || !indexByIdentity.has(identity4)) {
-      if (identity4 !== undefined)
-        indexByIdentity.set(identity4, merged.length);
-      merged.push(item);
-    }
+    if (identity4 !== undefined && !indexByIdentity.has(identity4))
+      indexByIdentity.set(identity4, merged.length);
+    merged.push(item);
   }
+  const matchedProjectIdentities = new Set;
   for (const item of projectItems) {
     const identity4 = identityOf(item);
-    const existing = identity4 === undefined ? undefined : indexByIdentity.get(identity4);
+    const existing = identity4 === undefined || matchedProjectIdentities.has(identity4) ? undefined : indexByIdentity.get(identity4);
     if (existing === undefined) {
-      if (identity4 !== undefined)
-        indexByIdentity.set(identity4, merged.length);
       merged.push(item);
       continue;
     }
+    if (identity4 !== undefined)
+      matchedProjectIdentities.add(identity4);
     const base2 = merged[existing];
     merged[existing] = isPlainObject6(base2) && isPlainObject6(item) ? mergeDeep(base2, item, [...segments, existing]) : item;
   }
@@ -84907,10 +84924,19 @@ class WorkflowAppService {
     };
   }
   async validate(file2, opts = {}) {
-    const absolute = resolve13(this.ctx.cwd, file2);
-    if (!await fileExists(absolute)) {
-      return { ok: false, valid: false, file: file2, errors: [`File not found: ${absolute}`] };
+    const resolved = resolveWorkflowFile(this.ctx.cwd, file2);
+    if (resolved.path === null) {
+      const [probedProject, probedBundled] = resolved.probed;
+      return {
+        ok: false,
+        valid: false,
+        file: file2,
+        errors: [
+          `File not found: ${probedProject}${probedBundled !== null ? ` (bundled: ${probedBundled})` : ""}`
+        ]
+      };
     }
+    const absolute = resolved.path;
     try {
       const embedded = this.embeddedSchemaOptions();
       const workflow = await loadWorkflowDef(absolute, {
@@ -84959,7 +84985,12 @@ class WorkflowAppService {
   }
   async run(file2, opts = {}) {
     const eventsBus = this.ctx.events?.();
-    const absolute = resolve13(this.ctx.cwd, file2);
+    const resolved = resolveWorkflowFile(this.ctx.cwd, file2);
+    if (resolved.path === null) {
+      const [probedProject, probedBundled] = resolved.probed;
+      throw new Error(`Workflow not found: ${probedProject}${probedBundled !== null ? ` (bundled: ${probedBundled})` : ""}`);
+    }
+    const absolute = resolved.path;
     const embedded = this.embeddedSchemaOptions();
     const workflow = await loadWorkflowDef(absolute, {
       validateSchema: true,
@@ -85019,7 +85050,10 @@ class WorkflowAppService {
       return;
     let workflowName;
     try {
-      const def = await loadWorkflowDef(resolve13(this.ctx.cwd, file2), { validateSchema: false });
+      const resolved = resolveWorkflowFile(this.ctx.cwd, file2);
+      if (resolved.path === null)
+        return;
+      const def = await loadWorkflowDef(resolved.path, { validateSchema: false });
       workflowName = def.name;
     } catch {
       return;
@@ -85532,6 +85566,21 @@ async function fileExists(path9) {
   const fs3 = createNodeFileSystem3();
   return await fs3.exists(path9);
 }
+function resolveWorkflowFile(cwd, file2) {
+  const projectPath = resolve13(cwd, file2);
+  if (existsSync10(projectPath)) {
+    return { path: projectPath, source: "project" };
+  }
+  const bundledRoot = bundledConfigRoot();
+  if (bundledRoot !== null) {
+    const bundledPath = join22(bundledRoot, "workflows", basename7(file2));
+    if (existsSync10(bundledPath)) {
+      return { path: bundledPath, source: "bundled" };
+    }
+    return { path: null, probed: [projectPath, bundledPath] };
+  }
+  return { path: null, probed: [projectPath, null] };
+}
 async function resolveDefaultAgentVar(cwd, callerVars, warn) {
   const result = {};
   if (callerVars?.implementAgent === undefined && callerVars?.agent !== undefined) {
@@ -86534,6 +86583,7 @@ __export(exports_src2, {
   runHistoryReport: () => runHistoryReport,
   runCorpusCheck: () => runCorpusCheck,
   resolveWorkflowLogRetentionDays: () => resolveWorkflowLogRetentionDays,
+  resolveWorkflowFile: () => resolveWorkflowFile,
   resolveSpurServeCommand: () => resolveSpurServeCommand,
   resolveRetentionQuotas: () => resolveRetentionQuotas,
   resolvePlanningFolders: () => resolvePlanningFolders,
@@ -95200,8 +95250,7 @@ init_loader();
 init_src2();
 await init_src3();
 import { existsSync as existsSync12 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join25, resolve as resolve16 } from "path";
+import { join as join25 } from "path";
 
 // src/workflow/resolve-spur-bin.ts
 import { basename as basename8 } from "path";
@@ -95219,11 +95268,6 @@ function resolveSpurBin() {
 }
 
 // src/workflow/make-lifecycle-adapter.ts
-var GLOBAL_CONFIG_DIR = join25(".config", "spur");
-function globalConfigRoot(context4) {
-  const override = context4.env.SPUR_GLOBAL_RULES_DIR;
-  return override !== undefined && override.length > 0 ? resolve16(context4.cwd, override) : join25(homedir9(), GLOBAL_CONFIG_DIR);
-}
 function resolveWorkflowPath(context4, profile) {
   const bundledRoot = bundledConfigRoot();
   if (bundledRoot !== null) {
@@ -95234,9 +95278,6 @@ function resolveWorkflowPath(context4, profile) {
   const projectPath = join25(context4.cwd, ".spur", "workflows", `${profile.workflowName}.yaml`);
   if (existsSync12(projectPath))
     return projectPath;
-  const globalPath = join25(globalConfigRoot(context4), "workflows", `${profile.workflowName}.yaml`);
-  if (existsSync12(globalPath))
-    return globalPath;
   return null;
 }
 function makeLifecycleAdapter(context4, profile) {
@@ -95652,7 +95693,7 @@ import { createRequire } from "module";
 var CLI_CONFIG = {
   binaryName: "spur",
   binaryLabel: "spur",
-  binaryVersion: "0.3.60",
+  binaryVersion: "0.3.61",
   configDir: ".spur",
   configFile: ".spur/config.yaml",
   databaseFile: ".spur/spur.db"
@@ -95926,24 +95967,17 @@ function formatDailyResult(r) {
 }
 
 // src/commands/init.ts
+init_src();
 init_loader();
 init_src2();
 init_dist10();
-import { homedir as homedir10 } from "os";
-import { join as join26, resolve as resolve17 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join26, resolve as resolve16 } from "path";
 
 // src/config/scaffold-manifest.ts
 var SCAFFOLD_MANIFEST = [
   { source: "rules/recommended-pre-check.yaml", target: "rules/recommended-pre-check.yaml" },
   { source: "rules/recommended-post-check.yaml", target: "rules/recommended-post-check.yaml" },
-  { source: "workflows/basic.yaml", target: "workflows/basic.yaml" },
-  { source: "workflows/task-lifecycle.yaml", target: "workflows/task-lifecycle.yaml" },
-  { source: "workflows/feature-lifecycle.yaml", target: "workflows/feature-lifecycle.yaml" },
-  { source: "workflows/feature-dev.yaml", target: "workflows/feature-dev.yaml" },
-  { source: "workflows/task-pipeline.yaml", target: "workflows/task-pipeline.yaml" },
-  { source: "workflows/idea-pipeline.yaml", target: "workflows/idea-pipeline.yaml" },
-  { source: "workflows/wrapup-pipeline.yaml", target: "workflows/wrapup-pipeline.yaml" },
-  { source: "workflows/pr-review.yaml", target: "workflows/pr-review.yaml" },
   { source: "tasks/section-matrix.yaml", target: "tasks/section-matrix.yaml" },
   { source: "templates/task/standard.md", target: "tasks/templates/standard.md" },
   { source: "templates/task/feature-impl.md", target: "tasks/templates/feature-impl.md" },
@@ -95951,9 +95985,6 @@ var SCAFFOLD_MANIFEST = [
   { source: "templates/task/review.md", target: "tasks/templates/review.md" },
   { source: "templates/task/brainstorm.md", target: "tasks/templates/brainstorm.md" },
   { source: "templates/task/meta.md", target: "tasks/templates/meta.md" },
-  { source: "templates/feature/default.md", target: "templates/feature/default.md" },
-  { source: "templates/bdd/gherkin.md", target: "templates/bdd/gherkin.md" },
-  { source: "templates/bdd/checklist.md", target: "templates/bdd/checklist.md" },
   {
     source: "templates/docs/99_PROJECT_CONSTITUTION.md",
     target: "docs/99_PROJECT_CONSTITUTION.md",
@@ -95966,19 +95997,12 @@ var SCAFFOLD_MANIFEST = [
   { source: "templates/docs/03_ARCHITECTURE.md", target: "docs/03_ARCHITECTURE.md", root: true, preserve: true },
   { source: "templates/docs/04_DESIGN.md", target: "docs/04_DESIGN.md", root: true, preserve: true },
   { source: "templates/docs/05_FEATURES.md", target: "docs/05_FEATURES.md", root: true, preserve: true },
-  { source: "templates/docs/99_PROJECT_CONSTITUTION.md", target: "templates/docs/99_PROJECT_CONSTITUTION.md" },
-  { source: "templates/docs/00_ADR.md", target: "templates/docs/00_ADR.md" },
-  { source: "templates/docs/01_PRD.md", target: "templates/docs/01_PRD.md" },
-  { source: "templates/docs/02_ROADMAP.md", target: "templates/docs/02_ROADMAP.md" },
-  { source: "templates/docs/03_ARCHITECTURE.md", target: "templates/docs/03_ARCHITECTURE.md" },
-  { source: "templates/docs/04_DESIGN.md", target: "templates/docs/04_DESIGN.md" },
-  { source: "templates/docs/05_FEATURES.md", target: "templates/docs/05_FEATURES.md" },
   { source: "templates/AGENTS.md", target: "AGENTS.md", root: true, preserve: true }
 ];
 
 // src/commands/init.ts
-var GLOBAL_CONFIG_DIR2 = join26(".config", "spur");
-var GLOBAL_RULES_DIR2 = join26(GLOBAL_CONFIG_DIR2, "rules");
+var GLOBAL_CONFIG_DIR = join26(".config", "spur");
+var GLOBAL_RULES_DIR2 = join26(GLOBAL_CONFIG_DIR, "rules");
 var GLOBAL_CONFIG_EXAMPLE = BUNDLED_GLOBAL_CONFIG;
 var GLOBAL_CONFIG_FILE2 = "config.yaml";
 var INDEXED_CONTEXT_MARKER = "## Indexed context";
@@ -96009,7 +96033,7 @@ If \`.spur/context/\` is absent, proceed normally. Never block work on its absen
 `;
 function globalRulesRoot(context4) {
   const override = context4.env.SPUR_GLOBAL_RULES_DIR;
-  return override !== undefined && override.length > 0 ? resolve17(context4.cwd, override) : join26(homedir10(), GLOBAL_RULES_DIR2);
+  return override !== undefined && override.length > 0 ? resolve16(context4.cwd, override) : join26(homedir9(), GLOBAL_RULES_DIR2);
 }
 async function writeIfNew(context4, path9, content, force, result) {
   if (!force && await context4.fs.exists(path9)) {
@@ -96035,12 +96059,15 @@ async function seedGlobalRules(context4) {
   }
   return written;
 }
+function resolveGlobalConfigDir(context4) {
+  const globalOverride = context4.env.SPUR_GLOBAL_RULES_DIR;
+  return globalOverride !== undefined && globalOverride.length > 0 ? resolve16(context4.cwd, globalOverride) : join26(homedir9(), GLOBAL_CONFIG_DIR);
+}
 async function seedGlobalConfig(context4) {
   const source = bundledConfigRoot();
   if (source === null)
     return 0;
-  const globalOverride = context4.env.SPUR_GLOBAL_RULES_DIR;
-  const target = globalOverride !== undefined && globalOverride.length > 0 ? resolve17(context4.cwd, globalOverride) : join26(homedir10(), GLOBAL_CONFIG_DIR2);
+  const target = resolveGlobalConfigDir(context4);
   let written = 0;
   for (const relPath of listBundledConfigFiles()) {
     if (relPath === GLOBAL_CONFIG_EXAMPLE)
@@ -96062,19 +96089,101 @@ async function seedGlobalConfig(context4) {
   return written;
 }
 function registerInitCommand(program2, context4, options = {}) {
-  program2.command("init", { hidden: options.hidden === true }).summary("scaffold a local Spur project").option(...SHARED_OPTIONS.nameProjectInit).option(...SHARED_OPTIONS.forceInitRecreate).option("--minimal", "Only write the minimal .spur scaffold").option(...SHARED_OPTIONS.json).action(async (options2) => {
+  program2.command("init", { hidden: options.hidden === true }).summary("scaffold a local Spur project").option(...SHARED_OPTIONS.nameProjectInit).option(...SHARED_OPTIONS.forceInitRecreate).option("--minimal", "Only write the minimal .spur scaffold").option("--adopt-global-config", "Also rewrite ~/.config/spur/config.yaml from the shipped global default (backed up first)").option(...SHARED_OPTIONS.json).action(async (options2) => {
     const json3 = options2.json === true;
     const force = options2.force === true;
     const minimal = options2.minimal === true;
+    const adoptGlobal = options2.adoptGlobalConfig === true;
     const projectName = options2.name ?? "default";
     const configPath = join26(context4.cwd, CLI_CONFIG.configFile);
+    const result = { created: [], skipped: [] };
+    const globalConfigDir = resolveGlobalConfigDir(context4);
+    const globalConfigPath = join26(globalConfigDir, GLOBAL_CONFIG_FILE2);
+    const globalConfigExists = await context4.fs.exists(globalConfigPath);
+    let misplacedKeys = [];
+    if (globalConfigExists) {
+      try {
+        const raw = await context4.fs.readFile(globalConfigPath);
+        misplacedKeys = misplacedGlobalKeys(parseConfigYaml2(raw));
+      } catch {}
+    }
     if (!force && await context4.fs.exists(configPath)) {
-      const message = `Already initialized: ${CLI_CONFIG.configFile}. Use --force to overwrite.`;
-      context4.output.write(json3 ? toJson2({ ok: false, reason: "already-initialized", config: CLI_CONFIG.configFile }) : message);
-      context4.setExitCode(1);
+      const configRoot = bundledConfigRoot();
+      if (configRoot !== null && !minimal) {
+        for (const relPath of listBundledProjectSeedFiles()) {
+          const sourcePath = join26(configRoot, relPath);
+          if (!await context4.fs.exists(sourcePath))
+            continue;
+          const targetPath = join26(context4.cwd, CLI_CONFIG.configDir, relPath);
+          await context4.fs.ensureDir(join26(targetPath, ".."));
+          await writeIfNew(context4, targetPath, await context4.fs.readFile(sourcePath), false, result);
+        }
+        for (const entry of SCAFFOLD_MANIFEST) {
+          const sourcePath = join26(configRoot, entry.source);
+          if (!await context4.fs.exists(sourcePath))
+            continue;
+          const baseDir = entry.root === true ? context4.cwd : join26(context4.cwd, CLI_CONFIG.configDir);
+          const targetPath = join26(baseDir, entry.target);
+          await context4.fs.ensureDir(join26(targetPath, ".."));
+          const entryForce = false;
+          let body = await context4.fs.readFile(sourcePath);
+          if (entry.target === "AGENTS.md") {
+            body = substituteAgentsMdTemplate(body, projectName);
+          }
+          if (entry.source.startsWith("templates/docs/")) {
+            body = substituteDocTemplateTokens(body);
+          }
+          await writeIfNew(context4, targetPath, body, entryForce, result);
+        }
+      }
+      let adoptedGlobal = false;
+      if (adoptGlobal && globalConfigExists) {
+        const backupPath = `${globalConfigPath}.bak-${new Date().toISOString().replace(/[:.]/g, "-")}`;
+        await context4.fs.writeFile(backupPath, await context4.fs.readFile(globalConfigPath));
+        const bundledRoot = bundledConfigRoot();
+        const examplePath = bundledRoot !== null ? join26(bundledRoot, GLOBAL_CONFIG_EXAMPLE) : null;
+        if (examplePath !== null && await context4.fs.exists(examplePath)) {
+          await context4.fs.writeFile(globalConfigPath, await context4.fs.readFile(examplePath));
+          adoptedGlobal = true;
+        }
+        result.created.push(backupPath);
+      }
+      const rulesSeeded2 = await seedGlobalRules(context4);
+      const configSeeded2 = await seedGlobalConfig(context4);
+      const payload = {
+        ok: true,
+        converged: true,
+        config: CLI_CONFIG.configFile,
+        ...result,
+        globalRulesSeeded: rulesSeeded2,
+        globalConfigSeeded: configSeeded2,
+        ...adoptedGlobal ? { adoptGlobalConfig: adoptedGlobal } : {},
+        ...misplacedKeys.length > 0 ? { misplacedGlobalKeys: misplacedKeys } : {}
+      };
+      if (json3) {
+        context4.output.write(toJson2(payload));
+      } else {
+        context4.output.write("Already initialized \u2014 converged (no project files overwritten)");
+        for (const path9 of result.created)
+          context4.output.write(`  \u2713 ${path9}`);
+        for (const path9 of result.skipped)
+          context4.output.write(`  - ${path9} (exists)`);
+        if (rulesSeeded2 > 0) {
+          context4.output.write(`  \u2713 seeded ${rulesSeeded2} rule file(s) to ~/${GLOBAL_RULES_DIR2}`);
+        }
+        if (configSeeded2 > 0) {
+          context4.output.write(`  \u2713 seeded ${configSeeded2} config file(s) to ~/${GLOBAL_CONFIG_DIR}`);
+        }
+        if (adoptedGlobal) {
+          context4.output.write("  \u2713 adopted global config from bundled default (backup written)");
+        }
+        if (misplacedKeys.length > 0) {
+          context4.output.write(`  \u26A0 global config carries project-shaped key(s): ${misplacedKeys.join(", ")}`);
+        }
+      }
+      context4.setExitCode(0);
       return;
     }
-    const result = { created: [], skipped: [] };
     const configYaml = `${[
       `# Spur project configuration for ${projectName}`,
       `# Generated by \`spur init\``,
@@ -96128,8 +96237,6 @@ ${contextEntry}
       const configRoot = bundledConfigRoot();
       if (configRoot !== null) {
         for (const relPath of listBundledProjectSeedFiles()) {
-          if (relPath.startsWith("templates/docs/"))
-            continue;
           const sourcePath = join26(configRoot, relPath);
           if (!await context4.fs.exists(sourcePath))
             continue;
@@ -96188,7 +96295,7 @@ ${contextEntry}
         context4.output.write(`  \u2713 seeded ${rulesSeeded} rule file(s) to ~/${GLOBAL_RULES_DIR2}`);
       }
       if (configSeeded > 0) {
-        context4.output.write(`  \u2713 seeded ${configSeeded} config file(s) to ~/${GLOBAL_CONFIG_DIR2}`);
+        context4.output.write(`  \u2713 seeded ${configSeeded} config file(s) to ~/${GLOBAL_CONFIG_DIR}`);
       }
     }
   });
@@ -96401,15 +96508,15 @@ async function runMessageWatch(svc, output2, options, runtime = {}) {
   }
 }
 function defaultSleep(ms, signal) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     if (signal?.aborted) {
-      resolve18();
+      resolve17();
       return;
     }
-    const timer = setTimeout(resolve18, ms);
+    const timer = setTimeout(resolve17, ms);
     signal?.addEventListener("abort", () => {
       clearTimeout(timer);
-      resolve18();
+      resolve17();
     }, { once: true });
   });
 }
@@ -96436,15 +96543,15 @@ function parseTimeout2(raw) {
   return n3;
 }
 function sendSleep(ms, signal) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     if (signal?.aborted) {
-      resolve18();
+      resolve17();
       return;
     }
-    const timer = setTimeout(resolve18, ms);
+    const timer = setTimeout(resolve17, ms);
     signal?.addEventListener("abort", () => {
       clearTimeout(timer);
-      resolve18();
+      resolve17();
     }, { once: true });
   });
 }
@@ -96514,12 +96621,12 @@ function registerMigrateCommand(program2, context4, options = {}) {
 // src/commands/projects.ts
 init_dist5();
 await init_src3();
-import { basename as basename9, resolve as resolve18 } from "path";
+import { basename as basename9, resolve as resolve17 } from "path";
 function registerProjectsCommand(program2, context4) {
   const projectsCmd = program2.command("projects").summary("manage the Spur multi-project registry");
   projectsCmd.command("add").argument("<path>", "Project root directory path").option(...SHARED_OPTIONS.nameProjectDisplay).option(...SHARED_OPTIONS.jsonProjectsResponse).action(async (pathArg, options) => {
     try {
-      const absolutePath = resolve18(context4.cwd, pathArg);
+      const absolutePath = resolve17(context4.cwd, pathArg);
       if (!await context4.fs.exists(absolutePath)) {
         throw new Error(`Directory does not exist: ${absolutePath}`);
       }
@@ -97227,8 +97334,8 @@ class EventPublisher {
       if (bufferedEvents.length > 0) {
         return { done: false, value: bufferedEvents.shift() };
       }
-      return new Promise((resolve19, reject) => {
-        pullResolvers.push([resolve19, reject]);
+      return new Promise((resolve18, reject) => {
+        pullResolvers.push([resolve18, reject]);
       });
     }, async () => {
       unsubscribe();
@@ -107164,7 +107271,7 @@ var spur_config_schema_default = {
     },
     version: {
       type: "string",
-      description: "Config schema version (string, not integer). Current recommended: '1.1' (ADR-033 executor tiers + planning blocks). '1' remains accepted for backward compatibility."
+      description: "Config schema version (string, not integer). Current recommended: '1.2' (config-1.2 layered global/project merge, ADR-033 executor tiers + planning blocks). '1' remains accepted for backward compatibility."
     },
     name: {
       type: "string",
@@ -109196,7 +109303,7 @@ init_dist6();
 init_dist5();
 await init_src3();
 import { closeSync as closeSync5, fstatSync as fstatSync3, openSync as openSync5, readSync as readSync3 } from "fs";
-import { join as join34, resolve as resolve19 } from "path";
+import { join as join34 } from "path";
 import { createInterface } from "readline";
 import { setTimeout as sleep5 } from "timers/promises";
 
@@ -109506,8 +109613,11 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     let planPreview;
     if (options.plan !== false) {
       try {
-        const def = await loadWorkflowDef(resolve19(context4.cwd, file2), { validateSchema: false });
-        planPreview = renderRunPlan(def);
+        const resolved = resolveWorkflowFile(context4.cwd, file2);
+        if (resolved.path !== null) {
+          const def = await loadWorkflowDef(resolved.path, { validateSchema: false });
+          planPreview = renderRunPlan(def);
+        }
       } catch {}
     }
     const runLog = options.log === false ? undefined : new WorkflowRunLogSink({
@@ -109562,10 +109672,13 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     const steeringController = options.steer === true ? await (async () => {
       let identity7;
       try {
-        const def = await loadWorkflowDef(resolve19(context4.cwd, file2), {
-          validateSchema: false
-        });
-        identity7 = createWorkflowEventIdentity(def);
+        const resolved = resolveWorkflowFile(context4.cwd, file2);
+        if (resolved.path !== null) {
+          const def = await loadWorkflowDef(resolved.path, {
+            validateSchema: false
+          });
+          identity7 = createWorkflowEventIdentity(def);
+        }
       } catch {}
       return new WorkflowSteeringController((ack) => {
         bus.emit("workflow.steering", identity7 === undefined ? ack : decorateWorkflowEvent(identity7, "workflow.steering", ack));
@@ -109732,7 +109845,14 @@ Monitor with: spur workflow trace ${runId2} --follow`);
     }
   });
   workflow.command("show").description("Render a workflow definition as a mermaid FSM diagram.").argument("<file>", "Workflow YAML file").action(async (file2) => {
-    const filePath = resolve19(context4.cwd, file2);
+    const resolved = resolveWorkflowFile(context4.cwd, file2);
+    if (resolved.path === null) {
+      const [probedProject, probedBundled] = resolved.probed;
+      context4.output.error(`workflow show: file not found: ${probedProject}${probedBundled !== null ? ` (bundled: ${probedBundled})` : ""}`);
+      context4.setExitCode(1);
+      return;
+    }
+    const filePath = resolved.path;
     let def;
     try {
       def = await loadWorkflowDef(filePath, { validateSchema: true });
@@ -110046,7 +110166,7 @@ init_src();
 init_src2();
 init_dist5();
 await init_src3();
-import { dirname as dirname22, join as join35, resolve as resolve20 } from "path";
+import { dirname as dirname22, join as join35, resolve as resolve18 } from "path";
 import { isatty as isatty4 } from "tty";
 
 // ../../node_modules/.bun/@clack+core@1.4.1/node_modules/@clack/core/dist/index.mjs
@@ -111461,7 +111581,7 @@ function resolveAgentRoles(agentConfig) {
   return resolved;
 }
 function createCliContext(options) {
-  const cwd = resolve20(options.cwd ?? process.cwd());
+  const cwd = resolve18(options.cwd ?? process.cwd());
   const env = options.env ?? process.env;
   const fs3 = createNodeFileSystem3(cwd);
   const agentRoles = options.agentRoles ?? resolveAgentRoles(options.agentConfig);

package/web/_astro/BoardApp.BtRfVADq.js

@@ -0,0 +1 @@
+import{a as t}from"./BoardApp.CBIzcvqi.js";import"./index.A0eX93qW.js";export{t as default};