@proagentstore/cli 0.4.28 → 0.4.29

package/dist/browser-runner/coding/headless.js

@@ -454,21 +454,28 @@ export function parseCommand(command) {
             i++;
         if (i >= src.length)
             break;
-        const start = i;
+        const tokenStart = i;
         let out = "";
-        let quote = null;
         while (i < src.length) {
             const ch = src[i];
-            if (quote) {
-                if (ch === quote)
-                    quote = null;
-                else
-                    out += ch;
-                i++;
-                continue;
-            }
-            if (ch === '"' || ch === "'") {
-                quote = ch;
+            // A DOUBLE quote always opens a span — that is what `--flag "two words"` means and
+            // what anyone typing this expects.
+            //
+            // A SINGLE quote opens one only at a token boundary (token start, or right after `=`),
+            // because in ordinary English it is an apostrophe. This field is a preset text box, not
+            // a shell: a real shell would pair the two apostrophes in `don't guess and don't stop`
+            // and hand the engine `dont guess and dont` plus a stray `stop`, which is exactly the
+            // mangling seen here. `--agent='my agent'` and `'my agent'` still work.
+            const opens = ch === '"' || (ch === "'" && (i === tokenStart || src[i - 1] === "="));
+            if (opens) {
+                const close = src.indexOf(ch, i + 1);
+                if (close !== -1) {
+                    out += src.slice(i + 1, close);
+                    i = close + 1;
+                    continue;
+                }
+                // Unterminated — the character is literal, not the start of a span.
+                out += ch;
                 i++;
                 continue;
             }
@@ -477,21 +484,7 @@ export function parseCommand(command) {
             out += ch;
             i++;
         }
-        if (quote) {
-            // UNTERMINATED quote → it was a literal character, not a quote. `don't` is ordinary
-            // English in a user-edited preset; treating the apostrophe as an opening quote made
-            // `--append-system-prompt don't guess` reach the engine as three broken arguments.
-            i = start;
-            let raw = "";
-            while (i < src.length && !isSpace(src[i])) {
-                raw += src[i];
-                i++;
-            }
-            tokens.push(raw);
-        }
-        else {
-            tokens.push(out);
-        }
+        tokens.push(out);
     }
     return { bin: tokens[0] ?? "", args: tokens.slice(1) };
 }

package/dist/browser-runner/runner.js

@@ -9,6 +9,7 @@ import { McpRuntime } from "./mcp-runtime.js";
 import { HumanHandoffError, RunnerInputError } from "./errors.js";
 import { RunnerStore } from "./store.js";
 import { CodingRuntime } from "./coding/runtime.js";
+import { WORKFLOW_DRIVEN_TASKS } from "./task-types.js";
 /** True for a plain object. */
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -39,7 +40,6 @@ const APPROVAL_REQUIRED_TASKS = new Set(["browser.open"]);
  * workflow then polled a dead session for 15 minutes before failing a run it had already
  * completed.
  */
-const WORKFLOW_DRIVEN_TASKS = new Set(["job.apply_agent", "browser.task"]);
 const require = createRequire(import.meta.url);
 export class LocalRunner {
     config;

package/dist/browser-runner/store.js

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
+import { WORKFLOW_DRIVEN_TASKS } from "./task-types.js";
 function emptyStore() {
     return {
         sessions: [],
@@ -50,7 +51,7 @@ export class RunnerStore {
             // to "failed", which re-mirrors to the board, resurrects the Retry button, and
             // slips past the API single-flight guard → a second concurrent apply on the one
             // browser page. Mirrors the API carve-out in expireOrphanedRuntimeTasks.
-            if (task.type === "job.apply_agent")
+            if (WORKFLOW_DRIVEN_TASKS.has(task.type))
                 continue;
             if (task.status === "needs_human" || task.status === "running") {
                 task.status = "failed";

package/dist/browser-runner/task-types.js

@@ -0,0 +1,20 @@
+/**
+ * Task types steered by a remote durable Workflow rather than executed by the runner.
+ *
+ * ONE list, in its own module because THREE places need it and they drifted: task creation had
+ * `job.apply_agent || browser.task`, `resumeTakeover` had only `job.apply_agent` (so resolving a
+ * stuck browse handoff destroyed the session), and `RunnerStore.expireInFlightTasks` still
+ * hardcodes its own copy — which meant restarting `pags up` failed a live browse run locally while
+ * the cloud side preserved it, leaving the two views of one durable run disagreeing.
+ *
+ * `browser.handoff` is the synthetic task `browserHandoff` creates for a caller that has none (the
+ * engine sign-in relay mints its own id for a coding session with no runner task). It belongs here
+ * for the same reason: the console's Resume button is agent-agnostic, so without it pressing
+ * Resume would complete and END the takeover mid-sign-in — reintroducing the exact bug the browse
+ * case was fixed for.
+ */
+export const WORKFLOW_DRIVEN_TASKS = new Set([
+    "job.apply_agent",
+    "browser.task",
+    "browser.handoff",
+]);

package/dist/index.js

@@ -1,10 +1,4 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/index.ts
 import { createRequire as createRequire3 } from "module";
@@ -371,7 +365,7 @@ jobs:
 });
 
 // src/commands/login.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
 import { createServer } from "http";
 import { homedir } from "os";
 import { join as join3 } from "path";
@@ -472,14 +466,16 @@ var loginCommand = new Command3("login").description("Sign in with Google or Git
   }
 });
 var logoutCommand = new Command3("logout").description("Sign out and remove stored session").action(() => {
+  if (!existsSync3(TOKEN_FILE)) {
+    writeLine("Already signed out.");
+    return;
+  }
   try {
-    if (existsSync3(TOKEN_FILE)) {
-      const { unlinkSync } = __require("fs");
-      unlinkSync(TOKEN_FILE);
-    }
+    unlinkSync(TOKEN_FILE);
     writeLine("Signed out.");
-  } catch {
-    writeLine("Already signed out.");
+  } catch (err) {
+    writeError(`Could not remove ${TOKEN_FILE}: ${err instanceof Error ? err.message : String(err)}`);
+    process.exit(1);
   }
 });
 var whoamiCommand = new Command3("whoami").description("Show current signed-in user").action(() => {
@@ -921,7 +917,9 @@ function openRelaySocket(instanceId, wsBase, mintToken, localUrl, runnerToken, f
     ws.onclose = (ev) => {
       if (reconnecting) return;
       reconnecting = true;
-      const reason = ev.code === 4401 || ev.code === 1008 ? " (token expired \u2014 run `pags login` then `pags up`)" : "";
+      const said = (ev.reason || "").trim();
+      const hint = ev.code === 4401 ? " \u2014 run `pags login`, then `pags up`" : ev.code === 4409 ? " \u2014 run `pags up --force` to take over" : "";
+      const reason = said ? ` (${said}${hint})` : ev.code === 1008 ? " (token expired \u2014 run `pags login` then `pags up`)" : "";
       writeLine(`Relay disconnected: ${instanceId.slice(0, 8)}\u2026${reason} \u2014 reconnecting in ${Math.round(backoffMs / 1e3)}s`);
       setTimeout(() => {
         reconnecting = false;
@@ -943,7 +941,7 @@ function createRunnerCommand() {
   const command = new Command6("runner").description(
     "Manage the local ProAgentStore browser runtime for ProAgentStore agents"
   );
-  command.command("start").description("Start the local ProAgentStore browser runtime in the foreground").option("--host <host>", "Host to bind", "127.0.0.1").option("--port <port>", "Port to bind", "49171").option("--data-dir <path>", "Runner data directory").option("--token <token>", "Require this bearer token").option("--instance-id <id>", "Bind runner requests to a PAGS instance id").option("--headless", "Run Playwright headless").action(async (opts) => {
+  command.command("start").description("Start the local ProAgentStore browser runtime in the foreground").option("--host <host>", "Host to bind", "127.0.0.1").option("--port <port>", "Port to bind (default: first free port from 49171)").option("--data-dir <path>", "Runner data directory").option("--token <token>", "Require this bearer token").option("--instance-id <id>", "Bind runner requests to a PAGS instance id").option("--headless", "Run Playwright headless").action(async (opts) => {
     await startRunnerForeground(opts);
   });
   command.command("connect <instanceIds...>").description("Start ONE local runtime, connect via WebSocket relay, and register it for every given PAGS instance").option("--host <host>", "Host to bind", "127.0.0.1").option("--port <port>", "Port to bind", "49171").option("--data-dir <path>", "Runner data directory").option("--token <token>", "Runner bearer token. Defaults to PAGS_RUNNER_TOKEN or a generated token").option("--headless", "Run Playwright headless").option("--api-base <url>", "PAGS API base URL").option("--pags-token <token>", "PAGS session token. Defaults to PAGS_TOKEN").option("--runner-version <version>", "Runner version").option("--force", "Take over from another connected machine").action(async (instanceIds, opts) => {
@@ -1184,7 +1182,7 @@ function printStep(label, status) {
   const icon = status === "ok" ? chalk.green("\u2713") : status === "fail" ? chalk.red("\u2717") : chalk.yellow("\u2026");
   console.log(pad + icon + " " + label);
 }
-async function waitForKey(keys) {
+async function waitForKey(keys, onInterrupt) {
   return new Promise((resolve5) => {
     readline.emitKeypressEvents(process.stdin);
     if (process.stdin.isTTY) process.stdin.setRawMode(true);
@@ -1192,6 +1190,10 @@ async function waitForKey(keys) {
     const onKeypress = (str, key) => {
       if (key?.ctrl && key.name === "c") {
         cleanup();
+        if (onInterrupt) {
+          onInterrupt();
+          return;
+        }
         process.exit(0);
       }
       const val = (str || "").trim().toLowerCase();
@@ -1366,7 +1368,7 @@ var upCommand = new Command7("up").description("Start the browser runner for all
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
   while (true) {
-    const key = await waitForKey(["r", "l", "q"]);
+    const key = await waitForKey(["r", "l", "q"], shutdown);
     if (key === "q") {
       shutdown();
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proagentstore/cli",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",