@basou/cli 0.65.0 → 0.66.0

package/dist/index.js

@@ -138,7 +138,7 @@ import {
   assertBasouRootSafe,
   assertLockStoreSafe,
   assertSessionDirSafe,
-  basouPaths,
+  basouPaths as basouPaths2,
   EVENT_SCHEMA_VERSION,
   enumerateApprovals,
   findErrorCode,
@@ -152,9 +152,154 @@ import {
   prefixedUlid,
   readSessionYaml,
   readYamlFile,
-  replayEvents,
+  replayEvents
+} from "@basou/core";
+
+// src/lib/repo-root.ts
+import { realpath, stat } from "fs/promises";
+import { basename, resolve } from "path";
+import {
+  basouPaths,
+  defaultPortfolioConfigPath,
+  loadPortfolioConfig,
+  readManifest,
+  resolveBasouRepositoryRoot,
   resolveRepositoryRoot
 } from "@basou/core";
+async function resolveBasouRootForCommand(cwd, commandName, opts = {}) {
+  let root;
+  try {
+    root = await resolveBasouRepositoryRoot(cwd, {
+      onRedirect: ({ via, root: root2 }) => {
+        if (opts.quiet !== true) console.error(`Resolved workspace view to ${root2} (via ${via}).`);
+      }
+    });
+  } catch (error) {
+    if (error instanceof Error && error.message === "Not a git repository") {
+      throw new Error(
+        `Not a git repository. Run 'git init' first, then re-run 'basou ${commandName}'.`,
+        { cause: error }
+      );
+    }
+    throw error;
+  }
+  if (!await hasBasouStore(root)) {
+    const master = await resolveMemberToMaster(
+      root,
+      opts.portfolioConfigPath ?? defaultPortfolioConfigPath()
+    );
+    if (master !== void 0) {
+      if (opts.quiet !== true) {
+        console.error(
+          `Resolved portfolio member to ${master.root} (via portfolio: ${master.label}).`
+        );
+      }
+      return master.root;
+    }
+  }
+  return root;
+}
+async function resolveRepositoryRootInPlace(cwd, commandName) {
+  try {
+    return await resolveRepositoryRoot(cwd);
+  } catch (error) {
+    if (!(error instanceof Error) || error.message !== "Not a git repository") throw error;
+    const links = await describeWorkspaceView(cwd);
+    if (links !== void 0) {
+      throw new Error(
+        `Not a git repository: this is a workspace view (it links ${links}). Run 'basou ${commandName}' inside a repository instead.`,
+        { cause: error }
+      );
+    }
+    throw new Error(
+      `Not a git repository. Run 'git init' first, then re-run 'basou ${commandName}'.`,
+      { cause: error }
+    );
+  }
+}
+async function describeWorkspaceView(dir) {
+  let via;
+  try {
+    await resolveBasouRepositoryRoot(dir, {
+      onRedirect: (info) => {
+        via = info.via;
+      }
+    });
+  } catch (error) {
+    if (error instanceof Error && error.message.startsWith("Ambiguous workspace view:")) {
+      return "more than one repository with a .basou store";
+    }
+    return void 0;
+  }
+  return via;
+}
+async function hasBasouStore(root) {
+  try {
+    return (await stat(basouPaths(root).root)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function resolveMemberToMaster(repoRoot, configPath) {
+  let workspaces;
+  try {
+    workspaces = await loadPortfolioConfig(configPath);
+  } catch (error) {
+    if (!(error instanceof Error) || !error.message.startsWith("No portfolio config at")) {
+      const detail = error instanceof Error ? error.message : String(error);
+      console.error(`Ignoring ~/.basou/portfolio.yaml: ${detail}`);
+    }
+    return void 0;
+  }
+  const memberReal = await realpathOrNull(repoRoot);
+  if (memberReal === null) return void 0;
+  const claimants = /* @__PURE__ */ new Map();
+  const seenMaster = /* @__PURE__ */ new Set();
+  for (const ws of workspaces) {
+    const masterReal = await realpathOrNull(ws.path);
+    if (masterReal === null) continue;
+    if (masterReal === memberReal) continue;
+    if (seenMaster.has(masterReal)) continue;
+    seenMaster.add(masterReal);
+    let manifest;
+    try {
+      manifest = await readManifest(basouPaths(masterReal));
+    } catch (error) {
+      if (error instanceof Error && error.message !== "YAML file not found") {
+        console.error(
+          `Skipping portfolio workspace '${ws.label ?? basename(masterReal)}': could not read its manifest (${error.message}).`
+        );
+      }
+      continue;
+    }
+    const sourceRoots = manifest.import?.source_roots ?? ["."];
+    for (const sr of sourceRoots) {
+      const real = await realpathOrNull(resolve(masterReal, sr));
+      if (real !== null && real === memberReal) {
+        claimants.set(masterReal, { root: masterReal, label: ws.label ?? basename(masterReal) });
+        break;
+      }
+    }
+  }
+  const matched = [...claimants.values()];
+  if (matched.length === 1) return matched[0];
+  if (matched.length > 1) {
+    const names = matched.map((c) => c.label).join(", ");
+    throw new Error(
+      `This repository is declared as a source root by ${matched.length} portfolio workspaces (${names}). Disambiguate in ~/.basou/portfolio.yaml so only one aggregates it.`
+    );
+  }
+  return void 0;
+}
+async function realpathOrNull(p) {
+  try {
+    return await realpath(p);
+  } catch {
+    return null;
+  }
+}
+
+// src/commands/approval.ts
 var APPR_PREFIX = "appr_";
 var SHORT_ID_BASE_LEN = 6;
 var SHORT_ID_MAX_LEN = 26;
@@ -190,8 +335,8 @@ async function runApprovalList(options, ctx = {}) {
 }
 async function doRunApprovalList(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForApproval(cwd, "list");
-  const paths = basouPaths(repositoryRoot);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "approval list");
+  const paths = basouPaths2(repositoryRoot);
   await assertWorkspaceInitialized(paths.root);
   const ids = await enumerateApprovals(paths);
   for (const entry of ids.unfollowed) {
@@ -263,8 +408,8 @@ async function runApprovalShow(idInput, options, ctx = {}) {
 }
 async function doRunApprovalShow(idInput, options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForApproval(cwd, "show");
-  const paths = basouPaths(repositoryRoot);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "approval show");
+  const paths = basouPaths2(repositoryRoot);
   await assertWorkspaceInitialized(paths.root);
   const { id, unfollowed } = await resolveApprovalId(paths, idInput);
   for (const entry2 of unfollowed) console.error(`Warning: ${describeUnfollowed(entry2)}`);
@@ -329,8 +474,8 @@ async function doRunApprovalResolve(idInput, options, ctx, decision) {
     }
   }
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForApproval(cwd, decision);
-  const paths = basouPaths(repositoryRoot);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, `approval ${decision}`);
+  const paths = basouPaths2(repositoryRoot);
   await assertWorkspaceInitialized(paths.root);
   const { id, location } = await resolveApprovalId(paths, idInput);
   if (location === "resolved") {
@@ -651,19 +796,6 @@ function truncate(value, maxLength) {
   if (value.length <= maxLength) return value;
   return `${value.slice(0, maxLength - 3)}...`;
 }
-async function resolveRepositoryRootForApproval(cwd, subcmd) {
-  try {
-    return await resolveRepositoryRoot(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        `Not a git repository. Run 'git init' first, then re-run 'basou approval ${subcmd}'.`,
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized(basouRoot) {
   try {
     await assertBasouRootSafe(basouRoot);
@@ -733,16 +865,16 @@ import {
 
 // src/commands/import.ts
 import { createReadStream } from "fs";
-import { readdir, readFile, rm, stat } from "fs/promises";
+import { readdir, readFile, rm, stat as stat2 } from "fs/promises";
 import { homedir } from "os";
-import { basename, dirname as dirname2, join as join2, resolve } from "path";
+import { basename as basename2, dirname as dirname2, join as join2, resolve as resolve2 } from "path";
 import { createInterface } from "readline";
 import {
   AGENT_INFRA_DIRS,
   assertBasouRootSafe as assertBasouRootSafe2,
   assertLockStoreSafe as assertLockStoreSafe2,
   assertSessionStoreSafe,
-  basouPaths as basouPaths2,
+  basouPaths as basouPaths3,
   CLAUDE_IMPORT_SOURCE,
   CODEX_IMPORT_SOURCE,
   classifyFilesBySourceRoot,
@@ -753,11 +885,10 @@ import {
   findErrorCode as findErrorCode2,
   importSessionFromJson,
   observedFilesOf,
-  readManifest,
+  readManifest as readManifest2,
   readSessionObservation,
   readSessionYaml as readSessionYaml2,
   reimportPreservingId,
-  resolveRepositoryRoot as resolveRepositoryRoot2,
   SESSION_IMPORT_SCHEMA_VERSION,
   SessionImportPayloadSchema
 } from "@basou/core";
@@ -827,10 +958,10 @@ function resolveSourceRoots(args) {
   const { projectFlags, manifest, repoRoot, cwd } = args;
   let resolved;
   if (projectFlags.length > 0) {
-    resolved = projectFlags.map((p) => resolve(cwd, p));
+    resolved = projectFlags.map((p) => resolve2(cwd, p));
   } else {
     const roots = manifest.import?.source_roots;
-    resolved = roots !== void 0 && roots.length > 0 ? roots.map((r) => resolve(repoRoot, r)) : [repoRoot];
+    resolved = roots !== void 0 && roots.length > 0 ? roots.map((r) => resolve2(repoRoot, r)) : [repoRoot];
   }
   return [...new Set(resolved)];
 }
@@ -848,7 +979,7 @@ async function doRunImportClaudeCode(options, ctx) {
   const files = await selectTranscriptFiles(projectsRoot, projectPaths, options);
   const projectSet = new Set(projectPaths);
   const candidates = files.map((file) => {
-    const externalId = basename(file, ".jsonl");
+    const externalId = basename2(file, ".jsonl");
     return {
       externalId,
       sourcePath: file,
@@ -923,10 +1054,10 @@ function assertSelector(options) {
 }
 async function resolveImportTarget(ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForImport(cwd);
-  const paths = basouPaths2(repositoryRoot);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "import");
+  const paths = basouPaths3(repositoryRoot);
   await assertWorkspaceInitialized2(paths.root);
-  const manifest = await readManifest(paths);
+  const manifest = await readManifest2(paths);
   return { repositoryRoot, paths, manifest };
 }
 async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
@@ -1173,7 +1304,7 @@ async function selectTranscriptFiles(projectsRoot, projectPaths, options) {
 }
 async function pathExists(file) {
   try {
-    await stat(file);
+    await stat2(file);
     return true;
   } catch (error) {
     if (findErrorCode2(error, "ENOENT")) return false;
@@ -1182,7 +1313,7 @@ async function pathExists(file) {
 }
 async function statSize(file) {
   try {
-    return (await stat(file)).size;
+    return (await stat2(file)).size;
   } catch (error) {
     if (findErrorCode2(error, "ENOENT")) return void 0;
     throw error;
@@ -1374,18 +1505,6 @@ function shortId2(id) {
   }
   return id.slice(0, SHORT_ID_LEN2);
 }
-async function resolveRepositoryRootForImport(cwd) {
-  try {
-    return await resolveRepositoryRoot2(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou import'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized2(basouRoot) {
   try {
     await assertBasouRootSafe2(basouRoot);
@@ -1578,111 +1697,6 @@ async function probeStaleness(args) {
   }
 }
 
-// src/lib/repo-root.ts
-import { realpath, stat as stat2 } from "fs/promises";
-import { basename as basename2, resolve as resolve2 } from "path";
-import {
-  basouPaths as basouPaths3,
-  defaultPortfolioConfigPath,
-  loadPortfolioConfig,
-  readManifest as readManifest2,
-  resolveBasouRepositoryRoot
-} from "@basou/core";
-async function resolveBasouRootForCommand(cwd, commandName, opts = {}) {
-  let root;
-  try {
-    root = await resolveBasouRepositoryRoot(cwd, {
-      onRedirect: ({ via, root: root2 }) => console.error(`Resolved workspace view to ${root2} (via ${via}).`)
-    });
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        `Not a git repository. Run 'git init' first, then re-run 'basou ${commandName}'.`,
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-  if (!await hasBasouStore(root)) {
-    const master = await resolveMemberToMaster(
-      root,
-      opts.portfolioConfigPath ?? defaultPortfolioConfigPath()
-    );
-    if (master !== void 0) {
-      console.error(
-        `Resolved portfolio member to ${master.root} (via portfolio: ${master.label}).`
-      );
-      return master.root;
-    }
-  }
-  return root;
-}
-async function hasBasouStore(root) {
-  try {
-    return (await stat2(basouPaths3(root).root)).isDirectory();
-  } catch {
-    return false;
-  }
-}
-async function resolveMemberToMaster(repoRoot, configPath) {
-  let workspaces;
-  try {
-    workspaces = await loadPortfolioConfig(configPath);
-  } catch (error) {
-    if (!(error instanceof Error) || !error.message.startsWith("No portfolio config at")) {
-      const detail = error instanceof Error ? error.message : String(error);
-      console.error(`Ignoring ~/.basou/portfolio.yaml: ${detail}`);
-    }
-    return void 0;
-  }
-  const memberReal = await realpathOrNull(repoRoot);
-  if (memberReal === null) return void 0;
-  const claimants = /* @__PURE__ */ new Map();
-  const seenMaster = /* @__PURE__ */ new Set();
-  for (const ws of workspaces) {
-    const masterReal = await realpathOrNull(ws.path);
-    if (masterReal === null) continue;
-    if (masterReal === memberReal) continue;
-    if (seenMaster.has(masterReal)) continue;
-    seenMaster.add(masterReal);
-    let manifest;
-    try {
-      manifest = await readManifest2(basouPaths3(masterReal));
-    } catch (error) {
-      if (error instanceof Error && error.message !== "YAML file not found") {
-        console.error(
-          `Skipping portfolio workspace '${ws.label ?? basename2(masterReal)}': could not read its manifest (${error.message}).`
-        );
-      }
-      continue;
-    }
-    const sourceRoots = manifest.import?.source_roots ?? ["."];
-    for (const sr of sourceRoots) {
-      const real = await realpathOrNull(resolve2(masterReal, sr));
-      if (real !== null && real === memberReal) {
-        claimants.set(masterReal, { root: masterReal, label: ws.label ?? basename2(masterReal) });
-        break;
-      }
-    }
-  }
-  const matched = [...claimants.values()];
-  if (matched.length === 1) return matched[0];
-  if (matched.length > 1) {
-    const names = matched.map((c) => c.label).join(", ");
-    throw new Error(
-      `This repository is declared as a source root by ${matched.length} portfolio workspaces (${names}). Disambiguate in ~/.basou/portfolio.yaml so only one aggregates it.`
-    );
-  }
-  return void 0;
-}
-async function realpathOrNull(p) {
-  try {
-    return await realpath(p);
-  } catch {
-    return null;
-  }
-}
-
 // src/commands/board.ts
 var DEFAULT_BOARD_PATH = "board/board.yaml";
 function registerBoardCommand(program2) {
@@ -2479,7 +2493,6 @@ import {
   prefixedUlid as prefixedUlid2,
   readManifest as readManifest4,
   replayEvents as replayEvents2,
-  resolveRepositoryRoot as resolveRepositoryRoot3,
   resolveSessionId,
   sanitizePath
 } from "@basou/core";
@@ -2762,7 +2775,7 @@ async function warnLinkedFilesOutsideRoots(input) {
 }
 async function doRunDecisionRecord(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForDecision(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "decision record");
   const paths = basouPaths6(repositoryRoot);
   await assertWorkspaceInitialized4(paths.root);
   const now = ctx.nowProvider !== void 0 ? ctx.nowProvider() : /* @__PURE__ */ new Date();
@@ -3409,19 +3422,6 @@ function printDecisionResult(options, result) {
     );
   }
 }
-async function resolveRepositoryRootForDecision(cwd) {
-  try {
-    return await resolveRepositoryRoot3(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        "Not a git repository. Run 'git init' first, then re-run 'basou decision record'.",
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized4(basouRoot) {
   try {
     await assertBasouRootSafe4(basouRoot);
@@ -3441,7 +3441,6 @@ import {
   readMarkdownFile as readMarkdownFile3,
   renderDecisions as renderDecisions2,
   renderWithMarkers as renderWithMarkers2,
-  resolveRepositoryRoot as resolveRepositoryRoot4,
   writeMarkdownFile as writeMarkdownFile2
 } from "@basou/core";
 function registerDecisionsCommand(program2) {
@@ -3461,7 +3460,7 @@ async function runDecisionsGenerate(options, ctx = {}) {
 async function doRunDecisionsGenerate(options, ctx) {
   void options;
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForDecisions(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "decisions generate");
   const paths = basouPaths7(repositoryRoot);
   await assertWorkspaceInitialized5(paths.root);
   const nowIso = (ctx.nowProvider?.() ?? /* @__PURE__ */ new Date()).toISOString();
@@ -3476,19 +3475,6 @@ async function doRunDecisionsGenerate(options, ctx) {
   await writeMarkdownFile2(paths.files.decisions, finalBody);
   console.log(`Generated .basou/decisions.md (decisions: ${result.decisionCount})`);
 }
-async function resolveRepositoryRootForDecisions(cwd) {
-  try {
-    return await resolveRepositoryRoot4(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        "Not a git repository. Run 'git init' first, then re-run 'basou decisions generate'.",
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized5(basouRoot) {
   try {
     await assertBasouRootSafe5(basouRoot);
@@ -3519,7 +3505,6 @@ import {
   prefixedUlid as prefixedUlid3,
   readManifest as readManifest5,
   readYamlFile as readYamlFile2,
-  resolveRepositoryRoot as resolveRepositoryRoot5,
   SESSION_SCHEMA_VERSION,
   SessionSchema,
   sanitizeWorkingDirectory,
@@ -3542,7 +3527,7 @@ async function runExec(command, args, options, ctx = {}) {
   const now = ctx.now ?? (() => /* @__PURE__ */ new Date());
   const cwd = options.cwd ?? process.cwd();
   const timeout_ms = options.timeout !== void 0 ? parseDuration(options.timeout) : void 0;
-  const repoRoot = await resolveRepositoryRootForExec(cwd);
+  const repoRoot = await resolveRepositoryRootInPlace(cwd, "exec");
   const paths = basouPaths8(repoRoot);
   await assertBasouRootSafe6(paths.root);
   const manifest = await readManifest5(paths);
@@ -3840,18 +3825,6 @@ async function finalizeSessionAsFailed(paths, sessionDir, sessionId, appendEvent
     s.session.invocation.exit_code = null;
   });
 }
-async function resolveRepositoryRootForExec(cwd) {
-  try {
-    return await resolveRepositoryRoot5(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou exec'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 
 // src/commands/handoff.ts
 import {
@@ -5439,7 +5412,6 @@ import {
   appendBasouGitignore,
   createManifest,
   ensureBasouDirectory,
-  resolveRepositoryRoot as resolveRepositoryRoot6,
   writeManifest
 } from "@basou/core";
 function collectValue(value, previous) {
@@ -5471,7 +5443,7 @@ async function runInit(options, ctx = {}) {
 }
 async function doRunInit(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForInit(cwd);
+  const repositoryRoot = await resolveRepositoryRootInPlace(cwd, "init");
   const workspaceName = options.name ?? basename6(repositoryRoot);
   if (options.repoUrl !== void 0) {
     console.error(
@@ -5507,18 +5479,6 @@ function renderGitignoreWarning(error, verbose) {
     if (label !== void 0) console.error(`Caused by: ${label}`);
   }
 }
-async function resolveRepositoryRootForInit(cwd) {
-  try {
-    return await resolveRepositoryRoot6(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou init'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 
 // src/commands/note.ts
 import { readFile as readFile5 } from "fs/promises";
@@ -5918,7 +5878,6 @@ import {
   renderAnchorStarter,
   renderViewPresetBlock,
   renderWithMarkers as renderWithMarkers4,
-  resolveRepositoryRoot as resolveRepositoryRoot7,
   safeSimpleGit,
   seedMarkers,
   summarizePresetPlan,
@@ -8464,19 +8423,6 @@ async function runProjectNew(repos, options, ctx = {}) {
     process.exitCode = 1;
   }
 }
-async function resolveRepositoryRootForNew(cwd) {
-  try {
-    return await resolveRepositoryRoot7(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        "Not a git repository. Run 'git init' first, then re-run 'basou project new'.",
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-}
 function validateProjectName(name) {
   if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(name)) {
     throw new Error(
@@ -8487,7 +8433,7 @@ function validateProjectName(name) {
 }
 async function doRunProjectNew(repos, options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForNew(cwd);
+  const repositoryRoot = await resolveRepositoryRootInPlace(cwd, "project new");
   const workspaceName = basename7(repositoryRoot);
   const productName = options.projectName !== void 0 ? validateProjectName(options.projectName) : void 0;
   const viewStem = productName ?? workspaceName;
@@ -9694,7 +9640,6 @@ import {
   basouPaths as basouPaths15,
   findErrorCode as findErrorCode11,
   renderReport,
-  resolveRepositoryRoot as resolveRepositoryRoot8,
   writeMarkdownFile as writeMarkdownFile6
 } from "@basou/core";
 function registerReportCommand(program2) {
@@ -9715,7 +9660,7 @@ async function runReportGenerate(options, ctx = {}) {
 }
 async function doRunReportGenerate(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForReport(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "report generate");
   const paths = basouPaths15(repositoryRoot);
   await assertWorkspaceInitialized10(paths.root);
   const nowIso = (ctx.nowProvider?.() ?? /* @__PURE__ */ new Date()).toISOString();
@@ -9741,19 +9686,6 @@ async function doRunReportGenerate(options, ctx) {
     console.log(result.body);
   }
 }
-async function resolveRepositoryRootForReport(cwd) {
-  try {
-    return await resolveRepositoryRoot8(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error(
-        "Not a git repository. Run 'git init' first, then re-run 'basou report generate'.",
-        { cause: error }
-      );
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized10(basouRoot) {
   try {
     await assertBasouRootSafe11(basouRoot);
@@ -10226,7 +10158,6 @@ import {
   readYamlFile as readYamlFile5,
   resolveClaudeCodeCommand,
   resolveCodexCommand,
-  resolveRepositoryRoot as resolveRepositoryRoot9,
   SESSION_SCHEMA_VERSION as SESSION_SCHEMA_VERSION2,
   SessionSchema as SessionSchema2,
   sanitizeRelatedFiles,
@@ -10281,7 +10212,7 @@ async function runTrackedTool(args, options, ctx, adapter) {
   const { command } = await adapter.resolveCommand();
   const childArgs = adapter.transformArgs ? adapter.transformArgs(args) : args;
   const cwd = options.cwd ?? process.cwd();
-  const repoRoot = await resolveRepositoryRootForRun(cwd);
+  const repoRoot = await resolveRepositoryRootInPlace(cwd, "run");
   const paths = basouPaths18(repoRoot);
   await assertBasouRootSafe13(paths.root);
   const manifest = await readManifest11(paths);
@@ -10650,18 +10581,6 @@ async function finalizeSessionAsFailed2(paths, sessionDir, sessionId, appendEven
     s.session.invocation.exit_code = null;
   });
 }
-async function resolveRepositoryRootForRun(cwd) {
-  try {
-    return await resolveRepositoryRoot9(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou run'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 async function noteCodexHookStatusPreSpawn(_cwd, ctx) {
   const hooksPath = ctx.codexHooksPath ?? DEFAULT_CODEX_HOOKS_PATH;
   let location;
@@ -11388,8 +11307,7 @@ import {
   assertBasouRootSafe as assertBasouRootSafe15,
   basouPaths as basouPaths20,
   computeWorkStats,
-  findErrorCode as findErrorCode14,
-  resolveRepositoryRoot as resolveRepositoryRoot10
+  findErrorCode as findErrorCode14
 } from "@basou/core";
 function registerStatsCommand(program2) {
   program2.command("stats").description("Report how much the AI worked (output volume + time proxies) across sessions").option("--by-source", "Break the totals down by session source kind").option("--by-day", "Break billable time and volume down by calendar day").option("--json", "Output the full stats as JSON").option("-v, --verbose", "Show error causes").action(async (options) => {
@@ -11406,7 +11324,7 @@ async function runStats(options, ctx = {}) {
 }
 async function doRunStats(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForStats(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "stats");
   const paths = basouPaths20(repositoryRoot);
   await assertWorkspaceInitialized13(paths.root);
   const now = ctx.nowProvider?.() ?? /* @__PURE__ */ new Date();
@@ -11494,18 +11412,6 @@ function formatFloorMs(ms) {
 function formatInt(n) {
   return n.toLocaleString("en-US");
 }
-async function resolveRepositoryRootForStats(cwd) {
-  try {
-    return await resolveRepositoryRoot10(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou stats'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized13(basouRoot) {
   try {
     await assertBasouRootSafe15(basouRoot);
@@ -11524,7 +11430,6 @@ import {
   buildStatusSnapshot,
   findErrorCode as findErrorCode15,
   readManifest as readManifest13,
-  resolveRepositoryRoot as resolveRepositoryRoot11,
   writeStatus
 } from "@basou/core";
 function registerStatusCommand(program2) {
@@ -11542,7 +11447,7 @@ async function runStatus(options, ctx = {}) {
 }
 async function doRunStatus(options, ctx) {
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForStatus(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "status");
   const paths = basouPaths21(repositoryRoot);
   try {
     await assertBasouRootSafe16(paths.root);
@@ -11580,18 +11485,6 @@ function renderTextStatus(s) {
   const present = Object.values(dp).filter((v) => v === true).length;
   console.log(`Subdirectories present: ${present}/${total}`);
 }
-async function resolveRepositoryRootForStatus(cwd) {
-  try {
-    return await resolveRepositoryRoot11(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou status'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 function formatVersionGateMessage(error) {
   const issues = error.issues;
   if (!Array.isArray(issues)) return void 0;
@@ -12733,7 +12626,6 @@ import {
   basouPaths as basouPaths23,
   enumerateSessionEntries as enumerateSessionEntries3,
   findErrorCode as findErrorCode17,
-  resolveRepositoryRoot as resolveRepositoryRoot12,
   resolveSessionId as resolveSessionId5,
   verifyEventsChain
 } from "@basou/core";
@@ -12762,7 +12654,7 @@ async function doRunVerify(options, ctx) {
     throw new Error("Specify either --session <id> or --all, not both");
   }
   const cwd = ctx.cwd ?? process.cwd();
-  const repositoryRoot = await resolveRepositoryRootForVerify(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "verify");
   const paths = basouPaths23(repositoryRoot);
   await assertWorkspaceInitialized15(paths.root);
   const sessionIds = options.session !== void 0 ? [await resolveSessionId5(paths, options.session, { allowNotDirectory: true })] : await enumerateAllSessionNames2(paths);
@@ -12816,18 +12708,6 @@ async function enumerateAllSessionNames2(paths) {
   const { dirs, notDirectories } = await enumerateSessionEntries3(paths);
   return [...dirs, ...notDirectories].sort();
 }
-async function resolveRepositoryRootForVerify(cwd) {
-  try {
-    return await resolveRepositoryRoot12(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou verify'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized15(basouRoot) {
   try {
     await assertBasouRootSafe18(basouRoot);
@@ -12848,8 +12728,7 @@ import {
   basouPaths as basouPaths25,
   findErrorCode as findErrorCode19,
   loadPortfolioConfig as loadPortfolioConfig6,
-  readManifest as readManifest18,
-  resolveRepositoryRoot as resolveRepositoryRoot14
+  readManifest as readManifest18
 } from "@basou/core";
 import { InvalidArgumentError as InvalidArgumentError8 } from "commander";
 
@@ -12859,12 +12738,15 @@ import { readdir as readdir3, stat as stat7 } from "fs/promises";
 import { homedir as homedir12 } from "os";
 import { basename as basename9, dirname as dirname7, join as join16 } from "path";
 import { createInterface as createInterface2 } from "readline";
-import { basouPaths as basouPaths24, readManifest as readManifest15, resolveRepositoryRoot as resolveRepositoryRoot13 } from "@basou/core";
+import { basouPaths as basouPaths24, readManifest as readManifest15 } from "@basou/core";
 function uncapturedTotal(result) {
   return result.groups.reduce((sum, g) => sum + g.logs, 0) + result.unplaceable;
 }
 async function checkPortfolioCoverage(workspaces, ctx = {}) {
-  const { roots, inertWorkspaces } = await collectDeclaredRoots(workspaces);
+  const { roots, inertWorkspaces } = await collectDeclaredRoots(
+    workspaces,
+    ctx.portfolioConfigPath
+  );
   const listedDirs = new Set([...roots].map((root) => encodeProjectDir(root)));
   const claudeProjectsDir = ctx.claudeProjectsDir ?? join16(homedir12(), ".claude", "projects");
   const codexSessionsDir = ctx.codexSessionsDir ?? join16(homedir12(), ".codex", "sessions");
@@ -12889,13 +12771,16 @@ async function checkPortfolioCoverage(workspaces, ctx = {}) {
   }
   return tally.finish(absentTrees, inertWorkspaces);
 }
-async function collectDeclaredRoots(workspaces) {
+async function collectDeclaredRoots(workspaces, portfolioConfigPath) {
   const roots = /* @__PURE__ */ new Set();
   const inertWorkspaces = [];
   for (const ws of workspaces) {
     let importRoot;
     try {
-      importRoot = await resolveRepositoryRoot13(ws.repoRoot);
+      importRoot = await resolveBasouRootForCommand(ws.repoRoot, "import", {
+        quiet: true,
+        ...portfolioConfigPath !== void 0 ? { portfolioConfigPath } : {}
+      });
     } catch {
       inertWorkspaces.push({ path: ws.repoRoot, reason: "not_a_git_repo" });
       continue;
@@ -15009,9 +14894,13 @@ async function handleWorkspaceGet(res, sub, ws, nowProvider, resolveRemoteUrl, b
   }
   return false;
 }
+var IMPORT_SUBS = /* @__PURE__ */ new Set(["import/claude-code", "import/codex"]);
 async function handleWorkspacePost(res, sub, ws, body, deps, runExclusive) {
   const nowIso = deps.nowProvider().toISOString();
   const actionOptions = readActionOptions(body);
+  if (!ws.initialized && (sub === "refresh" || IMPORT_SUBS.has(sub))) {
+    throw new Error("Workspace not initialized. Run 'basou init' first.");
+  }
   if (sub === "refresh") {
     const result = await runExclusive(
       () => refreshAll({ options: actionOptions, ctx: ws.importCtx, paths: ws.paths, nowIso })
@@ -15388,7 +15277,8 @@ async function doRunView(options, ctx) {
     if (isWholeRegistry) {
       const coverage = await checkPortfolioCoverage(deps.workspaces, {
         ...ctx.claudeProjectsDir !== void 0 ? { claudeProjectsDir: ctx.claudeProjectsDir } : {},
-        ...ctx.codexSessionsDir !== void 0 ? { codexSessionsDir: ctx.codexSessionsDir } : {}
+        ...ctx.codexSessionsDir !== void 0 ? { codexSessionsDir: ctx.codexSessionsDir } : {},
+        ...ctx.portfolioConfigPath !== void 0 ? { portfolioConfigPath: ctx.portfolioConfigPath } : {}
       });
       console.log("");
       for (const line of formatCoverageReport(coverage)) console.log(line);
@@ -15431,7 +15321,7 @@ async function doRunView(options, ctx) {
   }
 }
 async function buildSingleDeps(ctx, cwd) {
-  const repositoryRoot = await resolveRepositoryRootForView(cwd);
+  const repositoryRoot = await resolveBasouRootForCommand(cwd, "view");
   const paths = basouPaths25(repositoryRoot);
   await assertWorkspaceInitialized16(paths.root);
   const entry = await buildWorkspaceEntry(repositoryRoot, ctx);
@@ -15562,18 +15452,6 @@ function waitForShutdown(signal) {
     }
   });
 }
-async function resolveRepositoryRootForView(cwd) {
-  try {
-    return await resolveRepositoryRoot14(cwd);
-  } catch (error) {
-    if (error instanceof Error && error.message === "Not a git repository") {
-      throw new Error("Not a git repository. Run 'git init' first, then re-run 'basou view'.", {
-        cause: error
-      });
-    }
-    throw error;
-  }
-}
 async function assertWorkspaceInitialized16(basouRoot) {
   try {
     await assertBasouRootSafe19(basouRoot);
@@ -15617,7 +15495,7 @@ function installExperimentalNotice(program2, names = EXPERIMENTAL_COMMANDS, writ
 function readBuildStamp() {
   if (false) return void 0;
   try {
-    return JSON.parse('{"version":"0.65.0","commit":"a93e199","committedAt":"2026-10-08T07:48:03+09:00"}');
+    return JSON.parse('{"version":"0.66.0","commit":"2cd6700","committedAt":"2026-10-08T13:10:32+09:00"}');
   } catch {
     return void 0;
   }