@lesscap/baton-cli 0.9.5 → 0.9.6

package/dist/baton.mjs

@@ -7563,7 +7563,7 @@ var createProvisionerClient = (config) => {
 import { execFile as execFile3 } from "node:child_process";
 import { lstat, mkdir as mkdir3, realpath, writeFile as writeFile2 } from "node:fs/promises";
 import { hostname } from "node:os";
-import { join as join5 } from "node:path";
+import { dirname as dirname2, join as join5 } from "node:path";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 import { promisify as promisify3 } from "node:util";
 
@@ -7634,11 +7634,17 @@ var startAgent = async (config, agent, signal) => {
     throw new Error(`launchd start failed; inspect ${plist} and ${agent.log}`);
   }
 };
-var launchWorkerAgent = async (config, creation, repoPath, workerEnv2, signal) => startAgent(
+var launchWorkerAgent = async (config, creation, repoPath, configPath, workerEnv2, signal) => startAgent(
   config,
   {
     label: `dev.fmap.baton-worker-creation-${creation.id}`,
-    args: [config.nodePath ?? process.execPath, config.cliPath, "worker", "run"],
+    args: [
+      config.nodePath ?? process.execPath,
+      config.cliPath,
+      "worker",
+      "run",
+      ...configPath === null ? [] : ["--config", configPath]
+    ],
     cwd: repoPath,
     env: {
       PATH: workerEnv2.PATH ?? process.env.PATH ?? "/usr/bin:/bin",
@@ -7699,13 +7705,20 @@ var directory = async (path) => {
   const info = await lstat(path);
   if (!info.isDirectory() || info.isSymbolicLink()) throw new Error(`unsafe directory: ${path}`);
 };
-var provisionWorker = async (config, creation, client, signal) => {
-  const repoPath = join5(
-    config.projectsRoot,
-    `project-${creation.projectId}`,
-    `creation-${creation.id}`
-  );
-  const progress = (step) => client.report(creation.id, { status: "running", step, repoPath }, signal);
+var gitIn = async (config, repoPath, args, signal, failure = "Git repository initialization failed") => {
+  try {
+    const { stdout } = await promisify3(execFile3)("git", ["-C", repoPath, ...args], {
+      env: commandEnvironment(config),
+      signal,
+      timeout: 1e4
+    });
+    return stdout;
+  } catch (error) {
+    signal.throwIfAborted();
+    throw new Error(failure, { cause: error });
+  }
+};
+var initRepository = async (config, creation, repoPath, progress, signal) => {
   await progress("directory");
   signal.throwIfAborted();
   await mkdir3(config.projectsRoot, { recursive: true, mode: 448 });
@@ -7715,33 +7728,51 @@ var provisionWorker = async (config, creation, client, signal) => {
     mode: 448
   });
   await progress("git");
-  const git2 = async (args) => {
-    try {
-      await promisify3(execFile3)("git", ["-C", repoPath, ...args], {
-        env: commandEnvironment(config),
-        signal,
-        timeout: 1e4
-      });
-    } catch (error) {
-      signal.throwIfAborted();
-      throw new Error("Git repository initialization failed", { cause: error });
-    }
-  };
-  await git2(["init", "-b", "main"]);
+  await gitIn(config, repoPath, ["init", "-b", "main"], signal);
   await writeFile2(join5(repoPath, ".git/info/exclude"), "\n.baton.json\n", { flag: "a" });
-  await git2([
-    "-c",
-    "user.name=Baton",
-    "-c",
-    "user.email=baton@localhost",
-    "commit",
-    "--allow-empty",
-    "-m",
-    "chore: initialize repository"
-  ]);
+  await gitIn(
+    config,
+    repoPath,
+    [
+      "-c",
+      "user.name=Baton",
+      "-c",
+      "user.email=baton@localhost",
+      "commit",
+      "--allow-empty",
+      "-m",
+      "chore: initialize repository"
+    ],
+    signal
+  );
+};
+var adoptRepository = async (config, creation, repoPath, progress, signal) => {
+  await progress("directory");
+  signal.throwIfAborted();
+  const real = await realpath(repoPath);
+  const project2 = join5(await realpath(config.projectsRoot), `project-${creation.projectId}`);
+  if (dirname2(real) !== project2 || !(await lstat(real)).isDirectory())
+    throw new Error(`unsafe directory: ${repoPath}`);
+  await progress("git");
+  const top = await gitIn(
+    config,
+    real,
+    ["rev-parse", "--show-toplevel"],
+    signal,
+    `not a Git repository: ${repoPath}`
+  );
+  if (await realpath(top.trim()) !== real)
+    throw new Error(`not the root of a Git work tree: ${repoPath}`);
+};
+var provisionWorker = async (config, creation, client, signal) => {
+  const shared = creation.repoPath !== null;
+  const repoPath = creation.repoPath ?? join5(config.projectsRoot, `project-${creation.projectId}`, `creation-${creation.id}`);
+  const progress = (step) => client.report(creation.id, { status: "running", step, repoPath }, signal);
+  await (shared ? adoptRepository : initRepository)(config, creation, repoPath, progress, signal);
   await progress("register");
   const result = await client.register(creation.id, hostname(), signal);
   const state = workerStatePath(config, creation);
+  const root = await realpath(config.projectsRoot);
   await directory(join5(root, ".worker-state"));
   await directory(join5(root, ".worker-state", `project-${creation.projectId}`));
   await mkdir3(state, { mode: 448 });
@@ -7760,15 +7791,13 @@ var provisionWorker = async (config, creation, client, signal) => {
     machineId: result.worker.machineId,
     apiToken: result.apiToken
   });
-  await writeFile2(join5(repoPath, ".baton.json"), `${JSON.stringify(cfg, null, 2)}
-`, {
-    flag: "wx",
-    mode: 384
-  });
+  const configPath = shared ? join5(state, "worker.json") : join5(repoPath, ".baton.json");
+  await writeFile2(configPath, `${JSON.stringify(cfg, null, 2)}
+`, { flag: "wx", mode: 384 });
   await progress("start");
   signal.throwIfAborted();
   const workerEnv2 = await workerTemplateEnvironment(config, creation, state);
-  await launchWorkerAgent(config, creation, repoPath, workerEnv2, signal);
+  await launchWorkerAgent(config, creation, repoPath, shared ? configPath : null, workerEnv2, signal);
   await progress("connect");
   const deadline = Date.now() + 6e4;
   while (Date.now() < deadline) {
@@ -10013,13 +10042,13 @@ import { hostname as osHostname } from "node:os";
 // src/worker/bundled-skills.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { cpSync, existsSync as existsSync5 } from "node:fs";
-import { dirname as dirname3, join as join14 } from "node:path";
+import { dirname as dirname4, join as join14 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/worker/git-exclude.ts
 import { spawnSync } from "node:child_process";
 import { appendFileSync, existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname2, isAbsolute as isAbsolute3, resolve as resolve3 } from "node:path";
+import { dirname as dirname3, isAbsolute as isAbsolute3, resolve as resolve3 } from "node:path";
 var ensureExcluded = (cwd, pattern) => {
   const result = spawnSync("git", ["-C", cwd, "rev-parse", "--git-path", "info/exclude"], {
     encoding: "utf8",
@@ -10034,7 +10063,7 @@ var ensureExcluded = (cwd, pattern) => {
   const path = isAbsolute3(location) ? location : resolve3(cwd, location);
   const current = existsSync4(path) ? readFileSync5(path, "utf8") : "";
   if (current.split("\n").includes(pattern)) return;
-  mkdirSync3(dirname2(path), { recursive: true });
+  mkdirSync3(dirname3(path), { recursive: true });
   appendFileSync(path, `${current && !current.endsWith("\n") ? "\n" : ""}${pattern}
 `);
 };
@@ -10043,7 +10072,7 @@ var ensureExcluded = (cwd, pattern) => {
 var SKILL_NAME = "baton-publish-artifact";
 var TARGETS = [`.claude/skills/${SKILL_NAME}`, `.agents/skills/${SKILL_NAME}`];
 var bundledSkillPath = () => {
-  const here = dirname3(fileURLToPath(import.meta.url));
+  const here = dirname4(fileURLToPath(import.meta.url));
   const candidates = [
     join14(here, "..", "skills", SKILL_NAME),
     join14(here, "..", "..", "skills", SKILL_NAME)
@@ -10651,7 +10680,7 @@ import { join as join17 } from "node:path";
 // src/worker/service-process.ts
 import { spawn as spawn3 } from "node:child_process";
 import { closeSync, existsSync as existsSync6, openSync } from "node:fs";
-import { dirname as dirname4, join as join16 } from "node:path";
+import { dirname as dirname5, join as join16 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 var START_TIMEOUT_MS = 1e4;
 var isWrapperMessage = (message) => {
@@ -10661,7 +10690,7 @@ var isWrapperMessage = (message) => {
   return value.type === "error" && typeof value.error === "string";
 };
 var binPath = () => {
-  const here = dirname4(fileURLToPath2(import.meta.url));
+  const here = dirname5(fileURLToPath2(import.meta.url));
   const devShim = join16(here, "..", "..", "bin", "baton.mjs");
   return existsSync6(devShim) ? devShim : fileURLToPath2(import.meta.url);
 };
@@ -10823,7 +10852,7 @@ import { spawn as spawn4 } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { existsSync as existsSync7 } from "node:fs";
 import { mkdir as mkdir6, rm as rm3, stat as stat5 } from "node:fs/promises";
-import { dirname as dirname5, join as join21 } from "node:path";
+import { dirname as dirname6, join as join21 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { query as query2 } from "@anthropic-ai/claude-agent-sdk";
 
@@ -11086,7 +11115,7 @@ var stopRecordedRunner = async (record, expected, graceMs = 5e3) => {
 
 // src/worker/session-supervisor.ts
 var binPath2 = () => {
-  const here = dirname5(fileURLToPath3(import.meta.url));
+  const here = dirname6(fileURLToPath3(import.meta.url));
   const devShim = join21(here, "..", "..", "bin", "baton.mjs");
   return existsSync7(devShim) ? devShim : fileURLToPath3(import.meta.url);
 };
@@ -11332,7 +11361,7 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 import { existsSync as existsSync8, readdirSync as readdirSync2 } from "node:fs";
 import { createRequire as createModuleRequire } from "node:module";
 import { homedir as homedir5 } from "node:os";
-import { dirname as dirname6, join as join22 } from "node:path";
+import { dirname as dirname7, join as join22 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 var MAX_TERMINALS = 10;
 var claudePtyCommand = (agentSessionId, hasJsonl, env = process.env) => ({
@@ -11353,7 +11382,7 @@ var piPtyCommand = (agentSessionId, env = process.env) => {
   const override = env.BATON_PI_BIN?.trim();
   if (override) return { file: override, args };
   const entry = fileURLToPath4(import.meta.resolve("@earendil-works/pi-coding-agent"));
-  return { file: process.execPath, args: [join22(dirname6(entry), "bundle", "cli.js"), ...args] };
+  return { file: process.execPath, args: [join22(dirname7(entry), "bundle", "cli.js"), ...args] };
 };
 var hasSessionJsonl = (agentSessionId) => {
   const root = join22(homedir5(), ".claude", "projects");
@@ -11558,7 +11587,7 @@ var runWorkerDaemon = async (cfg, client, signal) => {
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname7, join as join23 } from "node:path";
+import { dirname as dirname8, join as join23 } from "node:path";
 var machineIdPath = (env = process.env) => join23(env.XDG_DATA_HOME ?? join23(env.HOME ?? homedir6(), ".local/share"), "baton", "machine-id");
 var readOrCreateMachineId = (path = machineIdPath()) => {
   if (existsSync9(path)) {
@@ -11566,7 +11595,7 @@ var readOrCreateMachineId = (path = machineIdPath()) => {
     if (s) return s;
   }
   const id = randomUUID3();
-  mkdirSync5(dirname7(path), { recursive: true });
+  mkdirSync5(dirname8(path), { recursive: true });
   writeFileSync5(path, `${id}
 `, "utf8");
   return id;
@@ -11600,7 +11629,11 @@ var workerCreateCommand = defineCommand({
       description: "mini-glm-codeplan | mini-dashscope-codeplan | mini-codex"
     },
     name: { type: "string", required: true, description: "worker name" },
-    agentKind: { type: "string", description: AGENT_KINDS.join(", ") }
+    agentKind: { type: "string", description: AGENT_KINDS.join(", ") },
+    repoPath: {
+      type: "string",
+      description: "share an existing worker's directory in this project (default: a new one)"
+    }
   },
   run: async ({ args }) => {
     if (!isWorkerTemplateId(args.template)) throw new Error("invalid worker template");
@@ -11615,7 +11648,8 @@ var workerCreateCommand = defineCommand({
       {
         templateId: args.template,
         name,
-        agentKind
+        agentKind,
+        ...args.repoPath ? { repoPath: args.repoPath } : {}
       }
     );
     console.log(renderOne(creation, fmtWorkerCreation, Boolean(args.json)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "license": "MIT",
   "publishConfig": {
     "access": "public"