@paleo/workspace 0.20.0 → 0.21.0

package/README.md

@@ -26,7 +26,8 @@ The agent reads the skill, adapts the reference scripts to your stack, installs
 ## Workflow
 
 ```sh
-npm run workspace -- setup feat/42 -c   # new branch + worktree + isolated env
+npm run workspace -- setup feat/42 -c        # new branch + worktree + isolated env
+npm run workspace -- setup feat/42 -c --go   # …then drop into a shell there (exit to return)
 npm run dev                             # foreground: stream logs, CTRL+C stops; attaches if already running
 npm run dev -- up                       # start in the background (no-op if already running here)
 npm run dev -- up --restart             # stop the dev-server in this worktree if running, then start fresh

package/dist/cli.d.ts

@@ -7,6 +7,7 @@ export type WorkspaceCommand = {
     slot?: string;
     force: boolean;
     wait: boolean;
+    go: boolean;
 } | {
     kind: "remove";
     branch?: string;

package/dist/cli.js

@@ -53,6 +53,7 @@ function parseSetup(tokens) {
             slot: { type: "string", short: "s" },
             force: { type: "boolean" },
             wait: { type: "boolean" },
+            go: { type: "boolean" },
             verbose: { type: "boolean", short: "v" },
         },
         allowPositionals: true,
@@ -60,12 +61,16 @@ function parseSetup(tokens) {
     });
     const branch = takeOptionalPositional(positionals, "setup");
     const newBranch = values["new-branch"] ?? false;
+    const go = values.go ?? false;
     if (newBranch && branch === undefined) {
         throw new ConfigError("`workspace setup <branch> -c` requires a branch name.");
     }
     if (values.from !== undefined && !newBranch) {
         throw new ConfigError("`--from` requires `-c`/`--new-branch`.");
     }
+    if (go && branch === undefined) {
+        throw new ConfigError("`--go` requires a branch (the worktree to enter).");
+    }
     return {
         command: {
             kind: "setup",
@@ -76,6 +81,7 @@ function parseSetup(tokens) {
             slot: values.slot,
             force: values.force ?? false,
             wait: values.wait ?? false,
+            go,
         },
         verbose: values.verbose ?? false,
     };
@@ -196,12 +202,14 @@ export function printWorkspaceHelp() {
         "Manage workspaces: a git worktree plus its own dev setup (ports, config, database, dev server).",
         "",
         "Commands:",
-        "  setup [<branch>] [-c|--new-branch] [--from <ref>] [--owner <name>] [-s|--slot <port>] [--force] [--wait]",
+        "  setup [<branch>] [-c|--new-branch] [--from <ref>] [--owner <name>] [-s|--slot <port>] [--force] [--wait] [--go]",
         "      Set up the workspace. With <branch>, create a sibling worktree for it",
         "      (add -c to create the branch first). Without, set up the current worktree",
         "      (idempotent; bootstrap and retry path).",
         "      With -c, the new branch starts at the current worktree's HEAD, or at <ref> with --from.",
         "      Finalize runs in the background; add --wait to block until it reaches READY.",
+        "      With --go, drop into an interactive shell in the new worktree (exit to return);",
+        "      combine with --wait to enter only once it is READY. Requires a branch and $SHELL.",
         "  remove [<branch>] [--force]",
         "      Remove a workspace by branch, or the current one when omitted.",
         "      Refuses on uncommitted changes unless --force.",

package/dist/workspace.js

@@ -71,13 +71,29 @@ export async function runWorkspace(config) {
             handleSetOwnerMode(command, ctx, registryDir);
             return;
         case "setup": {
-            const { slot } = await runSetup(command, ctx, run, config, registryDir);
+            const { slot, worktree } = await runSetup(command, ctx, run, config, registryDir);
             if (command.wait)
                 await waitForSlot(slot, config, registryDir, { printSummary: false });
+            if (command.go)
+                enterWorktree(worktree);
             return;
         }
     }
 }
+/**
+ * `--go`: open an interactive shell in the freshly set-up worktree (exit to return). Falls back to
+ * printing a `cd` hint when there is no `$SHELL` or stdin is not a tty (scripts, pipes) — dropping
+ * into an interactive shell there would hang.
+ */
+function enterWorktree(worktree) {
+    const shell = process.env.SHELL;
+    if (shell === undefined || !process.stdin.isTTY) {
+        console.log(`Now run: cd ${worktree}`);
+        return;
+    }
+    console.error(`Entering ${worktree} (exit to return).`);
+    spawnSync(shell, [], { cwd: worktree, stdio: "inherit" });
+}
 async function runSetup(command, ctx, run, config, registryDir) {
     const scheme = resolvePortScheme(config);
     const portsFn = resolvePortsFn(config);
@@ -158,7 +174,7 @@ async function runSetup(command, ctx, run, config, registryDir) {
     });
     child.unref();
     closeSync(logFd);
-    return { slot };
+    return { slot, worktree: setupCtx.currentWorktree };
 }
 function refuseIfFinalizePending(ctx, registryDir, force) {
     if (force)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paleo/workspace",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Run multiple git-worktree dev environments side by side.",
   "keywords": [
     "workspace",