@solaqua/gji 0.6.1 → 0.6.2

package/dist/gji-bundle.mjs

@@ -9740,7 +9740,7 @@ var retryifyAsync = (fn, options) => {
           throw error;
         const delay2 = Math.round(interval * Math.random());
         if (delay2 > 0) {
-          const delayPromise = new Promise((resolve5) => setTimeout(resolve5, delay2));
+          const delayPromise = new Promise((resolve6) => setTimeout(resolve6, delay2));
           return delayPromise.then(() => attempt.apply(void 0, args));
         } else {
           return attempt.apply(void 0, args);
@@ -9999,14 +9999,14 @@ var Temp = {
     }
   },
   truncate: (filePath) => {
-    const basename8 = path2.basename(filePath);
-    if (basename8.length <= LIMIT_BASENAME_LENGTH)
+    const basename9 = path2.basename(filePath);
+    if (basename9.length <= LIMIT_BASENAME_LENGTH)
       return filePath;
-    const truncable = /^(\.?)(.*?)((?:\.[^.]+)?(?:\.tmp-\d{10}[a-f0-9]{6})?)$/.exec(basename8);
+    const truncable = /^(\.?)(.*?)((?:\.[^.]+)?(?:\.tmp-\d{10}[a-f0-9]{6})?)$/.exec(basename9);
     if (!truncable)
       return filePath;
-    const truncationLength = basename8.length - LIMIT_BASENAME_LENGTH;
-    return `${filePath.slice(0, -basename8.length)}${truncable[1]}${truncable[2].slice(0, -truncationLength)}${truncable[3]}`;
+    const truncationLength = basename9.length - LIMIT_BASENAME_LENGTH;
+    return `${filePath.slice(0, -basename9.length)}${truncable[1]}${truncable[2].slice(0, -truncationLength)}${truncable[3]}`;
   }
 };
 node_default(Temp.purgeSyncAll);
@@ -11306,14 +11306,14 @@ var TimeoutError = class extends Error {
 
 // node_modules/.pnpm/ky@1.14.3/node_modules/ky/distribution/utils/timeout.js
 async function timeout(request, init, abortController, options) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const timeoutId = setTimeout(() => {
       if (abortController) {
         abortController.abort();
       }
       reject(new TimeoutError(request));
     }, options.timeout);
-    void options.fetch(request, init).then(resolve5).catch(reject).then(() => {
+    void options.fetch(request, init).then(resolve6).catch(reject).then(() => {
       clearTimeout(timeoutId);
     });
   });
@@ -11321,7 +11321,7 @@ async function timeout(request, init, abortController, options) {
 
 // node_modules/.pnpm/ky@1.14.3/node_modules/ky/distribution/utils/delay.js
 async function delay(ms, { signal }) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     if (signal) {
       signal.throwIfAborted();
       signal.addEventListener("abort", abortHandler, { once: true });
@@ -11332,7 +11332,7 @@ async function delay(ms, { signal }) {
     }
     const timeoutId = setTimeout(() => {
       signal?.removeEventListener("abort", abortHandler);
-      resolve5();
+      resolve6();
     }, ms);
   });
 }
@@ -13048,7 +13048,7 @@ async function runArgvHook(hookCmd, cwd, context, stderr) {
     stderr("gji: hook argv command must include a non-empty command\n");
     return;
   }
-  await new Promise((resolve5) => {
+  await new Promise((resolve6) => {
     const child = spawn2(command, args, {
       cwd,
       shell: false,
@@ -13063,18 +13063,18 @@ async function runArgvHook(hookCmd, cwd, context, stderr) {
         stderr(`gji: hook exited with code ${code}: ${formatArgvHook(command, args)}
 `);
       }
-      resolve5();
+      resolve6();
     });
     child.on("error", (err) => {
       stderr(`gji: hook failed to start: ${err.message}
 `);
-      resolve5();
+      resolve6();
     });
   });
 }
 async function runShellHook(hookCmd, cwd, context, stderr) {
   const interpolated = interpolate(hookCmd, context);
-  await new Promise((resolve5) => {
+  await new Promise((resolve6) => {
     const child = spawn2(interpolated, {
       cwd,
       shell: true,
@@ -13089,12 +13089,12 @@ async function runShellHook(hookCmd, cwd, context, stderr) {
         stderr(`gji: hook exited with code ${code}: ${interpolated}
 `);
       }
-      resolve5();
+      resolve6();
     });
     child.on("error", (err) => {
       stderr(`gji: hook failed to start: ${err.message}
 `);
-      resolve5();
+      resolve6();
     });
   });
 }
@@ -14881,7 +14881,11 @@ function writeJson(stdout, value) {
 }
 
 // src/go.ts
-import { basename as basename5 } from "node:path";
+import { basename as basename6 } from "node:path";
+
+// src/warp.ts
+import { realpath as realpath2 } from "node:fs/promises";
+import { basename as basename5, resolve as resolve5 } from "node:path";
 
 // src/new.ts
 import { mkdir as mkdir4 } from "node:fs/promises";
@@ -14900,9 +14904,9 @@ var EDITORS = [
 ];
 async function defaultSpawnEditor(cli, args) {
   const child = spawn3(cli, args, { detached: true, stdio: "ignore" });
-  await new Promise((resolve5, reject) => {
+  await new Promise((resolve6, reject) => {
     child.once("error", reject);
-    child.once("spawn", resolve5);
+    child.once("spawn", resolve6);
   });
   child.unref();
 }
@@ -15117,7 +15121,7 @@ async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stderr, dep
   }
 }
 async function defaultRunInstallCommand(command, cwd, stderr) {
-  await new Promise((resolve5, reject) => {
+  await new Promise((resolve6, reject) => {
     const child = spawn4(command, { cwd, shell: true, stdio: ["ignore", "inherit", "pipe"] });
     child.stderr.on("data", (chunk) => {
       stderr(chunk.toString());
@@ -15126,7 +15130,7 @@ async function defaultRunInstallCommand(command, cwd, stderr) {
       if (code !== 0) {
         reject(new Error(`exited with code ${code}`));
       } else {
-        resolve5();
+        resolve6();
       }
     });
     child.on("error", (err) => {
@@ -15467,7 +15471,7 @@ async function openWorktree(worktreePath, editorCli, spawnFn, stderr) {
 }
 
 // src/repo-registry.ts
-import { mkdir as mkdir5, readFile as readFile3, writeFile as writeFile4 } from "node:fs/promises";
+import { mkdir as mkdir5, readFile as readFile3, realpath, writeFile as writeFile4 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
 import { basename as basename4, dirname as dirname6, join as join6, resolve as resolve4 } from "node:path";
 var REGISTRY_FILE_NAME = "repos.json";
@@ -15490,21 +15494,46 @@ async function loadRegistry(home = homedir4()) {
     return [];
   }
 }
+async function canonicalizeRepoPath(repoPath) {
+  try {
+    return await realpath(repoPath);
+  } catch {
+    return resolve4(repoPath);
+  }
+}
 async function registerRepo(repoPath, home = homedir4()) {
   const registryPath = REGISTRY_FILE_PATH(home);
-  const existing = await loadRegistry(home);
-  if (existing.length > 0 && existing[0].path === repoPath) return;
+  const existing = await normalizeRegistryForWrite(await loadRegistry(home));
+  const canonicalRepoPath = await canonicalizeRepoPath(repoPath);
+  if (existing.length > 0 && existing[0].path === canonicalRepoPath) return;
   const entry = {
     lastUsed: Date.now(),
-    name: basename4(repoPath),
-    path: repoPath
+    name: basename4(canonicalRepoPath),
+    path: canonicalRepoPath
   };
-  const filtered = existing.filter((e2) => e2.path !== repoPath);
+  const filtered = existing.filter((e2) => e2.path !== canonicalRepoPath);
   const next = [entry, ...filtered].slice(0, MAX_REGISTRY_ENTRIES);
   await mkdir5(dirname6(registryPath), { recursive: true });
   await writeFile4(registryPath, `${JSON.stringify(next, null, 2)}
 `, "utf8");
 }
+async function normalizeRegistryForWrite(entries) {
+  const normalized = [];
+  const seenPaths = /* @__PURE__ */ new Set();
+  for (const entry of entries) {
+    const canonicalPath = await canonicalizeRepoPath(entry.path);
+    if (seenPaths.has(canonicalPath)) {
+      continue;
+    }
+    seenPaths.add(canonicalPath);
+    normalized.push({
+      ...entry,
+      name: basename4(canonicalPath),
+      path: canonicalPath
+    });
+  }
+  return normalized;
+}
 function isRegistryEntry(value) {
   return typeof value === "object" && value !== null && "path" in value && typeof value.path === "string" && "name" in value && typeof value.name === "string" && "lastUsed" in value && typeof value.lastUsed === "number";
 }
@@ -15549,9 +15578,10 @@ async function runWarpNavigate(options) {
   return 0;
 }
 async function runWarpNew(options, registry) {
+  const deduplicatedRegistry = await deduplicateRegistryForNew(registry);
   let targetRepoRoot;
-  if (registry.length === 1) {
-    targetRepoRoot = registry[0].path;
+  if (deduplicatedRegistry.length === 1) {
+    targetRepoRoot = deduplicatedRegistry[0].path;
   } else {
     if (isHeadless()) {
       options.stderr(
@@ -15561,7 +15591,7 @@ async function runWarpNew(options, registry) {
     }
     const choice = await ve({
       message: "Create worktree in which repo?",
-      options: registry.map((entry) => ({
+      options: deduplicatedRegistry.map((entry) => ({
         value: entry.path,
         label: entry.name,
         hint: entry.path
@@ -15602,6 +15632,30 @@ async function runWarpNew(options, registry) {
   await writeShellOutput(WARP_OUTPUT_FILE_ENV, capturedPath, options.stdout);
   return 0;
 }
+async function deduplicateRegistryForNew(registry) {
+  const deduplicated = [];
+  const seenPaths = /* @__PURE__ */ new Set();
+  for (const entry of registry) {
+    const canonicalPath = await canonicalizeRepoPath2(entry.path);
+    if (seenPaths.has(canonicalPath)) {
+      continue;
+    }
+    seenPaths.add(canonicalPath);
+    deduplicated.push({
+      ...entry,
+      name: basename5(canonicalPath),
+      path: canonicalPath
+    });
+  }
+  return deduplicated;
+}
+async function canonicalizeRepoPath2(repoPath) {
+  try {
+    return await realpath2(repoPath);
+  } catch {
+    return resolve5(repoPath);
+  }
+}
 function findByQuery(items, query) {
   const slashIdx = query.indexOf("/");
   if (slashIdx !== -1) {
@@ -15746,7 +15800,7 @@ function createGoCommand(dependencies = {}) {
     await runHook(
       hooks.afterEnter,
       resolvedPath,
-      { branch: chosenWorktree?.branch ?? void 0, path: resolvedPath, repo: basename5(repository.repoRoot) },
+      { branch: chosenWorktree?.branch ?? void 0, path: resolvedPath, repo: basename6(repository.repoRoot) },
       options.stderr
     );
     appendHistory(resolvedPath, chosenWorktree?.branch ?? null).catch(() => void 0);
@@ -16320,7 +16374,7 @@ function sortWorktrees(worktrees) {
 
 // src/pr.ts
 import { mkdir as mkdir7 } from "node:fs/promises";
-import { basename as basename6, dirname as dirname8 } from "node:path";
+import { basename as basename7, dirname as dirname8 } from "node:path";
 import { execFile as execFile5 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 var execFileAsync5 = promisify6(execFile5);
@@ -16422,7 +16476,7 @@ function createPrCommand(dependencies = {}) {
     await runHook(
       hooks.afterCreate,
       worktreePath,
-      { branch: branchName, path: worktreePath, repo: basename6(repository.repoRoot) },
+      { branch: branchName, path: worktreePath, repo: basename7(repository.repoRoot) },
       options.stderr
     );
     if (options.json) {
@@ -16495,7 +16549,7 @@ async function writeOutput2(worktreePath, stdout) {
 }
 
 // src/remove.ts
-import { basename as basename7 } from "node:path";
+import { basename as basename8 } from "node:path";
 var REMOVE_OUTPUT_FILE_ENV = "GJI_REMOVE_OUTPUT_FILE";
 function createRemoveCommand(dependencies = {}) {
   const promptForWorktree2 = dependencies.promptForWorktree ?? defaultPromptForWorktree2;
@@ -16560,7 +16614,7 @@ function createRemoveCommand(dependencies = {}) {
     await runHook(
       hooks.beforeRemove,
       worktree.path,
-      { branch: worktree.branch ?? void 0, path: worktree.path, repo: basename7(repository.repoRoot) },
+      { branch: worktree.branch ?? void 0, path: worktree.path, repo: basename8(repository.repoRoot) },
       options.stderr
     );
     try {

package/dist/repo-registry.js

@@ -1,4 +1,4 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, realpath, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, dirname, join, resolve } from 'node:path';
 import { GLOBAL_CONFIG_DIRECTORY } from './config.js';
@@ -24,22 +24,48 @@ export async function loadRegistry(home = homedir()) {
         return [];
     }
 }
+async function canonicalizeRepoPath(repoPath) {
+    try {
+        return await realpath(repoPath);
+    }
+    catch {
+        return resolve(repoPath);
+    }
+}
 export async function registerRepo(repoPath, home = homedir()) {
     const registryPath = REGISTRY_FILE_PATH(home);
-    const existing = await loadRegistry(home);
+    const existing = await normalizeRegistryForWrite(await loadRegistry(home));
+    const canonicalRepoPath = await canonicalizeRepoPath(repoPath);
     // Skip write if this repo is already the most-recently-used entry (common case).
-    if (existing.length > 0 && existing[0].path === repoPath)
+    if (existing.length > 0 && existing[0].path === canonicalRepoPath)
         return;
     const entry = {
         lastUsed: Date.now(),
-        name: basename(repoPath),
-        path: repoPath,
+        name: basename(canonicalRepoPath),
+        path: canonicalRepoPath,
     };
-    const filtered = existing.filter((e) => e.path !== repoPath);
+    const filtered = existing.filter((e) => e.path !== canonicalRepoPath);
     const next = [entry, ...filtered].slice(0, MAX_REGISTRY_ENTRIES);
     await mkdir(dirname(registryPath), { recursive: true });
     await writeFile(registryPath, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
 }
+async function normalizeRegistryForWrite(entries) {
+    const normalized = [];
+    const seenPaths = new Set();
+    for (const entry of entries) {
+        const canonicalPath = await canonicalizeRepoPath(entry.path);
+        if (seenPaths.has(canonicalPath)) {
+            continue;
+        }
+        seenPaths.add(canonicalPath);
+        normalized.push({
+            ...entry,
+            name: basename(canonicalPath),
+            path: canonicalPath,
+        });
+    }
+    return normalized;
+}
 function isRegistryEntry(value) {
     return (typeof value === 'object' &&
         value !== null &&

package/dist/warp.js

@@ -1,4 +1,6 @@
 import { isCancel, select } from '@clack/prompts';
+import { realpath } from 'node:fs/promises';
+import { basename, resolve } from 'node:path';
 import { readWorktreeHealth } from './git.js';
 import { isHeadless } from './headless.js';
 import { appendHistory } from './history.js';
@@ -43,9 +45,10 @@ async function runWarpNavigate(options) {
     return 0;
 }
 async function runWarpNew(options, registry) {
+    const deduplicatedRegistry = await deduplicateRegistryForNew(registry);
     let targetRepoRoot;
-    if (registry.length === 1) {
-        targetRepoRoot = registry[0].path;
+    if (deduplicatedRegistry.length === 1) {
+        targetRepoRoot = deduplicatedRegistry[0].path;
     }
     else {
         if (isHeadless()) {
@@ -54,7 +57,7 @@ async function runWarpNew(options, registry) {
         }
         const choice = await select({
             message: 'Create worktree in which repo?',
-            options: registry.map((entry) => ({
+            options: deduplicatedRegistry.map((entry) => ({
                 value: entry.path,
                 label: entry.name,
                 hint: entry.path,
@@ -98,6 +101,31 @@ async function runWarpNew(options, registry) {
     await writeShellOutput(WARP_OUTPUT_FILE_ENV, capturedPath, options.stdout);
     return 0;
 }
+async function deduplicateRegistryForNew(registry) {
+    const deduplicated = [];
+    const seenPaths = new Set();
+    for (const entry of registry) {
+        const canonicalPath = await canonicalizeRepoPath(entry.path);
+        if (seenPaths.has(canonicalPath)) {
+            continue;
+        }
+        seenPaths.add(canonicalPath);
+        deduplicated.push({
+            ...entry,
+            name: basename(canonicalPath),
+            path: canonicalPath,
+        });
+    }
+    return deduplicated;
+}
+async function canonicalizeRepoPath(repoPath) {
+    try {
+        return await realpath(repoPath);
+    }
+    catch {
+        return resolve(repoPath);
+    }
+}
 function findByQuery(items, query) {
     const slashIdx = query.indexOf('/');
     if (slashIdx !== -1) {

package/man/man1/gji-back.1

@@ -1,4 +1,4 @@
-.TH GJI\-BACK 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-BACK 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-back \- navigate to the previously visited worktree, optionally N steps back
 .SH SYNOPSIS

package/man/man1/gji-clean.1

@@ -1,4 +1,4 @@
-.TH GJI\-CLEAN 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-CLEAN 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-clean \- interactively prune linked worktrees
 .SH SYNOPSIS

package/man/man1/gji-completion.1

@@ -1,4 +1,4 @@
-.TH GJI\-COMPLETION 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-COMPLETION 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-completion \- print shell completion definitions
 .SH SYNOPSIS

package/man/man1/gji-config.1

@@ -1,4 +1,4 @@
-.TH GJI\-CONFIG 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-CONFIG 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-config \- manage global config defaults
 .SH SYNOPSIS

package/man/man1/gji-go.1

@@ -1,4 +1,4 @@
-.TH GJI\-GO 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-GO 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-go \- print or select a worktree path
 .SH SYNOPSIS

package/man/man1/gji-history.1

@@ -1,4 +1,4 @@
-.TH GJI\-HISTORY 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-HISTORY 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-history \- show navigation history
 .SH SYNOPSIS

package/man/man1/gji-init.1

@@ -1,4 +1,4 @@
-.TH GJI\-INIT 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-INIT 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-init \- print or install shell integration
 .SH SYNOPSIS

package/man/man1/gji-ls.1

@@ -1,4 +1,4 @@
-.TH GJI\-LS 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-LS 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-ls \- list active worktrees
 .SH SYNOPSIS

package/man/man1/gji-new.1

@@ -1,4 +1,4 @@
-.TH GJI\-NEW 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-NEW 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-new \- create a new branch or detached linked worktree
 .SH SYNOPSIS

package/man/man1/gji-open.1

@@ -1,4 +1,4 @@
-.TH GJI\-OPEN 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-OPEN 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-open \- open the worktree in an editor
 .SH SYNOPSIS

package/man/man1/gji-pr.1

@@ -1,4 +1,4 @@
-.TH GJI\-PR 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-PR 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-pr \- fetch a pull request by number, #number, or URL into a linked worktree
 .SH SYNOPSIS

package/man/man1/gji-remove.1

@@ -1,4 +1,4 @@
-.TH GJI\-REMOVE 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-REMOVE 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-remove \- remove a linked worktree and delete its branch when present
 .SH SYNOPSIS

package/man/man1/gji-root.1

@@ -1,4 +1,4 @@
-.TH GJI\-ROOT 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-ROOT 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-root \- print the main repository root path
 .SH SYNOPSIS

package/man/man1/gji-status.1

@@ -1,4 +1,4 @@
-.TH GJI\-STATUS 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-STATUS 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-status \- summarize repository and worktree health
 .SH SYNOPSIS

package/man/man1/gji-sync.1

@@ -1,4 +1,4 @@
-.TH GJI\-SYNC 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-SYNC 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-sync \- fetch and update one or all worktrees
 .SH SYNOPSIS

package/man/man1/gji-trigger-hook.1

@@ -1,4 +1,4 @@
-.TH GJI\-TRIGGER\-HOOK 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-TRIGGER\-HOOK 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-trigger\-hook \- run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree
 .SH SYNOPSIS

package/man/man1/gji-warp.1

@@ -1,4 +1,4 @@
-.TH GJI\-WARP 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI\-WARP 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji\-warp \- jump to any worktree across all known repos
 .SH SYNOPSIS

package/man/man1/gji.1

@@ -1,4 +1,4 @@
-.TH GJI 1 "May 2026" "gji 0.6.1" "User Commands"
+.TH GJI 1 "May 2026" "gji 0.6.2" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solaqua/gji",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Git worktree CLI for fast context switching.",
   "license": "MIT",
   "author": "sjquant",