@basou/cli 0.16.0 → 0.17.0

package/dist/index.js

@@ -1804,13 +1804,15 @@ async function assertWorkspaceInitialized4(basouRoot) {
 import { createReadStream } from "fs";
 import { readdir, readFile as readFile2, rm, stat as stat2 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { basename as basename2, join as join4, resolve as resolve4 } from "path";
+import { basename as basename2, dirname, join as join4, resolve as resolve4 } from "path";
 import { createInterface } from "readline";
 import {
+  AGENT_INFRA_DIRS,
   assertBasouRootSafe as assertBasouRootSafe6,
   basouPaths as basouPaths7,
   CLAUDE_IMPORT_SOURCE,
   CODEX_IMPORT_SOURCE,
+  classifyFilesBySourceRoot,
   claudeTranscriptToImportPayload,
   codexRolloutToImportPayload,
   enumerateSessionDirs,
@@ -1908,7 +1910,15 @@ async function doRunImportClaudeCode(options, ctx) {
       }
     };
   });
-  await importDerivedSessions(paths, manifest, options, CLAUDE_IMPORT_SOURCE, candidates);
+  await importDerivedSessions(
+    paths,
+    manifest,
+    options,
+    CLAUDE_IMPORT_SOURCE,
+    candidates,
+    projectPaths,
+    hasDeclaredBoundary(options, manifest)
+  );
 }
 async function doRunImportCodex(options, ctx) {
   assertSelector(options);
@@ -1933,7 +1943,18 @@ async function doRunImportCodex(options, ctx) {
       });
     }
   }));
-  await importDerivedSessions(paths, manifest, options, CODEX_IMPORT_SOURCE, candidates);
+  await importDerivedSessions(
+    paths,
+    manifest,
+    options,
+    CODEX_IMPORT_SOURCE,
+    candidates,
+    projectPaths,
+    hasDeclaredBoundary(options, manifest)
+  );
+}
+function hasDeclaredBoundary(options, manifest) {
+  return (options.project?.length ?? 0) > 0 || (manifest.import?.source_roots?.length ?? 0) > 0;
 }
 function assertSelector(options) {
   if (options.session !== void 0 && options.all === true) {
@@ -1951,9 +1972,25 @@ async function resolveImportTarget(ctx) {
   const manifest = await readManifest4(paths);
   return { repositoryRoot, paths, manifest };
 }
-async function importDerivedSessions(paths, manifest, options, sourceKind, candidates) {
+async function importDerivedSessions(paths, manifest, options, sourceKind, candidates, projectPaths, boundaryDeclared) {
   const existingByExternalId = await loadExistingByExternalId(paths, sourceKind);
   const seenThisRun = /* @__PURE__ */ new Set();
+  const crossProjectCheck = boundaryDeclared;
+  const crossProject = [];
+  const noteCrossProject = async (externalId, payload) => {
+    if (!crossProjectCheck) return;
+    try {
+      const scope = await classifyFilesBySourceRoot({
+        files: payload.session.related_files ?? [],
+        workingDirectory: payload.session.working_directory,
+        sourceRoots: projectPaths,
+        masterRoot: dirname(paths.root),
+        extraInRoot: AGENT_INFRA_DIRS
+      });
+      if (scope.outOfRoot.length > 0) crossProject.push({ externalId, outOfRoot: scope.outOfRoot });
+    } catch {
+    }
+  };
   const results = [];
   const counts = {
     skippedNoAction: 0,
@@ -2010,6 +2047,7 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
       }
       counts.reimported++;
       seenThisRun.add(externalId);
+      await noteCrossProject(externalId, payload2);
       continue;
     }
     const payload = validate(await toPayload());
@@ -2031,10 +2069,21 @@ async function importDerivedSessions(paths, manifest, options, sourceKind, candi
     results.push(result);
     seenThisRun.add(externalId);
     sanitizedPaths += result.pathSanitizeReport.relatedFiles + (result.pathSanitizeReport.workingDirectoryRewritten ? 1 : 0);
+    await noteCrossProject(externalId, payload);
   }
   if (sanitizedPaths > 0) {
     console.error(`Imported sessions: ${sanitizedPaths} path(s) sanitized`);
   }
+  if (crossProject.length > 0) {
+    const PATH_SAMPLE = 5;
+    for (const { externalId, outOfRoot } of crossProject) {
+      const sample = outOfRoot.slice(0, PATH_SAMPLE).join(", ");
+      const more = outOfRoot.length > PATH_SAMPLE ? ` (... +${outOfRoot.length - PATH_SAMPLE} more)` : "";
+      console.error(
+        `basou: session ${externalId} edited ${outOfRoot.length} file(s) outside this project's source_roots: ${sample}${more} \u2014 they may belong to another project.`
+      );
+    }
+  }
   printImportResult(options, results, counts);
 }
 async function classifyReimport(priors, sourcePath, externalId, counts) {
@@ -2941,7 +2990,7 @@ import {
   unlinkSync,
   writeFileSync
 } from "fs";
-import { basename as basename4, dirname, isAbsolute as isAbsolute3, join as join6, relative as relative2, resolve as resolve7 } from "path";
+import { basename as basename4, dirname as dirname2, isAbsolute as isAbsolute3, join as join6, relative as relative2, resolve as resolve7 } from "path";
 import {
   basouPaths as basouPaths10,
   GENERATED_END,
@@ -3580,7 +3629,7 @@ function applySymlinkPlan(repositoryRoot, plan) {
   for (const { name, target } of plan.toCreate) {
     const filePath = join6(real, name);
     try {
-      mkdirSync(dirname(filePath), { recursive: true });
+      mkdirSync(dirname2(filePath), { recursive: true });
       symlinkSync(target, filePath);
       created.push(name);
     } catch (error) {
@@ -3720,7 +3769,7 @@ function resolveViewDir(repositoryRoot, viewPath) {
     return realpathSync(abs);
   } catch {
     try {
-      return join6(realpathSync(dirname(abs)), basename4(abs));
+      return join6(realpathSync(dirname2(abs)), basename4(abs));
     } catch {
       return abs;
     }
@@ -3754,7 +3803,7 @@ function applyViewPlan(viewDir, toCreate) {
   for (const { name, target } of toCreate) {
     const filePath = join6(viewDir, name);
     try {
-      mkdirSync(dirname(filePath), { recursive: true });
+      mkdirSync(dirname2(filePath), { recursive: true });
       symlinkSync(target, filePath);
       created.push(name);
     } catch (error) {
@@ -4101,7 +4150,7 @@ async function applyPresetPlan(anchorReal, plan) {
     isLink = false;
   }
   if (isLink) throw new Error(`Canonical is a symlink in ${label}`);
-  if (plan.action === "create") mkdirSync(dirname(file), { recursive: true });
+  if (plan.action === "create") mkdirSync(dirname2(file), { recursive: true });
   const existing = await readMarkdownFile4(file);
   await writeMarkdownFile5(file, renderWithMarkers4(existing, plan.desiredBlock, label));
 }
@@ -4617,7 +4666,7 @@ import {
 // src/lib/durable-write.ts
 import { randomUUID } from "crypto";
 import { lstat, open, rename, stat as stat3, unlink as unlink2 } from "fs/promises";
-import { basename as basename5, dirname as dirname2, join as join7 } from "path";
+import { basename as basename5, dirname as dirname3, join as join7 } from "path";
 async function assertNotSymlink(targetPath) {
   try {
     const st = await lstat(targetPath);
@@ -4632,7 +4681,7 @@ async function assertNotSymlink(targetPath) {
   }
 }
 async function writeFileDurable(targetPath, content) {
-  const dir = dirname2(targetPath);
+  const dir = dirname3(targetPath);
   const tmpPath = join7(dir, `.${basename5(targetPath)}.tmp.${randomUUID()}`);
   let mode = 420;
   try {