@basou/cli 0.58.0 → 0.59.0

package/dist/program.js

@@ -12,10 +12,12 @@ import {
   acquireLock,
   appendChainedEventLocked,
   assertBasouRootSafe,
+  assertSessionDirSafe,
   basouPaths,
   EVENT_SCHEMA_VERSION,
   enumerateApprovals,
   findErrorCode,
+  inspectSessionEntry,
   isLazyExpired,
   LOCAL_CLI_EVENT_SOURCE,
   linkYamlFile,
@@ -262,13 +264,20 @@ async function doRunApprovalShow(idInput, options, ctx) {
   if (loaded === null) {
     throw new Error(`Approval not found: ${idInput}`);
   }
-  const sessionDir = join(paths.sessions, loaded.approval.session_id);
+  const sessionId = loaded.approval.session_id;
+  const entry = await inspectSessionEntry(paths, sessionId);
   const relatedEvents = [];
-  for await (const ev of replayEvents(sessionDir, {
-    onWarning: (w) => printReplayWarning(w, loaded.approval.session_id)
-  })) {
-    if (isApprovalEvent(ev) && ev.approval_id === id) {
-      relatedEvents.push(ev);
+  if (entry === "symlink" || entry === "not_a_directory") {
+    console.error(
+      `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), {
+      onWarning: (w) => printReplayWarning(w, sessionId)
+    })) {
+      if (isApprovalEvent(ev) && ev.approval_id === id) {
+        relatedEvents.push(ev);
+      }
     }
   }
   const now = /* @__PURE__ */ new Date();
@@ -347,6 +356,7 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
   const eventId = prefixedUlid("evt");
   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, {
       onWarning: (w) => printReplayWarning(w, approval.session_id)
@@ -2067,6 +2077,7 @@ import { join as join6 } from "path";
 import {
   acquireLock as acquireLock3,
   assertBasouRootSafe as assertBasouRootSafe4,
+  assertSessionStoreSafe,
   basouPaths as basouPaths6,
   ChildProcessRunner,
   appendChainedEvent as coreAppendChainedEvent,
@@ -2105,6 +2116,7 @@ async function runExec(command, args, options, ctx = {}) {
   const paths = basouPaths6(repoRoot);
   await assertBasouRootSafe4(paths.root);
   const manifest = await readManifest3(paths);
+  await assertSessionStoreSafe(paths);
   const sessionId = prefixedUlid3("ses");
   const sessionDir = join6(paths.sessions, sessionId);
   await mkdir(sessionDir, { recursive: true });
@@ -2919,6 +2931,7 @@ import { createInterface } from "readline";
 import {
   AGENT_INFRA_DIRS as AGENT_INFRA_DIRS2,
   assertBasouRootSafe as assertBasouRootSafe6,
+  assertSessionStoreSafe as assertSessionStoreSafe2,
   basouPaths as basouPaths8,
   CLAUDE_IMPORT_SOURCE,
   CODEX_IMPORT_SOURCE,
@@ -2926,7 +2939,7 @@ import {
   claudeTranscriptToImportPayload,
   codexRolloutToImportPayload,
   displayPath as displayPath2,
-  enumerateSessionDirs,
+  enumerateSessionEntries,
   findErrorCode as findErrorCode5,
   importSessionFromJson,
   observedFilesOf,
@@ -3090,7 +3103,12 @@ async function resolveImportTarget(ctx) {
   return { repositoryRoot, paths, manifest };
 }
 async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
-  const existingByExternalId = await loadExistingByExternalId(paths, sourceKind);
+  await assertSessionStoreSafe2(paths);
+  const { byExternalId: existingByExternalId, notDirectories } = await loadExistingByExternalId(
+    paths,
+    sourceKind
+  );
+  let notDirectoriesWarned = false;
   const seenThisRun = /* @__PURE__ */ new Set();
   const crossProjectCheck = boundaryDeclared;
   const crossProject = [];
@@ -3182,6 +3200,13 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
       }
       counts.replaced++;
     }
+    if (priors.length === 0 && notDirectories.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`
+      );
+    }
     const result = await importSessionFromJson(paths, manifest, payload, {
       dryRun: options.dryRun === true
     });
@@ -3258,10 +3283,11 @@ async function loadExistingByExternalId(paths, sourceKind) {
     else list.push(prior);
   };
   let sessionIds;
+  let notDirectories;
   try {
-    sessionIds = await enumerateSessionDirs(paths);
+    ({ dirs: sessionIds, notDirectories } = await enumerateSessionEntries(paths));
   } catch {
-    return byExternalId;
+    return { byExternalId, notDirectories: [] };
   }
   for (const sessionId of sessionIds) {
     let session;
@@ -3282,7 +3308,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;
+  return { byExternalId, notDirectories };
 }
 async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
   if (options.session !== void 0) {
@@ -9562,6 +9588,7 @@ import { join as join14 } from "path";
 import {
   acquireLock as acquireLock5,
   assertBasouRootSafe as assertBasouRootSafe12,
+  assertSessionStoreSafe as assertSessionStoreSafe3,
   basouPaths as basouPaths17,
   ChildProcessRunner as ChildProcessRunner2,
   claudeCodeAdapterMetadata,
@@ -9637,6 +9664,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   const paths = basouPaths17(repoRoot);
   await assertBasouRootSafe12(paths.root);
   const manifest = await readManifest10(paths);
+  await assertSessionStoreSafe3(paths);
   const sessionId = prefixedUlid4("ses");
   const sessionDir = join14(paths.sessions, sessionId);
   await mkdir2(sessionDir, { recursive: true });
@@ -10026,7 +10054,7 @@ import {
   basouPaths as basouPaths18,
   displayPath as displayPath3,
   EVENT_SCHEMA_VERSION as EVENT_SCHEMA_VERSION6,
-  enumerateSessionDirs as enumerateSessionDirs2,
+  enumerateSessionEntries as enumerateSessionEntries2,
   findErrorCode as findErrorCode12,
   importSessionFromJson as importSessionFromJson2,
   LOCAL_CLI_EVENT_SOURCE as LOCAL_CLI_EVENT_SOURCE4,
@@ -10658,7 +10686,7 @@ async function doRunSessionRechain(options, ctx) {
   const repositoryRoot = await resolveRepositoryRootForSession(cwd, "rechain");
   const paths = basouPaths18(repositoryRoot);
   await assertWorkspaceInitialized11(paths.root);
-  const sessionIds = options.session !== void 0 ? [await resolveSessionId3(paths, options.session)] : await enumerateSessionDirs2(paths);
+  const sessionIds = options.session !== void 0 ? [await resolveSessionId3(paths, options.session)] : await enumerateAllSessionNames(paths);
   const dryRun = options.dryRun === true;
   const rows = [];
   for (const sessionId of sessionIds) {
@@ -10679,7 +10707,9 @@ async function doRunSessionRechain(options, ctx) {
       rows.push({ session_id: sessionId, status: "skipped", reason: outcome.reason });
     }
   }
-  const tamperedCount = rows.filter((r) => r.reason === "tampered").length;
+  const tamperedCount = rows.filter(
+    (r) => r.reason === "tampered" || r.reason === "symlink" || r.reason === "not_a_directory"
+  ).length;
   const errorCount = rows.filter((r) => r.status === "error").length;
   if (options.json === true) {
     console.log(JSON.stringify(rows, null, 2));
@@ -10702,11 +10732,19 @@ function renderRechainRow(row, dryRun) {
     case "rechained":
       return `${dryRun ? "would rechain" : "rechained"} (${row.event_count} events)`;
     case "skipped":
-      return row.reason === "tampered" ? "skipped (TAMPERED \u2014 inspect with 'basou verify')" : `skipped (${row.reason})`;
+      if (row.reason === "tampered") return "skipped (TAMPERED \u2014 inspect with 'basou verify')";
+      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')`;
+      }
+      return `skipped (${row.reason})`;
     case "error":
       return `error (${row.message})`;
   }
 }
+async function enumerateAllSessionNames(paths) {
+  const { dirs, notDirectories } = await enumerateSessionEntries2(paths);
+  return [...dirs, ...notDirectories].sort();
+}
 
 // src/commands/stats.ts
 import {
@@ -12054,7 +12092,7 @@ function maxLen3(values, floor) {
 import {
   assertBasouRootSafe as assertBasouRootSafe17,
   basouPaths as basouPaths22,
-  enumerateSessionEntries,
+  enumerateSessionEntries as enumerateSessionEntries3,
   findErrorCode as findErrorCode16,
   resolveRepositoryRoot as resolveRepositoryRoot12,
   resolveSessionId as resolveSessionId5,
@@ -12088,7 +12126,7 @@ async function doRunVerify(options, ctx) {
   const repositoryRoot = await resolveRepositoryRootForVerify(cwd);
   const paths = basouPaths22(repositoryRoot);
   await assertWorkspaceInitialized14(paths.root);
-  const sessionIds = options.session !== void 0 ? [await resolveSessionId5(paths, options.session, { allowNotDirectory: true })] : await enumerateAllSessionNames(paths);
+  const sessionIds = options.session !== void 0 ? [await resolveSessionId5(paths, options.session, { allowNotDirectory: true })] : await enumerateAllSessionNames2(paths);
   const rows = [];
   for (const sessionId of sessionIds) {
     const verdict = await verifyEventsChain(paths, sessionId);
@@ -12135,8 +12173,8 @@ function renderVerdict(row) {
       return "empty";
   }
 }
-async function enumerateAllSessionNames(paths) {
-  const { dirs, notDirectories } = await enumerateSessionEntries(paths);
+async function enumerateAllSessionNames2(paths) {
+  const { dirs, notDirectories } = await enumerateSessionEntries3(paths);
   return [...dirs, ...notDirectories].sort();
 }
 async function resolveRepositoryRootForVerify(cwd) {
@@ -12676,6 +12714,7 @@ import {
   computeWorkStats as computeWorkStats2,
   enumerateApprovals as enumerateApprovals2,
   findErrorCode as findErrorCode17,
+  inspectSessionEntry as inspectSessionEntry2,
   isLazyExpired as isLazyExpired2,
   loadApproval as loadApproval2,
   loadSessionEntries as loadSessionEntries4,
@@ -13754,6 +13793,13 @@ async function sessionDetail(ws, sessionId) {
   if (!SessionIdSchema.safeParse(sessionId).success) {
     throw new HttpError(404, "Session not found");
   }
+  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`
+    );
+  }
   let session;
   try {
     session = await readSessionYaml3(ws.paths, sessionId);
@@ -14136,7 +14182,7 @@ async function assertWorkspaceInitialized15(basouRoot) {
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.58.0","commit":"4026254","committedAt":"2026-10-01T14:04:07+09:00"}');
+    return JSON.parse('{"version":"0.59.0","commit":"431fe03","committedAt":"2026-10-01T20:32:13+09:00"}');
   } catch {
     return void 0;
   }