@solaqua/gji 0.6.1 → 0.7.0

package/README.md

@@ -249,6 +249,7 @@ path=$(gji root --print)
 | `gji status [--json]` | repo overview, worktree health, ahead/behind |
 | `gji ls [--compact] [--json]` | list active worktrees |
 | `gji sync [--all]` | fetch and rebase worktrees onto default branch |
+| `gji sync-files [list\|add\|remove] [paths...]` | manage local files copied into new worktrees |
 | `gji clean [--stale] [--force] [--json]` | interactively prune linked worktrees |
 | `gji remove [branch] [--force] [--json]` | remove a worktree and its branch |
 | `gji trigger-hook <hook>` | run a hook in the current worktree |
@@ -272,7 +273,7 @@ No setup required. Optional config lives in:
 | `worktreePath` | base directory for new worktrees (absolute or `~/…`); overrides the default `../worktrees/<repo>/` layout |
 | `syncRemote` | remote for `gji sync` (default: `origin`) |
 | `syncDefaultBranch` | branch to rebase onto (default: remote `HEAD`) |
-| `syncFiles` | files to copy from main worktree into each new worktree |
+| `syncFiles` | files to copy from main worktree into each new worktree; use global per-repo config for private files |
 | `skipInstallPrompt` | `true` to disable the auto-install prompt permanently |
 | `installSaveTarget` | `"local"` or `"global"` — where **Always**/**Never** choices are persisted (default: `"local"`); set once during `gji init --write` |
 | `hooks` | lifecycle scripts (see [Hooks](#hooks)) |
@@ -287,6 +288,30 @@ No setup required. Optional config lives in:
 }
 ```
 
+### Syncing local files
+
+Use `syncFiles` for private, gitignored, or machine-local files that every new worktree needs, such as `.env.local` or `.npmrc`. `gji new` copies these files from the main worktree before install hooks run, skips missing source files, and does not overwrite files that already exist in the target worktree.
+
+For private files, prefer the `sync-files` command. It writes to your global per-repo config so secret filenames do not need to be committed to `.gji.json`:
+
+```sh
+gji sync-files add .env.local .npmrc
+gji sync-files list
+gji sync-files remove .npmrc
+```
+
+This stores:
+
+```json
+{
+  "repos": {
+    "/home/me/code/my-repo": {
+      "syncFiles": [".env.local"]
+    }
+  }
+}
+```
+
 ### Per-repo overrides in global config
 
 If you work across many repositories, you can scope config to a specific repo inside `~/.config/gji/config.json` without adding a `.gji.json` to that repo:

package/dist/back.d.ts

@@ -1,4 +1,4 @@
-import { type HistoryEntry } from './history.js';
+import { type HistoryEntry } from "./history.js";
 export declare const BACK_OUTPUT_FILE_ENV = "GJI_BACK_OUTPUT_FILE";
 export interface BackCommandOptions {
     cwd: string;

package/dist/back.js

@@ -1,16 +1,16 @@
-import { access } from 'node:fs/promises';
-import { basename } from 'node:path';
-import { loadEffectiveConfig } from './config.js';
-import { extractHooks, runHook } from './hooks.js';
-import { appendHistory, loadHistory } from './history.js';
-import { detectRepository } from './repo.js';
-import { writeShellOutput } from './shell-handoff.js';
-export const BACK_OUTPUT_FILE_ENV = 'GJI_BACK_OUTPUT_FILE';
+import { access } from "node:fs/promises";
+import { basename } from "node:path";
+import { loadEffectiveConfig } from "./config.js";
+import { appendHistory, loadHistory } from "./history.js";
+import { extractHooks, runHook } from "./hooks.js";
+import { detectRepository } from "./repo.js";
+import { writeShellOutput } from "./shell-handoff.js";
+export const BACK_OUTPUT_FILE_ENV = "GJI_BACK_OUTPUT_FILE";
 export async function runBackCommand(options) {
     const history = await loadHistory(options.home);
     const steps = options.n ?? 1;
     if (steps < 1) {
-        options.stderr('gji back: step count must be at least 1\n');
+        options.stderr("gji back: step count must be at least 1\n");
         return 1;
     }
     let found = 0;
@@ -31,7 +31,7 @@ export async function runBackCommand(options) {
         }
     }
     if (!target) {
-        options.stderr('gji back: no previous worktree in history\n');
+        options.stderr("gji back: no previous worktree in history\n");
         options.stderr("Hint: Use 'gji go', 'gji new', or 'gji pr' to navigate between worktrees\n");
         return 1;
     }
@@ -39,7 +39,11 @@ export async function runBackCommand(options) {
         const repository = await detectRepository(target.path);
         const config = await loadEffectiveConfig(repository.repoRoot, options.home, options.stderr);
         const hooks = extractHooks(config);
-        await runHook(hooks.afterEnter, target.path, { branch: target.branch ?? undefined, path: target.path, repo: basename(repository.repoRoot) }, options.stderr);
+        await runHook(hooks.afterEnter, target.path, {
+            branch: target.branch ?? undefined,
+            path: target.path,
+            repo: basename(repository.repoRoot),
+        }, options.stderr);
     }
     catch {
         // Not in a git repo or hooks unavailable — proceed without hook
@@ -49,20 +53,22 @@ export async function runBackCommand(options) {
     return 0;
 }
 export function formatHistoryList(history, cwd) {
-    const branchWidth = Math.max('BRANCH'.length, ...history.map((e) => (e.branch ?? '(detached)').length));
-    const lines = ['  ' + 'BRANCH'.padEnd(branchWidth) + ' WHEN       PATH'];
+    const branchWidth = Math.max("BRANCH".length, ...history.map((e) => (e.branch ?? "(detached)").length));
+    const lines = [
+        "  " + "BRANCH".padEnd(branchWidth) + " WHEN       PATH",
+    ];
     for (const entry of history) {
         const isCurrent = entry.path === cwd;
-        const branch = (entry.branch ?? '(detached)').padEnd(branchWidth);
+        const branch = (entry.branch ?? "(detached)").padEnd(branchWidth);
         const when = formatAge(entry.timestamp).padEnd(10);
-        lines.push(`${isCurrent ? '*' : ' '} ${branch} ${when} ${entry.path}`);
+        lines.push(`${isCurrent ? "*" : " "} ${branch} ${when} ${entry.path}`);
     }
-    return lines.join('\n') + '\n';
+    return lines.join("\n") + "\n";
 }
 export function formatAge(timestamp) {
     const seconds = Math.floor((Date.now() - timestamp) / 1000);
     if (seconds < 60)
-        return 'just now';
+        return "just now";
     const minutes = Math.floor(seconds / 60);
     if (minutes < 60)
         return `${minutes}m ago`;

package/dist/clean.d.ts

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

package/dist/clean.js

@@ -1,14 +1,15 @@
-import { confirm, isCancel, multiselect } from '@clack/prompts';
-import { loadEffectiveConfig } from './config.js';
-import { isBranchMergedInto, readWorktreeHealth, resolveRemoteDefaultBranch, runGit } from './git.js';
-import { isHeadless } from './headless.js';
-import { formatLastCommit, formatUpstreamState, formatWorktreeHint, readWorktreeInfos, serializeWorktreeInfo, } from './worktree-info.js';
-import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from './worktree-management.js';
-import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree } from './worktree-prompts.js';
+import { confirm, isCancel, multiselect } from "@clack/prompts";
+import { loadEffectiveConfig } from "./config.js";
+import { isBranchMergedInto, readWorktreeHealth, resolveRemoteDefaultBranch, runGit, } from "./git.js";
+import { isHeadless } from "./headless.js";
+import { formatLastCommit, formatUpstreamState, formatWorktreeHint, readWorktreeInfos, serializeWorktreeInfo, } from "./worktree-info.js";
+import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
+import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree, } from "./worktree-prompts.js";
 export function createCleanCommand(dependencies = {}) {
     const promptForWorktrees = dependencies.promptForWorktrees ?? defaultPromptForWorktrees;
     const confirmRemoval = dependencies.confirmRemoval ?? defaultConfirmRemoval;
-    const confirmForceRemoveWorktree = dependencies.confirmForceRemoveWorktree ?? defaultConfirmForceRemoveWorktree;
+    const confirmForceRemoveWorktree = dependencies.confirmForceRemoveWorktree ??
+        defaultConfirmForceRemoveWorktree;
     const confirmForceDeleteBranch = dependencies.confirmForceDeleteBranch ?? defaultConfirmForceDeleteBranch;
     return async function runCleanCommand(options) {
         const { linkedWorktrees, repository } = await loadLinkedWorktrees(options.cwd);
@@ -24,11 +25,11 @@ export function createCleanCommand(dependencies = {}) {
                 emitNoStaleCandidates(options);
                 return 0;
             }
-            emitError(options, 'No linked worktrees to clean');
+            emitError(options, "No linked worktrees to clean");
             return 1;
         }
         if (!options.dryRun && !options.force && (options.json || isHeadless())) {
-            const message = '--force is required';
+            const message = "--force is required";
             if (options.json) {
                 emitError(options, message);
             }
@@ -38,23 +39,26 @@ export function createCleanCommand(dependencies = {}) {
             return 1;
         }
         // With --force, or non-interactive dry-runs, skip selection prompt and target all candidates.
-        const shouldSelectAll = options.force || (options.dryRun && (options.stale || options.json || isHeadless()));
+        const shouldSelectAll = options.force ||
+            (options.dryRun && (options.stale || options.json || isHeadless()));
         const selections = shouldSelectAll
             ? cleanupCandidates.map((w) => w.path)
             : await promptForWorktrees(cleanupCandidates);
         if (!selections || selections.length === 0) {
-            options.stderr('Aborted\n');
+            options.stderr("Aborted\n");
             return 1;
         }
         const selectedWorktrees = resolveSelectedWorktrees(cleanupCandidates, selections);
         if (selectedWorktrees.length !== selections.length) {
-            options.stderr('Selected worktree no longer exists\n');
+            options.stderr("Selected worktree no longer exists\n");
             return 1;
         }
         const selectedWorktreeInfos = await readWorktreeInfos(selectedWorktrees);
         const selectedInfoByPath = new Map(selectedWorktreeInfos.map((info) => [info.path, info]));
-        if (!options.dryRun && !options.force && !(await confirmRemoval(selectedWorktrees))) {
-            options.stderr('Aborted\n');
+        if (!options.dryRun &&
+            !options.force &&
+            !(await confirmRemoval(selectedWorktrees))) {
+            options.stderr("Aborted\n");
             return 1;
         }
         if (options.dryRun) {
@@ -72,7 +76,8 @@ export function createCleanCommand(dependencies = {}) {
         const removedPaths = [];
         const removedWorktrees = [];
         for (const worktree of selectedWorktrees) {
-            if (options.stale && !(await isStaleCleanupCandidate(repository.repoRoot, worktree, staleBaseRef))) {
+            if (options.stale &&
+                !(await isStaleCleanupCandidate(repository.repoRoot, worktree, staleBaseRef))) {
                 options.stderr(`Skipped ${worktree.path}: no longer a safe stale cleanup candidate\n`);
                 continue;
             }
@@ -87,9 +92,10 @@ export function createCleanCommand(dependencies = {}) {
                     options.stderr(`Skipped ${worktree.path}: no longer a safe stale cleanup candidate\n`);
                     continue;
                 }
-                if (!options.force && !(await confirmForceRemoveWorktree(worktree.path))) {
+                if (!options.force &&
+                    !(await confirmForceRemoveWorktree(worktree.path))) {
                     reportRemovedPaths(removedPaths, options.stderr);
-                    options.stderr('Aborted\n');
+                    options.stderr("Aborted\n");
                     return 1;
                 }
                 try {
@@ -113,7 +119,8 @@ export function createCleanCommand(dependencies = {}) {
                     if (!isBranchUnmergedError(error)) {
                         throw error;
                     }
-                    if (options.force || (await confirmForceDeleteBranch(worktree.branch))) {
+                    if (options.force ||
+                        (await confirmForceDeleteBranch(worktree.branch))) {
                         try {
                             await forceDeleteBranch(repository.repoRoot, worktree.branch);
                         }
@@ -152,7 +159,7 @@ async function filterStaleCleanupCandidates(repoRoot, worktrees, baseBranch) {
 }
 async function resolveStaleBaseRef(repoRoot, stderr) {
     const config = await loadEffectiveConfig(repoRoot, undefined, stderr);
-    const remote = resolveConfiguredString(config.syncRemote) ?? 'origin';
+    const remote = resolveConfiguredString(config.syncRemote) ?? "origin";
     const configuredDefaultBranch = resolveConfiguredString(config.syncDefaultBranch);
     if (configuredDefaultBranch) {
         return await resolveFetchedRemoteRef(repoRoot, remote, configuredDefaultBranch);
@@ -169,7 +176,7 @@ async function resolveStaleBaseRef(repoRoot, stderr) {
 }
 async function resolveFetchedRemoteRef(repoRoot, remote, branch) {
     try {
-        await runGit(repoRoot, ['fetch', '--prune', remote]);
+        await runGit(repoRoot, ["fetch", "--prune", remote]);
         return `${remote}/${branch}`;
     }
     catch {
@@ -177,7 +184,7 @@ async function resolveFetchedRemoteRef(repoRoot, remote, branch) {
     }
 }
 function resolveConfiguredString(value) {
-    return typeof value === 'string' && value.length > 0 ? value : null;
+    return typeof value === "string" && value.length > 0 ? value : null;
 }
 async function isStaleCleanupCandidate(repoRoot, worktree, baseBranch) {
     if (baseBranch === null) {
@@ -187,7 +194,7 @@ async function isStaleCleanupCandidate(repoRoot, worktree, baseBranch) {
         return false;
     }
     const health = await readWorktreeHealth(worktree.path);
-    if (health.status !== 'clean' || !health.upstreamGone) {
+    if (health.status !== "clean" || !health.upstreamGone) {
         return false;
     }
     return isBranchMergedInto(repoRoot, worktree.branch, baseBranch);
@@ -207,15 +214,15 @@ function resolveSelectedWorktrees(worktrees, selections) {
 }
 function reportRemovedPaths(paths, stderr) {
     if (paths.length > 0) {
-        stderr(`Already removed: ${paths.join(', ')}\n`);
+        stderr(`Already removed: ${paths.join(", ")}\n`);
     }
 }
 function formatCleanInfo(info) {
-    const branch = info.branch === null ? 'detached' : `branch: ${info.branch}`;
+    const branch = info.branch === null ? "detached" : `branch: ${info.branch}`;
     const status = `status: ${info.status}`;
     const upstream = `upstream: ${formatUpstreamState(info.upstream)}`;
     const last = `last: ${formatLastCommit(info.lastCommitTimestamp)}`;
-    return [branch, status, upstream, last].join(', ');
+    return [branch, status, upstream, last].join(", ");
 }
 function emitError(options, message) {
     if (options.json) {
@@ -233,7 +240,7 @@ function emitNoStaleCandidates(options) {
         options.stdout(`${JSON.stringify(payload, null, 2)}\n`);
         return;
     }
-    options.stdout('No stale linked worktrees to clean\n');
+    options.stdout("No stale linked worktrees to clean\n");
 }
 function toMessage(error) {
     return error instanceof Error ? error.message : String(error);
@@ -241,11 +248,11 @@ function toMessage(error) {
 async function defaultPromptForWorktrees(worktrees) {
     const infos = await readWorktreeInfos(worktrees);
     const choice = await multiselect({
-        message: 'Choose worktrees to clean',
+        message: "Choose worktrees to clean",
         options: worktrees.map((worktree, i) => {
             return {
                 hint: formatWorktreeHint(infos[i]),
-                label: worktree.branch ?? '(detached)',
+                label: worktree.branch ?? "(detached)",
                 value: worktree.path,
             };
         }),
@@ -256,18 +263,20 @@ async function defaultPromptForWorktrees(worktrees) {
 async function defaultConfirmRemoval(worktrees) {
     const branchCount = worktrees.filter((worktree) => worktree.branch !== null).length;
     const detachedCount = worktrees.length - branchCount;
-    const messageParts = [`Remove ${worktrees.length} linked worktree${worktrees.length === 1 ? '' : 's'}`];
+    const messageParts = [
+        `Remove ${worktrees.length} linked worktree${worktrees.length === 1 ? "" : "s"}`,
+    ];
     if (branchCount > 0) {
-        messageParts.push(`delete ${branchCount} branch${branchCount === 1 ? '' : 'es'}`);
+        messageParts.push(`delete ${branchCount} branch${branchCount === 1 ? "" : "es"}`);
     }
     if (detachedCount > 0) {
-        messageParts.push(`remove ${detachedCount} detached worktree${detachedCount === 1 ? '' : 's'}`);
+        messageParts.push(`remove ${detachedCount} detached worktree${detachedCount === 1 ? "" : "s"}`);
     }
     const choice = await confirm({
-        active: 'Yes',
-        inactive: 'No',
+        active: "Yes",
+        inactive: "No",
         initialValue: true,
-        message: `${messageParts.join(', ')}?`,
+        message: `${messageParts.join(", ")}?`,
     });
     return !isCancel(choice) && choice;
 }

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { Command } from 'commander';
+import { Command } from "commander";
 export interface RunCliOptions {
     cwd?: string;
     stderr?: (chunk: string) => void;