@solaqua/gji 0.9.0 → 0.11.0

package/dist/init.js

@@ -12,49 +12,56 @@ import { SHELL_INTEGRATION_END_MARKER as END_MARKER, executableExists, hasShellI
 const ZSH_COMPLETION_PATH_LINE = "fpath=(~/.zsh/completions $fpath)";
 const SHELL_WRAPPED_COMMANDS = [
     {
-        bypassOptions: ["--help"],
+        bypassOptions: ["--help", "-h", "--json"],
         commandName: "new",
         envVar: "GJI_NEW_OUTPUT_FILE",
         names: ["new"],
         tempPrefix: "gji-new",
     },
     {
-        bypassOptions: ["--help"],
+        bypassOptions: ["--help", "-h", "--json"],
         commandName: "pr",
         envVar: "GJI_PR_OUTPUT_FILE",
         names: ["pr"],
         tempPrefix: "gji-pr",
     },
     {
-        bypassOptions: ["--print"],
+        bypassOptions: ["--print", "--help", "-h"],
         commandName: "back",
         envVar: "GJI_BACK_OUTPUT_FILE",
         names: ["back"],
         tempPrefix: "gji-back",
     },
     {
-        bypassOptions: ["--print"],
+        bypassOptions: ["--print", "--json", "--help", "-h"],
         commandName: "go",
         envVar: "GJI_GO_OUTPUT_FILE",
         names: ["go", "jump"],
         tempPrefix: "gji-go",
     },
     {
-        bypassOptions: ["--print"],
+        bypassOptions: ["--print", "--help", "-h"],
         commandName: "root",
         envVar: "GJI_ROOT_OUTPUT_FILE",
         names: ["root"],
         tempPrefix: "gji-root",
     },
     {
-        bypassOptions: ["--help"],
+        bypassOptions: ["--help", "-h", "--json"],
         commandName: "remove",
         envVar: "GJI_REMOVE_OUTPUT_FILE",
         names: ["remove", "rm"],
         tempPrefix: "gji-remove",
     },
     {
-        bypassOptions: ["--print", "--json"],
+        bypassOptions: ["--help", "-h", "--json"],
+        commandName: "done",
+        envVar: "GJI_DONE_OUTPUT_FILE",
+        names: ["done"],
+        tempPrefix: "gji-done",
+    },
+    {
+        bypassOptions: ["--print", "--json", "--help", "-h"],
         commandName: "warp",
         envVar: "GJI_WARP_OUTPUT_FILE",
         names: ["warp"],
@@ -405,16 +412,17 @@ function renderFishWrapper(command) {
     const nameCondition = nameTests.length === 1
         ? nameTests[0]
         : `begin; ${nameTests.join("; or ")}; end`;
-    const bypassTests = command.bypassOptions.map((opt) => `test $argv[1] = ${opt}`);
-    const bypassCondition = bypassTests.length === 1
-        ? bypassTests[0]
-        : `begin; ${bypassTests.join("; or ")}; end`;
+    const bypassBlock = `if test (count $argv) -gt 0
+        for arg in $argv
+            if ${command.bypassOptions.map((opt) => `test $arg = ${opt}`).join("; or ")}
+                command gji ${command.commandName} $argv
+                return $status
+            end
+        end
+    end`;
     return `if test (count $argv) -gt 0; and ${nameCondition}
     set -e argv[1]
-    if test (count $argv) -gt 0; and ${bypassCondition}
-        command gji ${command.commandName} $argv
-        return $status
-    end
+    ${bypassBlock}
 
     set -l output_file (mktemp -t ${command.tempPrefix}.XXXXXX)
     or return 1
@@ -434,15 +442,15 @@ function renderPosixWrapper(command) {
     const tests = command.names
         .map((name) => `[ "$1" = "${name}" ]`)
         .join(" || ");
-    const bypassTests = command.bypassOptions
-        .map((opt) => `[ "\${1:-}" = "${opt}" ]`)
-        .join(" || ");
+    const bypassBlock = `for arg do
+    if ${command.bypassOptions.map((opt) => `[ "$arg" = "${opt}" ]`).join(" || ")}; then
+      command gji ${command.commandName} "$@"
+      return $?
+    fi
+  done`;
     return `if ${tests}; then
   shift
-  if ${bypassTests}; then
-    command gji ${command.commandName} "$@"
-    return $?
-  fi
+  ${bypassBlock}
 
   local target
   local output_file

package/dist/install-prompt.d.ts

@@ -9,3 +9,4 @@ export interface InstallPromptDependencies {
     writeGlobalRepoConfigKey?: (repoRoot: string, key: string, value: unknown) => Promise<void>;
 }
 export declare function maybeRunInstallPrompt(worktreePath: string, repoRoot: string, config: GjiConfig, stderr: (chunk: string) => void, dependencies?: InstallPromptDependencies, nonInteractive?: boolean): Promise<void>;
+export declare const runInstallCommand: import("./command-runner.js").CommandRunner;

package/dist/install-prompt.js

@@ -1,5 +1,5 @@
-import { spawn } from "node:child_process";
 import { isCancel, select } from "@clack/prompts";
+import { runCommand } from "./command-runner.js";
 import { loadConfig, loadGlobalConfig, updateGlobalRepoConfigKey, updateLocalConfigKey, } from "./config.js";
 import { isHeadless } from "./headless.js";
 import { extractHooks } from "./hooks.js";
@@ -28,7 +28,7 @@ export async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stde
         return;
     }
     if (choice === "yes" || choice === "always") {
-        const runner = dependencies.runInstallCommand ?? defaultRunInstallCommand;
+        const runner = dependencies.runInstallCommand ?? runInstallCommand;
         try {
             await runner(pm.installCommand, worktreePath, stderr);
         }
@@ -88,29 +88,7 @@ export async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stde
         }
     }
 }
-async function defaultRunInstallCommand(command, cwd, stderr) {
-    await new Promise((resolve, reject) => {
-        const child = spawn(command, {
-            cwd,
-            shell: true,
-            stdio: ["ignore", "inherit", "pipe"],
-        });
-        child.stderr.on("data", (chunk) => {
-            stderr(chunk.toString());
-        });
-        child.on("close", (code) => {
-            if (code !== 0) {
-                reject(new Error(`exited with code ${code}`));
-            }
-            else {
-                resolve();
-            }
-        });
-        child.on("error", (err) => {
-            reject(err);
-        });
-    });
-}
+export const runInstallCommand = runCommand;
 async function defaultWriteConfigKey(root, key, value) {
     await updateLocalConfigKey(root, key, value);
 }

package/dist/navigation-output.d.ts

@@ -0,0 +1,11 @@
+export interface NavigationRepository {
+    name: string;
+    root: string;
+}
+export interface NavigationTarget {
+    branch: string | null;
+    path: string;
+    repository: NavigationRepository;
+}
+export declare function createNavigationTarget(repository: NavigationRepository, path: string, branch: string | null): NavigationTarget;
+export declare function createNavigationRepository(name: string, root: string): NavigationRepository;

package/dist/navigation-output.js

@@ -0,0 +1,6 @@
+export function createNavigationTarget(repository, path, branch) {
+    return { branch, path, repository };
+}
+export function createNavigationRepository(name, root) {
+    return { name, root };
+}

package/dist/new.d.ts

@@ -1,21 +1,33 @@
 import { type PathConflictChoice } from "./conflict.js";
-import { type InstallPromptDependencies } from "./install-prompt.js";
+import { type DependencyBootstrapPromptDependencies } from "./dependency-bootstrap-prompt.js";
+import { type CloneDirectory } from "./dir-clone.js";
+import type { InstallPromptDependencies } from "./install-prompt.js";
 export type { PathConflictChoice };
+export type NewWorktreeMode = "create" | "checkout" | "track";
 export interface NewCommandOptions {
     branch?: string;
+    copy?: boolean;
     cwd: string;
     detached?: boolean;
     dryRun?: boolean;
     editor?: string;
+    fromCurrent?: boolean;
     force?: boolean;
+    noFetch?: boolean;
     json?: boolean;
+    mode?: NewWorktreeMode;
     open?: boolean;
+    outputEnv?: string;
+    remote?: string;
+    take?: boolean;
     stderr: (chunk: string) => void;
     stdout: (chunk: string) => void;
 }
-export interface NewCommandDependencies extends InstallPromptDependencies {
+export interface NewCommandDependencies extends InstallPromptDependencies, DependencyBootstrapPromptDependencies {
+    cloneDir: CloneDirectory;
     createBranchPlaceholder: () => string;
     promptForBranch: (placeholder: string) => Promise<string | null>;
+    promptForFetchFailure: (message: string) => Promise<boolean>;
     promptForPathConflict: (path: string) => Promise<PathConflictChoice>;
     spawnEditor: (cli: string, args: string[]) => Promise<void>;
 }