@solaqua/gji 0.8.0 → 0.9.0

package/dist/worktree-picker.js

@@ -1,14 +1,27 @@
 import { env, platform, stdin, stdout } from "node:process";
 import { isCancel, Prompt } from "@clack/core";
 import { loadHistory } from "./history.js";
+import { createPullRequestQuery, } from "./pull-requests.js";
 import { readWorktreeInfos, } from "./worktree-info.js";
-export async function buildWorktreePromptEntries(sources) {
-    const [history, infos] = await Promise.all([
+const MAX_PULL_REQUEST_REPOSITORY_QUERY_CONCURRENCY = 4;
+export async function buildWorktreePromptEntries(sources, dependencies = {}) {
+    const pullRequestQuery = createPullRequestQuery();
+    const queryPullRequests = dependencies.queryPullRequests ?? pullRequestQuery.listOpenPullRequests;
+    const queryRepositoryPullRequests = dependencies.queryRepositoryPullRequests ??
+        (dependencies.queryPullRequests === undefined
+            ? pullRequestQuery.listOpenPullRequestsForRepository
+            : undefined);
+    const repositoryPullRequests = queryRepositoryPullRequests === undefined
+        ? Promise.resolve(null)
+        : readRepositoryPullRequests(sources, queryRepositoryPullRequests);
+    const [history, infos, pullRequestsByRepository] = await Promise.all([
         loadHistory(),
         readWorktreeInfos(sources.map((source) => source.worktree)),
+        repositoryPullRequests,
     ]);
+    const pullRequests = await Promise.all(sources.map((source) => readSourcePullRequests(source, queryPullRequests, pullRequestsByRepository)));
     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()));
+    const entries = sources.map((source, index) => buildWorktreePromptEntry(source, infos[index], pullRequests[index], historyByPath.get(source.worktree.path)?.timestamp ?? null, Date.now()));
     return entries
         .sort(comparePromptEntries)
         .map(({ lastActivityTimestamp: _lastActivityTimestamp, ...entry }) => entry);
@@ -110,7 +123,7 @@ function buildSearchableWorktreeEntry(worktree) {
         searchText: buildPromptSearchText(worktree),
         value: worktree.path,
         worktree: {
-            branch,
+            branch: formatWorktreeBranchLabel(worktree.branch, worktree.pullRequestNumbers),
             metadata,
             path: worktree.path,
             repoName: worktree.repoName,
@@ -715,11 +728,13 @@ function buildPromptSearchText(worktree) {
         worktree.path,
         worktree.label,
         `${worktree.repoName}/${worktree.branch ?? "detached"}`,
+        ...(worktree.pullRequestNumbers ?? []).map((number) => `#${number}`),
+        ...(worktree.pullRequestUrls ?? []),
     ]
         .join(" ")
         .toLowerCase();
 }
-function buildWorktreePromptEntry(source, info, lastUsedTimestamp, now) {
+function buildWorktreePromptEntry(source, info, pullRequests, lastUsedTimestamp, now) {
     const lastWorkedTimestamp = info.lastCommitTimestamp === null ? null : info.lastCommitTimestamp * 1000;
     const lastActivityTimestamp = lastUsedTimestamp ?? lastWorkedTimestamp;
     const lastActivityType = lastUsedTimestamp !== null
@@ -727,7 +742,7 @@ function buildWorktreePromptEntry(source, info, lastUsedTimestamp, now) {
         : lastWorkedTimestamp !== null
             ? "worked"
             : null;
-    const branch = source.worktree.branch ?? "(detached)";
+    const branch = formatWorktreeBranchLabel(source.worktree.branch, pullRequests.map((pullRequest) => pullRequest.number));
     const badges = buildStatusBadges(info);
     const recency = formatPromptRecency(lastActivityTimestamp, lastActivityType, now);
     const status = badges.length > 0 ? badges.map((badge) => `[${badge}]`).join(" ") : null;
@@ -748,9 +763,72 @@ function buildWorktreePromptEntry(source, info, lastUsedTimestamp, now) {
         label,
         lastActivityTimestamp,
         metadata,
+        pullRequestNumbers: pullRequests.map((pullRequest) => pullRequest.number),
+        pullRequestUrls: pullRequests.map((pullRequest) => pullRequest.url),
         repoName: source.repoName,
     };
 }
+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, pullRequestNumbers = []) {
+    const branchLabel = branch ?? "(detached)";
+    if (pullRequestNumbers.length === 0)
+        return branchLabel;
+    return `${branchLabel} (${pullRequestNumbers.map((number) => `#${number}`).join(", ")})`;
+}
 function buildStatusBadges(info) {
     const badges = [];
     if (info.isCurrent) {

package/man/man1/gji-back.1

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

package/man/man1/gji-doctor.1

@@ -0,0 +1,19 @@
+.TH GJI\-DOCTOR 1 "July 2026" "gji 0.9.0" "User Commands"
+.SH NAME
+gji\-doctor \- check gji installation and configuration health
+.SH SYNOPSIS
+.B gji doctor [\fIoptions\fR] [options]
+.SH DESCRIPTION
+check gji installation and configuration health
+.SH OPTIONS
+.TP
+.B \-\-fix
+apply safe automatic fixes after showing the plan
+.TP
+.B \-\-yes
+apply \-\-fix without prompting
+.TP
+.B \-\-json
+emit diagnostic checks as JSON
+.SH "SEE ALSO"
+.BR gji (1)

package/man/man1/gji-go.1

@@ -1,4 +1,4 @@
-.TH GJI\-GO 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-GO 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-HISTORY 1 "July 2026" "gji 0.9.0" "User Commands"
 .SH NAME
 gji\-history \- show navigation history
 .SH SYNOPSIS

package/man/man1/gji-init.1

@@ -1,13 +1,16 @@
-.TH GJI\-INIT 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-INIT 1 "July 2026" "gji 0.9.0" "User Commands"
 .SH NAME
-gji\-init \- print or install shell integration
+gji\-init \- set up shell integration interactively or print a shell wrapper
 .SH SYNOPSIS
 .B gji init [\fIoptions\fR] [options] [shell]
 .SH DESCRIPTION
-print or install shell integration
+set up shell integration interactively or print a shell wrapper
 .SH OPTIONS
 .TP
 .B \-\-write
 write the integration to the shell config file
+.TP
+.B \-\-json
+emit a JSON error in non\-interactive mode
 .SH "SEE ALSO"
 .BR gji (1)

package/man/man1/gji-ls.1

@@ -1,4 +1,4 @@
-.TH GJI\-LS 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-LS 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-NEW 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-OPEN 1 "July 2026" "gji 0.9.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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-PR 1 "July 2026" "gji 0.9.0" "User Commands"
 .SH NAME
 gji\-pr \- fetch a pull request by number, #number, or URL into a linked worktree
 .SH SYNOPSIS
@@ -12,5 +12,9 @@ show what would be created without executing any git commands or writing files
 .TP
 .B \-\-json
 emit JSON on success or error instead of human\-readable output
+.SH SUBCOMMANDS
+.TP
+.B open
+open an existing pull request in the default browser
 .SH "SEE ALSO"
 .BR gji (1)

package/man/man1/gji-remove.1

@@ -1,4 +1,4 @@
-.TH GJI\-REMOVE 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-REMOVE 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-ROOT 1 "July 2026" "gji 0.9.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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-RUN\-HOOK 1 "July 2026" "gji 0.9.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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-STATUS 1 "July 2026" "gji 0.9.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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-SYNC\-FILES 1 "July 2026" "gji 0.9.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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-SYNC 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-WARP 1 "July 2026" "gji 0.9.0" "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 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI 1 "July 2026" "gji 0.9.0" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS
@@ -15,7 +15,10 @@ eliminating the need for \fBgit stash\fR when switching contexts.
 create a new branch or detached linked worktree
 .TP
 .B init [options] [shell]
-print or install shell integration
+set up shell integration interactively or print a shell wrapper
+.TP
+.B doctor [options]
+check gji installation and configuration health
 .TP
 .B completion [options] [shell]
 print shell completion definitions
@@ -77,6 +80,7 @@ output the version number
 .SH "SEE ALSO"
 .BR gji\-new (1),
 .BR gji\-init (1),
+.BR gji\-doctor (1),
 .BR gji\-completion (1),
 .BR gji\-pr (1),
 .BR gji\-back (1),

package/package.json

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