@basou/cli 0.69.0 → 0.70.0

package/dist/index.js

@@ -95,7 +95,7 @@ function printSessionSkip(sid, reason) {
   const short = shortSessionId(sid);
   if (reason === "events_jsonl_unreadable") {
     console.error(`Warning: skipped suspect check for ${short}: events.jsonl unreadable`);
-  } else if (reason === "session_dir_not_directory") {
+  } else if (reason === "session_dir_not_directory" || reason === "session_yaml_not_a_file") {
     console.error(`Skipped ${sid}: ${reason}`);
   } else {
     console.error(`Skipped ${short}: ${reason}`);
@@ -116,6 +116,11 @@ function printSessionListSkip(sid, reason) {
     case "session_dir_not_directory":
       console.error(`Skipped ${sid}: not a directory (a symlink or a file is not followed)`);
       break;
+    case "session_yaml_not_a_file":
+      console.error(
+        `Skipped ${sid}: session.yaml is not a regular file (a symlink or anything else is not followed)`
+      );
+      break;
   }
 }
 function printTaskSkip(taskId, reason) {
@@ -152,7 +157,8 @@ import {
   prefixedUlid,
   readSessionYaml,
   readYamlFile,
-  replayEvents
+  replayEvents,
+  SessionFileNotAFileError
 } from "@basou/core";
 
 // src/lib/repo-root.ts
@@ -425,7 +431,7 @@ async function doRunApprovalShow(idInput, options, ctx) {
       `Warning: session ${sessionId} is not a directory (a symlink or a file is not followed); its events are not shown`
     );
   } else {
-    for await (const ev of replayEvents(join(paths.sessions, sessionId), {
+    for await (const ev of replayEvents(paths, sessionId, {
       onWarning: (w) => printReplayWarning(w, sessionId)
     })) {
       if (isApprovalEvent(ev) && ev.approval_id === id) {
@@ -525,8 +531,7 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
   const sessionLock = await acquireLock(paths, "session", approval.session_id);
   try {
     await assertSessionDirSafe(paths, approval.session_id);
-    const sessionDir = join(paths.sessions, approval.session_id);
-    for await (const ev of replayEvents(sessionDir, {
+    for await (const ev of replayEvents(paths, approval.session_id, {
       onWarning: (w) => printReplayWarning(w, approval.session_id)
     })) {
       if (isApprovalEvent(ev) && ev.approval_id === approval.id && (ev.type === "approval_approved" || ev.type === "approval_rejected" || ev.type === "approval_expired")) {
@@ -539,7 +544,8 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
     let sessionStatus = null;
     try {
       sessionStatus = (await readSessionYaml(paths, approval.session_id)).session.status;
-    } catch {
+    } catch (error) {
+      if (error instanceof SessionFileNotAFileError) throw error;
       sessionStatus = null;
     }
     const attachable = sessionStatus === "initialized" || sessionStatus === "running" || sessionStatus === "waiting_approval";
@@ -1048,6 +1054,7 @@ import {
   readSessionYaml as readSessionYaml2,
   reimportPreservingId,
   SESSION_IMPORT_SCHEMA_VERSION,
+  SessionFileNotAFileError as SessionFileNotAFileError2,
   SessionImportPayloadSchema
 } from "@basou/core";
 
@@ -1221,10 +1228,11 @@ async function resolveImportTarget(ctx) {
 async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
   await assertSessionStoreSafe(paths);
   if (options.dryRun !== true) await assertLockStoreSafe2(paths);
-  const { byExternalId: existingByExternalId, notDirectories } = await loadExistingByExternalId(
-    paths,
-    sourceKind
-  );
+  const {
+    byExternalId: existingByExternalId,
+    notDirectories,
+    yamlNotFiles
+  } = await loadExistingByExternalId(paths, sourceKind);
   let notDirectoriesWarned = false;
   const seenThisRun = /* @__PURE__ */ new Set();
   const crossProjectCheck = boundaryDeclared;
@@ -1317,12 +1325,20 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
       }
       counts.replaced++;
     }
-    if (priors.length === 0 && notDirectories.length > 0 && !notDirectoriesWarned) {
+    if (priors.length === 0 && (notDirectories.length > 0 || yamlNotFiles.length > 0) && !notDirectoriesWarned) {
       notDirectoriesWarned = true;
-      const one = notDirectories.length === 1;
-      console.error(
-        `Import: ${notDirectories.join(", ")} ${one ? "is not a directory" : "are not directories"} (a symlink or a file is not followed), so ${one ? "it was" : "they were"} not checked for an earlier import; a session imported there may be imported again`
-      );
+      if (notDirectories.length > 0) {
+        const one = notDirectories.length === 1;
+        console.error(
+          `Import: ${notDirectories.join(", ")} ${one ? "is not a directory" : "are not directories"} (a symlink or a file is not followed), so ${one ? "it was" : "they were"} not checked for an earlier import; a session imported there may be imported again`
+        );
+      }
+      if (yamlNotFiles.length > 0) {
+        const one = yamlNotFiles.length === 1;
+        console.error(
+          `Import: the session.yaml of ${yamlNotFiles.join(", ")} ${one ? "is" : "are"} not a regular file (a symlink or anything else is not followed), so ${one ? "it was" : "they were"} not checked for an earlier import; a session imported there may be imported again`
+        );
+      }
     }
     const result = await importSessionFromJson(paths, manifest, payload, {
       dryRun: options.dryRun === true
@@ -1404,13 +1420,15 @@ async function loadExistingByExternalId(paths, sourceKind) {
   try {
     ({ dirs: sessionIds, notDirectories } = await enumerateSessionEntries(paths));
   } catch {
-    return { byExternalId, notDirectories: [] };
+    return { byExternalId, notDirectories: [], yamlNotFiles: [] };
   }
+  const yamlNotFiles = [];
   for (const sessionId of sessionIds) {
     let session;
     try {
       session = await readSessionYaml2(paths, sessionId);
-    } catch {
+    } catch (error) {
+      if (error instanceof SessionFileNotAFileError2) yamlNotFiles.push(sessionId);
       continue;
     }
     if (session.session.source.kind !== sourceKind) continue;
@@ -1425,7 +1443,7 @@ async function loadExistingByExternalId(paths, sourceKind) {
     const match = typeof label === "string" ? label.match(/^claude-code import (\S+)$/) : null;
     if (match?.[1] !== void 0) add(match[1], prior);
   }
-  return { byExternalId, notDirectories };
+  return { byExternalId, notDirectories, yamlNotFiles };
 }
 async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
   if (options.session !== void 0) {
@@ -2959,7 +2977,7 @@ async function doRunChannelClear(face, options) {
 
 // src/commands/decision.ts
 import { homedir as homedir3 } from "os";
-import { join as join7, resolve as resolve4 } from "path";
+import { resolve as resolve4 } from "path";
 import {
   AGENT_INFRA_DIRS as AGENT_INFRA_DIRS2,
   acquireLock as acquireLock2,
@@ -3540,9 +3558,8 @@ function isDecisionId(value) {
 async function decisionExists(paths, decisionId) {
   const entries = await loadSessionEntries(paths, { now: /* @__PURE__ */ new Date() });
   for (const entry of entries) {
-    const sessionDir = join7(paths.sessions, entry.sessionId);
     try {
-      for await (const ev of replayEvents2(sessionDir, {})) {
+      for await (const ev of replayEvents2(paths, entry.sessionId, {})) {
         if (ev.type === "decision_recorded" && ev.decision_id === decisionId) return true;
       }
     } catch {
@@ -3996,7 +4013,7 @@ async function assertWorkspaceInitialized5(basouRoot) {
 // src/commands/exec.ts
 import { mkdir as mkdir2, rm as rm2 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { join as join8 } from "path";
+import { join as join7 } from "path";
 import {
   acquireLock as acquireLock3,
   assertBasouRootSafe as assertBasouRootSafe6,
@@ -4007,12 +4024,14 @@ import {
   EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION3,
   finalizeSessionYaml,
   getSnapshot,
+  lstatSessionFile,
   overwriteYamlFile,
   parseDuration,
   prefixedUlid as prefixedUlid3,
   readManifest as readManifest6,
   readYamlFile as readYamlFile2,
   SESSION_SCHEMA_VERSION,
+  SessionFileNotAFileError as SessionFileNotAFileError3,
   SessionSchema,
   sanitizeWorkingDirectory,
   writeObservedDuration,
@@ -4058,12 +4077,12 @@ async function runExec(command, args, options, ctx = {}) {
   const manifest = await readManifest6(paths);
   await assertSessionStoreSafe2(paths);
   const sessionId = prefixedUlid3("ses");
-  const sessionDir = join8(paths.sessions, sessionId);
+  const sessionDir = join7(paths.sessions, sessionId);
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent(paths, sessionId, event);
   });
   const startedAt = now().toISOString();
-  const sessionYamlPath = join8(sessionDir, "session.yaml");
+  const sessionYamlPath = join7(sessionDir, "session.yaml");
   const session = buildInitialSession({
     id: sessionId,
     command,
@@ -4112,7 +4131,7 @@ async function runExec(command, args, options, ctx = {}) {
   });
   const runningLock = await acquireLock3(paths, "session", sessionId);
   try {
-    await mutateSessionYaml(sessionYamlPath, (s) => {
+    await mutateSessionYaml(paths, sessionId, (s) => {
       s.session.status = "running";
     });
   } finally {
@@ -4289,7 +4308,14 @@ function buildInitialSession(input) {
     }
   };
 }
-async function mutateSessionYaml(filePath, mutator) {
+async function mutateSessionYaml(paths, sessionId, mutator) {
+  const kind = await lstatSessionFile(paths, sessionId, "session.yaml").catch((error) => {
+    throw new Error("Failed to read YAML file", { cause: error });
+  });
+  if (kind === "symlink" || kind === "not_a_file") {
+    throw new SessionFileNotAFileError3(sessionId, "session.yaml", kind);
+  }
+  const filePath = join7(paths.sessions, sessionId, "session.yaml");
   const raw = await readYamlFile2(filePath);
   const parsed = SessionSchema.parse(raw);
   mutator(parsed);
@@ -4412,7 +4438,7 @@ async function assertWorkspaceInitialized6(basouRoot) {
 import { execFile } from "child_process";
 import { open as open2, readFile as readFile4, realpath as realpath4, stat as stat4 } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { join as join11 } from "path";
+import { join as join10 } from "path";
 import { fileURLToPath } from "url";
 import { promisify } from "util";
 import {
@@ -4573,15 +4599,15 @@ function describeCodexHookTrust(trust) {
 
 // src/lib/protocols-config.ts
 import { homedir as homedir5 } from "os";
-import { isAbsolute, join as join9, resolve as resolve5 } from "path";
+import { isAbsolute, join as join8, resolve as resolve5 } from "path";
 import { readYamlFile as readYamlFile3 } from "@basou/core";
-var DEFAULT_PROTOCOLS_CONFIG_PATH = join9(homedir5(), ".basou", "protocols.yaml");
-var DEFAULT_TARGET_PATH = join9(homedir5(), ".claude", "CLAUDE.md");
+var DEFAULT_PROTOCOLS_CONFIG_PATH = join8(homedir5(), ".basou", "protocols.yaml");
+var DEFAULT_TARGET_PATH = join8(homedir5(), ".claude", "CLAUDE.md");
 var ALLOWED_TOP_KEYS = /* @__PURE__ */ new Set(["version", "protocols"]);
 var ALLOWED_ENTRY_KEYS = /* @__PURE__ */ new Set(["source", "title"]);
 function expandTilde(p) {
   if (p === "~") return homedir5();
-  if (p.startsWith("~/")) return join9(homedir5(), p.slice(2));
+  if (p.startsWith("~/")) return join8(homedir5(), p.slice(2));
   return p;
 }
 function isRecord(value) {
@@ -4659,12 +4685,12 @@ import {
 
 // src/lib/hosts-config.ts
 import { homedir as homedir6 } from "os";
-import { isAbsolute as isAbsolute2, join as join10, resolve as resolve6 } from "path";
+import { isAbsolute as isAbsolute2, join as join9, resolve as resolve6 } from "path";
 import { readYamlFile as readYamlFile4 } from "@basou/core";
-var DEFAULT_HOSTS_CONFIG_PATH = join10(homedir6(), ".basou", "hosts.yaml");
+var DEFAULT_HOSTS_CONFIG_PATH = join9(homedir6(), ".basou", "hosts.yaml");
 function expandTilde2(p) {
   if (p === "~") return homedir6();
-  if (p.startsWith("~/")) return join10(homedir6(), p.slice(2));
+  if (p.startsWith("~/")) return join9(homedir6(), p.slice(2));
   return p;
 }
 function isRecord2(value) {
@@ -5248,7 +5274,7 @@ function parseMinEdits(raw) {
   if (raw === void 0 || !/^\d+$/.test(raw)) return void 0;
   return Number(raw);
 }
-var DEFAULT_CLAUDE_SETTINGS_PATH = join11(homedir7(), ".claude", "settings.json");
+var DEFAULT_CLAUDE_SETTINGS_PATH = join10(homedir7(), ".claude", "settings.json");
 function resolveCliEntry() {
   return fileURLToPath(import.meta.url);
 }
@@ -5605,7 +5631,7 @@ function describeHookMode(tiers) {
   const gates = tiers.review ? "capture + review" : "capture";
   return `${enforcement}, ${gates}`;
 }
-var DEFAULT_CODEX_FACE_PATH = join11(homedir7(), ".codex", "AGENTS.md");
+var DEFAULT_CODEX_FACE_PATH = join10(homedir7(), ".codex", "AGENTS.md");
 var LEFTOVER_FACE_NOTE = (label) => `${label} still carries an orientation block rendered by an earlier basou (0.39 or before); every Codex session on this machine reads it. \`basou channel clear codex\` removes it.`;
 async function faceHasLeftoverOrientationBlock(facePath) {
   try {
@@ -5617,8 +5643,8 @@ async function faceHasLeftoverOrientationBlock(facePath) {
     return false;
   }
 }
-var DEFAULT_CODEX_HOOKS_PATH = join11(homedir7(), ".codex", "hooks.json");
-var DEFAULT_CODEX_CONFIG_PATH = join11(homedir7(), ".codex", "config.toml");
+var DEFAULT_CODEX_HOOKS_PATH = join10(homedir7(), ".codex", "hooks.json");
+var DEFAULT_CODEX_CONFIG_PATH = join10(homedir7(), ".codex", "config.toml");
 async function readHooksFile(path) {
   let raw;
   try {
@@ -6225,7 +6251,7 @@ import {
   writeFileSync,
   writeSync
 } from "fs";
-import { basename as basename7, dirname as dirname7, isAbsolute as isAbsolute3, join as join12, relative as relative3, resolve as resolve9 } from "path";
+import { basename as basename7, dirname as dirname7, isAbsolute as isAbsolute3, join as join11, relative as relative3, resolve as resolve9 } from "path";
 import {
   appendBasouGitignore as appendBasouGitignore2,
   basouPaths as basouPaths13,
@@ -6606,7 +6632,7 @@ function classifySourceRoot(repositoryRoot, declaredPath) {
   } catch {
     return { path: declaredPath, kind: "unresolved" };
   }
-  return { path: declaredPath, kind: existsSync(join12(real, ".git")) ? "repo" : "non-repo" };
+  return { path: declaredPath, kind: existsSync(join11(real, ".git")) ? "repo" : "non-repo" };
 }
 async function doRunProjectAdopt(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
@@ -6710,7 +6736,7 @@ async function gatherRepoWiring(repositoryRoot, entry) {
   } catch {
     return { ...base, reachable: false, instructionFiles: [] };
   }
-  if (!existsSync(join12(real, ".git"))) {
+  if (!existsSync(join11(real, ".git"))) {
     return { ...base, reachable: false, instructionFiles: [] };
   }
   try {
@@ -6718,7 +6744,7 @@ async function gatherRepoWiring(repositoryRoot, entry) {
     for (const name of INSTRUCTION_FILES) {
       let present = true;
       try {
-        lstatSync(join12(real, name));
+        lstatSync(join11(real, name));
       } catch {
         present = false;
       }
@@ -6829,10 +6855,10 @@ function gatherRepoGitignore(repositoryRoot, entry) {
   } catch {
     return { ...base, reachable: false, currentLines: [] };
   }
-  if (!existsSync(join12(real, ".git"))) {
+  if (!existsSync(join11(real, ".git"))) {
     return { ...base, reachable: false, currentLines: [] };
   }
-  return { ...base, reachable: true, currentLines: readGitignoreLines(join12(real, ".gitignore")) };
+  return { ...base, reachable: true, currentLines: readGitignoreLines(join11(real, ".gitignore")) };
 }
 function hasErrorCode(error) {
   return error instanceof Error && typeof error.code === "string";
@@ -6846,7 +6872,7 @@ function readGitignoreLines(file) {
   }
 }
 function applyGitignorePlan(repositoryRoot, plan) {
-  const file = join12(realpathSync(resolve9(repositoryRoot, plan.path)), ".gitignore");
+  const file = join11(realpathSync(resolve9(repositoryRoot, plan.path)), ".gitignore");
   let existing = "";
   try {
     existing = readFileSync(file, "utf8");
@@ -6986,7 +7012,7 @@ function gatherRepoSymlinks(repositoryRoot, anchorReal, entry) {
     return { ...base, isAnchor: false, reachable: false, canonicalPresent: false, files: [] };
   }
   if (real === anchorReal) {
-    const anchorCanonical = join12(real, CANONICAL_FILE);
+    const anchorCanonical = join11(real, CANONICAL_FILE);
     const anchorState = anchorCanonicalState(anchorCanonical);
     if (anchorState === "absent") {
       return { ...base, isAnchor: true, reachable: true, canonicalPresent: false, files: [] };
@@ -7006,7 +7032,7 @@ function gatherRepoSymlinks(repositoryRoot, anchorReal, entry) {
       anchorCanonical,
       "self"
     ).map((spec) => {
-      const { state, actualTarget } = inspectSymlink(join12(real, spec.name), spec.target);
+      const { state, actualTarget } = inspectSymlink(join11(real, spec.name), spec.target);
       return {
         name: spec.name,
         expectedTarget: spec.target,
@@ -7023,16 +7049,16 @@ function gatherRepoSymlinks(repositoryRoot, anchorReal, entry) {
       files: anchorFiles
     };
   }
-  if (!existsSync(join12(real, ".git"))) {
+  if (!existsSync(join11(real, ".git"))) {
     return { ...base, isAnchor: false, reachable: false, canonicalPresent: false, files: [] };
   }
-  const canonicalFile = isSelf ? join12(real, CANONICAL_FILE) : join12(anchorReal, "agents", basename7(real), CANONICAL_FILE);
+  const canonicalFile = isSelf ? join11(real, CANONICAL_FILE) : join11(anchorReal, "agents", basename7(real), CANONICAL_FILE);
   if (!existsSync(canonicalFile)) {
     return { ...base, isAnchor: false, reachable: true, canonicalPresent: false, files: [] };
   }
   const files = expectedSymlinkTargets(real, canonicalFile, mode).map(
     (spec) => {
-      const { state, actualTarget } = inspectSymlink(join12(real, spec.name), spec.target);
+      const { state, actualTarget } = inspectSymlink(join11(real, spec.name), spec.target);
       return {
         name: spec.name,
         expectedTarget: spec.target,
@@ -7061,7 +7087,7 @@ function applySymlinkPlan(repositoryRoot, plan) {
   const created = [];
   const failed = [];
   for (const { name, target } of plan.toCreate) {
-    const filePath = join12(real, name);
+    const filePath = join11(real, name);
     try {
       mkdirSync(dirname7(filePath), { recursive: true });
       symlinkSync(target, filePath);
@@ -7095,7 +7121,7 @@ function gatherViewSymlinks(repositoryRoot, anchorReal, roster, viewDir) {
   if (!existsSync(canonicalFile)) return { kind: "missing-canonical", viewName };
   const files = expectedSymlinkTargets(viewDir, canonicalFile, "hub").map(
     (spec) => {
-      const { state, actualTarget } = inspectSymlink(join12(viewDir, spec.name), spec.target);
+      const { state, actualTarget } = inspectSymlink(join11(viewDir, spec.name), spec.target);
       return {
         name: spec.name,
         expectedTarget: spec.target,
@@ -7111,7 +7137,7 @@ function applyViewSymlinks(viewDir, files) {
   const failed = [];
   for (const f of files) {
     if (f.state !== "missing") continue;
-    const filePath = join12(viewDir, f.name);
+    const filePath = join11(viewDir, f.name);
     try {
       mkdirSync(dirname7(filePath), { recursive: true });
       symlinkSync(f.expectedTarget, filePath);
@@ -7333,7 +7359,7 @@ function resolveViewDir(repositoryRoot, viewPath) {
     return realpathSync(abs);
   } catch {
     try {
-      return join12(realpathSync(dirname7(abs)), basename7(abs));
+      return join11(realpathSync(dirname7(abs)), basename7(abs));
     } catch {
       return abs;
     }
@@ -7351,7 +7377,7 @@ function gatherViewRepo(repositoryRoot, viewDir, entry) {
     return { path: entry.path, reachable: false };
   }
   const linkName = basename7(repoReal);
-  const { state, actualTarget } = inspectSymlink(join12(viewDir, linkName), expectedTarget);
+  const { state, actualTarget } = inspectSymlink(join11(viewDir, linkName), expectedTarget);
   return {
     path: entry.path,
     reachable: true,
@@ -7365,7 +7391,7 @@ function applyViewPlan(viewDir, toCreate) {
   const created = [];
   const failed = [];
   for (const { name, target } of toCreate) {
-    const filePath = join12(viewDir, name);
+    const filePath = join11(viewDir, name);
     try {
       mkdirSync(dirname7(filePath), { recursive: true });
       symlinkSync(target, filePath);
@@ -7380,7 +7406,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 = join12(viewDir, name);
+  const filePath = join11(viewDir, name);
   let isLink;
   try {
     isLink = lstatSync(filePath).isSymbolicLink();
@@ -7409,7 +7435,7 @@ function classifyViewLink(viewDir, name, rosterRealpaths) {
   if (!isDir) {
     return { target, kind: existsSync(resolved) ? "non-repo" : "broken" };
   }
-  return { target, kind: existsSync(join12(resolved, ".git")) ? "repo" : "non-repo" };
+  return { target, kind: existsSync(join11(resolved, ".git")) ? "repo" : "non-repo" };
 }
 function gatherExistingViewLinks(viewDir, rosterRealpaths) {
   let names;
@@ -7434,7 +7460,7 @@ function pruneViewLinks(viewDir, toPrune, rosterRealpaths) {
   const pruned = [];
   const failed = [];
   for (const { name } of toPrune) {
-    const filePath = join12(viewDir, name);
+    const filePath = join11(viewDir, name);
     const c = classifyViewLink(viewDir, name, rosterRealpaths);
     if (c === null || c.kind !== "repo") {
       failed.push({
@@ -7647,10 +7673,10 @@ async function runProjectPreset(options, ctx = {}) {
   }
 }
 function canonicalFileFor(anchorReal, canonicalName) {
-  return join12(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+  return join11(anchorReal, "agents", canonicalName, CANONICAL_FILE);
 }
 function canonicalLabelFor(canonicalName) {
-  return join12("agents", canonicalName, CANONICAL_FILE);
+  return join11("agents", canonicalName, CANONICAL_FILE);
 }
 async function gatherRepoPreset(repositoryRoot, anchorReal, entry) {
   const declared = {
@@ -7671,7 +7697,7 @@ async function gatherRepoPreset(repositoryRoot, anchorReal, entry) {
   if (real === anchorReal) {
     return { ...declared, isAnchor: true, reachable: true, canonicalPresent: false };
   }
-  if (!existsSync(join12(real, ".git"))) {
+  if (!existsSync(join11(real, ".git"))) {
     return { ...declared, isAnchor: false, reachable: false, canonicalPresent: false };
   }
   const canonicalName = basename7(real);
@@ -8053,24 +8079,24 @@ function gatherArchiveTeardown(repositoryRoot, manifest, target) {
   const instructionFiles = [];
   for (const name of INSTRUCTION_FILES) {
     try {
-      lstatSync(join12(real, name));
+      lstatSync(join11(real, name));
       instructionFiles.push(name);
     } catch {
     }
   }
   let ignored;
   try {
-    ignored = new Set(readGitignoreLines(join12(real, ".gitignore")).map((l) => l.trim()));
+    ignored = new Set(readGitignoreLines(join11(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(join12(anchorReal, "agents", canonicalName, CANONICAL_FILE));
+  const canonical2 = existsSync(join11(anchorReal, "agents", canonicalName, CANONICAL_FILE));
   let viewLink = false;
   const viewPath = manifest.workspace.view;
   if (viewPath !== void 0) {
     try {
-      lstatSync(join12(resolveViewDir(repositoryRoot, viewPath), canonicalName));
+      lstatSync(join11(resolveViewDir(repositoryRoot, viewPath), canonicalName));
       viewLink = true;
     } catch {
     }
@@ -8084,11 +8110,11 @@ function gatherArchiveTeardown(repositoryRoot, manifest, target) {
   };
 }
 function teardownExpectedTargets(repoReal, anchorReal, canonicalName) {
-  const canonicalFile = join12(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+  const canonicalFile = join11(anchorReal, "agents", canonicalName, CANONICAL_FILE);
   return expectedSymlinkTargets(repoReal, canonicalFile);
 }
 function viewLinkPointsAt(viewDir, name, repoReal) {
-  const filePath = join12(viewDir, name);
+  const filePath = join11(viewDir, name);
   try {
     if (!lstatSync(filePath).isSymbolicLink()) return false;
     const target = readlinkSync(filePath);
@@ -8099,7 +8125,7 @@ function viewLinkPointsAt(viewDir, name, repoReal) {
   }
 }
 function viewLinkPointsAtPath(viewDir, name, expectedRepoPath) {
-  const filePath = join12(viewDir, name);
+  const filePath = join11(viewDir, name);
   try {
     if (!lstatSync(filePath).isSymbolicLink()) return false;
     const target = readlinkSync(filePath);
@@ -8150,7 +8176,7 @@ function gatherRepoTeardown(repositoryRoot, manifest, target) {
   if (!isAnchor) {
     if (repoReal !== void 0) {
       for (const spec of teardownExpectedTargets(repoReal, anchorReal, canonicalName)) {
-        const { state, actualTarget } = inspectSymlink(join12(repoReal, spec.name), spec.target);
+        const { state, actualTarget } = inspectSymlink(join11(repoReal, spec.name), spec.target);
         if (isSelf) {
           if (state !== "missing")
             items.push({
@@ -8187,7 +8213,7 @@ function gatherRepoTeardown(repositoryRoot, manifest, target) {
       }
       let ignored;
       try {
-        ignored = new Set(readGitignoreLines(join12(repoReal, ".gitignore")).map((l) => l.trim()));
+        ignored = new Set(readGitignoreLines(join11(repoReal, ".gitignore")).map((l) => l.trim()));
         for (const p of INSTRUCTION_FILES) {
           if (ignored.has(p) || ignored.has(`/${p}`)) {
             items.push({
@@ -8210,7 +8236,7 @@ function gatherRepoTeardown(repositoryRoot, manifest, target) {
     const viewPath = manifest.workspace.view;
     if (viewPath !== void 0) {
       const viewDir = resolveViewDir(repositoryRoot, viewPath);
-      const linkPath = join12(viewDir, canonicalName);
+      const linkPath = join11(viewDir, canonicalName);
       let isLink = false;
       try {
         isLink = lstatSync(linkPath).isSymbolicLink();
@@ -8236,8 +8262,8 @@ function gatherRepoTeardown(repositoryRoot, manifest, target) {
         else items.push({ kind: "view-symlink", label: canonicalName, state: "removable" });
       }
     }
-    const canonicalFile = join12(anchorReal, "agents", canonicalName, CANONICAL_FILE);
-    const canonicalLabel = join12("agents", canonicalName, CANONICAL_FILE);
+    const canonicalFile = join11(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+    const canonicalLabel = join11("agents", canonicalName, CANONICAL_FILE);
     let canonicalIsLink = false;
     try {
       canonicalIsLink = lstatSync(canonicalFile).isSymbolicLink();
@@ -8341,12 +8367,12 @@ function applyRepoTeardown(repositoryRoot, manifest, plan) {
   );
   for (const item of removable.filter((i) => i.kind === "instruction-symlink")) {
     const expected = expectedByName.get(item.label);
-    if (repoReal === null || expected === void 0 || inspectSymlink(join12(repoReal, item.label), expected).state !== "correct") {
+    if (repoReal === null || expected === void 0 || inspectSymlink(join11(repoReal, item.label), expected).state !== "correct") {
       changed(item.label);
       continue;
     }
     try {
-      unlinkSync(join12(repoReal, item.label));
+      unlinkSync(join11(repoReal, item.label));
       removed.push(item.label);
     } catch (error) {
       failed.push({ label: item.label, message: failureReason(error) });
@@ -8365,7 +8391,7 @@ function applyRepoTeardown(repositoryRoot, manifest, plan) {
       continue;
     }
     try {
-      unlinkSync(join12(viewDir, item.label));
+      unlinkSync(join11(viewDir, item.label));
       removed.push(`view/${item.label}`);
     } catch (error) {
       failed.push({ label: `view/${item.label}`, message: failureReason(error) });
@@ -8373,7 +8399,7 @@ function applyRepoTeardown(repositoryRoot, manifest, plan) {
   }
   const NOFOLLOW = fsConstants.O_NOFOLLOW ?? 0;
   for (const item of removable.filter((i) => i.kind === "canonical-block")) {
-    const canonicalFile = join12(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+    const canonicalFile = join11(anchorReal, "agents", canonicalName, CANONICAL_FILE);
     try {
       if (lstatSync(canonicalFile).isSymbolicLink()) {
         changed(item.label);
@@ -8647,12 +8673,12 @@ function gatherRenameWiring(repositoryRoot, manifest, oldBasename) {
   } catch {
     return { canonicalDirOld: false, viewLinkOld: false };
   }
-  const canonicalDirOld = existsSync(join12(anchorReal, "agents", oldBasename));
+  const canonicalDirOld = existsSync(join11(anchorReal, "agents", oldBasename));
   let viewLinkOld = false;
   const viewPath = manifest.workspace.view;
   if (viewPath !== void 0) {
     try {
-      lstatSync(join12(resolveViewDir(repositoryRoot, viewPath), oldBasename));
+      lstatSync(join11(resolveViewDir(repositoryRoot, viewPath), oldBasename));
       viewLinkOld = true;
     } catch {
     }
@@ -8997,7 +9023,7 @@ async function doRunProjectSeedAnchor(options, ctx) {
     console.log("\u2139\uFE0F No repo roster declared \u2014 nothing to seed.");
     return;
   }
-  const anchorDoc = join12(repositoryRoot, CANONICAL_FILE);
+  const anchorDoc = join11(repositoryRoot, CANONICAL_FILE);
   if (pathPresent(anchorDoc)) {
     console.log(
       `\u2705 The anchor's own \`${CANONICAL_FILE}\` already exists \u2014 hand-maintained, left untouched.`
@@ -9059,7 +9085,7 @@ function regularFileSpokes(repoReal) {
   const out = [];
   for (const spoke of ["CLAUDE.md", ".github/copilot-instructions.md"]) {
     try {
-      const st = lstatSync(join12(repoReal, spoke));
+      const st = lstatSync(join11(repoReal, spoke));
       if (!st.isSymbolicLink() && st.isFile()) out.push(spoke);
     } catch {
     }
@@ -9105,8 +9131,8 @@ function gatherRetrofit(repositoryRoot, anchorReal, roster, argAbs, argReal, vie
     };
   }
   const isAnchor = argReal === anchorReal;
-  const reachable = existsSync(join12(argReal, ".git"));
-  const canonicalFile = join12(anchorReal, "agents", canonicalName, CANONICAL_FILE);
+  const reachable = existsSync(join11(argReal, ".git"));
+  const canonicalFile = join11(anchorReal, "agents", canonicalName, CANONICAL_FILE);
   return {
     path,
     declared,
@@ -9115,13 +9141,13 @@ function gatherRetrofit(repositoryRoot, anchorReal, roster, argAbs, argReal, vie
     reachable,
     canonicalName,
     ...viewCanonicalName !== void 0 ? { viewCanonicalName } : {},
-    agentsState: inspectAgentsState(join12(argReal, CANONICAL_FILE)),
+    agentsState: inspectAgentsState(join11(argReal, CANONICAL_FILE)),
     canonicalExists: pathPresent(canonicalFile),
     regularSpokes: regularFileSpokes(argReal)
   };
 }
 function relocateAgentsFile(repoReal, canonicalFile) {
-  const agentsFile = join12(repoReal, CANONICAL_FILE);
+  const agentsFile = join11(repoReal, CANONICAL_FILE);
   try {
     mkdirSync(dirname7(canonicalFile), { recursive: true });
   } catch (error) {
@@ -9237,7 +9263,7 @@ async function doRunProjectRetrofit(repo, options, ctx) {
   let failure;
   let partial = false;
   if (options.apply === true && plan.action === "relocate" && argReal !== void 0) {
-    const canonicalFile = join12(anchorReal, "agents", plan.canonicalName, CANONICAL_FILE);
+    const canonicalFile = join11(anchorReal, "agents", plan.canonicalName, CANONICAL_FILE);
     const res = relocateAgentsFile(argReal, canonicalFile);
     if (res.ok) {
       applied = true;
@@ -9629,7 +9655,7 @@ import { InvalidArgumentError as InvalidArgumentError4 } from "commander";
 // src/commands/refresh-watch.ts
 import { readdir as readdir3, stat as stat6 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { join as join13 } from "path";
+import { join as join12 } from "path";
 import {
   assertApprovalStoreSafe as assertApprovalStoreSafe2,
   assertLockStoreSafe as assertLockStoreSafe4,
@@ -9641,8 +9667,8 @@ var MIN_WATCH_INTERVAL_SEC = 5;
 var MAX_WATCH_INTERVAL_SEC = 86400;
 function watchedRoots(ctx) {
   return [
-    ctx.codexSessionsDir ?? join13(homedir9(), ".codex", "sessions"),
-    ctx.claudeProjectsDir ?? join13(homedir9(), ".claude", "projects")
+    ctx.codexSessionsDir ?? join12(homedir9(), ".codex", "sessions"),
+    ctx.claudeProjectsDir ?? join12(homedir9(), ".claude", "projects")
   ];
 }
 async function scanSourceLogs(roots) {
@@ -9656,7 +9682,7 @@ async function scanSourceLogs(roots) {
       throw new Error("Failed to read a source log directory", { cause: error });
     }
     for (const entry of entries) {
-      const full = join13(dir, entry.name);
+      const full = join12(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(full);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
@@ -10502,7 +10528,7 @@ function unattachedLines(u) {
 // src/commands/run.ts
 import { mkdir as mkdir3, readFile as readFile6, rm as rm3 } from "fs/promises";
 import { homedir as homedir11 } from "os";
-import { join as join14 } from "path";
+import { join as join13 } from "path";
 import {
   acquireLock as acquireLock5,
   assertBasouRootSafe as assertBasouRootSafe13,
@@ -10517,6 +10543,7 @@ import {
   findBasouSessionStartHook as findBasouSessionStartHook2,
   getDiff,
   getSnapshot as getSnapshot2,
+  lstatSessionFile as lstatSessionFile2,
   overwriteYamlFile as overwriteYamlFile2,
   prefixedUlid as prefixedUlid4,
   readManifest as readManifest12,
@@ -10524,6 +10551,7 @@ import {
   resolveClaudeCodeCommand,
   resolveCodexCommand,
   SESSION_SCHEMA_VERSION as SESSION_SCHEMA_VERSION2,
+  SessionFileNotAFileError as SessionFileNotAFileError4,
   SessionSchema as SessionSchema2,
   sanitizeRelatedFiles,
   sanitizeWorkingDirectory as sanitizeWorkingDirectory2,
@@ -10583,12 +10611,12 @@ async function runTrackedTool(args, options, ctx, adapter) {
   const manifest = await readManifest12(paths);
   await assertSessionStoreSafe3(paths);
   const sessionId = prefixedUlid4("ses");
-  const sessionDir = join14(paths.sessions, sessionId);
+  const sessionDir = join13(paths.sessions, sessionId);
   const appendEvent = ctx.appendEvent ?? (async (_sessionDir, event) => {
     await coreAppendChainedEvent2(paths, sessionId, event);
   });
   const startedAt = now().toISOString();
-  const sessionYamlPath = join14(sessionDir, "session.yaml");
+  const sessionYamlPath = join13(sessionDir, "session.yaml");
   const session = buildInitialSession2({
     id: sessionId,
     command,
@@ -10639,7 +10667,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   });
   const runningLock = await acquireLock5(paths, "session", sessionId);
   try {
-    await mutateSessionYaml2(sessionYamlPath, (s) => {
+    await mutateSessionYaml2(paths, sessionId, (s) => {
       s.session.status = "running";
     });
   } finally {
@@ -10885,7 +10913,14 @@ function buildInitialSession2(input) {
     }
   };
 }
-async function mutateSessionYaml2(filePath, mutator) {
+async function mutateSessionYaml2(paths, sessionId, mutator) {
+  const kind = await lstatSessionFile2(paths, sessionId, "session.yaml").catch((error) => {
+    throw new Error("Failed to read YAML file", { cause: error });
+  });
+  if (kind === "symlink" || kind === "not_a_file") {
+    throw new SessionFileNotAFileError4(sessionId, "session.yaml", kind);
+  }
+  const filePath = join13(paths.sessions, sessionId, "session.yaml");
   const raw = await readYamlFile5(filePath);
   const parsed = SessionSchema2.parse(raw);
   mutator(parsed);
@@ -10953,7 +10988,7 @@ async function noteCodexHookStatusPreSpawn(_cwd, ctx) {
 
 // src/commands/session.ts
 import { readFile as readFile7 } from "fs/promises";
-import { basename as basename8, isAbsolute as isAbsolute5, join as join15, relative as relative4, sep as sep3 } from "path";
+import { basename as basename8, isAbsolute as isAbsolute5, join as join14, relative as relative4, sep as sep3 } from "path";
 import {
   acquireLock as acquireLock6,
   appendEventToExistingSession as appendEventToExistingSession3,
@@ -10967,6 +11002,7 @@ import {
   importSessionFromJson as importSessionFromJson2,
   LOCAL_CLI_EVENT_SOURCE as LOCAL_CLI_EVENT_SOURCE4,
   loadSessionEntries as loadSessionEntries2,
+  lstatSessionFile as lstatSessionFile3,
   normalizeSessionTimestamps,
   readAllEvents,
   readManifest as readManifest13,
@@ -10976,6 +11012,7 @@ import {
   resolveSessionId as resolveSessionId3,
   resolveTaskId,
   SESSION_IMPORT_SCHEMA_VERSION as SESSION_IMPORT_SCHEMA_VERSION2,
+  SessionFileNotAFileError as SessionFileNotAFileError5,
   SessionImportPayloadSchema as SessionImportPayloadSchema2,
   SessionSchema as SessionSchema3,
   SessionStatusSchema,
@@ -11085,8 +11122,16 @@ async function doRunSessionShow(idInput, options, ctx) {
   const paths = basouPaths19(repositoryRoot);
   await assertWorkspaceInitialized12(paths.root);
   const sessionId = await resolveSessionId3(paths, idInput);
-  const sessionDir = join15(paths.sessions, sessionId);
-  const sessionYamlPath = join15(sessionDir, "session.yaml");
+  const sessionDir = join14(paths.sessions, sessionId);
+  const sessionYamlPath = join14(sessionDir, "session.yaml");
+  const yamlKind = await lstatSessionFile3(paths, sessionId, "session.yaml").catch(
+    (error) => {
+      throw new Error("Failed to read session", { cause: error });
+    }
+  );
+  if (yamlKind === "symlink" || yamlKind === "not_a_file") {
+    throw new SessionFileNotAFileError5(sessionId, "session.yaml", yamlKind);
+  }
   let session;
   try {
     const raw = await readYamlFile6(sessionYamlPath);
@@ -11098,7 +11143,7 @@ async function doRunSessionShow(idInput, options, ctx) {
     throw new Error("Failed to read session", { cause: error });
   }
   let eventsLostLines = 0;
-  const events = await readAllEvents(sessionDir, {
+  const events = await readAllEvents(paths, sessionId, {
     onWarning: (w) => {
       if (w.kind === "malformed_json" || w.kind === "schema_violation") eventsLostLines++;
       printReplayWarning(w, sessionId);
@@ -11616,7 +11661,7 @@ async function doRunSessionRechain(options, ctx) {
     }
   }
   const tamperedCount = rows.filter(
-    (r) => r.reason === "tampered" || r.reason === "symlink" || r.reason === "not_a_directory"
+    (r) => r.reason === "tampered" || r.reason === "symlink" || r.reason === "not_a_directory" || r.reason === "events_not_a_file" || r.reason === "yaml_not_a_file"
   ).length;
   const errorCount = rows.filter((r) => r.status === "error").length;
   if (options.json === true) {
@@ -11644,6 +11689,10 @@ function renderRechainRow(row, dryRun) {
       if (row.reason === "symlink" || row.reason === "not_a_directory") {
         return `skipped (${row.reason === "symlink" ? "SYMLINK" : "NOT A DIRECTORY"} \u2014 not followed; inspect with 'basou verify')`;
       }
+      if (row.reason === "events_not_a_file" || row.reason === "yaml_not_a_file") {
+        const file = row.reason === "events_not_a_file" ? "events.jsonl" : "session.yaml";
+        return `skipped (${file} NOT A REGULAR FILE \u2014 not followed; inspect with 'basou verify')`;
+      }
       return `skipped (${row.reason})`;
     case "error":
       return `error (${row.message})`;
@@ -11852,7 +11901,6 @@ function formatVersionGateMessage(error) {
 
 // src/commands/task.ts
 import { readFile as readFile8 } from "fs/promises";
-import { join as join16 } from "path";
 import {
   archiveTask,
   assertBasouRootSafe as assertBasouRootSafe17,
@@ -12177,9 +12225,8 @@ async function doRunTaskShow(idInput, options, ctx) {
   const events = [];
   const linkedSessionIds = new Set(doc.task.task.linked_sessions);
   for (const s of sessions) {
-    const sessionDir = join16(paths.sessions, s.sessionId);
     try {
-      for await (const ev of replayEvents3(sessionDir, {
+      for await (const ev of replayEvents3(paths, s.sessionId, {
         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) {
@@ -13072,7 +13119,7 @@ async function assertWorkspaceInitialized15(basouRoot) {
 // src/commands/view.ts
 import { spawn } from "child_process";
 import { createHash as createHash2 } from "crypto";
-import { basename as basename11, dirname as dirname9, join as join20, resolve as resolve14 } from "path";
+import { basename as basename11, dirname as dirname9, join as join17, resolve as resolve14 } from "path";
 import {
   assertBasouRootSafe as assertBasouRootSafe19,
   basouPaths as basouPaths25,
@@ -13086,7 +13133,7 @@ import { InvalidArgumentError as InvalidArgumentError8 } from "commander";
 import { createReadStream as createReadStream2 } from "fs";
 import { readdir as readdir4, stat as stat7 } from "fs/promises";
 import { homedir as homedir12 } from "os";
-import { basename as basename9, dirname as dirname8, join as join17 } from "path";
+import { basename as basename9, dirname as dirname8, join as join15 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { basouPaths as basouPaths24, readManifest as readManifest16 } from "@basou/core";
 function uncapturedTotal(result) {
@@ -13098,8 +13145,8 @@ async function checkPortfolioCoverage(workspaces, ctx = {}) {
     ctx.portfolioConfigPath
   );
   const listedDirs = new Set([...roots].map((root) => encodeProjectDir(root)));
-  const claudeProjectsDir = ctx.claudeProjectsDir ?? join17(homedir12(), ".claude", "projects");
-  const codexSessionsDir = ctx.codexSessionsDir ?? join17(homedir12(), ".codex", "sessions");
+  const claudeProjectsDir = ctx.claudeProjectsDir ?? join15(homedir12(), ".claude", "projects");
+  const codexSessionsDir = ctx.codexSessionsDir ?? join15(homedir12(), ".codex", "sessions");
   const tally = new Tally(roots);
   const absentTrees = [];
   const claudeFiles = await listClaudeTranscripts(claudeProjectsDir);
@@ -13237,7 +13284,7 @@ async function isDirEntry(parent, entry) {
   if (entry.isDirectory()) return true;
   if (!entry.isSymbolicLink()) return false;
   try {
-    return (await stat7(join17(parent, entry.name))).isDirectory();
+    return (await stat7(join15(parent, entry.name))).isDirectory();
   } catch {
     return false;
   }
@@ -13252,7 +13299,7 @@ async function listClaudeTranscripts(projectsRoot) {
   const files = [];
   for (const entry of entries) {
     if (!await isDirEntry(projectsRoot, entry)) continue;
-    const full = join17(projectsRoot, entry.name);
+    const full = join15(projectsRoot, entry.name);
     let names;
     try {
       names = await readdir4(full);
@@ -13260,7 +13307,7 @@ async function listClaudeTranscripts(projectsRoot) {
       continue;
     }
     for (const name of names) {
-      if (name.endsWith(".jsonl")) files.push(join17(full, name));
+      if (name.endsWith(".jsonl")) files.push(join15(full, name));
     }
   }
   return files.sort();
@@ -13275,7 +13322,7 @@ async function listCodexRollouts(sessionsRoot) {
       return;
     }
     for (const entry of entries) {
-      const full = join17(dir, entry.name);
+      const full = join15(dir, entry.name);
       if (entry.isDirectory()) await walk(full);
       else if (entry.isFile() && entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl")) {
         found.push(full);
@@ -13406,7 +13453,7 @@ function inertLines(result) {
 // src/lib/portfolio-safety.ts
 import { execFile as execFile2 } from "child_process";
 import { lstat as lstat3, realpath as realpath5 } from "fs/promises";
-import { isAbsolute as isAbsolute6, join as join18, relative as relative5, resolve as resolve12, sep as sep4 } from "path";
+import { isAbsolute as isAbsolute6, join as join16, relative as relative5, resolve as resolve12, sep as sep4 } from "path";
 import { promisify as promisify2 } from "util";
 import { readManifest as readManifest17 } from "@basou/core";
 var execFileAsync2 = promisify2(execFile2);
@@ -13430,7 +13477,7 @@ function isBasouPath(p) {
 async function inspectRepo(repoPath) {
   let hasEntry = false;
   try {
-    await lstat3(join18(repoPath, ".basou"));
+    await lstat3(join16(repoPath, ".basou"));
     hasEntry = true;
   } catch (error) {
     if (errorCode2(error) !== "ENOENT") {
@@ -13584,7 +13631,7 @@ function formatSafetyReport(result) {
 
 // src/lib/view-server.ts
 import { createServer } from "http";
-import { basename as basename10, join as join19, resolve as resolve13 } from "path";
+import { basename as basename10, resolve as resolve13 } from "path";
 import {
   boardLivePage,
   boardPage,
@@ -13606,7 +13653,9 @@ import {
   renderDecisions as renderDecisions3,
   renderHandoff as renderHandoff3,
   resolveViewLanguageFromPaths,
+  SessionFileNotAFileError as SessionFileNotAFileError6,
   SessionIdSchema,
+  SessionNotADirectoryError,
   summarizeOrientation,
   tryRemoteUrl
 } from "@basou/core";
@@ -15609,10 +15658,7 @@ async function sessionDetail(ws, sessionId) {
   }
   const entry = await inspectSessionEntry2(ws.paths, sessionId);
   if (entry === "symlink" || entry === "not_a_directory") {
-    throw new HttpError(
-      404,
-      `Session ${sessionId} is not a directory; a symlink or a file there is not followed`
-    );
+    throw new HttpError(404, new SessionNotADirectoryError(sessionId, entry).message);
   }
   let session;
   try {
@@ -15621,10 +15667,11 @@ async function sessionDetail(ws, sessionId) {
     if (error instanceof Error && error.message === "YAML file not found") {
       throw new HttpError(404, "Session not found");
     }
+    if (error instanceof SessionFileNotAFileError6) throw new HttpError(404, error.message);
     throw error;
   }
   try {
-    const events = await readAllEvents2(join19(ws.paths.sessions, sessionId));
+    const events = await readAllEvents2(ws.paths, sessionId);
     return { session, events };
   } catch {
     return { session, events: [], degraded: true };
@@ -15889,7 +15936,7 @@ async function viewBoardOf(root, paths) {
     own = void 0;
   }
   if (own?.visibility !== "private") return { why: "no_board" };
-  return { recordsDir: join20(root, dirname9(DEFAULT_BOARD_PATH), "records") };
+  return { recordsDir: join17(root, dirname9(DEFAULT_BOARD_PATH), "records") };
 }
 async function buildPortfolioDeps(workspaceFlags, ctx, cwd) {
   const specs = workspaceFlags.length > 0 ? workspaceFlags.map((p) => ({ path: resolve14(cwd, p) })) : await loadPortfolioConfig6(ctx.portfolioConfigPath);
@@ -16043,7 +16090,7 @@ function installExperimentalNotice(program2, names = EXPERIMENTAL_COMMANDS, writ
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.69.0","commit":"bffcfee","committedAt":"2026-10-16T08:07:08+09:00"}');
+    return JSON.parse('{"version":"0.70.0","commit":"60d302a","committedAt":"2026-10-16T17:39:30+09:00"}');
   } catch {
     return void 0;
   }