harnessed 4.8.0 → 4.9.1

package/bin/harnessed-inject-state.mjs

@@ -38,11 +38,28 @@ function harnessedRoot() {
     : join(homedir(), '.claude', 'harnessed')
 }
 
-// workflows.json[repoKey] first, then the legacy singleton (dual-write anchor).
-function readWorkflow(root, key) {
+// Phase 35 — mirror PlatformDescriptor.sessionIdEnv (src/installers/lib/platform.ts)
+// for the hot path: which env var carries the active session id. Minimal replica —
+// HARNESSED_PLATFORM selects (default claude); codex has none. State-root selection
+// (.platform pin / auto-probe) is orthogonal and already handled via
+// HARNESSED_ROOT_OVERRIDE, so it is not re-derived here. The TS `activeKey` uses the
+// full descriptor; the parity test sets matching signals.
+function sessionIdEnvName() {
+  const platform = (process.env.HARNESSED_PLATFORM || 'claude').trim()
+  if (platform === 'codex') return null
+  return 'CLAUDE_CODE_SESSION_ID' // claude (default)
+}
+
+// Phase 35 — try the session-scoped slot first, then the bare repoKey slot, then
+// the legacy singleton (dual-write anchor). `keys` is ordered most→least specific.
+function readWorkflow(root, keys) {
   try {
     const store = JSON.parse(readFileSync(join(root, 'workflows.json'), 'utf8'))
-    if (store && store.workflows && store.workflows[key]) return store.workflows[key]
+    if (store?.workflows) {
+      for (const k of keys) {
+        if (store.workflows[k]) return store.workflows[k]
+      }
+    }
   } catch {}
   try {
     return JSON.parse(readFileSync(join(root, 'current-workflow.json'), 'utf8'))
@@ -76,6 +93,14 @@ function workflowStateBlock(wf) {
       'RETRO-DUE: enough phases completed since the last retro — run /retro, then `harnessed retro --done`',
     )
   }
+  // Phase 36 — scale-adaptive verify_mode directive (parity with injectState.ts).
+  if (wf.verify_mode === 'full') {
+    lines.push(
+      'VERIFY-MODE: full — run full verification (large/risky change: >5 files / >4 subs / >3 reqs)',
+    )
+  } else if (wf.verify_mode === 'light') {
+    lines.push('VERIFY-MODE: light — scope verification to the changed surface (small change)')
+  }
   lines.push('</workflow-state>')
   return lines.join('\n')
 }
@@ -140,8 +165,14 @@ function projectContextBlock(learnings, contextExcerpt) {
 
 try {
   const root = harnessedRoot()
+  // `key` is the repo ROOT directory (used for .planning/ fs paths below). The
+  // workflow LOOKUP uses the session-scoped composite key first (Phase 34/35),
+  // falling back to the bare repoKey, then the legacy singleton. The composite
+  // key is NOT a real directory — only the bare repoKey is.
   const key = repoKey(process.cwd())
-  const wf = readWorkflow(root, key)
+  const envName = sessionIdEnvName()
+  const sid = envName ? process.env[envName]?.trim() : undefined
+  const wf = readWorkflow(root, sid ? [`${key}::${sid}`, key] : [key])
   if (!wf) process.exit(0)
 
   const budget = Number(process.env.HARNESSED_INJECT_BUDGET) || DEFAULT_INJECT_BUDGET

package/dist/cli.mjs

@@ -38,7 +38,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "harnessed",
-      version: "4.8.0",
+      version: "4.9.1",
       description: "AI coding harness package manager + composition orchestrator",
       type: "module",
       license: "Apache-2.0",
@@ -936,7 +936,9 @@ function claudeDescriptor(home = homedir()) {
     // the same home base — not a child of homeDir.
     mcpConfigPath: join(home, ".claude.json"),
     // claude writes its env keys into JSON settings.json (capability present).
-    supportsEnvKeyWrite: true
+    supportsEnvKeyWrite: true,
+    // Claude Code exposes the active session id to Bash-invoked CLI + hooks.
+    sessionIdEnv: "CLAUDE_CODE_SESSION_ID"
   };
 }
 function codexDescriptor(home = homedir()) {
@@ -952,7 +954,9 @@ function codexDescriptor(home = homedir()) {
     commandsDir: join(codexHome, "prompts"),
     pluginsRegistry: null,
     mcpConfigPath: configToml,
-    supportsEnvKeyWrite: false
+    supportsEnvKeyWrite: false,
+    // No verified codex session-id env → single-session fallback (anti-stale).
+    sessionIdEnv: null
   };
 }
 function descriptorById(id, home) {
@@ -1476,6 +1480,7 @@ var workflowStore_exports = {};
 __export(workflowStore_exports, {
   RetroMetaEntry: () => RetroMetaEntry,
   WorkflowStoreV1: () => WorkflowStoreV1,
+  activeKey: () => activeKey,
   listWorkflows: () => listWorkflows,
   readStoreRaw: () => readStoreRaw,
   repoKey: () => repoKey,
@@ -1500,6 +1505,12 @@ function repoKey(cwd = process.cwd()) {
   }
   return resolve(cwd);
 }
+function activeKey(cwd = process.cwd()) {
+  const base = repoKey(cwd);
+  const envName = detectPlatform().sessionIdEnv;
+  const sid = envName ? process.env[envName]?.trim() : void 0;
+  return sid ? `${base}::${sid}` : base;
+}
 async function readStoreRaw() {
   try {
     const parsed = JSON.parse(await readFile(storePath(), "utf8"));
@@ -1539,6 +1550,7 @@ var RetroMetaEntry, WorkflowStoreV1;
 var init_workflowStore = __esm({
   "src/checkpoint/workflowStore.ts"() {
     init_harnessedRoot();
+    init_platform();
     init_schemaVersion();
     init_atomicWrite();
     init_currentWorkflow_v1();
@@ -1605,7 +1617,7 @@ async function withLock(fn) {
 }
 async function readCurrentWorkflow() {
   const store = await readStoreRaw();
-  return store.workflows[repoKey()] ?? null;
+  return store.workflows[activeKey()] ?? store.workflows[repoKey()] ?? null;
 }
 async function writeCurrentWorkflowUnlocked(s) {
   if (!Value.Check(CurrentWorkflowV1, s)) {
@@ -1613,7 +1625,7 @@ async function writeCurrentWorkflowUnlocked(s) {
     throw new WorkflowStateError(`current-workflow schema validation failed: ${errs}`);
   }
   const store = await readStoreRaw();
-  store.workflows[repoKey()] = s;
+  store.workflows[activeKey()] = s;
   await writeStoreRaw(store);
   await writeFileAtomic(statePath(), JSON.stringify(s, null, 2));
 }
@@ -2983,15 +2995,20 @@ var init_masterOrchestrator_helpers = __esm({
     init_run();
     defaultSpawnDriver = async (masterName, subName, _context, packageRoot) => {
       const subYamlPath = resolveSubYamlPath(masterName, subName, packageRoot);
-      try {
-        await runWorkflow(subYamlPath, {}, { packageRoot, gateContext: _context });
-      } catch (err2) {
-        console.warn(
-          `\u26A0\uFE0F master spawnSubWorkflow Path A failed for ${masterName}/${subName} (${err2.message});Path B sub-shell fallback deferred T3.5.W2.1.`
+      const result = await runWorkflow(subYamlPath, {}, { packageRoot, gateContext: _context });
+      if (result.status === "failed") {
+        throw new Error(
+          `sub-workflow ${masterName}/${subName} failed` + (result.lastPhaseId ? ` at phase ${result.lastPhaseId}` : "")
+        );
+      }
+      if (result.status === "paused-veto") {
+        throw new Error(
+          `sub-workflow ${masterName}/${subName} paused (governance veto)` + (result.lastPhaseId ? ` at phase ${result.lastPhaseId}` : "")
         );
       }
     };
     defaultPauseFn = async (stageName) => {
+      if (!process.stdin.isTTY) return;
       const readline2 = await import('readline/promises');
       const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
       try {
@@ -3014,6 +3031,7 @@ var init_masterOrchestrator_helpers = __esm({
       return !(a === "n" || a === "no");
     };
     defaultPrompter = async (question) => {
+      if (!process.stdin.isTTY) return "";
       const readline2 = await import('readline/promises');
       const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
       try {
@@ -3108,6 +3126,15 @@ async function runMasterOrchestrator(masterName, context, packageRoot, spawnDriv
   for (const r of parallelResults) {
     if (r.status === "fulfilled") fired.push(r.value);
   }
+  const parallelFailures = parallelResults.map(
+    (r, i) => r.status === "rejected" ? { sub: parallelClauses[i]?.sub, reason: r.reason } : null
+  ).filter((x) => x !== null);
+  if (parallelFailures.length > 0) {
+    const detail = parallelFailures.map((f) => `${f.sub}: ${f.reason instanceof Error ? f.reason.message : String(f.reason)}`).join("; ");
+    throw new Error(
+      `[${masterName} master] ${parallelFailures.length} parallel sub(s) failed \u2014 ${detail}`
+    );
+  }
   for (const clause of serialTrailing) {
     console.log(`  \u2192 ${clause.sub} (serial order=${clause.order ?? 0})`);
     await spawnDriver(masterName, clause.sub, context, packageRoot);
@@ -3623,6 +3650,13 @@ function registerRun(program2) {
       console.log(JSON.stringify({ workflow: name, yamlPath, gateContext }, null, 2));
       process.exit(0);
     }
+    if (isNestedHarnessContext()) {
+      console.error(
+        `error: \`harnessed run\` is the CI/headless path (in-process SDK spawn) and hangs when invoked from inside a Claude Code session. Use the CC-native \`/${name}\` slash command instead \u2014 it drives subagent spawns via harnessed gates / prompt / checkpoint (keeps the session responsive, enables Agent Teams, allows clarification round-trips). Set HARNESSED_ALLOW_NESTED=1 to override (CI / testing only).`
+      );
+      process.exit(1);
+      return;
+    }
     let result;
     try {
       result = await runWorkflow(yamlPath, {}, { packageRoot: PACKAGE_ROOT, gateContext });
@@ -3642,6 +3676,14 @@ function registerRun(program2) {
     process.exit(result.status === "failed" ? 1 : 0);
   });
 }
+function isNestedHarnessContext() {
+  if (process.env.HARNESSED_ALLOW_NESTED === "1") return false;
+  const sessEnv = detectPlatform().sessionIdEnv;
+  if (!sessEnv) return false;
+  const sid = process.env[sessEnv]?.trim();
+  if (!sid) return false;
+  return !process.stdin.isTTY;
+}
 async function resolveWorkflowYaml(name, workflowsDir) {
   const tier1 = join(workflowsDir, name, "workflow.yaml");
   if (existsSync(tier1)) return tier1;
@@ -3732,6 +3774,7 @@ async function getNextHint(workflowName) {
 var PACKAGE_ROOT, WORKFLOWS_DIR, _autoChainCache, _autoChainLoadFailed;
 var init_run2 = __esm({
   "src/cli/run.ts"() {
+    init_platform();
     init_path_guard();
     init_loadPhases();
     init_run();