@lesscap/baton-cli 0.2.4 → 0.2.5

package/dist/baton.mjs

@@ -768,7 +768,11 @@ var common = {
   },
   json: { type: "boolean", description: "output JSON" }
 };
-var clientFor = (args) => createClient(resolveBaseUrl(args.url));
+var clientFor = (args) => {
+  const envAuth = process.env.BATON_TOKEN ?? (process.env.BATON_USER && process.env.BATON_PASS);
+  const cfgToken = envAuth ? void 0 : loadProjectConfigOrNull(projectConfigPath())?.worker?.apiToken;
+  return createClient(resolveBaseUrl(args.url), cfgToken ? { bearer: cfgToken } : void 0);
+};
 var resolveProjectId = (args) => {
   if (args.project !== void 0 && args.project !== "") return Number(args.project);
   const cfg = loadProjectConfigOrNull(projectConfigPath());
@@ -783,6 +787,10 @@ var resolveWorkspaceId = (args) => {
     "no workspace in scope. pass --workspace <id> or run `baton init` in this directory."
   );
 };
+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)
@@ -863,7 +871,7 @@ var fmtComment = (c) => `${c.workerId !== void 0 ? `worker#${c.workerId}` : "you
 var fmtSession = (s) => `${s.id}  ${s.name}  ${s.attached ? "[active]" : "[inactive]"}  ${s.worktreePath ?? "(pending)"}`;
 var fmtWorker = (w) => {
   const offline = w.alive === false ? "  [offline]" : "";
-  return `${w.id}  ${w.name}  ${w.hostname}${offline}`;
+  return `W-${w.id}  ${w.name}  ${w.hostname}${offline}`;
 };
 var renderOne = (item, fmt, json) => json ? toJson(item) : fmt(item);
 var renderList = (items, fmt, json) => {
@@ -1113,7 +1121,10 @@ var resolveSession = async (client, projectId, handle) => {
 
 // src/commands/session/abort.ts
 var sessionAbortCommand = defineCommand({
-  meta: { name: "abort", description: "interrupt the in-flight turn (like Esc); keeps the session" },
+  meta: {
+    name: "abort",
+    description: "interrupt the in-flight turn (like Esc); keeps the session"
+  },
   args: {
     session: { type: "positional", required: true, description: "session int id or name" },
     project: { type: "string", description: "project id (overrides .baton.json)" },
@@ -1129,7 +1140,10 @@ var sessionAbortCommand = defineCommand({
 
 // src/commands/session/clear.ts
 var sessionClearCommand = defineCommand({
-  meta: { name: "clear", description: "reset the conversation context (keeps the session + worktree)" },
+  meta: {
+    name: "clear",
+    description: "reset the conversation context (keeps the session + worktree)"
+  },
   args: {
     session: { type: "positional", required: true, description: "session int id or name" },
     project: { type: "string", description: "project id (overrides .baton.json)" },
@@ -1148,16 +1162,24 @@ var sessionCreateCommand = defineCommand({
   meta: { name: "create", description: "create + start a session on a worker" },
   args: {
     name: { type: "positional", required: true, description: "session name" },
-    worker: { type: "string", description: "worker id (default: this machine's worker)" },
-    project: { type: "string", description: "project id (overrides .baton.json)" },
+    worker: {
+      type: "string",
+      description: "worker handle: W-N or int id (default: this machine's worker)"
+    },
+    project: {
+      type: "string",
+      description: "project id (default: the worker's own project, else .baton.json)"
+    },
     ...common
   },
   run: async ({ args }) => {
     const c = clientFor(args);
-    const projectId = resolveProjectId(args);
-    const workerId = args.worker ? Number(args.worker) : loadProjectConfigOrNull(projectConfigPath())?.worker?.id;
-    if (!workerId)
-      throw new Error("no worker id \u2014 pass --worker or run `baton worker register` first");
+    const workerId = args.worker ? parseWorkerHandle(args.worker) : loadProjectConfigOrNull(projectConfigPath())?.worker?.id ?? null;
+    if (workerId === null)
+      throw new Error(
+        "no worker \u2014 pass --worker <W-N|id> or run `baton worker register` first (names need --project)"
+      );
+    const projectId = args.project !== void 0 && args.project !== "" ? Number(args.project) : args.worker ? (await c.workers.get(workerId)).projectId : resolveProjectId(args);
     const s = await c.sessions.create({ projectId, workerId, name: args.name });
     console.log(renderOne(s, fmtSession, Boolean(args.json)));
   }
@@ -2750,9 +2772,9 @@ var readOrCreateMachineId = (path = machineIdPath()) => {
 
 // src/commands/worker.ts
 var resolveWorker = async (client, projectId, handle) => {
-  const asInt = Number(handle);
-  if (Number.isInteger(asInt) && asInt > 0) {
-    const byId = await client.workers.get(asInt).catch(() => null);
+  const asId = parseWorkerHandle(handle);
+  if (asId !== null) {
+    const byId = await client.workers.get(asId).catch(() => null);
     if (byId) return { id: byId.id, name: byId.name };
   }
   const byName = await client.workers.findByName(projectId, handle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lesscap/baton-cli",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "type": "module",
   "description": "baton CLI — register/run a worker, manage projects/requirements/tasks/sessions",
   "bin": {