@solaqua/gji 0.12.5 → 0.13.0

package/dist/{worktree-picker.js → presentation/worktree/picker.js}

@@ -1,13 +1,8 @@
 import { env, platform, stdin, stdout } from "node:process";
 import { isCancel, Prompt } from "@clack/core";
 import { spinner } from "@clack/prompts";
-import { loadHistory } from "./history.js";
-import { createPullRequestQuery, } from "./pull-requests.js";
-import { readTask } from "./task.js";
-import { middleEllipsize, sanitizeTerminalText, startEllipsize, terminalWidth, } from "./terminal-text.js";
-import { readWorktreeInfos, } from "./worktree-info.js";
-const MAX_PULL_REQUEST_REPOSITORY_QUERY_CONCURRENCY = 4;
-const MAX_TASK_READ_CONCURRENCY = 8;
+import { loadWorktreeCatalog, } from "../../application/worktree/catalog.js";
+import { middleEllipsize, sanitizeTerminalText, startEllipsize, terminalWidth, } from "../terminal/text.js";
 export async function buildWorktreePromptEntries(sources, dependencies = {}) {
     const loading = stdin.isTTY === true && stdout.isTTY === true && stdin.isRaw !== true
         ? spinner({ indicator: "timer" })
@@ -22,91 +17,14 @@ export async function buildWorktreePromptEntries(sources, dependencies = {}) {
 }
 async function buildWorktreePromptEntriesWithoutLoading(sources, dependencies) {
     const metadataMode = dependencies.metadata ?? "full";
-    const includeMetadata = metadataMode === "full";
-    const pullRequestQuery = createPullRequestQuery();
-    const queryPullRequests = dependencies.queryPullRequests ?? pullRequestQuery.listOpenPullRequests;
-    const queryRepositoryPullRequests = includeMetadata
-        ? (dependencies.queryRepositoryPullRequests ??
-            (dependencies.queryPullRequests === undefined
-                ? pullRequestQuery.listOpenPullRequestsForRepository
-                : undefined))
-        : undefined;
-    const repositoryPullRequests = queryRepositoryPullRequests === undefined
-        ? Promise.resolve(null)
-        : readRepositoryPullRequests(sources, queryRepositoryPullRequests);
-    const [history, infos, pullRequestsByRepository] = await Promise.all([
-        loadHistory(),
-        includeMetadata
-            ? readWorktreeInfos(sources.map((source) => source.worktree))
-            : mapWithConcurrency(sources, MAX_TASK_READ_CONCURRENCY, (source) => createUnhydratedWorktreeInfo(source.worktree)),
-        repositoryPullRequests,
-    ]);
-    const pullRequests = includeMetadata
-        ? await Promise.all(sources.map((source) => readSourcePullRequests(source, queryPullRequests, pullRequestsByRepository)))
-        : sources.map(() => []);
-    const historyByPath = new Map(history.map((entry) => [entry.path, entry]));
-    const entries = sources.map((source, index) => buildWorktreePromptEntry(source, infos[index], pullRequests[index], historyByPath.get(source.worktree.path)?.timestamp ?? null, Date.now()));
+    const hydrated = await loadWorktreeCatalog(sources, metadataMode, dependencies.catalog ?? missingCatalogDependencies());
+    const entries = hydrated.map(({ info, lastUsedTimestamp, pullRequests, source }) => buildWorktreePromptEntry(source, info, pullRequests, lastUsedTimestamp, Date.now()));
     return entries
         .sort(comparePromptEntries)
         .map(({ lastActivityTimestamp: _lastActivityTimestamp, ...entry }) => entry);
 }
-async function createUnhydratedWorktreeInfo(worktree) {
-    let task = null;
-    try {
-        task = (await readTask(worktree.path))?.task ?? null;
-    }
-    catch {
-        // Task metadata is optional picker decoration.
-    }
-    return {
-        ...worktree,
-        lastCommitTimestamp: null,
-        slot: null,
-        status: "unknown",
-        task,
-        upstream: { kind: "unknown" },
-    };
-}
-export function resolveWorktreeQuery(sources, query) {
-    return resolveWorktreeQueryMatches(sources, query)[0] ?? null;
-}
-export function resolveWorktreeQueryMatches(sources, query) {
-    const normalizedQuery = normalizeQuery(query);
-    if (normalizedQuery === null)
-        return [];
-    const matches = findWorktreePromptSourceMatches(sources, normalizedQuery);
-    if (isAmbiguousRepoOnlyQuery(matches, normalizedQuery))
-        return [];
-    const bestScore = matches[0]?.matchScore;
-    return matches
-        .filter((match) => match.matchScore === bestScore)
-        .map((match) => match.source);
-}
-export function resolveExactWorktreeQueryMatches(sources, query) {
-    const normalizedQuery = normalizeQuery(query);
-    if (normalizedQuery === null)
-        return [];
-    return sources.filter((source) => scoreWorktreeMatch({
-        ...source.worktree,
-        repoName: source.repoName,
-    }, normalizedQuery) === 1000);
-}
-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);
+function missingCatalogDependencies() {
+    throw new Error("Worktree picker hydration must be supplied by the application composition root");
 }
 export async function promptForSingleWorktree(message, worktrees, io = {}) {
     const choice = await runSearchablePrompt({
@@ -129,18 +47,6 @@ export async function promptForMultipleWorktrees(message, worktrees, io = {}) {
     });
     return Array.isArray(choice) ? choice : null;
 }
-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 = new Map();
     for (const worktree of worktrees) {
@@ -605,7 +511,7 @@ class SearchablePrompt {
         return index === -1 ? 0 : index;
     }
     visibleEntries() {
-        const query = normalizeQuery(this.query);
+        const query = normalizePromptQuery(this.query);
         if (query === null) {
             return this.entries;
         }
@@ -940,61 +846,6 @@ function buildWorktreePromptEntry(source, info, pullRequests, lastUsedTimestamp,
         task: info.task,
     };
 }
-async function readSourcePullRequests(source, queryPullRequests, pullRequestsByRepository) {
-    if (source.repoRoot === undefined || source.worktree.branch === null) {
-        return [];
-    }
-    if (pullRequestsByRepository !== null) {
-        return sortSourcePullRequests(pullRequestsByRepository
-            .get(source.repoRoot)
-            ?.filter((pullRequest) => pullRequest.sourceBranch === source.worktree.branch));
-    }
-    try {
-        const pullRequests = await queryPullRequests(source.repoRoot, source.worktree.branch);
-        return sortSourcePullRequests(pullRequests);
-    }
-    catch {
-        // PR metadata is optional selector decoration; preserve the worktree entry on lookup failures.
-        return [];
-    }
-}
-async function readRepositoryPullRequests(sources, queryPullRequests) {
-    const repoRoots = [
-        ...new Set(sources.flatMap((source) => source.repoRoot === undefined || source.worktree.branch === null
-            ? []
-            : [source.repoRoot])),
-    ];
-    const results = await mapWithConcurrency(repoRoots, MAX_PULL_REQUEST_REPOSITORY_QUERY_CONCURRENCY, async (repoRoot) => {
-        try {
-            return [
-                repoRoot,
-                sortSourcePullRequests(await queryPullRequests(repoRoot)),
-            ];
-        }
-        catch {
-            return [repoRoot, []];
-        }
-    });
-    return new Map(results);
-}
-async function mapWithConcurrency(items, limit, mapper) {
-    const results = new Array(items.length);
-    let nextIndex = 0;
-    async function readNext() {
-        for (;;) {
-            const index = nextIndex;
-            nextIndex += 1;
-            if (index >= items.length)
-                return;
-            results[index] = await mapper(items[index]);
-        }
-    }
-    await Promise.all(Array.from({ length: Math.min(limit, items.length) }, () => readNext()));
-    return results;
-}
-function sortSourcePullRequests(pullRequests) {
-    return [...(pullRequests ?? [])].sort((a, b) => a.number - b.number);
-}
 export function formatWorktreeBranchLabel(branch, pullRequests = []) {
     const branchLabel = branch ?? "(detached)";
     if (pullRequests.length === 0)
@@ -1064,20 +915,6 @@ function isYesterday(timestamp, now) {
         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;
@@ -1095,18 +932,10 @@ function comparePromptEntries(a, b) {
         (a.branch ?? "").localeCompare(b.branch ?? "") ||
         a.path.localeCompare(b.path));
 }
+function normalizePromptQuery(query) {
+    const normalized = query?.trim().toLowerCase();
+    return normalized && normalized.length > 0 ? normalized : null;
+}
 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;
-}

package/man/man1/gji-back.1

@@ -1,4 +1,4 @@
-.TH GJI\-BACK 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-BACK 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-CLEAN 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-COMPLETION 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-CONFIG 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-config \- manage global config defaults
 .SH SYNOPSIS

package/man/man1/gji-doctor.1

@@ -1,4 +1,4 @@
-.TH GJI\-DOCTOR 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-DOCTOR 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-doctor \- check gji installation and configuration health
 .SH SYNOPSIS

package/man/man1/gji-done.1

@@ -1,4 +1,4 @@
-.TH GJI\-DONE 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-DONE 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-done \- finish the current linked worktree and return safely
 .SH SYNOPSIS

package/man/man1/gji-go.1

@@ -1,4 +1,4 @@
-.TH GJI\-GO 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-GO 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-go \- resolve and jump to a worktree path
 .SH SYNOPSIS

package/man/man1/gji-history.1

@@ -1,4 +1,4 @@
-.TH GJI\-HISTORY 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-HISTORY 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-INIT 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-init \- set up shell integration interactively or print a shell wrapper
 .SH SYNOPSIS

package/man/man1/gji-ls.1

@@ -1,4 +1,4 @@
-.TH GJI\-LS 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-LS 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-ls \- list active worktrees
 .SH SYNOPSIS

package/man/man1/gji-new.1

@@ -1,10 +1,10 @@
-.TH GJI\-NEW 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-NEW 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
-gji\-new \- create a new branch or detached linked worktree
+gji\-new \- create a branch with an optional linked worktree
 .SH SYNOPSIS
 .B gji new [\fIoptions\fR] [options] [branch]
 .SH DESCRIPTION
-create a new branch or detached linked worktree
+create a branch with an optional linked worktree
 .SH BOOTSTRAP_POLICY
 dependencyBuildCommand overrides Cargo's default cargo check. Supported lockfiles are installed automatically in new worktrees; set dependencyBootstrap to off or pass \-\-no\-install to skip setup. Sync\-file failures stop dependency installation and after\-create hooks. JSON bootstrap events include structured reasons, and failed setup reports the created worktree path.
 
@@ -13,6 +13,9 @@ Dependency bootstrap never copies dependency trees or build caches. pnpm, Yarn,
 
 .SH OPTIONS
 .TP
+.B \-\-branch\-only
+update the default branch and create the new branch in the current worktree
+.TP
 .B \-f, \-\-force
 remove and recreate the worktree if the target path already exists
 .TP

package/man/man1/gji-open.1

@@ -1,4 +1,4 @@
-.TH GJI\-OPEN 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-OPEN 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-PR 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-REMOVE 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-remove \- deprecated: use gji done for one worktree or gji clean for bulk cleanup
 .SH SYNOPSIS

package/man/man1/gji-root.1

@@ -1,4 +1,4 @@
-.TH GJI\-ROOT 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-ROOT 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-RUN\-HOOK 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-STATUS 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-SYNC\-FILES 1 "August 2026" "gji 0.13.0" "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 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-SYNC 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-sync \- fetch and update one or all worktrees
 .SH SYNOPSIS

package/man/man1/gji-task.1

@@ -1,4 +1,4 @@
-.TH GJI\-TASK 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-TASK 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-task \- show or update the current worktree task
 .SH SYNOPSIS

package/man/man1/gji-undo.1

@@ -1,4 +1,4 @@
-.TH GJI\-UNDO 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-UNDO 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-undo \- restore the most recent destructive worktree operation
 .SH SYNOPSIS

package/man/man1/gji-warp.1

@@ -1,4 +1,4 @@
-.TH GJI\-WARP 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI\-WARP 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji\-warp \- deprecated: use gji go (press Tab for all known repos)
 .SH SYNOPSIS

package/man/man1/gji.1

@@ -1,4 +1,4 @@
-.TH GJI 1 "August 2026" "gji 0.12.5" "User Commands"
+.TH GJI 1 "August 2026" "gji 0.13.0" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS
@@ -12,7 +12,7 @@ eliminating the need for \fBgit stash\fR when switching contexts.
 .SH COMMANDS
 .TP
 .B new [options] [branch]
-create a new branch or detached linked worktree
+create a branch with an optional linked worktree
 .TP
 .B done [options] [branch]
 finish the current linked worktree and return safely

package/package.json

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

package/dist/bootstrap-preview.d.ts

@@ -1,9 +0,0 @@
-import type { DependencyBootstrapMode } from "./dependency-bootstrap.js";
-import { type DependencyBootstrapPreview } from "./dependency-bootstrap.js";
-export declare function createDependencyBootstrapPreview(mode: DependencyBootstrapMode, context: {
-    repoRoot: string;
-    currentRoot?: string;
-    worktreePath: string;
-    cargoBuildCommand?: string;
-}): Promise<DependencyBootstrapPreview>;
-export declare function formatDependencyBootstrapPreview(preview: DependencyBootstrapPreview | undefined): string;

package/dist/context-card.d.ts

@@ -1 +0,0 @@
-export declare function renderContextCard(worktreePath: string): Promise<string | null>;

package/dist/format-bytes.d.ts

@@ -1 +0,0 @@
-export declare function formatBytes(bytes: number | undefined): string;

package/dist/format-bytes.js

@@ -1,14 +0,0 @@
-export function formatBytes(bytes) {
-    if (bytes === undefined)
-        return "size unavailable";
-    if (bytes < 1024)
-        return `${bytes} B`;
-    const units = ["KB", "MB", "GB", "TB"];
-    let value = bytes;
-    let unit = -1;
-    while (value >= 1024 && unit < units.length - 1) {
-        value /= 1024;
-        unit += 1;
-    }
-    return `${value.toFixed(value >= 10 ? 0 : 1)} ${units[unit]}`;
-}

package/dist/git.d.ts

@@ -1,18 +0,0 @@
-export interface WorktreeHealth {
-    ahead: number;
-    behind: number;
-    hasUpstream: boolean;
-    upstreamGone: boolean;
-    status: "clean" | "dirty";
-}
-export interface RemoteBase {
-    branch: string;
-    ref: string;
-}
-export declare function runGit(cwd: string, args: string[]): Promise<string>;
-export declare function readWorktreeHealth(cwd: string): Promise<WorktreeHealth>;
-export declare function isDirtyWorktree(cwd: string): Promise<boolean>;
-export declare function isBranchMergedInto(cwd: string, branch: string, base?: string): Promise<boolean>;
-export declare function resolveRemoteDefaultBranch(cwd: string, remote: string): Promise<string | null>;
-export declare function resolveRemoteBase(cwd: string, remote: string, configuredBranch?: string): Promise<RemoteBase | null>;
-export declare function readBranchLastCommitTimestamp(cwd: string, branch: string): Promise<number | null>;

package/dist/repo.d.ts

@@ -1,20 +0,0 @@
-export interface RepositoryContext {
-    currentRoot: string;
-    gitCommonDir: string;
-    isWorktree: boolean;
-    repoName: string;
-    repoRoot: string;
-}
-export interface WorktreeEntry {
-    branch: string | null;
-    isCurrent: boolean;
-    path: string;
-}
-export declare function detectRepository(cwd: string): Promise<RepositoryContext>;
-export declare function worktreeGitDir(worktreePath: string): Promise<string>;
-export declare function resolveWorktreePath(repoRoot: string, branch: string, basePath?: string): string;
-export declare function validateBranchName(name: string): string | null;
-export declare function hasLocalBranch(repoRoot: string, branch: string): Promise<boolean>;
-export declare function hasRemoteBranch(repoRoot: string, remote: string, branch: string): Promise<boolean>;
-export declare function getRepositoryRemoteUrl(repoRoot: string, remote: string): Promise<string | null>;
-export declare function listWorktrees(cwd: string): Promise<WorktreeEntry[]>;