@lesscap/baton-cli 0.2.8 → 0.2.10

package/dist/baton.mjs

@@ -799,12 +799,6 @@ var parseWorkerHandle = (handle) => {
   const m = handle.trim().match(/^(?:[wW]-)?(\d+)$/);
   return m ? Number(m[1]) : null;
 };
-var parseIssueUrl = (url) => {
-  const m = url.match(/^https:\/\/github\.com\/[^/]+\/[^/]+\/issues\/(\d+)/);
-  if (!m)
-    throw new Error(`expected a GitHub issue url (https://github.com/o/r/issues/N), got "${url}"`);
-  return { source: "github", number: Number(m[1]), url: url.split(/[?#]/)[0] };
-};
 var splitCsv = (s) => s ? s.split(",").map((x) => x.trim()).filter(Boolean) : void 0;
 
 // src/commands/init.ts
@@ -980,7 +974,6 @@ var requirement = defineCommand({
         project: { type: "string", description: "project id (overrides .baton.json)" },
         desc: { type: "string", description: "description" },
         body: { type: "string", description: "requirement body (markdown)" },
-        github: { type: "string", description: "link a GitHub issue url (light association)" },
         ...common
       },
       run: async ({ args }) => {
@@ -991,8 +984,7 @@ var requirement = defineCommand({
               projectId: resolveProjectId(args),
               title: args.title,
               description: args.desc,
-              body: args.body,
-              external: args.github ? parseIssueUrl(args.github) : void 0
+              body: args.body
             },
             Boolean(args.json)
           )
@@ -1019,41 +1011,6 @@ var requirement = defineCommand({
         console.log(await updateRequirement(c, id, patch2, Boolean(args.json)));
       }
     }),
-    link: defineCommand({
-      meta: { name: "link", description: "link a requirement to a GitHub issue url" },
-      args: {
-        code: { type: "positional", required: true, description: "requirement code (R-N)" },
-        // Named `issue` (not `url`) — `url` would collide with the common --url flag.
-        issue: { type: "positional", required: true, description: "GitHub issue url" },
-        project: { type: "string", description: "project id (overrides .baton.json)" },
-        ...common
-      },
-      run: async ({ args }) => {
-        const c = clientFor(args);
-        const id = await resolveByCode(c, resolveProjectId(args), args.code);
-        console.log(
-          await updateRequirement(
-            c,
-            id,
-            { external: parseIssueUrl(args.issue) },
-            Boolean(args.json)
-          )
-        );
-      }
-    }),
-    unlink: defineCommand({
-      meta: { name: "unlink", description: "clear a requirement\u2019s GitHub issue association" },
-      args: {
-        code: { type: "positional", required: true, description: "requirement code (R-N)" },
-        project: { type: "string", description: "project id (overrides .baton.json)" },
-        ...common
-      },
-      run: async ({ args }) => {
-        const c = clientFor(args);
-        const id = await resolveByCode(c, resolveProjectId(args), args.code);
-        console.log(await updateRequirement(c, id, { external: null }, Boolean(args.json)));
-      }
-    }),
     ls: defineCommand({
       meta: { name: "ls", description: "list requirements in a project" },
       args: {
@@ -2338,7 +2295,6 @@ var task = defineCommand({
         project: { type: "string", description: "project id (overrides .baton.json)" },
         body: { type: "string", description: "task body (markdown)" },
         deps: { type: "string", description: "comma-separated dependency task codes (T-N,T-N)" },
-        github: { type: "string", description: "link a GitHub issue url (light association)" },
         ...common
       },
       run: async ({ args }) => {
@@ -2356,8 +2312,7 @@ var task = defineCommand({
               requirementId,
               title: args.title,
               body: args.body,
-              dependsOn: dependsOn.length ? dependsOn : void 0,
-              external: args.github ? parseIssueUrl(args.github) : void 0
+              dependsOn: dependsOn.length ? dependsOn : void 0
             },
             Boolean(args.json)
           )
@@ -2384,36 +2339,6 @@ var task = defineCommand({
         console.log(await updateTask(c, id, patch2, Boolean(args.json)));
       }
     }),
-    link: defineCommand({
-      meta: { name: "link", description: "link a task to a GitHub issue url" },
-      args: {
-        code: { type: "positional", required: true, description: "task code (T-N)" },
-        // Named `issue` (not `url`) — `url` would collide with the common --url flag.
-        issue: { type: "positional", required: true, description: "GitHub issue url" },
-        project: { type: "string", description: "project id (overrides .baton.json)" },
-        ...common
-      },
-      run: async ({ args }) => {
-        const c = clientFor(args);
-        const id = await resolveTaskByCode(c, resolveProjectId(args), args.code);
-        console.log(
-          await updateTask(c, id, { external: parseIssueUrl(args.issue) }, Boolean(args.json))
-        );
-      }
-    }),
-    unlink: defineCommand({
-      meta: { name: "unlink", description: "clear a task\u2019s GitHub issue association" },
-      args: {
-        code: { type: "positional", required: true, description: "task code (T-N)" },
-        project: { type: "string", description: "project id (overrides .baton.json)" },
-        ...common
-      },
-      run: async ({ args }) => {
-        const c = clientFor(args);
-        const id = await resolveTaskByCode(c, resolveProjectId(args), args.code);
-        console.log(await updateTask(c, id, { external: null }, Boolean(args.json)));
-      }
-    }),
     ls: defineCommand({
       meta: { name: "ls", description: "list tasks in a requirement" },
       args: {
@@ -2595,6 +2520,14 @@ import { dirname, isAbsolute as isAbsolute2, resolve } from "node:path";
 var createWorktree = (input) => {
   if (existsSync4(input.worktreePath))
     throw new Error(`worktree path already exists: ${input.worktreePath}`);
+  const head = spawnSync2("git", ["-C", input.repo, "rev-parse", "--verify", "-q", "HEAD"], {
+    stdio: "pipe",
+    encoding: "utf8"
+  });
+  if (head.status !== 0)
+    throw new Error(
+      `repo has no commits (unborn HEAD) \u2014 create an initial commit before starting sessions`
+    );
   mkdirSync(dirname(input.worktreePath), { recursive: true });
   const branch = `baton/${input.sessionCode}`;
   const r = spawnSync2(
@@ -2642,6 +2575,10 @@ var removeWorktree = (repo, worktreePath) => {
   }
 };
 
+// src/worker/watchdog.ts
+var stale = (okAt, now, thresholdMs) => now - okAt > thresholdMs;
+var streamWedged = (isOpen, okAt, now, thresholdMs) => !isOpen && stale(okAt, now, thresholdMs);
+
 // src/worker/daemon.ts
 var binPath = () => {
   const here = dirname2(fileURLToPath(import.meta.url));
@@ -2655,11 +2592,20 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   const log = (m) => console.log(`[worker #${cfg.workerId} ${cfg.name}] ${m}`);
   const HEARTBEAT_MS = 3e4;
   const HEARTBEAT_TIMEOUT_MS = 15e3;
-  const MAX_HEARTBEAT_FAILURES = 5;
-  let heartbeatFailures = 0;
+  const HEARTBEAT_DEAD_MS = 15e4;
+  const STREAM_STALE_MS = 9e4;
+  const ES_OPEN = 1;
+  let heartbeatOkAt = Date.now();
+  let streamOkAt = Date.now();
   let fatal = false;
   let stop = () => {
   };
+  const trip = (reason) => {
+    if (fatal) return;
+    log(`${reason} \u2014 exiting so the supervisor restarts a clean worker`);
+    fatal = true;
+    stop();
+  };
   const ping = async () => {
     try {
       await Promise.race([
@@ -2668,20 +2614,11 @@ var runWorkerDaemon = async (cfg, client, signal) => {
           (_, reject) => setTimeout(() => reject(new Error("heartbeat timeout")), HEARTBEAT_TIMEOUT_MS)
         )
       ]);
-      heartbeatFailures = 0;
+      heartbeatOkAt = Date.now();
     } catch (e) {
-      heartbeatFailures += 1;
-      log(`heartbeat failed (${heartbeatFailures}/${MAX_HEARTBEAT_FAILURES}): ${String(e)}`);
-      if (heartbeatFailures >= MAX_HEARTBEAT_FAILURES) {
-        const downSec = MAX_HEARTBEAT_FAILURES * HEARTBEAT_MS / 1e3;
-        log(`heartbeat down ~${downSec}s \u2014 exiting so the supervisor restarts a clean worker`);
-        fatal = true;
-        stop();
-      }
+      log(`heartbeat failed: ${String(e)}`);
     }
   };
-  void ping();
-  const hb = setInterval(() => void ping(), HEARTBEAT_MS);
   const killChild = (child) => {
     if (child.pid === void 0) return;
     try {
@@ -2783,8 +2720,12 @@ var runWorkerDaemon = async (cfg, client, signal) => {
       }
     })
   });
-  es.onopen = () => void reconcile().catch((err) => log(`reconcile failed: ${String(err)}`));
+  es.onopen = () => {
+    streamOkAt = Date.now();
+    void reconcile().catch((err) => log(`reconcile failed: ${String(err)}`));
+  };
   es.onmessage = (e) => {
+    streamOkAt = Date.now();
     try {
       const cmd = JSON.parse(e.data);
       if (cmd.cmd === "session.start")
@@ -2800,6 +2741,18 @@ var runWorkerDaemon = async (cfg, client, signal) => {
   };
   es.onerror = () => log("command stream error (eventsource will retry)");
   log(`listening for commands (server ${cfg.server}, repo ${repo})`);
+  const watchdog = () => {
+    const now = Date.now();
+    if (stale(heartbeatOkAt, now, HEARTBEAT_DEAD_MS))
+      trip(`heartbeat down ~${HEARTBEAT_DEAD_MS / 1e3}s`);
+    else if (streamWedged(es.readyState === ES_OPEN, streamOkAt, now, STREAM_STALE_MS))
+      trip(`command stream wedged ~${STREAM_STALE_MS / 1e3}s`);
+  };
+  void ping();
+  const hb = setInterval(() => {
+    void ping();
+    watchdog();
+  }, HEARTBEAT_MS);
   await new Promise((resolve2) => {
     stop = resolve2;
     if (signal.aborted) return resolve2();

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "license": "MIT",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
   "bin": {
-    "baton": "./dist/baton.mjs"
+    "baton": "dist/baton.mjs"
   },
   "files": [
     "dist"