@basou/cli 0.16.0 → 0.18.0

package/dist/index.js

@@ -635,17 +635,21 @@ function printNoApprovals(options) {
 // src/commands/decision.ts
 import { readFile } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { resolve as resolve3 } from "path";
+import { join as join3, resolve as resolve3 } from "path";
 import {
+  AGENT_INFRA_DIRS,
   acquireLock as acquireLock2,
   appendEventToExistingSession,
   assertBasouRootSafe as assertBasouRootSafe2,
   basouPaths as basouPaths3,
+  classifyFilesBySourceRoot,
   createAdHocSessionWithEvent,
   findErrorCode as findErrorCode2,
   isValidPrefixedId,
+  loadSessionEntries,
   prefixedUlid as prefixedUlid2,
   readManifest as readManifest2,
+  replayEvents as replayEvents2,
   resolveRepositoryRoot as resolveRepositoryRoot2,
   resolveSessionId,
   sanitizePath
@@ -845,6 +849,17 @@ function registerDecisionCommand(program2) {
   ).option("--file <path>", "Read the JSON array from a file instead of stdin").option("--dry-run", "Validate and preview the decisions without writing them").option("--json", "Output the result as JSON").option("-v, --verbose", "Show error causes").addHelpText("after", CAPTURE_HELP).action(async (options) => {
     await runDecisionCapture(options);
   });
+  decision.command("void").description(
+    "Void (or supersede) a recorded decision. Append-only: the original is kept but struck in decisions.md and skipped as orientation's latest direction. Use when a decision was wrong or recorded in the wrong project."
+  ).argument("<decision_id>", "The decision to void (its decision_ ULID)").option("--reason <text>", "Why the decision is voided", parseReason).option(
+    "--superseded-by <decision_id>",
+    "The decision that replaces this one (records a supersede rather than a plain void)"
+  ).option(
+    "--session <session_id>",
+    "Attach to an existing session; otherwise an ad-hoc session is created"
+  ).option("--json", "Output the result as JSON").option("-v, --verbose", "Show error causes").action(async (decisionId, options) => {
+    await runDecisionVoid(decisionId, options);
+  });
 }
 var CAPTURE_HELP = `
 Input format (a JSON array; one object per decision):
@@ -879,6 +894,28 @@ async function runDecisionRecord(options, ctx = {}) {
     process.exitCode = 1;
   }
 }
+async function warnLinkedFilesOutsideRoots(input) {
+  if (input.linkedFiles.length === 0) return;
+  try {
+    const manifest = await readManifest2(input.paths);
+    if ((manifest.import?.source_roots?.length ?? 0) === 0) return;
+    const scope = await classifyFilesBySourceRoot({
+      files: input.linkedFiles,
+      workingDirectory: input.cwd,
+      sourceRoots: manifest.import?.source_roots,
+      masterRoot: input.repositoryRoot,
+      extraInRoot: AGENT_INFRA_DIRS
+    });
+    if (scope.outOfRoot.length === 0) return;
+    const PATH_SAMPLE = 5;
+    const sample = scope.outOfRoot.slice(0, PATH_SAMPLE).join(", ");
+    const more = scope.outOfRoot.length > PATH_SAMPLE ? ` (... +${scope.outOfRoot.length - PATH_SAMPLE} more)` : "";
+    console.error(
+      `basou: ${scope.outOfRoot.length} linked file(s) resolve outside this project's source_roots: ${sample}${more} \u2014 this decision may belong to another project.`
+    );
+  } catch {
+  }
+}
 async function doRunDecisionRecord(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
   const repositoryRoot = await resolveRepositoryRootForDecision(cwd);
@@ -888,6 +925,12 @@ async function doRunDecisionRecord(options, ctx) {
   const occurredAt = now.toISOString();
   const decisionId = prefixedUlid2("decision");
   const rich = pickRichFields(options);
+  await warnLinkedFilesOutsideRoots({
+    linkedFiles: rich.linked_files ?? [],
+    cwd,
+    paths,
+    repositoryRoot
+  });
   if (options.session !== void 0) {
     const sessionId = await resolveSessionId(paths, options.session);
     const sesId = sessionId;
@@ -971,6 +1014,12 @@ async function doRunDecisionCapture(options, ctx) {
   await assertWorkspaceInitialized2(paths.root);
   const raw = await readCaptureInput(options, ctx);
   const decisions = parseCaptureInput(raw);
+  await warnLinkedFilesOutsideRoots({
+    linkedFiles: decisions.flatMap((d) => d.linked_files ?? []),
+    cwd,
+    paths,
+    repositoryRoot
+  });
   if (options.dryRun === true) {
     printCapturePreview(options, decisions);
     return;
@@ -1017,6 +1066,161 @@ async function doRunDecisionCapture(options, ctx) {
     }))
   });
 }
+async function runDecisionVoid(decisionId, options, ctx = {}) {
+  try {
+    await doRunDecisionVoid(decisionId, options, ctx);
+  } catch (error) {
+    renderCliError(error, {
+      verbose: isVerbose(options),
+      classifiers: [failedToFinalizeClassifier]
+    });
+    process.exitCode = 1;
+  }
+}
+async function doRunDecisionVoid(decisionId, options, ctx) {
+  if (!isDecisionId(decisionId)) {
+    throw new Error(`Invalid decision id: ${decisionId} (expected a decision_<ULID>).`);
+  }
+  if (options.supersededBy !== void 0 && !isDecisionId(options.supersededBy)) {
+    throw new Error(
+      `Invalid --superseded-by id: ${options.supersededBy} (expected a decision_<ULID>).`
+    );
+  }
+  if (options.supersededBy === decisionId) {
+    throw new Error("A decision cannot supersede itself.");
+  }
+  const cwd = ctx.cwd ?? process.cwd();
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "decision void");
+  const paths = basouPaths3(repositoryRoot);
+  await assertWorkspaceInitialized2(paths.root);
+  if (!await decisionExists(paths, decisionId)) {
+    throw new Error(
+      `Decision ${decisionId} not found in this workspace. Run 'basou decisions generate' or check the id.`
+    );
+  }
+  const now = ctx.nowProvider !== void 0 ? ctx.nowProvider() : /* @__PURE__ */ new Date();
+  const occurredAt = now.toISOString();
+  const reason = options.reason;
+  const supersededBy = options.supersededBy;
+  if (options.session !== void 0) {
+    const sessionId = await resolveSessionId(paths, options.session);
+    const sessionLock = await acquireLock2(paths, "session", sessionId);
+    let result;
+    try {
+      result = await appendEventToExistingSession({
+        paths,
+        sessionId,
+        eventBuilder: (eventId) => buildDecisionVoidedEvent({
+          eventId,
+          sessionId,
+          decisionId,
+          occurredAt,
+          reason,
+          supersededBy
+        })
+      });
+    } finally {
+      await sessionLock.release();
+    }
+    printVoidResult(options, {
+      mode: "attached",
+      sessionId,
+      decisionId,
+      eventId: result.eventId,
+      sessionStatus: result.sessionStatus,
+      reason,
+      supersededBy
+    });
+    return;
+  }
+  const manifest = await readManifest2(paths);
+  const adHoc = await createAdHocSessionWithEvent({
+    paths,
+    manifest,
+    label: `Ad-hoc decision void: ${decisionId}`,
+    occurredAt,
+    sessionSource: "human",
+    workingDirectory: repositoryRoot,
+    invocation: { command: "basou decision void", args: [decisionId] },
+    targetEventBuilders: [
+      (sessionId, eventId) => buildDecisionVoidedEvent({
+        eventId,
+        sessionId,
+        decisionId,
+        occurredAt,
+        reason,
+        supersededBy
+      })
+    ]
+  });
+  printVoidResult(options, {
+    mode: "ad-hoc",
+    sessionId: adHoc.sessionId,
+    decisionId,
+    eventId: adHoc.targetEventIds[0],
+    sessionStatus: "completed",
+    reason,
+    supersededBy
+  });
+}
+function isDecisionId(value) {
+  return value.startsWith("decision_") && isValidPrefixedId(value);
+}
+async function decisionExists(paths, decisionId) {
+  const entries = await loadSessionEntries(paths, { now: /* @__PURE__ */ new Date() });
+  for (const entry of entries) {
+    const sessionDir = join3(paths.sessions, entry.sessionId);
+    try {
+      for await (const ev of replayEvents2(sessionDir, {})) {
+        if (ev.type === "decision_recorded" && ev.decision_id === decisionId) return true;
+      }
+    } catch {
+    }
+  }
+  return false;
+}
+function buildDecisionVoidedEvent(input) {
+  return {
+    schema_version: "0.1.0",
+    id: input.eventId,
+    session_id: input.sessionId,
+    occurred_at: input.occurredAt,
+    source: "local-cli",
+    type: "decision_voided",
+    decision_id: input.decisionId,
+    ...input.reason !== void 0 ? { reason: input.reason } : {},
+    ...input.supersededBy !== void 0 ? { superseded_by: input.supersededBy } : {}
+  };
+}
+function printVoidResult(options, result) {
+  if (options.json === true) {
+    console.log(
+      JSON.stringify({
+        event_id: result.eventId,
+        session_id: result.sessionId,
+        decision_id: result.decisionId,
+        session_status: result.sessionStatus,
+        mode: result.mode,
+        ...result.reason !== void 0 ? { reason: result.reason } : {},
+        ...result.supersededBy !== void 0 ? { superseded_by: result.supersededBy } : {}
+      })
+    );
+    return;
+  }
+  const sid = shortSessionId(result.sessionId);
+  const tail = result.supersededBy !== void 0 ? ` (superseded by ${result.supersededBy})` : "";
+  if (result.mode === "ad-hoc") {
+    console.log(`Voided ${result.decisionId} in ad-hoc session ${sid}${tail}`);
+  } else {
+    console.log(`Voided ${result.decisionId} in session ${sid} (${result.sessionStatus})${tail}`);
+  }
+}
+function parseReason(raw) {
+  if (raw.trim().length === 0) {
+    throw new InvalidArgumentError("--reason must not be empty");
+  }
+  return raw;
+}
 async function readCaptureInput(options, ctx) {
   if (options.file !== void 0) {
     try {
@@ -1408,7 +1612,7 @@ async function assertWorkspaceInitialized3(basouRoot) {
 // src/commands/exec.ts
 import { mkdir } from "fs/promises";
 import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import {
   acquireLock as acquireLock3,
   assertBasouRootSafe as assertBasouRootSafe4,
@@ -1448,13 +1652,13 @@ async function runExec(command, args, options, ctx = {}) {
   await assertBasouRootSafe4(paths.root);
   const manifest = await readManifest3(paths);
   const sessionId = prefixedUlid3("ses");
-  const sessionDir = join3(paths.sessions, sessionId);
+  const sessionDir = join4(paths.sessions, sessionId);
   await mkdir(sessionDir, { recursive: true });
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent(paths, sessionId, event);
   });
   const startedAt = now().toISOString();
-  const sessionYamlPath = join3(sessionDir, "session.yaml");
+  const sessionYamlPath = join4(sessionDir, "session.yaml");
   const session = buildInitialSession({
     id: sessionId,
     command,
@@ -1804,13 +2008,15 @@ async function assertWorkspaceInitialized4(basouRoot) {
 import { createReadStream } from "fs";
 import { readdir, readFile as readFile2, rm, stat as stat2 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { basename as basename2, join as join4, resolve as resolve4 } from "path";
+import { basename as basename2, dirname, join as join5, resolve as resolve4 } from "path";
 import { createInterface } from "readline";
 import {
+  AGENT_INFRA_DIRS as AGENT_INFRA_DIRS2,
   assertBasouRootSafe as assertBasouRootSafe6,
   basouPaths as basouPaths7,
   CLAUDE_IMPORT_SOURCE,
   CODEX_IMPORT_SOURCE,
+  classifyFilesBySourceRoot as classifyFilesBySourceRoot2,
   claudeTranscriptToImportPayload,
   codexRolloutToImportPayload,
   enumerateSessionDirs,
@@ -1888,7 +2094,7 @@ async function doRunImportClaudeCode(options, ctx) {
     repoRoot: repositoryRoot,
     cwd: ctx.cwd ?? process.cwd()
   });
-  const projectsRoot = ctx.claudeProjectsDir ?? join4(homedir4(), ".claude", "projects");
+  const projectsRoot = ctx.claudeProjectsDir ?? join5(homedir4(), ".claude", "projects");
   const files = await selectTranscriptFiles(projectsRoot, projectPaths, options);
   const projectSet = new Set(projectPaths);
   const candidates = files.map((file) => {
@@ -1908,7 +2114,15 @@ async function doRunImportClaudeCode(options, ctx) {
       }
     };
   });
-  await importDerivedSessions(paths, manifest, options, CLAUDE_IMPORT_SOURCE, candidates);
+  await importDerivedSessions(
+    paths,
+    manifest,
+    options,
+    CLAUDE_IMPORT_SOURCE,
+    candidates,
+    projectPaths,
+    hasDeclaredBoundary(options, manifest)
+  );
 }
 async function doRunImportCodex(options, ctx) {
   assertSelector(options);
@@ -1919,7 +2133,7 @@ async function doRunImportCodex(options, ctx) {
     repoRoot: repositoryRoot,
     cwd: ctx.cwd ?? process.cwd()
   });
-  const sessionsRoot = ctx.codexSessionsDir ?? join4(homedir4(), ".codex", "sessions");
+  const sessionsRoot = ctx.codexSessionsDir ?? join5(homedir4(), ".codex", "sessions");
   const rollouts = await discoverCodexRollouts(sessionsRoot, projectPaths, options);
   const candidates = rollouts.map(({ file, externalId }) => ({
     externalId,
@@ -1933,7 +2147,18 @@ async function doRunImportCodex(options, ctx) {
       });
     }
   }));
-  await importDerivedSessions(paths, manifest, options, CODEX_IMPORT_SOURCE, candidates);
+  await importDerivedSessions(
+    paths,
+    manifest,
+    options,
+    CODEX_IMPORT_SOURCE,
+    candidates,
+    projectPaths,
+    hasDeclaredBoundary(options, manifest)
+  );
+}
+function hasDeclaredBoundary(options, manifest) {
+  return (options.project?.length ?? 0) > 0 || (manifest.import?.source_roots?.length ?? 0) > 0;
 }
 function assertSelector(options) {
   if (options.session !== void 0 && options.all === true) {
@@ -1951,9 +2176,25 @@ async function resolveImportTarget(ctx) {
   const manifest = await readManifest4(paths);
   return { repositoryRoot, paths, manifest };
 }
-async function importDerivedSessions(paths, manifest, options, sourceKind, candidates) {
+async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
   const existingByExternalId = await loadExistingByExternalId(paths, sourceKind);
   const seenThisRun = /* @__PURE__ */ new Set();
+  const crossProjectCheck = boundaryDeclared;
+  const crossProject = [];
+  const noteCrossProject = async (externalId, payload) => {
+    if (!crossProjectCheck) return;
+    try {
+      const scope = await classifyFilesBySourceRoot2({
+        files: payload.session.related_files ?? [],
+        workingDirectory: payload.session.working_directory,
+        sourceRoots: projectPaths,
+        masterRoot: dirname(paths.root),
+        extraInRoot: AGENT_INFRA_DIRS2
+      });
+      if (scope.outOfRoot.length > 0) crossProject.push({ externalId, outOfRoot: scope.outOfRoot });
+    } catch {
+    }
+  };
   const results = [];
   const counts = {
     skippedNoAction: 0,
@@ -2010,6 +2251,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
       }
       counts.reimported++;
       seenThisRun.add(externalId);
+      await noteCrossProject(externalId, payload2);
       continue;
     }
     const payload = validate(await toPayload());
@@ -2020,7 +2262,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     if (priors.length > 0 && options.force === true) {
       if (options.dryRun !== true) {
         for (const { sessionId } of priors) {
-          await rm(join4(paths.sessions, sessionId), { recursive: true, force: true });
+          await rm(join5(paths.sessions, sessionId), { recursive: true, force: true });
         }
       }
       counts.replaced++;
@@ -2031,10 +2273,21 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     results.push(result);
     seenThisRun.add(externalId);
     sanitizedPaths += result.pathSanitizeReport.relatedFiles + (result.pathSanitizeReport.workingDirectoryRewritten ? 1 : 0);
+    await noteCrossProject(externalId, payload);
   }
   if (sanitizedPaths > 0) {
     console.error(`Imported sessions: ${sanitizedPaths} path(s) sanitized`);
   }
+  if (crossProject.length > 0) {
+    const PATH_SAMPLE = 5;
+    for (const { externalId, outOfRoot } of crossProject) {
+      const sample = outOfRoot.slice(0, PATH_SAMPLE).join(", ");
+      const more = outOfRoot.length > PATH_SAMPLE ? ` (... +${outOfRoot.length - PATH_SAMPLE} more)` : "";
+      console.error(
+        `basou: session ${externalId} edited ${outOfRoot.length} file(s) outside this project's source_roots: ${sample}${more} \u2014 they may belong to another project.`
+      );
+    }
+  }
   printImportResult(options, results, counts);
 }
 async function classifyReimport(priors, sourcePath, externalId, counts) {
@@ -2120,7 +2373,7 @@ async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
   if (options.session !== void 0) {
     const matches = [];
     for (const projectPath of projectPaths) {
-      const file = join4(projectsRoot, encodeProjectDir(projectPath), `${options.session}.jsonl`);
+      const file = join5(projectsRoot, encodeProjectDir(projectPath), `${options.session}.jsonl`);
       if (await pathExists(file)) matches.push(file);
     }
     if (matches.length === 0) {
@@ -2131,7 +2384,7 @@ async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
   const files = [];
   let anyDirFound = false;
   for (const projectPath of projectPaths) {
-    const transcriptDir = join4(projectsRoot, encodeProjectDir(projectPath));
+    const transcriptDir = join5(projectsRoot, encodeProjectDir(projectPath));
     let entries;
     try {
       entries = await readdir(transcriptDir);
@@ -2141,7 +2394,7 @@ async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
     }
     anyDirFound = true;
     for (const name of entries) {
-      if (name.endsWith(".jsonl")) files.push(join4(transcriptDir, name));
+      if (name.endsWith(".jsonl")) files.push(join5(transcriptDir, name));
     }
   }
   if (!anyDirFound) {
@@ -2198,7 +2451,7 @@ async function findRolloutFiles(sessionsRoot) {
       throw new Error("Failed to read Codex sessions directory", { cause: error });
     }
     for (const entry of entries) {
-      const full = join4(dir, entry.name);
+      const full = join5(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(full, false);
       } else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl")) {
@@ -2622,12 +2875,12 @@ import {
 
 // src/lib/hosts-config.ts
 import { homedir as homedir5 } from "os";
-import { isAbsolute as isAbsolute2, join as join5, resolve as resolve6 } from "path";
+import { isAbsolute as isAbsolute2, join as join6, resolve as resolve6 } from "path";
 import { readYamlFile as readYamlFile4 } from "@basou/core";
-var DEFAULT_HOSTS_CONFIG_PATH = join5(homedir5(), ".basou", "hosts.yaml");
+var DEFAULT_HOSTS_CONFIG_PATH = join6(homedir5(), ".basou", "hosts.yaml");
 function expandTilde2(p) {
   if (p === "~") return homedir5();
-  if (p.startsWith("~/")) return join5(homedir5(), p.slice(2));
+  if (p.startsWith("~/")) return join6(homedir5(), p.slice(2));
   return p;
 }
 function isRecord2(value) {
@@ -2941,7 +3194,7 @@ import {
   unlinkSync,
   writeFileSync
 } from "fs";
-import { basename as basename4, dirname, isAbsolute as isAbsolute3, join as join6, relative as relative2, resolve as resolve7 } from "path";
+import { basename as basename4, dirname as dirname2, isAbsolute as isAbsolute3, join as join7, relative as relative2, resolve as resolve7 } from "path";
 import {
   basouPaths as basouPaths10,
   GENERATED_END,
@@ -3200,7 +3453,7 @@ function classifySourceRoot(repositoryRoot, declaredPath) {
   } catch {
     return { path: declaredPath, kind: "unresolved" };
   }
-  return { path: declaredPath, kind: existsSync(join6(real, ".git")) ? "repo" : "non-repo" };
+  return { path: declaredPath, kind: existsSync(join7(real, ".git")) ? "repo" : "non-repo" };
 }
 async function doRunProjectAdopt(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
@@ -3299,7 +3552,7 @@ async function gatherRepoWiring(repositoryRoot, entry) {
   } catch {
     return { ...base, reachable: false, instructionFiles: [] };
   }
-  if (!existsSync(join6(real, ".git"))) {
+  if (!existsSync(join7(real, ".git"))) {
     return { ...base, reachable: false, instructionFiles: [] };
   }
   try {
@@ -3307,7 +3560,7 @@ async function gatherRepoWiring(repositoryRoot, entry) {
     for (const name of INSTRUCTION_FILES) {
       let present = true;
       try {
-        lstatSync(join6(real, name));
+        lstatSync(join7(real, name));
       } catch {
         present = false;
       }
@@ -3404,10 +3657,10 @@ function gatherRepoGitignore(repositoryRoot, entry) {
   } catch {
     return { ...base, reachable: false, currentLines: [] };
   }
-  if (!existsSync(join6(real, ".git"))) {
+  if (!existsSync(join7(real, ".git"))) {
     return { ...base, reachable: false, currentLines: [] };
   }
-  return { ...base, reachable: true, currentLines: readGitignoreLines(join6(real, ".gitignore")) };
+  return { ...base, reachable: true, currentLines: readGitignoreLines(join7(real, ".gitignore")) };
 }
 function hasErrorCode(error) {
   return error instanceof Error && typeof error.code === "string";
@@ -3421,7 +3674,7 @@ function readGitignoreLines(file) {
   }
 }
 function applyGitignorePlan(repositoryRoot, plan) {
-  const file = join6(realpathSync(resolve7(repositoryRoot, plan.path)), ".gitignore");
+  const file = join7(realpathSync(resolve7(repositoryRoot, plan.path)), ".gitignore");
   let existing = "";
   try {
     existing = readFileSync(file, "utf8");
@@ -3540,16 +3793,16 @@ function gatherRepoSymlinks(repositoryRoot, anchorReal, entry) {
   if (real === anchorReal) {
     return { ...base, isAnchor: true, reachable: true, canonicalPresent: false, files: [] };
   }
-  if (!existsSync(join6(real, ".git"))) {
+  if (!existsSync(join7(real, ".git"))) {
     return { ...base, isAnchor: false, reachable: false, canonicalPresent: false, files: [] };
   }
-  const canonicalFile = join6(anchorReal, "agents", basename4(real), CANONICAL_FILE);
+  const canonicalFile = join7(anchorReal, "agents", basename4(real), CANONICAL_FILE);
   if (!existsSync(canonicalFile)) {
     return { ...base, isAnchor: false, reachable: true, canonicalPresent: false, files: [] };
   }
   const files = expectedSymlinkTargets(real, canonicalFile).map(
     (spec) => {
-      const { state, actualTarget } = inspectSymlink(join6(real, spec.name), spec.target);
+      const { state, actualTarget } = inspectSymlink(join7(real, spec.name), spec.target);
       return {
         name: spec.name,
         expectedTarget: spec.target,
@@ -3578,9 +3831,9 @@ function applySymlinkPlan(repositoryRoot, plan) {
   const created = [];
   const failed = [];
   for (const { name, target } of plan.toCreate) {
-    const filePath = join6(real, name);
+    const filePath = join7(real, name);
     try {
-      mkdirSync(dirname(filePath), { recursive: true });
+      mkdirSync(dirname2(filePath), { recursive: true });
       symlinkSync(target, filePath);
       created.push(name);
     } catch (error) {
@@ -3720,7 +3973,7 @@ function resolveViewDir(repositoryRoot, viewPath) {
     return realpathSync(abs);
   } catch {
     try {
-      return join6(realpathSync(dirname(abs)), basename4(abs));
+      return join7(realpathSync(dirname2(abs)), basename4(abs));
     } catch {
       return abs;
     }
@@ -3738,7 +3991,7 @@ function gatherViewRepo(repositoryRoot, viewDir, entry) {
     return { path: entry.path, reachable: false };
   }
   const linkName = basename4(repoReal);
-  const { state, actualTarget } = inspectSymlink(join6(viewDir, linkName), expectedTarget);
+  const { state, actualTarget } = inspectSymlink(join7(viewDir, linkName), expectedTarget);
   return {
     path: entry.path,
     reachable: true,
@@ -3752,9 +4005,9 @@ function applyViewPlan(viewDir, toCreate) {
   const created = [];
   const failed = [];
   for (const { name, target } of toCreate) {
-    const filePath = join6(viewDir, name);
+    const filePath = join7(viewDir, name);
     try {
-      mkdirSync(dirname(filePath), { recursive: true });
+      mkdirSync(dirname2(filePath), { recursive: true });
       symlinkSync(target, filePath);
       created.push(name);
     } catch (error) {
@@ -3767,7 +4020,7 @@ var TOP_LEVEL_INSTRUCTION_FILES_LOWER = new Set(
   INSTRUCTION_FILES.filter((f) => !f.includes("/")).map((f) => f.toLowerCase())
 );
 function classifyViewLink(viewDir, name, rosterRealpaths) {
-  const filePath = join6(viewDir, name);
+  const filePath = join7(viewDir, name);
   let isLink;
   try {
     isLink = lstatSync(filePath).isSymbolicLink();
@@ -3796,7 +4049,7 @@ function classifyViewLink(viewDir, name, rosterRealpaths) {
   if (!isDir) {
     return { target, kind: existsSync(resolved) ? "non-repo" : "broken" };
   }
-  return { target, kind: existsSync(join6(resolved, ".git")) ? "repo" : "non-repo" };
+  return { target, kind: existsSync(join7(resolved, ".git")) ? "repo" : "non-repo" };
 }
 function gatherExistingViewLinks(viewDir, rosterRealpaths) {
   let names;
@@ -3821,7 +4074,7 @@ function pruneViewLinks(viewDir, toPrune, rosterRealpaths) {
   const pruned = [];
   const failed = [];
   for (const { name } of toPrune) {
-    const filePath = join6(viewDir, name);
+    const filePath = join7(viewDir, name);
     const c = classifyViewLink(viewDir, name, rosterRealpaths);
     if (c === null || c.kind !== "repo") {
       failed.push({
@@ -4032,10 +4285,10 @@ async function runProjectPreset(options, ctx = {}) {
   }
 }
 function canonicalFileFor(anchorReal, canonicalName) {
-  return join6(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+  return join7(anchorReal, "agents", canonicalName, CANONICAL_FILE);
 }
 function canonicalLabelFor(canonicalName) {
-  return join6("agents", canonicalName, CANONICAL_FILE);
+  return join7("agents", canonicalName, CANONICAL_FILE);
 }
 async function gatherRepoPreset(repositoryRoot, anchorReal, entry) {
   const declared = {
@@ -4053,7 +4306,7 @@ async function gatherRepoPreset(repositoryRoot, anchorReal, entry) {
   if (real === anchorReal) {
     return { ...declared, isAnchor: true, reachable: true, canonicalPresent: false };
   }
-  if (!existsSync(join6(real, ".git"))) {
+  if (!existsSync(join7(real, ".git"))) {
     return { ...declared, isAnchor: false, reachable: false, canonicalPresent: false };
   }
   const canonicalName = basename4(real);
@@ -4101,7 +4354,7 @@ async function applyPresetPlan(anchorReal, plan) {
     isLink = false;
   }
   if (isLink) throw new Error(`Canonical is a symlink in ${label}`);
-  if (plan.action === "create") mkdirSync(dirname(file), { recursive: true });
+  if (plan.action === "create") mkdirSync(dirname2(file), { recursive: true });
   const existing = await readMarkdownFile4(file);
   await writeMarkdownFile5(file, renderWithMarkers4(existing, plan.desiredBlock, label));
 }
@@ -4284,24 +4537,24 @@ function gatherArchiveTeardown(repositoryRoot, manifest, target) {
   const instructionFiles = [];
   for (const name of INSTRUCTION_FILES) {
     try {
-      lstatSync(join6(real, name));
+      lstatSync(join7(real, name));
       instructionFiles.push(name);
     } catch {
     }
   }
   let ignored;
   try {
-    ignored = new Set(readGitignoreLines(join6(real, ".gitignore")).map((l) => l.trim()));
+    ignored = new Set(readGitignoreLines(join7(real, ".gitignore")).map((l) => l.trim()));
   } catch {
     ignored = /* @__PURE__ */ new Set();
   }
   const gitignorePatterns = INSTRUCTION_FILES.filter((p) => ignored.has(p) || ignored.has(`/${p}`));
-  const canonical2 = existsSync(join6(anchorReal, "agents", canonicalName, CANONICAL_FILE));
+  const canonical2 = existsSync(join7(anchorReal, "agents", canonicalName, CANONICAL_FILE));
   let viewLink = false;
   const viewPath = manifest.workspace.view;
   if (viewPath !== void 0) {
     try {
-      lstatSync(join6(resolveViewDir(repositoryRoot, viewPath), canonicalName));
+      lstatSync(join7(resolveViewDir(repositoryRoot, viewPath), canonicalName));
       viewLink = true;
     } catch {
     }
@@ -4463,12 +4716,12 @@ function gatherRenameWiring(repositoryRoot, manifest, oldBasename) {
   } catch {
     return { canonicalDirOld: false, viewLinkOld: false };
   }
-  const canonicalDirOld = existsSync(join6(anchorReal, "agents", oldBasename));
+  const canonicalDirOld = existsSync(join7(anchorReal, "agents", oldBasename));
   let viewLinkOld = false;
   const viewPath = manifest.workspace.view;
   if (viewPath !== void 0) {
     try {
-      lstatSync(join6(resolveViewDir(repositoryRoot, viewPath), oldBasename));
+      lstatSync(join7(resolveViewDir(repositoryRoot, viewPath), oldBasename));
       viewLinkOld = true;
     } catch {
     }
@@ -4617,7 +4870,7 @@ import {
 // src/lib/durable-write.ts
 import { randomUUID } from "crypto";
 import { lstat, open, rename, stat as stat3, unlink as unlink2 } from "fs/promises";
-import { basename as basename5, dirname as dirname2, join as join7 } from "path";
+import { basename as basename5, dirname as dirname3, join as join8 } from "path";
 async function assertNotSymlink(targetPath) {
   try {
     const st = await lstat(targetPath);
@@ -4632,8 +4885,8 @@ async function assertNotSymlink(targetPath) {
   }
 }
 async function writeFileDurable(targetPath, content) {
-  const dir = dirname2(targetPath);
-  const tmpPath = join7(dir, `.${basename5(targetPath)}.tmp.${randomUUID()}`);
+  const dir = dirname3(targetPath);
+  const tmpPath = join8(dir, `.${basename5(targetPath)}.tmp.${randomUUID()}`);
   let mode = 420;
   try {
     mode = (await stat3(targetPath)).mode & 511;
@@ -4669,15 +4922,15 @@ async function writeFileDurable(targetPath, content) {
 
 // src/lib/protocols-config.ts
 import { homedir as homedir6 } from "os";
-import { isAbsolute as isAbsolute4, join as join8, resolve as resolve8 } from "path";
+import { isAbsolute as isAbsolute4, join as join9, resolve as resolve8 } from "path";
 import { readYamlFile as readYamlFile5 } from "@basou/core";
-var DEFAULT_PROTOCOLS_CONFIG_PATH = join8(homedir6(), ".basou", "protocols.yaml");
-var DEFAULT_TARGET_PATH = join8(homedir6(), ".claude", "CLAUDE.md");
+var DEFAULT_PROTOCOLS_CONFIG_PATH = join9(homedir6(), ".basou", "protocols.yaml");
+var DEFAULT_TARGET_PATH = join9(homedir6(), ".claude", "CLAUDE.md");
 var ALLOWED_TOP_KEYS = /* @__PURE__ */ new Set(["version", "protocols"]);
 var ALLOWED_ENTRY_KEYS = /* @__PURE__ */ new Set(["source", "title"]);
 function expandTilde3(p) {
   if (p === "~") return homedir6();
-  if (p.startsWith("~/")) return join8(homedir6(), p.slice(2));
+  if (p.startsWith("~/")) return join9(homedir6(), p.slice(2));
   return p;
 }
 function isRecord3(value) {
@@ -4930,15 +5183,15 @@ import { InvalidArgumentError as InvalidArgumentError3 } from "commander";
 // src/commands/refresh-watch.ts
 import { readdir as readdir2, stat as stat4 } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 import { findErrorCode as findErrorCode8 } from "@basou/core";
 var DEFAULT_WATCH_INTERVAL_SEC = 30;
 var MIN_WATCH_INTERVAL_SEC = 5;
 var MAX_WATCH_INTERVAL_SEC = 86400;
 function watchedRoots(ctx) {
   return [
-    ctx.codexSessionsDir ?? join9(homedir7(), ".codex", "sessions"),
-    ctx.claudeProjectsDir ?? join9(homedir7(), ".claude", "projects")
+    ctx.codexSessionsDir ?? join10(homedir7(), ".codex", "sessions"),
+    ctx.claudeProjectsDir ?? join10(homedir7(), ".claude", "projects")
   ];
 }
 async function scanSourceLogs(roots) {
@@ -4952,7 +5205,7 @@ async function scanSourceLogs(roots) {
       throw new Error("Failed to read a source log directory", { cause: error });
     }
     for (const entry of entries) {
-      const full = join9(dir, entry.name);
+      const full = join10(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(full);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
@@ -5474,7 +5727,7 @@ function renderReviewGaps(summary) {
 // src/commands/run.ts
 import { mkdir as mkdir2 } from "fs/promises";
 import { homedir as homedir8 } from "os";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import {
   acquireLock as acquireLock5,
   assertBasouRootSafe as assertBasouRootSafe11,
@@ -5527,13 +5780,13 @@ async function runClaudeCode(args, options, ctx = {}) {
   await assertBasouRootSafe11(paths.root);
   const manifest = await readManifest7(paths);
   const sessionId = prefixedUlid4("ses");
-  const sessionDir = join10(paths.sessions, sessionId);
+  const sessionDir = join11(paths.sessions, sessionId);
   await mkdir2(sessionDir, { recursive: true });
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent2(paths, sessionId, event);
   });
   const startedAt = now().toISOString();
-  const sessionYamlPath = join10(sessionDir, "session.yaml");
+  const sessionYamlPath = join11(sessionDir, "session.yaml");
   const session = buildInitialSession2({
     id: sessionId,
     command,
@@ -5876,7 +6129,7 @@ async function resolveRepositoryRootForRun(cwd) {
 
 // src/commands/session.ts
 import { readFile as readFile4 } from "fs/promises";
-import { basename as basename6, isAbsolute as isAbsolute6, join as join11, relative as relative3 } from "path";
+import { basename as basename6, isAbsolute as isAbsolute6, join as join12, relative as relative3 } from "path";
 import {
   acquireLock as acquireLock6,
   appendEventToExistingSession as appendEventToExistingSession3,
@@ -5885,7 +6138,7 @@ import {
   enumerateSessionDirs as enumerateSessionDirs2,
   findErrorCode as findErrorCode11,
   importSessionFromJson as importSessionFromJson2,
-  loadSessionEntries,
+  loadSessionEntries as loadSessionEntries2,
   readAllEvents,
   readManifest as readManifest8,
   readYamlFile as readYamlFile7,
@@ -5949,7 +6202,7 @@ async function doRunSessionList(options, ctx) {
   const paths = basouPaths15(repositoryRoot);
   await assertWorkspaceInitialized10(paths.root);
   const now = /* @__PURE__ */ new Date();
-  const records = (await loadSessionEntries(paths, {
+  const records = (await loadSessionEntries2(paths, {
     now,
     onWarning: (w, sid) => printReplayWarning(w, sid),
     onSkip: (sid, reason) => printSessionListSkip(sid, reason)
@@ -6001,8 +6254,8 @@ async function doRunSessionShow(idInput, options, ctx) {
   const paths = basouPaths15(repositoryRoot);
   await assertWorkspaceInitialized10(paths.root);
   const sessionId = await resolveSessionId3(paths, idInput);
-  const sessionDir = join11(paths.sessions, sessionId);
-  const sessionYamlPath = join11(sessionDir, "session.yaml");
+  const sessionDir = join12(paths.sessions, sessionId);
+  const sessionYamlPath = join12(sessionDir, "session.yaml");
   let session;
   try {
     const raw = await readYamlFile7(sessionYamlPath);
@@ -6177,6 +6430,11 @@ function eventVariantSummary(ev) {
       return `approval=${ev.approval_id}`;
     case "decision_recorded":
       return ev.title;
+    case "decision_voided": {
+      const sup = ev.superseded_by !== void 0 ? ` superseded by ${ev.superseded_by}` : "";
+      const reason = typeof ev.reason === "string" && ev.reason.length > 0 ? `: ${ev.reason}` : "";
+      return `voided ${ev.decision_id}${reason}${sup}`;
+    }
     case "task_created":
       return ev.title;
     case "task_status_changed":
@@ -6740,7 +6998,7 @@ async function resolveRepositoryRootForStatus(cwd) {
 
 // src/commands/task.ts
 import { readFile as readFile5 } from "fs/promises";
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import {
   archiveTask,
   assertBasouRootSafe as assertBasouRootSafe15,
@@ -6750,7 +7008,7 @@ import {
   editTask,
   enumerateArchivedTaskIds,
   findErrorCode as findErrorCode14,
-  loadSessionEntries as loadSessionEntries2,
+  loadSessionEntries as loadSessionEntries3,
   loadTaskEntries,
   prefixedUlid as prefixedUlid5,
   readManifest as readManifest10,
@@ -6759,7 +7017,7 @@ import {
   reconcileAllTasks,
   reconcileTask,
   refreshTaskLinkedSessions,
-  replayEvents as replayEvents2,
+  replayEvents as replayEvents3,
   resolveRepositoryRoot as resolveRepositoryRoot12,
   resolveSessionId as resolveSessionId4,
   resolveTaskId as resolveTaskId2,
@@ -7063,13 +7321,13 @@ async function doRunTaskShow(idInput, options, ctx) {
   await assertWorkspaceInitialized12(paths.root);
   const taskId = await resolveTaskId2(paths, idInput, { includeArchived: true });
   const { doc, archived } = await readTaskFileWithArchiveFallback(paths, taskId);
-  const sessions = await loadSessionEntries2(paths, { now: /* @__PURE__ */ new Date() });
+  const sessions = await loadSessionEntries3(paths, { now: /* @__PURE__ */ new Date() });
   const events = [];
   const linkedSessionIds = new Set(doc.task.task.linked_sessions);
   for (const s of sessions) {
-    const sessionDir = join12(paths.sessions, s.sessionId);
+    const sessionDir = join13(paths.sessions, s.sessionId);
     try {
-      for await (const ev of replayEvents2(sessionDir, {
+      for await (const ev of replayEvents3(sessionDir, {
         onWarning: (w) => printReplayWarning(w, s.sessionId)
       })) {
         if ((ev.type === "task_created" || ev.type === "task_status_changed" || ev.type === "task_reconciled" || ev.type === "task_linkage_refreshed" || ev.type === "task_deleted" || ev.type === "task_archived") && ev.task_id === taskId) {
@@ -7983,7 +8241,7 @@ import { InvalidArgumentError as InvalidArgumentError7 } from "commander";
 // src/lib/portfolio-safety.ts
 import { execFile } from "child_process";
 import { lstat as lstat2, realpath as realpath2 } from "fs/promises";
-import { isAbsolute as isAbsolute7, join as join13, relative as relative4, resolve as resolve10 } from "path";
+import { isAbsolute as isAbsolute7, join as join14, relative as relative4, resolve as resolve10 } from "path";
 import { promisify } from "util";
 import { readManifest as readManifest11 } from "@basou/core";
 var execFileAsync = promisify(execFile);
@@ -8007,7 +8265,7 @@ function isBasouPath(p) {
 async function inspectRepo(repoPath) {
   let hasEntry = false;
   try {
-    await lstat2(join13(repoPath, ".basou"));
+    await lstat2(join14(repoPath, ".basou"));
     hasEntry = true;
   } catch (error) {
     if (errorCode(error) !== "ENOENT") {
@@ -8108,14 +8366,14 @@ function formatSafetyReport(result) {
 
 // src/lib/view-server.ts
 import { createServer } from "http";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import {
   computeWorkStats as computeWorkStats2,
   enumerateApprovals as enumerateApprovals2,
   findErrorCode as findErrorCode16,
   isLazyExpired as isLazyExpired2,
   loadApproval as loadApproval2,
-  loadSessionEntries as loadSessionEntries3,
+  loadSessionEntries as loadSessionEntries4,
   loadTaskEntries as loadTaskEntries2,
   readAllEvents as readAllEvents2,
   readManifest as readManifest12,
@@ -8660,6 +8918,10 @@ var VIEW_HTML = `<!doctype html>
     }
     if (ev.type === 'file_changed') return ev.path + ' [' + ev.change_type + ']';
     if (ev.type === 'decision_recorded') return ev.title || '';
+    if (ev.type === 'decision_voided') {
+      var vs = ev.superseded_by ? ' superseded by ' + ev.superseded_by : '';
+      return 'voided ' + ev.decision_id + (ev.reason ? ': ' + ev.reason : '') + vs;
+    }
     return '';
   }
 
@@ -9037,7 +9299,7 @@ async function overview(ws, nowProvider) {
   };
 }
 async function sessionsList(ws, nowProvider) {
-  const entries = await loadSessionEntries3(ws.paths, { now: nowProvider() });
+  const entries = await loadSessionEntries4(ws.paths, { now: nowProvider() });
   const sessions = entries.map((entry) => ({
     sessionId: entry.sessionId,
     label: entry.session.session.label ?? null,
@@ -9063,7 +9325,7 @@ async function sessionDetail(ws, sessionId) {
     throw error;
   }
   try {
-    const events = await readAllEvents2(join14(ws.paths.sessions, sessionId));
+    const events = await readAllEvents2(join15(ws.paths.sessions, sessionId));
     return { session, events };
   } catch {
     return { session, events: [], degraded: true };