@solaqua/gji 0.7.1 → 0.7.2

package/dist/worktree-picker.d.ts

@@ -0,0 +1,14 @@
+import type { WorktreeEntry } from "./repo.js";
+export interface WorktreePromptSource {
+    repoName: string;
+    worktree: WorktreeEntry;
+}
+export interface WorktreePromptEntry extends WorktreeEntry {
+    group: "recent" | "other";
+    label: string;
+    repoName: string;
+}
+export declare function buildWorktreePromptEntries(sources: WorktreePromptSource[]): Promise<WorktreePromptEntry[]>;
+export declare function resolveWorktreeQuery(sources: WorktreePromptSource[], query: string): WorktreePromptSource | null;
+export declare function promptForSingleWorktree(message: string, worktrees: WorktreePromptEntry[]): Promise<string | null>;
+export declare function promptForMultipleWorktrees(message: string, worktrees: WorktreePromptEntry[]): Promise<string[] | null>;

package/dist/worktree-picker.js

@@ -0,0 +1,228 @@
+import { groupMultiselect, isCancel, select } from "@clack/prompts";
+import { loadHistory } from "./history.js";
+import { readWorktreeInfos, } from "./worktree-info.js";
+export async function buildWorktreePromptEntries(sources) {
+    const [history, infos] = await Promise.all([
+        loadHistory(),
+        readWorktreeInfos(sources.map((source) => source.worktree)),
+    ]);
+    const historyByPath = new Map(history.map((entry) => [entry.path, entry]));
+    const entries = sources.map((source, index) => buildWorktreePromptEntry(source, infos[index], historyByPath.get(source.worktree.path)?.timestamp ?? null, Date.now()));
+    return entries
+        .sort(comparePromptEntries)
+        .map(({ lastActivityTimestamp: _lastActivityTimestamp, ...entry }) => entry);
+}
+export function resolveWorktreeQuery(sources, query) {
+    const normalizedQuery = normalizeQuery(query);
+    if (normalizedQuery === null)
+        return null;
+    const matches = findWorktreePromptSourceMatches(sources, normalizedQuery);
+    if (isAmbiguousRepoOnlyQuery(matches, normalizedQuery))
+        return null;
+    return matches[0]?.source ?? null;
+}
+function findWorktreePromptSourceMatches(sources, normalizedQuery) {
+    return sources
+        .flatMap((source) => {
+        const matchScore = scoreWorktreeMatch({
+            ...source.worktree,
+            repoName: source.repoName,
+        }, normalizedQuery);
+        return matchScore === null ? [] : [{ matchScore, source }];
+    })
+        .sort(compareQueryMatches);
+}
+function isAmbiguousRepoOnlyQuery(matches, query) {
+    if (matches[0]?.matchScore === 1000)
+        return false;
+    return (matches.filter((match) => match.source.repoName.toLowerCase() === query)
+        .length > 1);
+}
+export async function promptForSingleWorktree(message, worktrees) {
+    const choice = await select({
+        message,
+        options: worktrees.map((worktree) => ({
+            label: worktree.label,
+            value: worktree.path,
+        })),
+        maxItems: 12,
+    });
+    return isCancel(choice) ? null : choice;
+}
+export async function promptForMultipleWorktrees(message, worktrees) {
+    const choice = await groupMultiselect({
+        message,
+        options: groupPromptEntries(worktrees),
+        required: true,
+        selectableGroups: false,
+    });
+    return isCancel(choice) ? null : choice;
+}
+function compareQueryMatches(a, b) {
+    if (a.matchScore !== b.matchScore) {
+        return b.matchScore - a.matchScore;
+    }
+    if (a.source.worktree.isCurrent && !b.source.worktree.isCurrent)
+        return -1;
+    if (!a.source.worktree.isCurrent && b.source.worktree.isCurrent)
+        return 1;
+    return (a.source.repoName.localeCompare(b.source.repoName) ||
+        (a.source.worktree.branch ?? "").localeCompare(b.source.worktree.branch ?? "") ||
+        a.source.worktree.path.localeCompare(b.source.worktree.path));
+}
+function groupPromptEntries(worktrees) {
+    const groups = {};
+    for (const worktree of worktrees) {
+        const group = worktree.group === "recent" ? "Recent worktrees" : "Other worktrees";
+        groups[group] ??= [];
+        groups[group].push({
+            label: worktree.label,
+            value: worktree.path,
+        });
+    }
+    return groups;
+}
+function buildWorktreePromptEntry(source, info, lastUsedTimestamp, now) {
+    const lastWorkedTimestamp = info.lastCommitTimestamp === null ? null : info.lastCommitTimestamp * 1000;
+    const lastActivityTimestamp = lastUsedTimestamp ?? lastWorkedTimestamp;
+    const lastActivityType = lastUsedTimestamp !== null
+        ? "used"
+        : lastWorkedTimestamp !== null
+            ? "worked"
+            : null;
+    const branch = source.worktree.branch ?? "(detached)";
+    const badges = buildStatusBadges(info);
+    const recency = formatPromptRecency(lastActivityTimestamp, lastActivityType, now);
+    const status = badges.length > 0 ? badges.map((badge) => `[${badge}]`).join(" ") : null;
+    const path = middleEllipsize(source.worktree.path, 76);
+    const label = [
+        middleEllipsize(source.repoName, 22),
+        middleEllipsize(branch, 34),
+        status,
+        recency,
+        path,
+    ]
+        .filter((part) => part !== null && part.length > 0)
+        .join(" · ");
+    return {
+        ...source.worktree,
+        group: lastUsedTimestamp !== null ? "recent" : "other",
+        label,
+        lastActivityTimestamp,
+        repoName: source.repoName,
+    };
+}
+function buildStatusBadges(info) {
+    const badges = [];
+    if (info.isCurrent) {
+        badges.push("current");
+    }
+    if (info.branch === null) {
+        badges.push("detached");
+    }
+    if (info.status === "dirty") {
+        badges.push("dirty");
+    }
+    if (info.upstream.kind === "stale") {
+        badges.push("stale", "gone");
+    }
+    if (isUpToDate(info.upstream)) {
+        badges.push("up to date");
+    }
+    return badges;
+}
+function isUpToDate(upstream) {
+    return (upstream.kind === "tracked" && upstream.ahead === 0 && upstream.behind === 0);
+}
+function formatPromptRecency(timestamp, type, now) {
+    if (timestamp === null || type === null) {
+        return "last used: never";
+    }
+    const label = type === "used" ? "last used" : "last worked";
+    return `${label}: ${formatPickerAge(timestamp, now)}`;
+}
+function formatPickerAge(timestamp, now) {
+    const ageSeconds = Math.max(0, Math.floor((now - timestamp) / 1000));
+    if (ageSeconds < 60) {
+        return "now";
+    }
+    if (ageSeconds < 60 * 60) {
+        return `${Math.floor(ageSeconds / 60)}m ago`;
+    }
+    if (ageSeconds < 24 * 60 * 60) {
+        return `${Math.floor(ageSeconds / (60 * 60))}h ago`;
+    }
+    if (isYesterday(timestamp, now)) {
+        return "yesterday";
+    }
+    return new Intl.DateTimeFormat("en-US", {
+        day: "numeric",
+        month: "short",
+    }).format(new Date(timestamp));
+}
+function isYesterday(timestamp, now) {
+    const date = new Date(timestamp);
+    const yesterday = new Date(now);
+    yesterday.setDate(yesterday.getDate() - 1);
+    return (date.getFullYear() === yesterday.getFullYear() &&
+        date.getMonth() === yesterday.getMonth() &&
+        date.getDate() === yesterday.getDate());
+}
+function buildSearchText(repoName, worktree) {
+    return [
+        repoName,
+        worktree.branch ?? "detached",
+        worktree.path,
+        `${repoName}/${worktree.branch ?? "detached"}`,
+    ]
+        .join(" ")
+        .toLowerCase();
+}
+function normalizeQuery(query) {
+    const normalized = query?.trim().toLowerCase();
+    return normalized && normalized.length > 0 ? normalized : null;
+}
+function comparePromptEntries(a, b) {
+    if (a.isCurrent && !b.isCurrent)
+        return -1;
+    if (!a.isCurrent && b.isCurrent)
+        return 1;
+    if (a.group !== b.group) {
+        return groupRank(a.group) - groupRank(b.group);
+    }
+    const aRecent = a.lastActivityTimestamp ?? 0;
+    const bRecent = b.lastActivityTimestamp ?? 0;
+    if (aRecent !== bRecent) {
+        return bRecent - aRecent;
+    }
+    return (a.repoName.localeCompare(b.repoName) ||
+        (a.branch ?? "").localeCompare(b.branch ?? "") ||
+        a.path.localeCompare(b.path));
+}
+function groupRank(group) {
+    return group === "recent" ? 0 : 1;
+}
+function scoreWorktreeMatch(entry, query) {
+    const branch = entry.branch ?? "detached";
+    const exactCandidates = [
+        branch,
+        entry.path,
+        `${entry.repoName}/${branch}`,
+    ].map((candidate) => candidate.toLowerCase());
+    if (exactCandidates.includes(query)) {
+        return 1000;
+    }
+    return buildSearchText(entry.repoName, entry).includes(query) ? 1 : null;
+}
+function middleEllipsize(value, maxLength) {
+    if (value.length <= maxLength) {
+        return value;
+    }
+    if (maxLength <= 1) {
+        return "…";
+    }
+    const keep = maxLength - 1;
+    const start = Math.ceil(keep / 2);
+    const end = Math.floor(keep / 2);
+    return `${value.slice(0, start)}…${value.slice(value.length - end)}`;
+}

package/man/man1/gji-back.1

@@ -1,4 +1,4 @@
-.TH GJI\-BACK 1 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-BACK 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-CLEAN 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-COMPLETION 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-CONFIG 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-GO 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-HISTORY 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-INIT 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-LS 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-NEW 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-OPEN 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-PR 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-REMOVE 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-ROOT 1 "June 2026" "gji 0.7.2" "User Commands"
 .SH NAME
 gji\-root \- print the main repository root path
 .SH SYNOPSIS

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

@@ -1,4 +1,4 @@
-.TH GJI\-RUN\-HOOK 1 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-RUN\-HOOK 1 "June 2026" "gji 0.7.2" "User Commands"
 .SH NAME
 gji\-run\-hook \- run a named hook (after\-create, after\-enter, before\-remove) in the current worktree
 .SH SYNOPSIS

package/man/man1/gji-status.1

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

package/man/man1/gji-sync-files.1

@@ -1,4 +1,4 @@
-.TH GJI\-SYNC\-FILES 1 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-SYNC\-FILES 1 "June 2026" "gji 0.7.2" "User Commands"
 .SH NAME
 gji\-sync\-files \- manage local files copied into new worktrees
 .SH SYNOPSIS

package/man/man1/gji-sync.1

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

package/man/man1/gji-warp.1

@@ -1,4 +1,4 @@
-.TH GJI\-WARP 1 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI\-WARP 1 "June 2026" "gji 0.7.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 "June 2026" "gji 0.7.1" "User Commands"
+.TH GJI 1 "June 2026" "gji 0.7.2" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@solaqua/gji",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Git worktree CLI for fast context switching.",
   "license": "MIT",
   "author": "sjquant",
   "type": "module",
-  "packageManager": "pnpm@10.6.3",
+  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
   "homepage": "https://github.com/sjquant/gji#readme",
   "bugs": {
     "url": "https://github.com/sjquant/gji/issues"
@@ -66,12 +66,8 @@
     "@j178/prek": "^0.3.13",
     "@types/node": "^24.6.0",
     "esbuild": "^0.27.0",
+    "tsx": "^4.22.4",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "esbuild"
-    ]
   }
 }