@solaqua/gji 0.2.3 → 0.2.4

package/dist/go.js

@@ -3,7 +3,7 @@ import { isCancel, select } from '@clack/prompts';
 import { loadEffectiveConfig } from './config.js';
 import { isHeadless } from './headless.js';
 import { extractHooks, runHook } from './hooks.js';
-import { detectRepository, listWorktrees } from './repo.js';
+import { detectRepository, listWorktrees, sortByCurrentFirst } from './repo.js';
 import { writeShellOutput } from './shell-handoff.js';
 const GO_OUTPUT_FILE_ENV = 'GJI_GO_OUTPUT_FILE';
 export function createGoCommand(dependencies = {}) {
@@ -17,7 +17,7 @@ export function createGoCommand(dependencies = {}) {
             options.stderr('gji go: branch argument is required in non-interactive mode (GJI_NO_TUI=1)\n');
             return 1;
         }
-        const prompted = options.branch ? null : await prompt(worktrees);
+        const prompted = options.branch ? null : await prompt(sortByCurrentFirst(worktrees));
         const resolvedPath = options.branch
             ? worktrees.find((entry) => entry.branch === options.branch)?.path
             : prompted ?? undefined;
@@ -46,7 +46,7 @@ async function promptForWorktree(worktrees) {
         options: worktrees.map((worktree) => ({
             value: worktree.path,
             label: worktree.branch ?? '(detached)',
-            hint: worktree.path,
+            hint: worktree.isCurrent ? `${worktree.path} (current)` : worktree.path,
         })),
     });
     if (isCancel(choice)) {

package/dist/ls.js

@@ -1,7 +1,7 @@
 import { listWorktrees } from './repo.js';
 import { comparePaths } from './paths.js';
 export async function runLsCommand(options) {
-    const worktrees = sortWorktreesByPath(await listWorktrees(options.cwd));
+    const worktrees = sortWorktrees(await listWorktrees(options.cwd));
     if (options.json) {
         options.stdout(`${JSON.stringify(worktrees, null, 2)}\n`);
         return 0;
@@ -12,15 +12,22 @@ export async function runLsCommand(options) {
 export function formatWorktreeTable(worktrees) {
     const rows = worktrees.map((worktree) => ({
         branch: worktree.branch ?? '(detached)',
+        isCurrent: worktree.isCurrent,
         path: worktree.path,
     }));
     const branchWidth = Math.max('BRANCH'.length, ...rows.map((row) => row.branch.length));
-    const lines = ['BRANCH'.padEnd(branchWidth, ' ') + ' PATH'];
+    const lines = ['  ' + 'BRANCH'.padEnd(branchWidth, ' ') + ' PATH'];
     for (const row of rows) {
-        lines.push(`${row.branch.padEnd(branchWidth, ' ')} ${row.path}`);
+        lines.push(`${row.isCurrent ? '*' : ' '} ${row.branch.padEnd(branchWidth, ' ')} ${row.path}`);
     }
     return lines.join('\n');
 }
-function sortWorktreesByPath(worktrees) {
-    return [...worktrees].sort((left, right) => comparePaths(left.path, right.path));
+function sortWorktrees(worktrees) {
+    return [...worktrees].sort((left, right) => {
+        if (left.isCurrent && !right.isCurrent)
+            return -1;
+        if (!left.isCurrent && right.isCurrent)
+            return 1;
+        return comparePaths(left.path, right.path);
+    });
 }

package/dist/remove.d.ts

@@ -1,4 +1,4 @@
-import type { WorktreeEntry } from './repo.js';
+import { type WorktreeEntry } from './repo.js';
 export interface RemoveCommandOptions {
     branch?: string;
     cwd: string;

package/dist/remove.js

@@ -3,6 +3,7 @@ import { confirm, isCancel, select } from '@clack/prompts';
 import { loadEffectiveConfig } from './config.js';
 import { extractHooks, runHook } from './hooks.js';
 import { isHeadless } from './headless.js';
+import { sortByCurrentFirst } from './repo.js';
 import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from './worktree-management.js';
 import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree } from './worktree-prompts.js';
 import { writeShellOutput } from './shell-handoff.js';
@@ -28,7 +29,7 @@ export function createRemoveCommand(dependencies = {}) {
             }
             return 1;
         }
-        const selection = options.branch ?? (await promptForWorktree(linkedWorktrees));
+        const selection = options.branch ?? (await promptForWorktree(sortByCurrentFirst(linkedWorktrees)));
         if (!selection) {
             options.stderr('Aborted\n');
             return 1;
@@ -119,7 +120,7 @@ async function defaultPromptForWorktree(worktrees) {
     const choice = await select({
         message: 'Choose a worktree to finish',
         options: worktrees.map((worktree) => ({
-            hint: worktree.path,
+            hint: worktree.isCurrent ? `${worktree.path} (current)` : worktree.path,
             label: worktree.branch ?? '(detached)',
             value: worktree.path,
         })),

package/dist/repo.d.ts

@@ -7,8 +7,10 @@ export interface RepositoryContext {
 }
 export interface WorktreeEntry {
     branch: string | null;
+    isCurrent: boolean;
     path: string;
 }
 export declare function detectRepository(cwd: string): Promise<RepositoryContext>;
 export declare function resolveWorktreePath(repoRoot: string, branch: string): string;
 export declare function listWorktrees(cwd: string): Promise<WorktreeEntry[]>;
+export declare function sortByCurrentFirst(worktrees: WorktreeEntry[]): WorktreeEntry[];

package/dist/repo.js

@@ -26,17 +26,30 @@ export function resolveWorktreePath(repoRoot, branch) {
     return join(dirname(repoRoot), 'worktrees', basename(repoRoot), ...segments);
 }
 export async function listWorktrees(cwd) {
-    const output = await runGit(cwd, ['worktree', 'list', '--porcelain']);
+    const [output, currentRoot] = await Promise.all([
+        runGit(cwd, ['worktree', 'list', '--porcelain']),
+        runGit(cwd, ['rev-parse', '--show-toplevel']),
+    ]);
     const entries = output.split('\n\n').filter(Boolean);
     return entries.map((entry) => {
         const path = findPorcelainValue(entry, 'worktree');
         const branchRef = findOptionalPorcelainValue(entry, 'branch');
         return {
             branch: branchRef ? branchRef.replace('refs/heads/', '') : null,
+            isCurrent: path === currentRoot,
             path,
         };
     });
 }
+export function sortByCurrentFirst(worktrees) {
+    return [...worktrees].sort((a, b) => {
+        if (a.isCurrent && !b.isCurrent)
+            return -1;
+        if (!a.isCurrent && b.isCurrent)
+            return 1;
+        return 0;
+    });
+}
 function findPorcelainValue(block, key) {
     const value = findOptionalPorcelainValue(block, key);
     if (!value) {

package/dist/status.js

@@ -4,7 +4,7 @@ import { comparePaths } from './paths.js';
 export async function runStatusCommand(options) {
     const repository = await detectRepository(options.cwd);
     const worktrees = sortWorktreesByPath(await listWorktrees(options.cwd));
-    const rows = await Promise.all(worktrees.map(async (worktree) => buildStatusRow(worktree, repository.currentRoot)));
+    const rows = await Promise.all(worktrees.map(async (worktree) => buildStatusRow(worktree)));
     if (options.json) {
         options.stdout(`${JSON.stringify(formatStatusJson(repository.repoRoot, repository.currentRoot, rows), null, 2)}\n`);
         return 0;
@@ -35,11 +35,11 @@ export function formatStatusJson(repoRoot, currentRoot, rows) {
         worktrees: rows,
     };
 }
-async function buildStatusRow(worktree, currentRoot) {
+async function buildStatusRow(worktree) {
     const health = await readWorktreeHealth(worktree.path);
     return {
         branch: worktree.branch,
-        current: worktree.path === currentRoot,
+        current: worktree.isCurrent,
         path: worktree.path,
         status: health.status,
         upstream: buildUpstreamState(worktree.branch, health),

package/package.json

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