@solaqua/gji 0.13.0 → 0.14.0

package/dist/cli/commands/go.d.ts

@@ -1,3 +1,4 @@
+import type { WorktreeCatalogDependencies } from "../../application/worktree/catalog.js";
 import { type QueryWorktreePullRequests, type WorktreePromptEntry, type WorktreePromptScope } from "../../presentation/worktree/picker.js";
 import { type CliRuntime } from "../dependencies.js";
 export interface GoCommandOptions {
@@ -14,7 +15,7 @@ export interface GoCommandOptions {
 type GoRuntime = CliRuntime<"bootstrap" | "config" | "contextCard" | "git" | "history" | "historyStore" | "hooks" | "integrations" | "repositoryContext" | "repositoryRefs" | "repositoryRegistry" | "slots" | "tasks" | "worktrees" | "worktreeCatalog">;
 export interface GoCommandDependencies {
     confirmBranchCreation: (branch: string) => Promise<boolean>;
-    promptForWorktree: (worktrees: WorktreePromptEntry[], scope?: WorktreePromptScope) => Promise<string | null>;
+    promptForWorktree: (worktrees: WorktreePromptEntry[], scope?: WorktreePromptScope, catalog?: WorktreeCatalogDependencies) => Promise<string | null>;
     queryPullRequests: QueryWorktreePullRequests;
     runtime: GoRuntime;
 }

package/dist/cli/commands/go.js

@@ -49,13 +49,16 @@ export function createGoCommand(dependencies = {}) {
             let promptSources = currentSources;
             const loadAllSources = async () => {
                 if (registeredSources === null) {
-                    registeredSources = await listRegisteredWorktreeSources(options.cwd, {
-                        ...runtime.repositoryContext,
-                        ...runtime.repositoryRegistry,
-                        ...runtime.worktrees,
-                    }, () => {
-                        skippedRegisteredRepos++;
+                    const registered = await listRegisteredWorktreeSources({
+                        cwd: options.cwd,
+                        repositoryPort: {
+                            ...runtime.repositoryContext,
+                            ...runtime.repositoryRegistry,
+                            ...runtime.worktrees,
+                        },
                     });
+                    registeredSources = registered.sources;
+                    skippedRegisteredRepos = registered.skipped.length;
                 }
                 return deduplicateSources([...currentSources, ...registeredSources]);
             };
@@ -79,10 +82,8 @@ export function createGoCommand(dependencies = {}) {
                         currentRepositoryScope = nextCurrentRepositoryScope;
                         promptSources = nextSources;
                         return {
-                            entries: await buildWorktreePromptEntries(promptSources, {
-                                metadata: currentRepositoryScope ? "full" : "fast",
-                                catalog: withPullRequestQueries(runtime, dependencies.queryPullRequests),
-                            }),
+                            sources: promptSources,
+                            metadata: currentRepositoryScope ? "full" : "fast",
                             label: currentRepositoryScope
                                 ? "current repository"
                                 : "all repositories",
@@ -97,7 +98,7 @@ export function createGoCommand(dependencies = {}) {
                 metadata: repository ? "full" : "fast",
                 catalog: withPullRequestQueries(runtime, dependencies.queryPullRequests),
             });
-            const selectedPath = await prompt(promptEntries, scope);
+            const selectedPath = await prompt(promptEntries, scope, withPullRequestQueries(runtime, dependencies.queryPullRequests));
             if (!selectedPath) {
                 options.stderr("Aborted\n");
                 return 1;
@@ -304,6 +305,9 @@ async function defaultConfirmBranchCreation(branch) {
     });
     return !isCancel(choice) && choice;
 }
-async function promptForWorktree(worktrees, scope) {
-    return promptForSingleWorktree("Choose a worktree", worktrees, { scope });
+async function promptForWorktree(worktrees, scope, catalog) {
+    return promptForSingleWorktree("Choose a worktree", worktrees, {
+        catalog,
+        scope,
+    });
 }

package/dist/cli/commands/hub.js

@@ -18,7 +18,10 @@ export async function buildHubData(cwd, dependencies = {}, runtime = defaultCliD
     const queryRepositoryPullRequests = dependencies.queryRepositoryPullRequests ??
         runtime.pullRequests.listOpenPullRequestsForRepository;
     const currentRepository = await detectRepository(cwd).catch(() => null);
-    const sources = await listDiscoverableWorktreeSources(cwd, sourceDependencies);
+    const { sources } = await listDiscoverableWorktreeSources({
+        cwd,
+        repositoryPort: sourceDependencies,
+    });
     const groups = new Map();
     for (const source of sources) {
         if (!source.repoRoot)

package/dist/cli/commands/warp.js

@@ -65,10 +65,12 @@ export async function resolveWarpTarget(options) {
         emitError("not in a git repository and no repos registered yet.", "Use any gji command inside a repository to register it.\n");
         return null;
     }
-    let skippedRegisteredRepos = 0;
-    const allItems = (await listRegisteredWorktreeSources(options.cwd, sourceDependencies, () => {
-        skippedRegisteredRepos++;
-    })).filter((item) => item.repoRoot !== options.excludeRepoRoot);
+    const registered = await listRegisteredWorktreeSources({
+        cwd: options.cwd,
+        repositoryPort: sourceDependencies,
+    });
+    const skippedRegisteredRepos = registered.skipped.length;
+    const allItems = registered.sources.filter((item) => item.repoRoot !== options.excludeRepoRoot);
     if (allItems.length === 0) {
         emitError("no accessible worktrees found in any registered repo.", skippedRegisteredRepos > 0
             ? "Hint: Run 'gji doctor' to inspect stale repository entries.\n"

package/dist/domain/shared/concurrency.d.ts

@@ -1 +1 @@
-export declare function mapWithConcurrency<Input, Output>(items: readonly Input[], limit: number, mapper: (item: Input) => Promise<Output>): Promise<Output[]>;
+export declare function mapWithConcurrency<Input, Output>(items: readonly Input[], limit: number, mapper: (item: Input) => Promise<Output>, signal?: AbortSignal): Promise<Output[]>;

package/dist/domain/shared/concurrency.js

@@ -1,8 +1,9 @@
-export async function mapWithConcurrency(items, limit, mapper) {
+export async function mapWithConcurrency(items, limit, mapper, signal) {
     const results = new Array(items.length);
     let nextIndex = 0;
     async function readNext() {
         for (;;) {
+            throwIfAborted(signal);
             const index = nextIndex;
             nextIndex += 1;
             if (index >= items.length)
@@ -13,3 +14,7 @@ export async function mapWithConcurrency(items, limit, mapper) {
     await Promise.all(Array.from({ length: Math.min(limit, items.length) }, () => readNext()));
     return results;
 }
+function throwIfAborted(signal) {
+    if (signal?.aborted)
+        throw new Error("Operation cancelled");
+}