@solaqua/gji 0.12.2 → 0.12.3

package/dist/new.d.ts

@@ -1,7 +1,5 @@
 import { type PathConflictChoice } from "./conflict.js";
-import { type DependencyBootstrapPromptDependencies } from "./dependency-bootstrap-prompt.js";
-import { type CloneDirectory } from "./dir-clone.js";
-import type { InstallPromptDependencies } from "./install-prompt.js";
+import { type BootstrapCommandRunner } from "./dependency-bootstrap.js";
 export type { PathConflictChoice };
 export type NewWorktreeMode = "create" | "checkout" | "track";
 export interface NewCommandOptions {
@@ -16,6 +14,7 @@ export interface NewCommandOptions {
     noFetch?: boolean;
     json?: boolean;
     mode?: NewWorktreeMode;
+    noInstall?: boolean;
     open?: boolean;
     outputEnv?: string;
     remote?: string;
@@ -24,12 +23,12 @@ export interface NewCommandOptions {
     stdout: (chunk: string) => void;
     task?: string;
 }
-export interface NewCommandDependencies extends InstallPromptDependencies, DependencyBootstrapPromptDependencies {
-    cloneDir: CloneDirectory;
+export interface NewCommandDependencies {
     createBranchPlaceholder: () => string;
     promptForBranch: (placeholder: string) => Promise<string | null>;
     promptForFetchFailure: (message: string) => Promise<boolean>;
     promptForPathConflict: (path: string) => Promise<PathConflictChoice>;
+    runCommand: BootstrapCommandRunner;
     spawnEditor: (cli: string, args: string[]) => Promise<void>;
 }
 export declare function createNewCommand(dependencies?: Partial<NewCommandDependencies>): (options: NewCommandOptions) => Promise<number>;

package/dist/new.js

@@ -5,26 +5,22 @@ import { promisify } from "node:util";
 import { confirm, isCancel, text } from "@clack/prompts";
 import { createBootstrapReporter } from "./bootstrap-output.js";
 import { createDependencyBootstrapPreview, formatDependencyBootstrapPreview, } from "./bootstrap-preview.js";
-import { loadEffectiveConfigResult, resolveConfigString, } from "./config.js";
+import { loadEffectiveConfig, resolveConfigString, } from "./config.js";
 import { pathExists, promptForPathConflict, } from "./conflict.js";
-import { resolveDependencyBootstrapPolicy, } from "./dependency-bootstrap-prompt.js";
-import { cloneDir } from "./dir-clone.js";
+import { resolveDependencyBootstrapMode, } from "./dependency-bootstrap.js";
 import { defaultSpawnEditor, EDITORS } from "./editor.js";
-import { formatBytes } from "./format-bytes.js";
 import { resolveRemoteBase, runGit } from "./git.js";
 import { isHeadless } from "./headless.js";
 import { recordWorktreeUsage } from "./history.js";
 import { createNavigationRepository, createNavigationTarget, } from "./navigation-output.js";
 import { detectRepository, resolveWorktreePath, validateBranchName, } from "./repo.js";
 import { writeShellOutput } from "./shell-handoff.js";
-import { estimateSyncDirectories } from "./sync-plan.js";
 import { writeTask } from "./task.js";
 import { bootstrapWorktree } from "./worktree-bootstrap.js";
 const execFileAsync = promisify(execFile);
 const NEW_OUTPUT_FILE_ENV = "GJI_NEW_OUTPUT_FILE";
 export function createNewCommand(dependencies = {}) {
     const createBranchPlaceholder = dependencies.createBranchPlaceholder ?? generateBranchPlaceholder;
-    const cloneDirectory = dependencies.cloneDir ?? cloneDir;
     const promptForBranch = dependencies.promptForBranch ?? defaultPromptForBranch;
     const promptForFetchFailure = dependencies.promptForFetchFailure ?? defaultPromptForFetchFailure;
     const prompt = dependencies.promptForPathConflict ?? promptForPathConflict;
@@ -44,11 +40,8 @@ export function createNewCommand(dependencies = {}) {
         }
         const repository = await detectRepository(options.cwd);
         let config;
-        let dependencyBootstrapExplicit;
         try {
-            const loaded = await loadEffectiveConfigResult(repository.repoRoot, undefined, options.json ? undefined : options.stderr);
-            config = loaded.config;
-            dependencyBootstrapExplicit = loaded.dependencyBootstrapExplicit;
+            config = await loadEffectiveConfig(repository.repoRoot, undefined, options.json ? undefined : options.stderr);
         }
         catch (error) {
             return emitNewError(options, error instanceof Error ? error.message : String(error));
@@ -157,21 +150,7 @@ export function createNewCommand(dependencies = {}) {
                 return 1;
             }
         }
-        const dependencyPolicy = await resolveDependencyBootstrapPolicy({
-            currentRoot: repository.currentRoot,
-            repoRoot: repository.repoRoot,
-            worktreePath,
-        }, config, dependencyBootstrapExplicit, {
-            dependencies,
-            dryRun: options.dryRun,
-            legacyInstallPromptConfigured: dependencies.promptForInstallChoice !== undefined,
-            nonInteractive: !!options.json,
-            stderr: options.stderr,
-        });
-        config = {
-            ...config,
-            dependencyBootstrap: dependencyPolicy.mode,
-        };
+        const dependencyMode = resolveDependencyBootstrapMode(config.dependencyBootstrap, options.noInstall);
         if (options.dryRun) {
             if (options.take) {
                 const changedFiles = await listTakeFiles(options.cwd);
@@ -191,8 +170,7 @@ export function createNewCommand(dependencies = {}) {
                 }
                 return 0;
             }
-            const dryRunSyncDirs = await estimateSyncDirectories(repository.repoRoot, worktreePath, config.syncDirs ?? []);
-            const dryRunDependencyBootstrap = await createDependencyBootstrapPreview(config.dependencyBootstrap ?? "off", {
+            const dryRunDependencyBootstrap = await createDependencyBootstrapPreview(dependencyMode, {
                 currentRoot: repository.currentRoot,
                 repoRoot: repository.repoRoot,
                 cargoBuildCommand: config.dependencyBuildCommand,
@@ -203,8 +181,6 @@ export function createNewCommand(dependencies = {}) {
                     ...createNavigationTarget(createNavigationRepository(repository.repoName, repository.repoRoot), worktreePath, worktreeName),
                     dryRun: true,
                 };
-                if (dryRunSyncDirs.length > 0)
-                    output.syncDirs = dryRunSyncDirs;
                 if (dryRunDependencyBootstrap.targets.length > 0)
                     output.dependencyBootstrap = dryRunDependencyBootstrap;
                 options.stdout(`${JSON.stringify(output, null, 2)}\n`);
@@ -216,7 +192,7 @@ export function createNewCommand(dependencies = {}) {
                 const openNote = resolvedEditor
                     ? `, then open in ${resolvedEditor}`
                     : "";
-                options.stdout(`Would create worktree at ${worktreePath} (branch: ${worktreeName}${openNote})\n${dryRunSyncDirs.map(({ dir, bytes }) => `Would clone ${dir} (${formatBytes(bytes)})\n`).join("")}${formatDependencyBootstrapPreview(dryRunDependencyBootstrap)}`);
+                options.stdout(`Would create worktree at ${worktreePath} (branch: ${worktreeName}${openNote})\n${formatDependencyBootstrapPreview(dryRunDependencyBootstrap)}`);
             }
             return 0;
         }
@@ -330,25 +306,22 @@ export function createNewCommand(dependencies = {}) {
         }
         const bootstrap = await bootstrapWorktree({
             branch: worktreeName,
-            cloneDirectory,
             config,
             currentRoot: repository.currentRoot,
-            nonInteractive: !!options.json,
+            dependencyDetectionRoot: worktreePath,
+            dependencyMode,
             repoRoot: repository.repoRoot,
             reporter: createBootstrapReporter(options.stderr, !!options.json),
-            runCommand: dependencies.runInstallCommand,
+            runCommand: dependencies.runCommand,
             commandStdout: options.json ? () => undefined : options.stdout,
             commandStderr: options.json ? () => undefined : options.stderr,
             json: options.json,
             worktreePath,
-            installDependencies: dependencies,
-            dependencyBootstrapPolicy: dependencyPolicy,
         });
         if (!bootstrap.ready) {
             return emitNewError(options, "worktree bootstrap failed", {
                 dependencyBootstrap: bootstrap.dependencyBootstrap,
                 path: worktreePath,
-                skipped: bootstrap.skippedDirs,
                 syncFiles: bootstrap.syncFileFailures,
             });
         }
@@ -364,15 +337,7 @@ export function createNewCommand(dependencies = {}) {
                     },
                 }
                 : { ...navigation };
-            if (bootstrap.clonedDirs.length > 0) {
-                output.cloned = bootstrap.clonedDirs.map(({ dir, ms }) => ({
-                    dir,
-                    ms,
-                }));
-            }
-            if (bootstrap.skippedDirs.length > 0)
-                output.skipped = bootstrap.skippedDirs;
-            if (bootstrap.dependencyBootstrap.mode !== "off")
+            if (bootstrap.dependencyBootstrap.events.length > 0)
                 output.dependencyBootstrap = bootstrap.dependencyBootstrap;
             options.stdout(`${JSON.stringify(output, null, 2)}\n`);
         }

package/dist/pr.d.ts

@@ -1,20 +1,19 @@
 import { type PathConflictChoice } from "./conflict.js";
-import { type DependencyBootstrapPromptDependencies } from "./dependency-bootstrap-prompt.js";
-import type { CloneDirectory } from "./dir-clone.js";
-import type { InstallPromptDependencies } from "./install-prompt.js";
+import { type BootstrapCommandRunner } from "./dependency-bootstrap.js";
 export type { PathConflictChoice };
 export interface PrCommandOptions {
     cwd: string;
     dryRun?: boolean;
     json?: boolean;
+    noInstall?: boolean;
     number: string;
     outputEnv?: string;
     stderr: (chunk: string) => void;
     stdout: (chunk: string) => void;
 }
-export interface PrCommandDependencies extends InstallPromptDependencies, DependencyBootstrapPromptDependencies {
-    cloneDir?: CloneDirectory;
+export interface PrCommandDependencies {
     promptForPathConflict: (path: string) => Promise<PathConflictChoice>;
+    runCommand: BootstrapCommandRunner;
 }
 export declare function parsePrInput(input: string): string | null;
 export declare function createPrCommand(dependencies?: Partial<PrCommandDependencies>): (options: PrCommandOptions) => Promise<number>;

package/dist/pr.js

@@ -4,16 +4,14 @@ import { dirname } from "node:path";
 import { promisify } from "node:util";
 import { createBootstrapReporter } from "./bootstrap-output.js";
 import { createDependencyBootstrapPreview, formatDependencyBootstrapPreview, } from "./bootstrap-preview.js";
-import { loadEffectiveConfigResult, resolveConfigString, } from "./config.js";
+import { loadEffectiveConfig, resolveConfigString, } from "./config.js";
 import { pathExists, promptForPathConflict, } from "./conflict.js";
-import { resolveDependencyBootstrapPolicy, } from "./dependency-bootstrap-prompt.js";
-import { formatBytes } from "./format-bytes.js";
+import { resolveDependencyBootstrapMode, } from "./dependency-bootstrap.js";
 import { isHeadless } from "./headless.js";
 import { recordWorktreeUsage } from "./history.js";
 import { createNavigationRepository, createNavigationTarget, } from "./navigation-output.js";
 import { detectRepository, resolveWorktreePath } from "./repo.js";
 import { writeShellOutput } from "./shell-handoff.js";
-import { estimateSyncDirectories } from "./sync-plan.js";
 import { bootstrapWorktree } from "./worktree-bootstrap.js";
 const execFileAsync = promisify(execFile);
 const PR_OUTPUT_FILE_ENV = "GJI_PR_OUTPUT_FILE";
@@ -44,11 +42,8 @@ export function createPrCommand(dependencies = {}) {
         }
         const repository = await detectRepository(options.cwd);
         let config;
-        let dependencyBootstrapExplicit;
         try {
-            const loaded = await loadEffectiveConfigResult(repository.repoRoot, undefined, options.json ? undefined : options.stderr);
-            config = loaded.config;
-            dependencyBootstrapExplicit = loaded.dependencyBootstrapExplicit;
+            config = await loadEffectiveConfig(repository.repoRoot, undefined, options.json ? undefined : options.stderr);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -88,33 +83,9 @@ export function createPrCommand(dependencies = {}) {
             options.stderr(`Aborted because target worktree path already exists: ${worktreePath}\n`);
             return 1;
         }
-        let dependencyPolicy = {
-            mode: config.dependencyBootstrap ?? "off",
-            prompted: false,
-            source: dependencyBootstrapExplicit ? "explicit" : "default",
-        };
-        if (options.dryRun) {
-            dependencyPolicy = await resolveDependencyBootstrapPolicy({
-                currentRoot: repository.currentRoot,
-                repoRoot: repository.repoRoot,
-                worktreePath,
-            }, config, dependencyBootstrapExplicit, {
-                dependencies,
-                dryRun: true,
-                legacyInstallPromptConfigured: dependencies.promptForInstallChoice !== undefined,
-                nonInteractive: !!options.json,
-                stderr: options.stderr,
-            });
-            config = {
-                ...config,
-                dependencyBootstrap: dependencyPolicy.mode,
-            };
-        }
-        const dryRunSyncDirs = options.dryRun
-            ? await estimateSyncDirectories(repository.repoRoot, worktreePath, config.syncDirs ?? [])
-            : [];
+        const dependencyMode = resolveDependencyBootstrapMode(config.dependencyBootstrap, options.noInstall);
         const dryRunDependencyBootstrap = options.dryRun
-            ? await createDependencyBootstrapPreview(config.dependencyBootstrap ?? "off", {
+            ? await createDependencyBootstrapPreview(dependencyMode, {
                 currentRoot: repository.currentRoot,
                 repoRoot: repository.repoRoot,
                 cargoBuildCommand: config.dependencyBuildCommand,
@@ -127,14 +98,12 @@ export function createPrCommand(dependencies = {}) {
                     ...createNavigationTarget(createNavigationRepository(repository.repoName, repository.repoRoot), worktreePath, branchName),
                     dryRun: true,
                 };
-                if (dryRunSyncDirs.length > 0)
-                    output.syncDirs = dryRunSyncDirs;
                 if (dryRunDependencyBootstrap?.targets.length)
                     output.dependencyBootstrap = dryRunDependencyBootstrap;
                 options.stdout(`${JSON.stringify(output, null, 2)}\n`);
             }
             else {
-                options.stdout(`Would create worktree at ${worktreePath} (branch: ${branchName})\n${dryRunSyncDirs.map(({ dir, bytes }) => `Would clone ${dir} (${formatBytes(bytes)})\n`).join("")}${formatDependencyBootstrapPreview(dryRunDependencyBootstrap)}`);
+                options.stdout(`Would create worktree at ${worktreePath} (branch: ${branchName})\n${formatDependencyBootstrapPreview(dryRunDependencyBootstrap)}`);
             }
             return 0;
         }
@@ -158,45 +127,24 @@ export function createPrCommand(dependencies = {}) {
             ? ["worktree", "add", worktreePath, branchName]
             : ["worktree", "add", "-b", branchName, worktreePath, remoteRef];
         await execFileAsync("git", worktreeArgs, { cwd: repository.repoRoot });
-        if (!dependencyBootstrapExplicit) {
-            dependencyPolicy = await resolveDependencyBootstrapPolicy({
-                currentRoot: repository.currentRoot,
-                detectionRoot: worktreePath,
-                repoRoot: repository.repoRoot,
-                worktreePath,
-            }, config, false, {
-                dependencies,
-                legacyInstallPromptConfigured: dependencies.promptForInstallChoice !== undefined,
-                nonInteractive: !!options.json,
-                stderr: options.stderr,
-            });
-            config = {
-                ...config,
-                dependencyBootstrap: dependencyPolicy.mode,
-            };
-        }
         const bootstrap = await bootstrapWorktree({
             branch: branchName,
-            cloneDirectory: dependencies.cloneDir,
             config,
             currentRoot: repository.currentRoot,
             dependencyDetectionRoot: worktreePath,
-            nonInteractive: !!options.json,
+            dependencyMode,
             repoRoot: repository.repoRoot,
             reporter: createBootstrapReporter(options.stderr, !!options.json),
-            runCommand: dependencies.runInstallCommand,
+            runCommand: dependencies.runCommand,
             commandStdout: options.json ? () => undefined : options.stdout,
             commandStderr: options.json ? () => undefined : options.stderr,
             json: options.json,
             worktreePath,
-            installDependencies: dependencies,
-            dependencyBootstrapPolicy: dependencyPolicy,
         });
         if (!bootstrap.ready) {
             const details = {
                 dependencyBootstrap: bootstrap.dependencyBootstrap,
                 path: worktreePath,
-                skipped: bootstrap.skippedDirs,
                 syncFiles: bootstrap.syncFileFailures,
             };
             if (options.json) {
@@ -212,15 +160,7 @@ export function createPrCommand(dependencies = {}) {
             const output = {
                 ...createNavigationTarget(createNavigationRepository(repository.repoName, repository.repoRoot), worktreePath, branchName),
             };
-            if (bootstrap.clonedDirs.length > 0) {
-                output.cloned = bootstrap.clonedDirs.map(({ dir, ms }) => ({
-                    dir,
-                    ms,
-                }));
-            }
-            if (bootstrap.skippedDirs.length > 0)
-                output.skipped = bootstrap.skippedDirs;
-            if (bootstrap.dependencyBootstrap.mode !== "off")
+            if (bootstrap.dependencyBootstrap.events.length > 0)
                 output.dependencyBootstrap = bootstrap.dependencyBootstrap;
             options.stdout(`${JSON.stringify(output, null, 2)}\n`);
         }

package/dist/shell-completion.js

@@ -2,7 +2,7 @@ import { KNOWN_GLOBAL_CONFIG_KEYS } from "./config.js";
 const TOP_LEVEL_COMMANDS = [
     {
         name: "new",
-        description: "create a new branch or detached linked worktree and CoW-bootstrap configured directories",
+        description: "create a new branch or detached linked worktree",
     },
     {
         name: "done",
@@ -149,7 +149,7 @@ _gji_completion() {
 
   case "$command_name" in
     new)
-				COMPREPLY=( $(compgen -W "--detached --from-current --no-fetch --take --copy --task --force --open --editor --dry-run --json --help" -- "$cur") )
+				COMPREPLY=( $(compgen -W "--detached --from-current --no-fetch --take --copy --task --force --open --editor --dry-run --no-install --json --help" -- "$cur") )
       ;;
     done)
       COMPREPLY=( $(compgen -W "--force --keep-branch --json --help" -- "$cur") )
@@ -187,7 +187,7 @@ _gji_completion() {
           COMPREPLY=( $(compgen -W "$(__gji_pr_targets) --select --help" -- "$cur") )
         fi
       else
-        COMPREPLY=( $(compgen -W "--dry-run --json --help" -- "$cur") )
+        COMPREPLY=( $(compgen -W "--dry-run --no-install --json --help" -- "$cur") )
       fi
       ;;
     back)
@@ -395,6 +395,7 @@ complete -c gji -n '__fish_seen_subcommand_from new' -l force -d 'remove and rec
 complete -c gji -n '__fish_seen_subcommand_from new' -l open -d 'open the new worktree in an editor after creation'
 complete -c gji -n '__fish_seen_subcommand_from new' -l editor -r -d 'editor CLI to use with --open (code, cursor, zed, …)'
 complete -c gji -n '__fish_seen_subcommand_from new' -l dry-run -d 'show what would be created without executing any git commands or writing files'
+complete -c gji -n '__fish_seen_subcommand_from new' -l no-install -d 'skip automatic dependency setup in the new worktree'
 complete -c gji -n '__fish_seen_subcommand_from new' -l json -d 'emit JSON on success or error instead of human-readable output'
 
 complete -c gji -n '__fish_seen_subcommand_from init' -l write -d 'write the integration to the shell config file'
@@ -410,6 +411,7 @@ complete -c gji -n '__fish_seen_subcommand_from completion' -a 'fish' -d 'shell'
 complete -c gji -n '__fish_seen_subcommand_from completion' -a 'zsh' -d 'shell'
 
 complete -c gji -n '__fish_seen_subcommand_from pr; and test (commandline -opc)[3] != open' -l dry-run -d 'show what would be created without executing any git commands or writing files'
+complete -c gji -n '__fish_seen_subcommand_from pr; and test (commandline -opc)[3] != open' -l no-install -d 'skip automatic dependency setup in the PR worktree'
 complete -c gji -n '__fish_seen_subcommand_from pr; and test (commandline -opc)[3] != open' -l json -d 'emit JSON on success or error instead of human-readable output'
 complete -c gji -n '__fish_seen_subcommand_from pr' -a 'open' -d 'open a pull request in the default browser'
 complete -c gji -n '__gji_should_complete_pr_select' -l select -d 'choose a pull request from any linked worktree'
@@ -551,7 +553,7 @@ fi
 
 case "\${words[2]}" in
   new)
-    _arguments '--detached[create a detached worktree without a branch]' '--from-current[base the new branch on the current worktree instead of the main worktree]' '--no-fetch[skip refreshing the remote default branch before creating the new branch]' '--take[move current uncommitted changes into the new worktree]' '--copy[copy current uncommitted changes instead of moving them (requires --take)]' '--task[record the purpose of the new worktree]:description:' '--force[remove and recreate the worktree if the target path already exists]' '--open[open the new worktree in an editor after creation]' '--editor[editor CLI to use with --open (code, cursor, zed, …)]:editor:' '--dry-run[show what would be created without executing any git commands or writing files]' '--json[emit JSON on success or error instead of human-readable output]' '2:branch: '
+    _arguments '--detached[create a detached worktree without a branch]' '--from-current[base the new branch on the current worktree instead of the main worktree]' '--no-fetch[skip refreshing the remote default branch before creating the new branch]' '--take[move current uncommitted changes into the new worktree]' '--copy[copy current uncommitted changes instead of moving them (requires --take)]' '--task[record the purpose of the new worktree]:description:' '--force[remove and recreate the worktree if the target path already exists]' '--open[open the new worktree in an editor after creation]' '--editor[editor CLI to use with --open (code, cursor, zed, …)]:editor:' '--dry-run[show what would be created without executing any git commands or writing files]' '--no-install[skip automatic dependency setup in the new worktree]' '--json[emit JSON on success or error instead of human-readable output]' '2:branch: '
     ;;
   done)
     _arguments '--force[remove dirty or unmerged worktrees without prompting]' '--keep-branch[remove the worktree but preserve its branch]' '--json[emit JSON on success or error instead of human-readable output]' '2:branch: '
@@ -578,7 +580,7 @@ case "\${words[2]}" in
         _arguments '--select[choose a pull request from any linked worktree]' '4:branch or PR number:->pr_targets'
       fi
     else
-      _arguments '--dry-run[show what would be created without executing any git commands or writing files]' '--json[emit JSON on success or error instead of human-readable output]' '2:ref:(open)'
+      _arguments '--dry-run[show what would be created without executing any git commands or writing files]' '--no-install[skip automatic dependency setup in the PR worktree]' '--json[emit JSON on success or error instead of human-readable output]' '2:ref:(open)'
     fi
     ;;
   back)

package/dist/uv-validation.d.ts

@@ -0,0 +1,4 @@
+import type { BootstrapExecutionContext, BootstrapTarget } from "./dependency-bootstrap.js";
+export declare function validateUvRelocation(target: BootstrapTarget, context: BootstrapExecutionContext): Promise<void>;
+export declare function validateUvInstallation(target: BootstrapTarget, context: BootstrapExecutionContext): Promise<void>;
+export declare function validateUvStructure(target: BootstrapTarget, context: BootstrapExecutionContext): Promise<void>;

package/dist/uv-validation.js

@@ -0,0 +1,210 @@
+import { execFile } from "node:child_process";
+import { constants } from "node:fs";
+import { lstat, open, readdir, realpath } from "node:fs/promises";
+import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
+import { promisify } from "node:util";
+import { isNotFoundError } from "./fs-utils.js";
+const execFileAsync = promisify(execFile);
+const UV_VALIDATION_MAX_ENTRIES = 10_000;
+const UV_VALIDATION_MAX_FILE_BYTES = 1024 * 1024;
+const UV_VALIDATION_MAX_TOTAL_BYTES = 16 * 1024 * 1024;
+function virtualEnvironmentPrefixes(text) {
+    const prefixes = [];
+    for (const line of text.split(/\r?\n/u)) {
+        if (!/\bVIRTUAL_ENV\b/u.test(line))
+            continue;
+        const quotedAssignment = line.match(/\bVIRTUAL_ENV(?:\s*=|\s+)\s*(?:"([^"]+)"|'([^']+)')/u);
+        const quotedPrefix = quotedAssignment?.[1] ?? quotedAssignment?.[2];
+        if (quotedPrefix && isAbsolute(quotedPrefix))
+            prefixes.push(quotedPrefix);
+        const unquoted = line.match(/\bVIRTUAL_ENV(?:\s*=|\s+)\s*([^\s"']+)/u)?.[1];
+        if (unquoted && isAbsolute(unquoted))
+            prefixes.push(unquoted);
+    }
+    return uniquePaths(prefixes);
+}
+function pythonPrefixFromShebang(text) {
+    const command = text
+        .match(/^#!\s*([^\r\n]+)/u)?.[1]
+        ?.trim()
+        .split(/\s+/u)[0];
+    if (!command || !isAbsolute(command))
+        return undefined;
+    if (!/^python(?:\d+(?:\.\d+)?)?(?:\.exe)?$/iu.test(command.split(sep).at(-1) ?? "")) {
+        return undefined;
+    }
+    return dirname(dirname(command));
+}
+function pythonPrefixesFromText(text) {
+    const interpreters = [];
+    for (const match of text.matchAll(/["'](\/[^"']+)["']/gu)) {
+        if (match[1])
+            interpreters.push(match[1]);
+    }
+    for (const match of text.matchAll(/(?:^|\s)(\/[^\s"']+)/gmu)) {
+        if (match[1])
+            interpreters.push(match[1]);
+    }
+    return uniquePaths(interpreters.flatMap((interpreter) => {
+        const name = interpreter.split(sep).at(-1) ?? "";
+        return /^python(?:\d+(?:\.\d+)?)?(?:\.exe)?$/iu.test(name)
+            ? [dirname(dirname(interpreter))]
+            : [];
+    }));
+}
+export async function validateUvRelocation(target, context) {
+    if (context.input === "preserve")
+        return;
+    if (!target.targetPath || !target.sourcePath) {
+        throw new Error("uv environment target is not project-local");
+    }
+    const scriptsDirectory = join(target.targetPath, process.platform === "win32" ? "Scripts" : "bin");
+    const interpreter = join(scriptsDirectory, process.platform === "win32" ? "python.exe" : "python");
+    const { stdout } = await execFileAsync(interpreter, [
+        "-c",
+        "import os, sys; print(os.path.realpath(sys.prefix))",
+    ]);
+    const [actualPrefix, expectedPrefix] = await Promise.all([
+        realpath(stdout.trim()),
+        realpath(target.targetPath),
+    ]);
+    if (actualPrefix !== expectedPrefix) {
+        throw new Error(`uv environment still points to its source prefix: ${actualPrefix}`);
+    }
+    const sourcePaths = uniquePaths([
+        target.sourcePath,
+        (await realpath(target.sourcePath).catch(() => undefined)) ?? "",
+    ]).filter(Boolean);
+    const entries = await readdir(scriptsDirectory, { withFileTypes: true });
+    assertSafeUvScriptEntries(entries);
+    const environmentName = basename(target.targetPath);
+    const acceptedPrefixes = new Set([
+        resolve(target.targetPath),
+        await realpath(target.targetPath),
+    ]);
+    let validatedBytes = 0;
+    for (const path of [
+        join(target.targetPath, "pyvenv.cfg"),
+        ...entries
+            .filter((entry) => entry.isFile())
+            .map((entry) => join(scriptsDirectory, entry.name)),
+    ]) {
+        const validated = await readBoundedUvTextFile(path, UV_VALIDATION_MAX_TOTAL_BYTES - validatedBytes);
+        if (!validated)
+            continue;
+        validatedBytes += validated.bytes;
+        if (validated.text === undefined)
+            continue;
+        const { text } = validated;
+        if (sourcePaths.some((sourcePath) => text.includes(sourcePath))) {
+            throw new Error(`uv environment contains a stale source path: ${path}`);
+        }
+        const shebangPrefix = pythonPrefixFromShebang(text);
+        if (shebangPrefix &&
+            basename(shebangPrefix) === environmentName &&
+            !acceptedPrefixes.has(resolve(shebangPrefix))) {
+            throw new Error(`uv launcher points outside its environment: ${path}`);
+        }
+        if (pythonPrefixesFromText(text)
+            .filter((prefix) => basename(prefix) === environmentName)
+            .some((prefix) => !acceptedPrefixes.has(resolve(prefix)))) {
+            throw new Error(`uv launcher points outside its environment: ${path}`);
+        }
+        if (virtualEnvironmentPrefixes(text).some((prefix) => !acceptedPrefixes.has(resolve(prefix)))) {
+            throw new Error(`uv activation script points outside its environment: ${path}`);
+        }
+    }
+}
+export async function validateUvInstallation(target, context) {
+    await validateUvStructure(target, context);
+    await validateUvRelocation(target, context);
+}
+export async function validateUvStructure(target, context) {
+    if (context.input === "preserve")
+        return;
+    if (!target.targetPath)
+        throw new Error("uv environment target is not project-local");
+    const targetStats = await lstat(target.targetPath).catch(() => undefined);
+    if (!targetStats)
+        return;
+    if (!targetStats.isDirectory() || targetStats.isSymbolicLink()) {
+        throw new Error("uv environment must be a real directory");
+    }
+    const configStats = await lstat(join(target.targetPath, "pyvenv.cfg")).catch(() => undefined);
+    if (configStats && (!configStats.isFile() || configStats.isSymbolicLink())) {
+        throw new Error("uv pyvenv.cfg must be a regular file");
+    }
+    const scriptsDirectory = join(target.targetPath, process.platform === "win32" ? "Scripts" : "bin");
+    const scriptsStats = await lstat(scriptsDirectory).catch(() => undefined);
+    if (!scriptsStats)
+        return;
+    if (!scriptsStats.isDirectory() || scriptsStats.isSymbolicLink()) {
+        throw new Error("uv scripts path must be a real directory");
+    }
+    assertSafeUvScriptEntries(await readdir(scriptsDirectory, { withFileTypes: true }));
+}
+function assertSafeUvScriptEntries(entries) {
+    if (entries.length > UV_VALIDATION_MAX_ENTRIES) {
+        throw new Error("uv scripts directory exceeds the validation entry limit");
+    }
+    for (const entry of entries) {
+        if (entry.isSymbolicLink() && !isUvInterpreterName(entry.name)) {
+            throw new Error(`uv script must not be a symbolic link: ${entry.name}`);
+        }
+    }
+}
+async function readBoundedUvTextFile(path, remainingBytes) {
+    let handle;
+    try {
+        handle = await open(path, constants.O_RDONLY |
+            (process.platform === "win32" ? 0 : constants.O_NOFOLLOW));
+    }
+    catch (error) {
+        if (isNotFoundError(error))
+            return undefined;
+        throw error;
+    }
+    try {
+        const stats = await handle.stat();
+        if (!stats.isFile())
+            return undefined;
+        if (stats.size > UV_VALIDATION_MAX_FILE_BYTES) {
+            throw new Error(`uv launcher exceeds the validation size limit: ${path}`);
+        }
+        if (stats.size > remainingBytes) {
+            throw new Error("uv launchers exceed the total validation size limit");
+        }
+        const readLimit = Math.min(UV_VALIDATION_MAX_FILE_BYTES, remainingBytes);
+        const contents = await readFilePrefix(handle, readLimit + 1);
+        if (contents.byteLength > UV_VALIDATION_MAX_FILE_BYTES) {
+            throw new Error(`uv launcher exceeds the validation size limit: ${path}`);
+        }
+        if (contents.byteLength > remainingBytes) {
+            throw new Error("uv launchers exceed the total validation size limit");
+        }
+        const text = contents.toString("utf8");
+        return Buffer.from(text, "utf8").equals(contents)
+            ? { bytes: contents.byteLength, text }
+            : { bytes: contents.byteLength };
+    }
+    finally {
+        await handle.close();
+    }
+}
+async function readFilePrefix(handle, maxBytes) {
+    const contents = Buffer.allocUnsafe(maxBytes);
+    let offset = 0;
+    while (offset < contents.byteLength) {
+        const { bytesRead } = await handle.read(contents, offset, contents.byteLength - offset, offset);
+        if (bytesRead === 0)
+            break;
+        offset += bytesRead;
+    }
+    return contents.subarray(0, offset);
+}
+function isUvInterpreterName(name) {
+    return /^python(?:\d+(?:\.\d+)?)?(?:\.exe)?$/iu.test(name);
+}
+function uniquePaths(paths) {
+    return [...new Set(paths.filter((path) => Boolean(path)))];
+}

package/dist/worktree-bootstrap.d.ts

@@ -1,35 +1,24 @@
 import type { EffectiveGjiConfig } from "./config.js";
-import { type BootstrapCommandRunner, type BootstrapEvent, type DependencyBootstrapReport, type DependencyBootstrapReporter } from "./dependency-bootstrap.js";
-import type { DependencyBootstrapPolicyResolution } from "./dependency-bootstrap-prompt.js";
-import { type CloneDirectory } from "./dir-clone.js";
-import { type InstallPromptDependencies } from "./install-prompt.js";
-import { type ClonedDirectory, type SyncDirectoryReporter } from "./sync-directories.js";
-export type { ClonedDirectory as ClonedDir } from "./sync-directories.js";
+import { type BootstrapCommandRunner, type BootstrapEvent, type DependencyBootstrapMode, type DependencyBootstrapReport, type DependencyBootstrapReporter } from "./dependency-bootstrap.js";
 export interface WorktreeBootstrapOptions {
     branch: string;
-    cloneDirectory?: CloneDirectory;
     config: EffectiveGjiConfig;
     currentRoot?: string;
     dependencyDetectionRoot?: string;
-    installDependencies?: InstallPromptDependencies;
+    dependencyMode: DependencyBootstrapMode;
     runCommand?: BootstrapCommandRunner;
     commandStdout?: (chunk: string) => void;
     commandStderr?: (chunk: string) => void;
-    dependencyBootstrapPolicy?: DependencyBootstrapPolicyResolution;
     json?: boolean;
-    nonInteractive: boolean;
     repoRoot: string;
-    reporter: SyncDirectoryReporter & DependencyBootstrapReporter;
+    reporter: DependencyBootstrapReporter & {
+        write: (chunk: string) => void;
+    };
     worktreePath: string;
 }
 export interface WorktreeBootstrapResult {
-    clonedDirs: readonly ClonedDirectory[];
     dependencyBootstrap: DependencyBootstrapReport;
     ready: boolean;
     syncFileFailures: readonly BootstrapEvent[];
-    skippedDirs: readonly {
-        dir: string;
-        reason: string;
-    }[];
 }
 export declare function bootstrapWorktree(options: WorktreeBootstrapOptions): Promise<WorktreeBootstrapResult>;