@proagentstore/cli 0.4.21 → 0.4.23

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

@@ -1,4 +1,24 @@
 import { spawn } from "node:child_process";
+/**
+ * Merge the platform's resolved engine env over the machine's, where an EMPTY value means
+ * REMOVE rather than "set to empty".
+ *
+ * Needed because the machine env is inherited wholesale: a developer with ANTHROPIC_API_KEY in
+ * their shell handed it to every engine, and Claude Code prefers an API key over the
+ * subscription token — so choosing "subscription" injected CLAUDE_CODE_OAUTH_TOKEN and then
+ * silently lost, billing per token anyway. Without a way to express removal the setting could
+ * not mean what it said.
+ */
+export function mergeEnv(base, overlay) {
+    const out = { ...base };
+    for (const [k, v] of Object.entries(overlay ?? {})) {
+        if (v === "")
+            delete out[k];
+        else
+            out[k] = v;
+    }
+    return out;
+}
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { handlerFor } from "./handlers.js";
@@ -95,7 +115,7 @@ export class HeadlessSession {
         const args = this.mode === "stream-json" ? buildClaudeArgs(this.cmdArgs, this.claudeSessionId) : [...this.cmdArgs];
         const proc = spawn(this.cmdBin, args, {
             cwd: this.config.workDir,
-            env: { ...process.env, ...this.config.env },
+            env: mergeEnv(process.env, this.config.env),
             stdio: ["pipe", "pipe", "pipe"],
         });
         this.proc = proc;

package/dist/browser-runner/runner.js

@@ -97,10 +97,11 @@ export class LocalRunner {
             card.subtitle = normalized.subtitle;
         if (normalized.description)
             card.description = normalized.description;
-        // Agent-driven applications are steered by the remote Workflow brain via the
-        // /browser/* endpoints — the runner never auto-executes them. The task exists
-        // for the console board, the activity trace, and takeover keying.
-        if (normalized.type === "job.apply_agent") {
+        // Agent-driven browser tasks (job applications AND generic browser tasks) are
+        // steered by the remote Workflow brain via the /browser/* endpoints — the runner
+        // never auto-executes them. The task exists for the console board, the activity
+        // trace, and takeover keying.
+        if (normalized.type === "job.apply_agent" || normalized.type === "browser.task") {
             const task = {
                 id: `task_${crypto.randomUUID()}`,
                 type: normalized.type,
@@ -112,7 +113,8 @@ export class LocalRunner {
                 updatedAt: now,
             };
             this.store.putTask(task);
-            this.addTaskEvent(task, "task.created", "Job application started (agent-driven)", { status: "running", url: normalized.input.url });
+            const startedMsg = normalized.type === "browser.task" ? "Browser task started (agent-driven)" : "Job application started (agent-driven)";
+            this.addTaskEvent(task, "task.created", startedMsg, { status: "running", url: normalized.input.url });
             return task;
         }
         const requiresApproval = normalized.requiresApproval || APPROVAL_REQUIRED_TASKS.has(normalized.type);

package/dist/index.js

@@ -608,16 +608,104 @@ var publishCommand = new Command5("publish").description("Publish an agent to Pr
   writeLine();
 });
 
-// src/commands/runner.ts
-import { spawn as spawn2 } from "child_process";
+// src/commands/runner/command.ts
+import { spawn as spawn3 } from "child_process";
 import { randomUUID } from "crypto";
-import { existsSync as existsSync5 } from "fs";
+import { Command as Command6 } from "commander";
+
+// src/commands/runner/http.ts
 import { hostname } from "os";
+function clean(value) {
+  const trimmed = value?.trim();
+  return trimmed || void 0;
+}
+function runnerBaseUrl(url) {
+  return (clean(url) || clean(process.env.PAGS_RUNNER_URL) || "http://127.0.0.1:49171").replace(/\/$/, "");
+}
+function pagsApiBase(url) {
+  return (clean(url) || clean(process.env.PAGS_API_BASE) || "https://api.proagentstore.online").replace(/\/$/, "");
+}
+function pagsHeaders(token) {
+  const resolved = clean(token) || clean(process.env.PAGS_TOKEN) || clean(loadSession()?.token);
+  return resolved ? { Authorization: `Bearer ${resolved}` } : {};
+}
+function runnerRequestHeaders(opts) {
+  const resolved = clean(opts.token) || clean(process.env.PAGS_RUNNER_TOKEN);
+  const headers = resolved ? { Authorization: `Bearer ${resolved}` } : {};
+  const instanceId = clean(opts.instanceId) || clean(process.env.PAGS_INSTANCE_ID);
+  if (instanceId) headers["X-PAGS-Instance-Id"] = instanceId;
+  return headers;
+}
+function apiPathSegment(value) {
+  return encodeURIComponent(value);
+}
+function buildRuntimeRegistrationBody(opts, capabilities = []) {
+  return {
+    endpointUrl: clean(opts.endpointUrl) || opts.endpointUrl,
+    token: clean(opts.runnerToken) || clean(opts.token) || clean(process.env.PAGS_RUNNER_TOKEN),
+    placement: opts.placement === "managed" ? "managed" : "local",
+    capabilities,
+    runnerVersion: clean(opts.runnerVersion) || "",
+    runnerNode: hostname()
+  };
+}
+async function requestRunner(method, path, opts, body) {
+  const headers = {
+    ...runnerRequestHeaders(opts)
+  };
+  if (body !== void 0) headers["Content-Type"] = "application/json";
+  const res = await fetch(`${runnerBaseUrl(opts.url)}${path}`, {
+    method,
+    headers,
+    body: body === void 0 ? void 0 : JSON.stringify(body)
+  });
+  const { text, data } = await readResponse(res);
+  if (!res.ok) {
+    const message = responseErrorMessage(data, text, res.statusText);
+    throw new Error(`${res.status} ${message}`);
+  }
+  return data;
+}
+async function requestPags(method, path, opts, body) {
+  const headers = {
+    ...pagsHeaders(opts.pagsToken)
+  };
+  if (!headers.Authorization) {
+    throw new Error("PAGS token required. Set PAGS_TOKEN or pass --pags-token.");
+  }
+  if (body !== void 0) headers["Content-Type"] = "application/json";
+  const res = await fetch(`${pagsApiBase(opts.apiBase)}${path}`, {
+    method,
+    headers,
+    body: body === void 0 ? void 0 : JSON.stringify(body)
+  });
+  const { text, data } = await readResponse(res);
+  if (!res.ok) {
+    const message = responseErrorMessage(data, text, res.statusText);
+    throw new Error(`${res.status} ${message}`);
+  }
+  return data;
+}
+async function readResponse(res) {
+  const text = await res.text();
+  if (!text) return { text, data: {} };
+  try {
+    return { text, data: JSON.parse(text) };
+  } catch {
+    return { text, data: {} };
+  }
+}
+function responseErrorMessage(data, text, statusText) {
+  return typeof data.error === "string" ? data.error : text || statusText;
+}
+
+// src/commands/runner/process.ts
+import { spawn as spawn2 } from "child_process";
+import { existsSync as existsSync5 } from "fs";
 import { resolve as resolve4 } from "path";
 import { createServer as createServer2 } from "net";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { createRequire } from "module";
-import { Command as Command6 } from "commander";
 var CLI_VERSION = (() => {
   try {
     return createRequire(import.meta.url)("../package.json").version;
@@ -637,27 +725,6 @@ async function findFreePort2(start) {
   }
   return start;
 }
-var runnerCommand = createRunnerCommand();
-function runnerBaseUrl(url) {
-  return (clean(url) || clean(process.env.PAGS_RUNNER_URL) || "http://127.0.0.1:49171").replace(/\/$/, "");
-}
-function pagsApiBase(url) {
-  return (clean(url) || clean(process.env.PAGS_API_BASE) || "https://api.proagentstore.online").replace(/\/$/, "");
-}
-function pagsHeaders(token) {
-  const resolved = clean(token) || clean(process.env.PAGS_TOKEN) || clean(loadSession()?.token);
-  return resolved ? { Authorization: `Bearer ${resolved}` } : {};
-}
-function runnerRequestHeaders(opts) {
-  const resolved = clean(opts.token) || clean(process.env.PAGS_RUNNER_TOKEN);
-  const headers = resolved ? { Authorization: `Bearer ${resolved}` } : {};
-  const instanceId = clean(opts.instanceId) || clean(process.env.PAGS_INSTANCE_ID);
-  if (instanceId) headers["X-PAGS-Instance-Id"] = instanceId;
-  return headers;
-}
-function apiPathSegment(value) {
-  return encodeURIComponent(value);
-}
 function buildRunnerArgs(opts) {
   const args = [];
   if (clean(opts.host)) args.push("--host", clean(opts.host));
@@ -668,20 +735,6 @@ function buildRunnerArgs(opts) {
   if (opts.headless) args.push("--headless");
   return args;
 }
-function buildRuntimeRegistrationBody(opts, capabilities = []) {
-  return {
-    endpointUrl: clean(opts.endpointUrl) || opts.endpointUrl,
-    token: clean(opts.runnerToken) || clean(opts.token) || clean(process.env.PAGS_RUNNER_TOKEN),
-    placement: opts.placement === "managed" ? "managed" : "local",
-    capabilities,
-    runnerVersion: clean(opts.runnerVersion) || "",
-    runnerNode: hostname()
-  };
-}
-function clean(value) {
-  const trimmed = value?.trim();
-  return trimmed || void 0;
-}
 function findWorkspaceRoot() {
   let dir = process.cwd();
   for (let i = 0; i < 8; i++) {
@@ -742,63 +795,14 @@ async function waitForLocalRunner(opts, timeoutMs = 15e3) {
   }
   throw new Error(`runner did not become healthy: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
 }
-async function requestRunner(method, path, opts, body) {
-  const headers = {
-    ...runnerRequestHeaders(opts)
-  };
-  if (body !== void 0) headers["Content-Type"] = "application/json";
-  const res = await fetch(`${runnerBaseUrl(opts.url)}${path}`, {
-    method,
-    headers,
-    body: body === void 0 ? void 0 : JSON.stringify(body)
-  });
-  const { text, data } = await readResponse(res);
-  if (!res.ok) {
-    const message = responseErrorMessage(data, text, res.statusText);
-    throw new Error(`${res.status} ${message}`);
-  }
-  return data;
-}
-async function requestPags(method, path, opts, body) {
-  const headers = {
-    ...pagsHeaders(opts.pagsToken)
-  };
-  if (!headers.Authorization) {
-    throw new Error("PAGS token required. Set PAGS_TOKEN or pass --pags-token.");
-  }
-  if (body !== void 0) headers["Content-Type"] = "application/json";
-  const res = await fetch(`${pagsApiBase(opts.apiBase)}${path}`, {
-    method,
-    headers,
-    body: body === void 0 ? void 0 : JSON.stringify(body)
-  });
-  const { text, data } = await readResponse(res);
-  if (!res.ok) {
-    const message = responseErrorMessage(data, text, res.statusText);
-    throw new Error(`${res.status} ${message}`);
-  }
-  return data;
-}
-async function readResponse(res) {
-  const text = await res.text();
-  if (!text) return { text, data: {} };
-  try {
-    return { text, data: JSON.parse(text) };
-  } catch {
-    return { text, data: {} };
-  }
-}
-function responseErrorMessage(data, text, statusText) {
-  return typeof data.error === "string" ? data.error : text || statusText;
-}
-function collectCapability(value, previous = []) {
-  return [...previous, value];
-}
+
+// src/commands/runner/relay.ts
+import { hostname as hostname2 } from "os";
 async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force = false) {
   const apiBase = pagsApiBase(opts.apiBase).replace(/^http/, "ws");
   const pagsToken = clean(opts.pagsToken) || clean(process.env.PAGS_TOKEN) || clean(loadSession()?.token);
   if (!pagsToken) throw new Error("PAGS token required for WebSocket relay");
-  const runnerNode = hostname();
+  const runnerNode = hostname2();
   const capabilities = await requestRunner("GET", "/capabilities", { url: localUrl, token: runnerToken, instanceId: instanceIds[0] });
   const caps = Array.isArray(capabilities.capabilities) ? capabilities.capabilities.filter((item) => typeof item === "string") : [];
   for (const id of instanceIds) {
@@ -824,7 +828,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
   writeLine("Runtime registered with PAGS \u2713");
   writeLine("");
   writeLine("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
-  writeLine(`  \u2705 CONNECTED \u2014 WebSocket relay \xB7 ${hostname()}`);
+  writeLine(`  \u2705 CONNECTED \u2014 WebSocket relay \xB7 ${hostname2()}`);
   writeLine(`  Agents:   ${instanceIds.length} instance${instanceIds.length === 1 ? "" : "s"}`);
   writeLine("  No cloudflared needed. Ctrl+C to disconnect.");
   writeLine("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
@@ -860,7 +864,7 @@ function openRelaySocket(instanceId, wsBase, mintToken, localUrl, runnerToken, f
       backoffMs = Math.min(backoffMs * 2, 3e4);
       return;
     }
-    const params = new URLSearchParams({ token: relayToken, node: hostname() });
+    const params = new URLSearchParams({ token: relayToken, node: hostname2() });
     if (force) params.set("force", "1");
     const url = `${wsBase}/v1/relay/${encodeURIComponent(instanceId)}/connect?${params.toString()}`;
     const ws = new WebSocket(url);
@@ -930,6 +934,11 @@ function openRelaySocket(instanceId, wsBase, mintToken, localUrl, runnerToken, f
   };
   connect();
 }
+
+// src/commands/runner/command.ts
+function collectCapability(value, previous = []) {
+  return [...previous, value];
+}
 function createRunnerCommand() {
   const command = new Command6("runner").description(
     "Manage the local ProAgentStore browser runtime for ProAgentStore agents"
@@ -945,7 +954,7 @@ function createRunnerCommand() {
     const primary = instanceIds[0];
     const runnerOpts = { ...opts, host, port, token: runnerToken };
     const spec = runnerSpawnSpec(runnerOpts);
-    const runner = spawn2(spec.command, spec.args, {
+    const runner = spawn3(spec.command, spec.args, {
       cwd: spec.cwd,
       stdio: ["ignore", "pipe", "pipe"],
       shell: process.platform === "win32"
@@ -1091,13 +1100,16 @@ function createRunnerCommand() {
   return command;
 }
 
+// src/commands/runner.ts
+var runnerCommand = createRunnerCommand();
+
 // src/commands/up.ts
 import { createRequire as createRequire2 } from "module";
 import { Command as Command7 } from "commander";
 
 // src/tui.ts
 import chalk from "chalk";
-import { hostname as hostname2 } from "os";
+import { hostname as hostname3 } from "os";
 import readline from "readline";
 var ACCENT = "#7c3aed";
 var c = chalk.hex(ACCENT);
@@ -1139,7 +1151,7 @@ function printStatus(state) {
   clearScreen();
   printLogo(state.version);
   const connected = state.runner === "online" && state.tunnel === "online" && state.registration === "registered";
-  console.log(pad + d("Signed in as ") + w(state.user) + d("  \xB7  agent: ") + w(state.activeInstance) + d("  \xB7  node: ") + w(hostname2()));
+  console.log(pad + d("Signed in as ") + w(state.user) + d("  \xB7  agent: ") + w(state.activeInstance) + d("  \xB7  node: ") + w(hostname3()));
   console.log("");
   const row = (kind, s) => {
     const { icon, label, note } = describe(kind, s);
@@ -1202,7 +1214,7 @@ var API_BASE2 = "https://api.proagentstore.online";
 var CLI_VERSION2 = createRequire2(import.meta.url)("../package.json").version;
 async function stopRunnerProcesses() {
   if (process.platform === "win32") return false;
-  const { execSync } = await import("child_process");
+  const { execFileSync: execFileSync2 } = await import("child_process");
   const patterns = [
     "dist/browser-runner/index.js",
     "browser-runner/src/index",
@@ -1211,7 +1223,7 @@ async function stopRunnerProcesses() {
   let stopped = false;
   for (const p of patterns) {
     try {
-      execSync(`pkill -f ${JSON.stringify(p)}`, { stdio: "ignore" });
+      execFileSync2("pkill", ["-f", p], { stdio: "ignore" });
       stopped = true;
     } catch {
     }
@@ -1270,12 +1282,12 @@ var upCommand = new Command7("up").description("Start the browser runner for all
   state.activeInstance = instances.length === 1 ? instances[0].name || instances[0].slug || instances[0].id.slice(0, 8) : `${instances.length} agents`;
   printStep(`Connecting ${state.activeInstance}\u2026`, "wait");
   await stopRunnerProcesses();
-  const { spawn: spawn3 } = await import("child_process");
+  const { spawn: spawn4 } = await import("child_process");
   const cliPath = process.argv[1];
   const args = [cliPath, "runner", "connect", ...instances.map((i) => i.id)];
   if (opts.headless) args.push("--headless");
   if (opts.force) args.push("--force");
-  const child = spawn3(process.execPath, args, {
+  const child = spawn4(process.execPath, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: { ...process.env, PAGS_TOKEN: session.token }
   });

package/package.json

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