agentradar-cli 0.1.3 → 0.1.5

package/dist/vendor-runner/feeder.mjs

@@ -47,6 +47,8 @@ const AWP_BEARER = (() => {
 const TMUX_SESSION = process.env.TMUX_SESSION ?? "agent";
 // The claude pid marker (same predicate entrypoint.sh uses) — proves the pane is live.
 const AGENT_PID_PATTERN = process.env.AGENT_PID_PATTERN ?? "mcp-config.*awp-only";
+const CLAUDE_BIN = process.env.CLAUDE_BIN ?? "claude";
+const AR_OAUTH_TOKEN_FILE = process.env.AR_OAUTH_TOKEN_FILE ?? "";
 
 const MCP_CALL_TIMEOUT_MS = Number(process.env.AWP_MCP_CALL_TIMEOUT_MS ?? "30000");
 // #171: mirror the SERVER long-poll hold (NEXT_EVENT_HOLD_MS, default 200s), held UNDER the ~240s ALB
@@ -193,12 +195,47 @@ function toolJson(result) {
   const text = result?.content?.find((c) => c.type === "text")?.text;
   return text ? JSON.parse(text) : {};
 }
-async function nextEvent(ackEventIds) {
-  const args = ackEventIds && ackEventIds.length ? { ackEventIds } : {};
+async function nextEvent(ackEventIds, runnerState) {
+  const args = {
+    ...(ackEventIds && ackEventIds.length ? { ackEventIds } : {}),
+    ...(runnerState ? { runnerState } : {}),
+  };
   const result = await mcpPost("tools/call", { name: "next_event", arguments: args }, { timeoutMs: NEXT_EVENT_TIMEOUT_MS });
   return toolJson(result); // { events: [...] }
 }
 
+// --------------------------------------------------------------------------
+// Work readiness — process liveness is not enough. A live Claude process can
+// be blocked on subscription OAuth, where injected work is consumed as the OAuth code.
+// --------------------------------------------------------------------------
+export function claudeAuthState(run = spawnSync, readFile = fs.readFileSync) {
+  const env = {};
+  for (const name of ["HOME", "PATH", "USER", "LOGNAME", "SHELL", "LANG", "LC_ALL", "LC_CTYPE", "CLAUDE_CONFIG_DIR"]) {
+    if (typeof process.env[name] === "string") env[name] = process.env[name];
+  }
+  if (AR_OAUTH_TOKEN_FILE) {
+    try {
+      env.CLAUDE_CODE_OAUTH_TOKEN = readFile(AR_OAUTH_TOKEN_FILE, "utf8").trim();
+    } catch {
+      return "unknown";
+    }
+  }
+  const r = run(CLAUDE_BIN, ["auth", "status", "--json"], { encoding: "utf8", env, timeout: 10000 });
+  if (typeof r.stdout !== "string") return "unknown";
+  try {
+    return JSON.parse(r.stdout).loggedIn === true ? "authenticated" : "unauthenticated";
+  } catch {
+    return "unknown";
+  }
+}
+
+export function runnerState(auth = claudeAuthState, sample = capturePane) {
+  const authState = auth();
+  if (authState === "unauthenticated") return "auth_required";
+  if (authState !== "authenticated") return "starting";
+  return sample()?.inputReady ? "ready" : "starting";
+}
+
 // --------------------------------------------------------------------------
 // tmux injection — push one event into the live pane as the agent's next turn.
 // --------------------------------------------------------------------------
@@ -402,7 +439,10 @@ function capturePane() {
   // claude's TUI shows a working line ("… esc to interrupt") while mid-turn. This is only a HINT that
   // triggers a probe on stagnation — it never decides liveness, so a missed/extra hint is harmless.
   const inProgress = /esc to interrupt|\besc to cancel\b/i.test(text);
-  return { hash, inProgress };
+  // This runner always starts Claude with --dangerously-skip-permissions. Its input footer is therefore a
+  // positive signal that startup/trust/auth screens are gone and the interactive TUI can accept a work turn.
+  const inputReady = /bypass permissions on\b/i.test(text.split("\n").slice(-12).join("\n"));
+  return { hash, inProgress, inputReady };
 }
 /**
  * #173b (disc obs) — format-drift detector. If the STRIPPED fingerprint keeps CHANGING while the pane
@@ -459,10 +499,11 @@ async function reportPane() {
 let _stopping = false;
 let _pendingAck = [];
 let _paneTimer = null;
+let _lastRunnerState = null;
 
 /** One receive→inject→ack-select cycle (extracted from loop() + exported so the #173b _pendingAck
  *  fence is directly testable). Sets `_pendingAck` = the eventIds to ack on the NEXT poll. */
-export async function pollOnce(paneLive = paneIsLive) {
+export async function pollOnce(paneLive = paneIsLive, readiness = runnerState, deliverEvent = injectEvent) {
   // next_event refreshes the portal's runner heartbeat. Never call it for a detached/orphan feeder: a
   // process without its owned tmux session cannot receive work, so polling would paint a false Live state
   // while every event stays unacknowledged. The supervisor recreates the session; until then the durable
@@ -472,7 +513,19 @@ export async function pollOnce(paneLive = paneIsLive) {
     await sleep(IDLE_DELAY_MS);
     return;
   }
-  const { events = [], livenessProbe } = await nextEvent(_pendingAck.length ? _pendingAck : undefined);
+  const state = readiness();
+  if (state !== _lastRunnerState) {
+    console.log(`[feeder] runner state ${_lastRunnerState ?? "unknown"} → ${state}`);
+    _lastRunnerState = state;
+  }
+  // The server treats non-ready calls as status-only heartbeats: no drain and no ack. Keep any pending ack
+  // until readiness returns, and defensively ignore events from an older server that does not know the gate.
+  const canWork = state === "ready";
+  const { events = [], livenessProbe } = await nextEvent(canWork && _pendingAck.length ? _pendingAck : undefined, state);
+  if (!canWork) {
+    await sleep(IDLE_DELAY_MS);
+    return;
+  }
   _pendingAck = [];
   // #156/#173b: forward a liveness probe (if any) into the pane so the agent proves it can act.
   // Framed like an event for TRUST (synthetic `probe-<nonce>` eventId, control-plane source) but
@@ -490,7 +543,7 @@ export async function pollOnce(paneLive = paneIsLive) {
   for (const e of events) {
     // Inject in order; ack ONLY the ones that reached a live pane (no-phantom).
     // eslint-disable-next-line no-await-in-loop
-    if (await injectEvent(e)) delivered.push(e.eventId);
+    if (await deliverEvent(e)) delivered.push(e.eventId);
     // eslint-disable-next-line no-await-in-loop
     else break; // pane went away mid-batch → stop; unacked events re-deliver in order.
     // eslint-disable-next-line no-await-in-loop

package/dist/vendor-runner/supervisor/supervise-agent.sh

@@ -307,7 +307,7 @@ log "starting feeder (${FEEDER_JS}) → session '${TMUX_SESSION}'"
 # #152: pass AWP_BEARER_FILE (a 0600 PATH), NEVER the raw AWP_BEARER — the feeder reads the file, so the
 # bearer is not in the feeder process's environment (`ps eww`) or argv. AWP_MCP_URL is not a secret.
 AWP_MCP_URL="${AWP_MCP_URL}" AWP_BEARER_FILE="${AWP_BEARER_FILE}" TMUX_SESSION="${TMUX_SESSION}" \
-  AGENT_PID_PATTERN="${AGENT_PID_PATTERN}" \
+  AGENT_PID_PATTERN="${AGENT_PID_PATTERN}" CLAUDE_BIN="${CLAUDE_BIN}" AR_OAUTH_TOKEN_FILE="${_OAUTH_TOKEN_FILE}" \
   node "${FEEDER_JS}" &
 FEEDER_PID=$!
 log "feeder pid ${FEEDER_PID}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentradar-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Secure AgentRadar vendor setup and skill installer",
   "type": "module",
   "bin": {