@paleo/worktree-env 0.3.0 → 0.4.1

package/dist/cli.d.ts

@@ -2,11 +2,11 @@ export interface SetupArgs {
     help?: boolean;
     use?: string;
     create?: string;
-    self?: boolean;
+    here?: boolean;
     owner?: string;
     "set-owner"?: string;
     remove?: string;
-    "remove-self"?: boolean;
+    "remove-here"?: boolean;
     "no-remote-check"?: boolean;
     slot?: string;
     force?: boolean;

package/dist/cli.js

@@ -12,7 +12,7 @@ const SETUP_OPTIONS = {
         arg: "branch",
         description: "Create a new branch + worktree, then set up the local environment. If the branch already exists, appends a numeric suffix (-2, -3, ...)",
     },
-    self: {
+    here: {
         type: "boolean",
         description: "Set up the local environment in the current linked worktree",
     },
@@ -31,13 +31,13 @@ const SETUP_OPTIONS = {
         arg: "branch",
         description: "Remove a worktree by branch name (stop dev server, free slot, delete directory)",
     },
-    "remove-self": {
+    "remove-here": {
         type: "boolean",
         description: "Remove the current linked worktree (same as --remove, but for the worktree you are in)",
     },
     "no-remote-check": {
         type: "boolean",
-        description: "Skip remote branch verification when removing (use with --remove or --remove-self)",
+        description: "Skip remote branch verification when removing (use with --remove or --remove-here)",
     },
     slot: {
         type: "string",
@@ -87,10 +87,10 @@ export function printDevServerHelp() {
     console.log(formatHelp("dev-server [options]", "Start, stop, or list background dev-server processes.", DEV_SERVER_OPTIONS));
 }
 export function isSetupMode(args) {
-    return args.use !== undefined || args.create !== undefined || Boolean(args.self);
+    return args.use !== undefined || args.create !== undefined || Boolean(args.here);
 }
 export function isRemoveMode(args) {
-    return args.remove !== undefined || Boolean(args["remove-self"]);
+    return args.remove !== undefined || Boolean(args["remove-here"]);
 }
 export function isSetOwnerMode(args) {
     return args["set-owner"] !== undefined;
@@ -99,24 +99,24 @@ export function validateSetupFlags(args) {
     const modeFlags = [
         args.use,
         args.create,
-        args.self,
+        args.here,
         isRemoveMode(args),
         isSetOwnerMode(args),
     ].filter(Boolean);
     if (modeFlags.length > 1) {
-        throw new ConfigError("Error: --use, --create, --self, --remove, --remove-self, and --set-owner are mutually exclusive.");
+        throw new ConfigError("Error: --use, --create, --here, --remove, --remove-here, and --set-owner are mutually exclusive.");
     }
-    if (args.remove !== undefined && args["remove-self"]) {
-        throw new ConfigError("Error: --remove and --remove-self are mutually exclusive.");
+    if (args.remove !== undefined && args["remove-here"]) {
+        throw new ConfigError("Error: --remove and --remove-here are mutually exclusive.");
     }
     if ((args.slot !== undefined || args.force) && !isSetupMode(args)) {
-        throw new ConfigError("Error: --slot and --force can only be used with --use, --create, or --self.");
+        throw new ConfigError("Error: --slot and --force can only be used with --use, --create, or --here.");
     }
     if (args.owner !== undefined && !isSetupMode(args)) {
-        throw new ConfigError("Error: --owner is only valid with --use, --create, or --self.");
+        throw new ConfigError("Error: --owner is only valid with --use, --create, or --here.");
     }
     if (args["no-remote-check"] && !isRemoveMode(args)) {
-        throw new ConfigError("Error: --no-remote-check is only valid with --remove or --remove-self.");
+        throw new ConfigError("Error: --no-remote-check is only valid with --remove or --remove-here.");
     }
 }
 export function validateDevServerFlags(args) {

package/dist/setup-worktree.js

@@ -8,7 +8,7 @@ import { defaultComputePorts, resolvePortScheme } from "./ports.js";
 import { handleSetOwner, readSlots, resolveAndRegisterSlot, validateSlotAvailability, writeSlots, } from "./slots.js";
 import { createBranch, detectWorktree, enforceWorktreeMode, getCurrentBranch, removeWorktree, useExistingBranch, verifyBranchAbsentFromRemote, } from "./worktree.js";
 import { cleanupPidFile, isProcessAlive, isProcessGroupAlive, killProcessGroup, readPid, } from "./process-control.js";
-function makeLog(verbose) {
+function makeVerboseLog(verbose) {
     return (msg) => {
         if (verbose)
             console.log(msg);
@@ -64,7 +64,7 @@ export async function runSetupWorktree(config) {
     await runSetup(args, ctx, run, config);
 }
 async function runSetup(args, ctx, run, config) {
-    const log = makeLog(run.verbose);
+    const verboseLog = makeVerboseLog(run.verbose);
     const scheme = resolvePortScheme(config);
     const portsFn = resolvePortsFn(config);
     validateSlotAvailability(args.slot, {
@@ -83,12 +83,13 @@ async function runSetup(args, ctx, run, config) {
         requestedOwner: args.owner,
     });
     const ports = portsFn(slot);
-    log(`Using slot ${slot} (${Object.entries(ports)
+    verboseLog(`Using slot ${slot} (${Object.entries(ports)
         .map(([k, v]) => `${k}: ${v}`)
         .join(", ")})`);
+    console.log(`WORKTREE_CREATED path=${setupCtx.currentWorktree} branch=${branch} slot=${slot}`);
     const sharedDirs = config.sharedDirs ?? [".local", ".plans"];
-    linkSharedDirectories(setupCtx, sharedDirs, log);
-    generateConfigFiles(setupCtx, config.configFiles, slot, ports, args.force ?? false, log);
+    linkSharedDirectories(setupCtx, sharedDirs, verboseLog);
+    generateConfigFiles(setupCtx, config.configFiles, slot, ports, args.force ?? false, verboseLog);
     const force = args.force ?? false;
     const setupContext = {
         currentWorktree: setupCtx.currentWorktree,
@@ -147,8 +148,8 @@ function generateConfigFiles(ctx, entries, slot, ports, force, log) {
         }), entry.path, force, entry.required ?? false);
     }
 }
-function resolveRemoveTarget(args, ctx, registry, removeSelf) {
-    if (removeSelf) {
+function resolveRemoveTarget(args, ctx, registry, removeHere) {
+    if (removeHere) {
         if (ctx.isMainWorktree) {
             console.error("Error: Cannot remove the main worktree.");
             process.exit(1);
@@ -174,7 +175,7 @@ function resolveRemoveTarget(args, ctx, registry, removeSelf) {
     }
     const worktreePath = entry[1].worktree;
     if (resolve(ctx.currentWorktree) === resolve(worktreePath)) {
-        console.error("Error: You are currently in this worktree. Use --remove-self instead.");
+        console.error("Error: You are currently in this worktree. Use --remove-here instead.");
         process.exit(1);
     }
     return { slotPort: entry[0], branch, worktreePath, owner: entry[1].owner };
@@ -207,10 +208,10 @@ async function stopDevServerByPidFiles(worktreePath, pidFiles, log) {
     }
 }
 async function handleRemove(args, ctx, run, config) {
-    const log = makeLog(run.verbose);
-    const removeSelf = Boolean(args["remove-self"]);
+    const verboseLog = makeVerboseLog(run.verbose);
+    const removeHere = Boolean(args["remove-here"]);
     const registry = readSlots(ctx.mainWorktree);
-    const target = resolveRemoveTarget(args, ctx, registry, removeSelf);
+    const target = resolveRemoveTarget(args, ctx, registry, removeHere);
     if (!args["no-remote-check"]) {
         verifyBranchAbsentFromRemote(target.branch, run);
     }
@@ -222,7 +223,7 @@ async function handleRemove(args, ctx, run, config) {
         console.log(`Removed registry entry for branch "${target.branch}" (slot ${target.slotPort}${ownerSuffix}).`);
         return;
     }
-    await stopDevServerByPidFiles(target.worktreePath, config.devServerPidFiles, log);
+    await stopDevServerByPidFiles(target.worktreePath, config.devServerPidFiles, verboseLog);
     if (config.teardownInfrastructure) {
         await config.teardownInfrastructure({
             worktree: target.worktreePath,
@@ -233,12 +234,12 @@ async function handleRemove(args, ctx, run, config) {
     delete registry.slots[target.slotPort];
     writeSlots(ctx.mainWorktree, registry);
     removeDevServerEntryByWorktree(ctx.mainWorktree, target.worktreePath);
-    if (removeSelf) {
+    if (removeHere) {
         process.chdir(ctx.mainWorktree);
     }
     removeWorktree(target.worktreePath, run);
     console.log(`Removed worktree for branch "${target.branch}" (slot ${target.slotPort}${ownerSuffix}).`);
-    if (removeSelf) {
+    if (removeHere) {
         console.log(`Now run: cd ${ctx.mainWorktree}`);
     }
 }

package/dist/worktree.d.ts

@@ -16,6 +16,6 @@ export declare function getCurrentBranch(worktreePath: string): string;
 export declare function enforceWorktreeMode(args: {
     use?: string;
     create?: string;
-    self?: boolean;
+    here?: boolean;
 }, ctx: WorktreeContext): void;
 export declare function removeWorktree(worktreePath: string, run: RunCtx): void;

package/dist/worktree.js

@@ -54,7 +54,6 @@ export function createBranch(requestedBranch, ctx, run) {
     execFileSync("git", ["worktree", "add", "-b", finalBranch, worktreePath], {
         stdio: stdioFor(run),
     });
-    console.log(`Branch: ${finalBranch}`);
     return { ...ctx, currentWorktree: worktreePath, isMainWorktree: false };
 }
 export function verifyBranchAbsentFromRemote(branch, run) {
@@ -80,9 +79,9 @@ export function enforceWorktreeMode(args, ctx) {
             process.exit(1);
         }
     }
-    else if (args.self) {
+    else if (args.here) {
         if (ctx.isMainWorktree) {
-            console.error("Error: --self must be run from a linked worktree, not from the main worktree.");
+            console.error("Error: --here must be run from a linked worktree, not from the main worktree.");
             process.exit(1);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paleo/worktree-env",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Worktree-based concurrent local environment kernel.",
   "keywords": [
     "worktree",