@solaqua/gji 0.1.0 → 0.2.1

package/dist/remove.js

@@ -2,6 +2,7 @@ import { basename } from 'node:path';
 import { confirm, isCancel, select } from '@clack/prompts';
 import { loadEffectiveConfig } from './config.js';
 import { extractHooks, runHook } from './hooks.js';
+import { isHeadless } from './headless.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';
@@ -14,7 +15,17 @@ export function createRemoveCommand(dependencies = {}) {
     return async function runRemoveCommand(options) {
         const { linkedWorktrees, repository } = await loadLinkedWorktrees(options.cwd);
         if (linkedWorktrees.length === 0) {
-            options.stderr('No linked worktrees to finish\n');
+            emitError(options, 'No linked worktrees to finish');
+            return 1;
+        }
+        if (!options.branch && (options.json || isHeadless())) {
+            const message = 'branch argument is required';
+            if (options.json) {
+                emitError(options, message);
+            }
+            else {
+                options.stderr(`gji remove: ${message} in non-interactive mode (GJI_NO_TUI=1)\n`);
+            }
             return 1;
         }
         const selection = options.branch ?? (await promptForWorktree(linkedWorktrees));
@@ -24,13 +35,33 @@ export function createRemoveCommand(dependencies = {}) {
         }
         const worktree = linkedWorktrees.find((entry) => entry.branch === selection || entry.path === selection);
         if (!worktree) {
-            options.stderr(`No linked worktree found for branch: ${selection}\n`);
+            emitError(options, `No linked worktree found for branch: ${selection}`);
+            return 1;
+        }
+        if (!options.dryRun && !options.force && (options.json || isHeadless())) {
+            const message = '--force is required';
+            if (options.json) {
+                emitError(options, message);
+            }
+            else {
+                options.stderr(`gji remove: ${message} in non-interactive mode (GJI_NO_TUI=1)\n`);
+            }
             return 1;
         }
-        if (!options.force && !(await confirmRemoval(worktree))) {
+        if (!options.dryRun && !options.force && !(await confirmRemoval(worktree))) {
             options.stderr('Aborted\n');
             return 1;
         }
+        if (options.dryRun) {
+            if (options.json) {
+                options.stdout(`${JSON.stringify({ branch: worktree.branch, path: worktree.path, dryRun: true }, null, 2)}\n`);
+            }
+            else {
+                const desc = worktree.branch ? `branch: ${worktree.branch}` : 'detached';
+                options.stdout(`Would remove worktree at ${worktree.path} (${desc})\n`);
+            }
+            return 0;
+        }
         const config = await loadEffectiveConfig(repository.repoRoot);
         const hooks = extractHooks(config);
         await runHook(hooks.beforeRemove, worktree.path, { branch: worktree.branch ?? undefined, path: worktree.path, repo: basename(repository.repoRoot) }, options.stderr);
@@ -49,7 +80,7 @@ export function createRemoveCommand(dependencies = {}) {
                 await forceRemoveWorktree(repository.repoRoot, worktree.path);
             }
             catch (forceError) {
-                options.stderr(`Failed to remove worktree at ${worktree.path}: ${toMessage(forceError)}\n`);
+                emitError(options, `Failed to remove worktree at ${worktree.path}: ${toMessage(forceError)}`);
                 return 1;
             }
         }
@@ -74,7 +105,12 @@ export function createRemoveCommand(dependencies = {}) {
                 }
             }
         }
-        await writeOutput(repository.repoRoot, options.stdout);
+        if (options.json) {
+            options.stdout(`${JSON.stringify({ branch: worktree.branch, path: worktree.path, deleted: true }, null, 2)}\n`);
+        }
+        else {
+            await writeOutput(repository.repoRoot, options.stdout);
+        }
         return 0;
     };
 }
@@ -104,6 +140,14 @@ async function defaultConfirmRemoval(worktree) {
 async function writeOutput(repoRoot, stdout) {
     await writeShellOutput(REMOVE_OUTPUT_FILE_ENV, repoRoot, stdout);
 }
+function emitError(options, message) {
+    if (options.json) {
+        options.stderr(`${JSON.stringify({ error: message }, null, 2)}\n`);
+    }
+    else {
+        options.stderr(`${message}\n`);
+    }
+}
 function toMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }

package/dist/sync.d.ts

@@ -1,6 +1,7 @@
 export interface SyncCommandOptions {
     all?: boolean;
     cwd: string;
+    json?: boolean;
     stderr: (chunk: string) => void;
     stdout: (chunk: string) => void;
 }

package/dist/sync.js

@@ -7,24 +7,47 @@ export async function runSyncCommand(options) {
     const config = await loadEffectiveConfig(repository.repoRoot);
     const worktrees = await listWorktrees(options.cwd);
     const remote = resolveConfiguredString(config.syncRemote) ?? 'origin';
-    const defaultBranch = resolveConfiguredString(config.syncDefaultBranch)
-        ?? await resolveDefaultBranch(repository.repoRoot, remote);
+    let defaultBranch;
+    try {
+        defaultBranch = resolveConfiguredString(config.syncDefaultBranch)
+            ?? await resolveDefaultBranch(repository.repoRoot, remote);
+    }
+    catch {
+        emitError(options, `Unable to reach remote '${remote}'`);
+        if (!options.json) {
+            options.stderr(`Hint: Add the remote with: git remote add ${remote} <url>\n`);
+        }
+        return 1;
+    }
     if (!defaultBranch) {
-        options.stderr('Unable to determine the default branch for sync.\n');
+        emitError(options, 'Unable to determine the default branch for sync.');
+        if (!options.json) {
+            options.stderr(`Hint: Add the remote with: git remote add ${remote} <url>\n`);
+        }
         return 1;
     }
     const targetWorktrees = selectTargetWorktrees(worktrees, repository.currentRoot, options.all);
     if (targetWorktrees === 'detached') {
-        options.stderr(`Cannot sync detached worktree: ${repository.currentRoot}\n`);
+        emitError(options, `Cannot sync detached worktree: ${repository.currentRoot}`);
         return 1;
     }
     for (const worktree of targetWorktrees) {
         if (await isDirtyWorktree(worktree.path)) {
-            options.stderr(`Cannot sync dirty worktree: ${worktree.path}\n`);
+            emitError(options, `Cannot sync dirty worktree: ${worktree.path}`);
             return 1;
         }
     }
-    await runGit(repository.repoRoot, ['fetch', '--prune', remote]);
+    try {
+        await runGit(repository.repoRoot, ['fetch', '--prune', remote]);
+    }
+    catch {
+        emitError(options, `Failed to fetch from remote '${remote}'`);
+        if (!options.json) {
+            options.stderr(`Hint: Add the remote with: git remote add ${remote} <url>\n`);
+        }
+        return 1;
+    }
+    const updatedWorktrees = [];
     for (const worktree of targetWorktrees) {
         if (worktree.branch === defaultBranch) {
             await runGit(worktree.path, ['merge', '--ff-only', `${remote}/${defaultBranch}`]);
@@ -32,10 +55,25 @@ export async function runSyncCommand(options) {
         else {
             await runGit(worktree.path, ['rebase', `${remote}/${defaultBranch}`]);
         }
-        options.stdout(`${worktree.path}\n`);
+        updatedWorktrees.push(worktree);
+        if (!options.json) {
+            options.stdout(`${worktree.path}\n`);
+        }
+    }
+    if (options.json) {
+        const updated = updatedWorktrees.map((w) => ({ branch: w.branch, path: w.path }));
+        options.stdout(`${JSON.stringify({ updated }, null, 2)}\n`);
     }
     return 0;
 }
+function emitError(options, message) {
+    if (options.json) {
+        options.stderr(`${JSON.stringify({ error: message }, null, 2)}\n`);
+    }
+    else {
+        options.stderr(`${message}\n`);
+    }
+}
 function selectTargetWorktrees(worktrees, currentRoot, all) {
     if (all) {
         return worktrees

package/package.json

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