@hasna/loops 0.4.8 → 0.4.10

package/dist/cli/index.js

@@ -56,8 +56,12 @@ function nowIso() {
 import { mkdirSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+function homeDir() {
+  const home = process.env.HOME?.trim();
+  return home ? home : homedir();
+}
 function dataDir() {
-  return process.env.LOOPS_DATA_DIR || join(homedir(), ".hasna", "loops");
+  return process.env.LOOPS_DATA_DIR || join(homeDir(), ".hasna", "loops");
 }
 function ensureDataDir() {
   const dir = dataDir();
@@ -74,10 +78,10 @@ function daemonLogPath() {
   return join(dataDir(), "daemon.log");
 }
 function systemdServicePath() {
-  return join(homedir(), ".config", "systemd", "user", "loops-daemon.service");
+  return join(homeDir(), ".config", "systemd", "user", "loops-daemon.service");
 }
 function launchdPlistPath() {
-  return join(homedir(), "Library", "LaunchAgents", "com.hasna.loops.daemon.plist");
+  return join(homeDir(), "Library", "LaunchAgents", "com.hasna.loops.daemon.plist");
 }
 
 // src/lib/process-identity.ts
@@ -581,7 +585,7 @@ import { isAbsolute, resolve } from "path";
 
 // src/lib/agent-adapter.ts
 import { spawn } from "child_process";
-var UNSAFE_CODEWITH_DURABLE_EXTRA_ARGS = new Set([
+var UNSAFE_CODEWITH_EXEC_EXTRA_ARGS = new Set([
   "e",
   "exec",
   "agent",
@@ -630,12 +634,12 @@ function validateAgentOptions(target, label, capabilities) {
     throw new Error(`${label}.agent is not supported for provider codex`);
   }
   if (provider === "codewith" && target.agent !== undefined) {
-    throw new Error(`${label}.agent is not supported for provider codewith durable background-agent execution`);
+    throw new Error(`${label}.agent is not supported for provider codewith`);
   }
   if (provider === "codewith") {
-    const unsafe = target.extraArgs?.find((arg) => UNSAFE_CODEWITH_DURABLE_EXTRA_ARGS.has(arg));
+    const unsafe = target.extraArgs?.find((arg) => UNSAFE_CODEWITH_EXEC_EXTRA_ARGS.has(arg));
     if (unsafe) {
-      throw new Error(`${label}.extraArgs cannot include ${unsafe}; codewith agent steps use durable agent start, not exec/ephemeral flags`);
+      throw new Error(`${label}.extraArgs cannot include ${unsafe}; codewith exec launch flags are managed by the adapter`);
     }
   }
   if (target.addDirs?.length && !["codewith", "codex"].includes(provider)) {
@@ -718,7 +722,10 @@ function buildAgentInvocation(target) {
       args.push(...target.authProfile ? ["--auth-profile", target.authProfile] : []);
       if (target.variant)
         args.push("-c", `model_reasoning_effort=${configStringValue(target.variant)}`);
-      args.push("--ask-for-approval", "never", "--sandbox", codewithLikeSandbox(target));
+      const sandbox = codewithLikeSandbox(target);
+      if (sandbox === "workspace-write")
+        args.push("-c", "sandbox_workspace_write.network_access=true");
+      args.push("--ask-for-approval", "never", "exec", "--json", "--ephemeral", "--sandbox", sandbox, "--skip-git-repo-check");
       if (target.cwd)
         args.push("--cd", target.cwd);
       for (const dir of target.addDirs ?? [])
@@ -726,11 +733,7 @@ function buildAgentInvocation(target) {
       if (target.model)
         args.push("--model", target.model);
       args.push(...target.extraArgs ?? []);
-      args.push("agent", "start", "--json");
-      if (target.cwd)
-        args.push("--cwd", target.cwd);
-      args.push(target.prompt);
-      return { command: "codewith", args };
+      return { command: "codewith", args, stdin: target.prompt };
     }
     case "codex": {
       if (target.variant)
@@ -783,7 +786,7 @@ function adapterFor(provider, capabilities) {
 var PROVIDER_ADAPTERS = {
   claude: adapterFor("claude", { sandbox: [], durable: false, remote: true, promptChannel: "stdin" }),
   cursor: adapterFor("cursor", { sandbox: CURSOR_SANDBOXES, durable: false, remote: true, promptChannel: "stdin" }),
-  codewith: adapterFor("codewith", { sandbox: CODEX_LIKE_SANDBOXES, durable: true, remote: false, promptChannel: "argv" }),
+  codewith: adapterFor("codewith", { sandbox: CODEX_LIKE_SANDBOXES, durable: false, remote: true, promptChannel: "stdin" }),
   codex: adapterFor("codex", { sandbox: CODEX_LIKE_SANDBOXES, durable: false, remote: true, promptChannel: "stdin" }),
   aicopilot: adapterFor("aicopilot", { sandbox: [], durable: false, remote: true, promptChannel: "stdin" }),
   opencode: adapterFor("opencode", { sandbox: [], durable: false, remote: true, promptChannel: "stdin" })
@@ -1475,6 +1478,21 @@ function workItemStatusForLoopRun(status, attempt, maxAttempts) {
 function scrubbedOrNull(value) {
   return value == null ? null : scrubSecrets(value);
 }
+var MAX_PERSISTED_RUN_OUTPUT_CHARS = 64 * 1024;
+function clampPersistedRunOutput(value) {
+  if (value == null || value.length <= MAX_PERSISTED_RUN_OUTPUT_CHARS)
+    return value;
+  const half = Math.floor(MAX_PERSISTED_RUN_OUTPUT_CHARS / 2);
+  const head = value.slice(0, half);
+  const tail = value.slice(value.length - half);
+  const omitted = value.length - head.length - tail.length;
+  return `${head}
+\u2026[${omitted} chars truncated by loops run-output retention]\u2026
+${tail}`;
+}
+function persistedRunOutput(value) {
+  return clampPersistedRunOutput(scrubbedOrNull(value));
+}
 function chmodIfExists(path, mode) {
   try {
     if (existsSync(path))
@@ -3221,8 +3239,8 @@ class Store {
              ))`).run({
         $workflowRunId: workflowRunId,
         $stepId: stepId,
-        $stdout: progress.stdout === undefined ? null : scrubbedOrNull(progress.stdout),
-        $stderr: progress.stderr === undefined ? null : scrubbedOrNull(progress.stderr),
+        $stdout: progress.stdout === undefined ? null : persistedRunOutput(progress.stdout),
+        $stderr: progress.stderr === undefined ? null : persistedRunOutput(progress.stderr),
         $updated: now,
         $daemonLeaseId: opts.daemonLeaseId ?? null,
         $now: now
@@ -3283,8 +3301,8 @@ class Store {
         $finished: finishedAt,
         $exitCode: patch.exitCode ?? null,
         $durationMs: patch.durationMs ?? null,
-        $stdout: scrubbedOrNull(patch.stdout),
-        $stderr: scrubbedOrNull(patch.stderr),
+        $stdout: persistedRunOutput(patch.stdout),
+        $stderr: persistedRunOutput(patch.stderr),
         $error: error ?? null,
         $updated: finishedAt,
         $daemonLeaseId: opts.daemonLeaseId ?? null,
@@ -3662,8 +3680,8 @@ class Store {
       $pid: patch.pid ?? null,
       $exitCode: patch.exitCode ?? null,
       $durationMs: patch.durationMs ?? null,
-      $stdout: scrubbedOrNull(patch.stdout),
-      $stderr: scrubbedOrNull(patch.stderr),
+      $stdout: persistedRunOutput(patch.stdout),
+      $stderr: persistedRunOutput(patch.stderr),
       $error: error ?? null,
       $updated: finishedAt,
       $claimedBy: opts.claimedBy ?? null,
@@ -4060,8 +4078,8 @@ class Store {
       $processStartedAt: run.processStartedAt ?? null,
       $exitCode: run.exitCode ?? null,
       $durationMs: run.durationMs ?? null,
-      $stdout: scrubbedOrNull(run.stdout),
-      $stderr: scrubbedOrNull(run.stderr),
+      $stdout: persistedRunOutput(run.stdout),
+      $stderr: persistedRunOutput(run.stderr),
       $error: scrubbedOrNull(run.error),
       $goalRunId: run.goalRunId ?? null,
       $created: run.createdAt,
@@ -4219,7 +4237,7 @@ class Store {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.4.8",
+  version: "0.4.10",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -4902,11 +4920,6 @@ var TRANSPORT_ENV_KEYS = new Set([
   "USER",
   "XDG_RUNTIME_DIR"
 ]);
-function boundedText(text, maxBytes) {
-  const buffer = new BoundedOutputBuffer(maxBytes);
-  buffer.append(text);
-  return buffer.value();
-}
 function buildResult(status, startedAt, fields = {}) {
   const finishedAt = fields.finishedAt ?? nowIso();
   return {
@@ -4944,6 +4957,20 @@ function notifySpawn(pid, opts) {
 function shellQuote(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
+function codewithProfileCandidateFromLine(line) {
+  const cols = line.trim().split(/\s+/);
+  if (cols[0] === "*")
+    return cols[1];
+  return cols[0];
+}
+function codewithProfileForError(profile) {
+  return /[\u0000-\u001F\u007F]/.test(profile) ? JSON.stringify(profile) ?? profile : profile;
+}
+function assertCodewithAuthProfileSupported(profile) {
+  if (profile.includes("\x00")) {
+    throw new Error(`codewith auth profile contains unsupported NUL byte: ${codewithProfileForError(profile)}`);
+  }
+}
 function metadataEnv(metadata) {
   const env = {};
   if (metadata.loopId)
@@ -4970,21 +4997,6 @@ function metadataEnv(metadata) {
     env.LOOPS_GOAL_NODE_KEY = metadata.goalNodeKey;
   return env;
 }
-function codewithAgentIdempotencyKey(metadata) {
-  const parts = [
-    "openloops",
-    metadata.workflowRunId ? `workflow-run:${metadata.workflowRunId}` : undefined,
-    metadata.workflowStepId ? `step:${metadata.workflowStepId}` : undefined,
-    metadata.runId ? `loop-run:${metadata.runId}` : undefined,
-    metadata.loopId ? `loop:${metadata.loopId}` : undefined,
-    metadata.scheduledFor ? `scheduled:${metadata.scheduledFor}` : undefined,
-    metadata.goalId ? `goal:${metadata.goalId}` : undefined,
-    metadata.goalNodeKey ? `node:${metadata.goalNodeKey}` : undefined
-  ].filter(Boolean);
-  if (parts.length > 1)
-    return parts.join(":");
-  return `openloops:adhoc:${randomBytes2(16).toString("hex")}`;
-}
 function allowlistEnv(allowlist) {
   const env = {};
   if (allowlist?.tools?.length)
@@ -5025,6 +5037,9 @@ function commandSpec(target, opts) {
     };
   }
   const agentTarget = target;
+  if (agentTarget.provider === "codewith" && agentTarget.authProfile) {
+    assertCodewithAuthProfileSupported(agentTarget.authProfile);
+  }
   const adapter = providerAdapter(agentTarget.provider);
   const invocation = adapter.buildInvocation(agentTarget);
   return {
@@ -5039,8 +5054,7 @@ function commandSpec(target, opts) {
     preflightAnyOf: invocation.preflightAnyOf,
     stdin: invocation.stdin,
     allowlist: agentTarget.allowlist,
-    worktree: agentTarget.worktree,
-    codewithDurableAgent: adapter.capabilities.durable ? { target: agentTarget } : undefined
+    worktree: agentTarget.worktree
   };
 }
 function composeExecutionEnv(spec, metadata, opts, accountEnv) {
@@ -5198,7 +5212,8 @@ function remotePreflightScript(spec, metadata) {
     lines.push(`if ! ${spec.preflightAnyOf.map((command) => `command -v ${shellQuote(command)} >/dev/null 2>&1`).join(" && ! ")}; then`, `  echo 'none of required executables found: ${spec.preflightAnyOf.join(", ")}' >&2`, "  exit 127", "fi");
   }
   if (spec.nativeAuthProfile?.provider === "codewith") {
-    lines.push(`__OPENLOOPS_CODEWITH_PROFILES="$(${shellQuote(spec.command)} profile list)" || {`, `  printf '%s\\n' ${shellQuote("codewith auth profile preflight failed")} >&2`, "  exit 1", "}", `if ! printf '%s\\n' "$__OPENLOOPS_CODEWITH_PROFILES" | awk 'NR > 1 { print $1 }' | grep -Fx ${shellQuote(spec.nativeAuthProfile.profile)} >/dev/null; then`, `  printf '%s\\n' ${shellQuote(`codewith auth profile not found: ${spec.nativeAuthProfile.profile}`)} >&2`, "  exit 1", "fi");
+    const profileForError = codewithProfileForError(spec.nativeAuthProfile.profile);
+    lines.push(`__OPENLOOPS_CODEWITH_PROFILE=${shellQuote(spec.nativeAuthProfile.profile)}`, "export __OPENLOOPS_CODEWITH_PROFILE", `__OPENLOOPS_CODEWITH_PROFILES="$(${shellQuote(spec.command)} profile list)" || {`, `  printf '%s\\n' ${shellQuote("codewith auth profile preflight failed")} >&2`, "  exit 1", "}", `if ! printf '%s\\n' "$__OPENLOOPS_CODEWITH_PROFILES" | awk 'NR > 1 { candidate = ($1 == "*" ? $2 : $1); if (candidate == ENVIRON["__OPENLOOPS_CODEWITH_PROFILE"]) found = 1 } END { exit(found ? 0 : 1) }'; then`, `  printf '%s\\n' ${shellQuote(`codewith auth profile not found: ${profileForError}`)} >&2`, "  exit 1", "fi");
   }
   return lines.join(`
 `);
@@ -5223,9 +5238,9 @@ function assertCodewithProfileListed(profile, result) {
     const detail = (result.stderr || result.stdout || `exit ${result.status ?? "unknown"}`).trim();
     throw new Error(`codewith auth profile preflight failed${detail ? `: ${detail}` : ""}`);
   }
-  const profiles = new Set((result.stdout || "").split(/\r?\n/).slice(1).map((line) => line.trim().split(/\s+/)[0]).filter(Boolean));
+  const profiles = new Set((result.stdout || "").split(/\r?\n/).slice(1).map(codewithProfileCandidateFromLine).filter(Boolean));
   if (!profiles.has(profile)) {
-    throw new Error(`codewith auth profile not found: ${profile}`);
+    throw new Error(`codewith auth profile not found: ${codewithProfileForError(profile)}`);
   }
 }
 function preflightNativeAuthProfileSync(spec, env) {
@@ -5250,266 +5265,6 @@ async function preflightNativeAuthProfile(spec, env) {
   const result = await spawnCapture(spec.command, ["profile", "list"], { env, timeoutMs: 15000 });
   assertCodewithProfileListed(spec.nativeAuthProfile.profile, result);
 }
-function codewithAgentStartArgs(target, idempotencyKey) {
-  const args = providerAdapter(target.provider).buildInvocation(target).args;
-  const startIndex = args.findIndex((arg, index) => arg === "start" && args[index - 1] === "agent");
-  if (startIndex === -1)
-    throw new Error("internal error: codewith durable agent args missing agent start");
-  args.splice(startIndex + 1, 0, "--idempotency-key", idempotencyKey);
-  return args;
-}
-function codewithAgentControlArgs(target, command, agentId) {
-  return [
-    ...target.authProfile ? ["--auth-profile", target.authProfile] : [],
-    "agent",
-    command,
-    ...command === "logs" ? ["--limit", "20"] : [],
-    "--json",
-    agentId
-  ];
-}
-function extractFirstJsonObject(text) {
-  let depth = 0;
-  let start = -1;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0;i < text.length; i += 1) {
-    const ch = text[i];
-    if (inString) {
-      if (escaped)
-        escaped = false;
-      else if (ch === "\\")
-        escaped = true;
-      else if (ch === '"')
-        inString = false;
-      continue;
-    }
-    if (ch === '"') {
-      inString = true;
-    } else if (ch === "{") {
-      if (depth === 0)
-        start = i;
-      depth += 1;
-    } else if (ch === "}") {
-      if (depth > 0) {
-        depth -= 1;
-        if (depth === 0 && start !== -1)
-          return text.slice(start, i + 1);
-      }
-    }
-  }
-  return;
-}
-function parseJsonOutput(stdout, label) {
-  const raw = stdout || "{}";
-  const candidates = [raw.trim()];
-  const scanned = extractFirstJsonObject(raw);
-  if (scanned && scanned !== raw.trim())
-    candidates.push(scanned);
-  let lastError;
-  for (const candidate of candidates) {
-    try {
-      const value = JSON.parse(candidate);
-      if (!value || typeof value !== "object" || Array.isArray(value))
-        throw new Error("not an object");
-      return value;
-    } catch (error) {
-      lastError = error;
-    }
-  }
-  throw new Error(`${label} did not return JSON${lastError instanceof Error ? `: ${lastError.message}` : ""}`);
-}
-function recordField(value, key) {
-  if (!value || typeof value !== "object" || Array.isArray(value))
-    return;
-  const field = value[key];
-  return field && typeof field === "object" && !Array.isArray(field) ? field : undefined;
-}
-function stringField(value, key) {
-  const field = value?.[key];
-  return typeof field === "string" ? field : undefined;
-}
-function numberField(value, key) {
-  const field = value?.[key];
-  return typeof field === "number" && Number.isFinite(field) ? field : undefined;
-}
-function codewithAgentStatus(readJson) {
-  return stringField(recordField(readJson, "agent"), "status") ?? stringField(recordField(readJson, "statusSnapshot"), "status");
-}
-function codewithAgentLastEventSeq(readJson) {
-  const agentSeq = numberField(recordField(readJson, "agent"), "lastEventSeq");
-  const snapshotSeq = numberField(recordField(readJson, "statusSnapshot"), "lastEventSeq");
-  if (agentSeq !== undefined && snapshotSeq !== undefined)
-    return Math.max(agentSeq, snapshotSeq);
-  return agentSeq ?? snapshotSeq;
-}
-function codewithAgentEvidence(startJson, readJson, logsJson) {
-  const agent = recordField(readJson, "agent") ?? recordField(startJson, "agent");
-  const statusSnapshot = recordField(readJson, "statusSnapshot");
-  const events = Array.isArray(logsJson?.data) ? logsJson.data.filter((event) => Boolean(event) && typeof event === "object" && !Array.isArray(event)).map((event) => ({
-    seq: numberField(event, "seq"),
-    eventType: stringField(event, "eventType"),
-    createdAt: numberField(event, "createdAt")
-  })) : undefined;
-  return JSON.stringify({
-    codewithAgent: {
-      agentId: stringField(agent, "agentId"),
-      status: stringField(agent, "status"),
-      desiredState: stringField(agent, "desiredState"),
-      statusReason: stringField(agent, "statusReason"),
-      threadId: stringField(agent, "threadId"),
-      rolloutPath: stringField(agent, "rolloutPath"),
-      pid: numberField(agent, "pid"),
-      exitCode: numberField(agent, "exitCode"),
-      created: typeof startJson.created === "boolean" ? startJson.created : undefined
-    },
-    statusSnapshot: statusSnapshot ? {
-      seq: numberField(statusSnapshot, "seq"),
-      status: stringField(statusSnapshot, "status"),
-      summary: stringField(statusSnapshot, "summary"),
-      pendingInteractionCount: numberField(statusSnapshot, "pendingInteractionCount"),
-      lastEventSeq: numberField(statusSnapshot, "lastEventSeq")
-    } : undefined,
-    events
-  }, null, 2);
-}
-function codewithAgentProgress(readJson) {
-  const agent = recordField(readJson, "agent");
-  const statusSnapshot = recordField(readJson, "statusSnapshot");
-  return {
-    provider: "codewith",
-    agentId: stringField(agent, "agentId"),
-    status: stringField(agent, "status") ?? stringField(statusSnapshot, "status"),
-    summary: stringField(statusSnapshot, "summary"),
-    statusReason: stringField(agent, "statusReason"),
-    threadId: stringField(agent, "threadId"),
-    rolloutPath: stringField(agent, "rolloutPath"),
-    pid: numberField(agent, "pid"),
-    lastEventSeq: codewithAgentLastEventSeq(readJson)
-  };
-}
-function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
-}
-async function executeCodewithDurableAgent(spec, metadata, opts, env, startedAt) {
-  const target = spec.codewithDurableAgent?.target;
-  if (!target)
-    throw new Error("internal error: missing codewith durable target");
-  const maxOutputBytes = opts.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
-  const idempotencyKey = codewithAgentIdempotencyKey(metadata);
-  const start = await spawnCapture(spec.command, codewithAgentStartArgs(target, idempotencyKey), {
-    cwd: spec.cwd,
-    env,
-    timeoutMs: 30000,
-    maxOutputBytes
-  });
-  const stderr = new BoundedOutputBuffer(maxOutputBytes);
-  stderr.append(start.stderr);
-  if (start.error || (start.status ?? 1) !== 0) {
-    return failureResult(startedAt, start.error ?? `codewith agent start exited with code ${start.status ?? "unknown"}`, {
-      exitCode: start.status ?? undefined,
-      stdout: start.stdout,
-      stderr: stderr.value()
-    });
-  }
-  let startJson;
-  try {
-    startJson = parseJsonOutput(start.stdout || "{}", "codewith agent start");
-  } catch (error) {
-    return failureResult(startedAt, error instanceof Error ? error.message : String(error), { stdout: start.stdout, stderr: stderr.value() });
-  }
-  const agentId = stringField(recordField(startJson, "agent"), "agentId");
-  if (!agentId) {
-    return failureResult(startedAt, "codewith agent start did not return agent.agentId", { stdout: start.stdout, stderr: stderr.value() });
-  }
-  opts.onAgentProgress?.(codewithAgentProgress(startJson));
-  const stopAgent = async () => {
-    await spawnCapture(spec.command, codewithAgentControlArgs(target, "stop", agentId), {
-      cwd: spec.cwd,
-      env,
-      timeoutMs: 15000,
-      maxOutputBytes
-    });
-  };
-  const pollMs = Math.max(100, Number(opts.env?.LOOPS_CODEWITH_AGENT_POLL_MS ?? process.env.LOOPS_CODEWITH_AGENT_POLL_MS ?? 2000) || 2000);
-  let lastReadJson = startJson;
-  let lastLogsJson;
-  let lastFingerprint;
-  let lastProgressAt = Date.now();
-  const evidence = () => boundedText(codewithAgentEvidence(startJson, lastReadJson, lastLogsJson), maxOutputBytes);
-  while (true) {
-    if (opts.signal?.aborted) {
-      await stopAgent();
-      return failureResult(startedAt, "cancelled", { stdout: evidence(), stderr: stderr.value() });
-    }
-    const read = await spawnCapture(spec.command, codewithAgentControlArgs(target, "read", agentId), {
-      cwd: spec.cwd,
-      env,
-      timeoutMs: 30000,
-      maxOutputBytes
-    });
-    stderr.append(read.stderr);
-    if (read.error || (read.status ?? 1) !== 0) {
-      return failureResult(startedAt, read.error ?? `codewith agent read exited with code ${read.status ?? "unknown"}`, {
-        exitCode: read.status ?? undefined,
-        stdout: evidence(),
-        stderr: stderr.value()
-      });
-    }
-    try {
-      lastReadJson = parseJsonOutput(read.stdout || "{}", "codewith agent read");
-    } catch (error) {
-      return failureResult(startedAt, error instanceof Error ? error.message : String(error), {
-        stdout: boundedText(read.stdout, maxOutputBytes),
-        stderr: stderr.value()
-      });
-    }
-    const status = codewithAgentStatus(lastReadJson);
-    const fingerprint = JSON.stringify({
-      status,
-      agentLastEventSeq: numberField(recordField(lastReadJson, "agent"), "lastEventSeq"),
-      snapshot: recordField(lastReadJson, "statusSnapshot") ?? null
-    });
-    if (fingerprint !== lastFingerprint) {
-      lastFingerprint = fingerprint;
-      lastProgressAt = Date.now();
-      opts.onAgentProgress?.(codewithAgentProgress(lastReadJson));
-    }
-    if (status === "completed" || status === "failed" || status === "cancelled") {
-      const logs = await spawnCapture(spec.command, codewithAgentControlArgs(target, "logs", agentId), {
-        cwd: spec.cwd,
-        env,
-        timeoutMs: 30000,
-        maxOutputBytes
-      });
-      if (!logs.error && (logs.status ?? 1) === 0) {
-        try {
-          lastLogsJson = parseJsonOutput(logs.stdout || "{}", "codewith agent logs");
-        } catch {
-          lastLogsJson = undefined;
-        }
-      } else {
-        stderr.append(logs.stderr || logs.error || "");
-      }
-      if (status === "completed") {
-        return successResult(startedAt, { exitCode: 0, stdout: evidence(), stderr: stderr.value() });
-      }
-      return failureResult(startedAt, stringField(recordField(lastReadJson, "agent"), "statusReason") ?? `codewith agent ${status}`, { exitCode: 1, stdout: evidence(), stderr: stderr.value() });
-    }
-    if (typeof spec.timeoutMs === "number" && new Date(nowIso()).getTime() - new Date(startedAt).getTime() >= spec.timeoutMs) {
-      await stopAgent();
-      return timeoutResult(startedAt, `timed out after ${spec.timeoutMs}ms`, { stdout: evidence(), stderr: stderr.value() });
-    }
-    if (typeof spec.idleTimeoutMs === "number" && Date.now() - lastProgressAt >= spec.idleTimeoutMs) {
-      await stopAgent();
-      return timeoutResult(startedAt, `idle timed out after ${spec.idleTimeoutMs}ms without agent progress`, {
-        stdout: evidence(),
-        stderr: stderr.value()
-      });
-    }
-    await sleep(pollMs);
-  }
-}
 function resolvedDirEquals(left, right) {
   try {
     return realpathSync(left) === realpathSync(right);
@@ -5743,9 +5498,6 @@ function preflightTarget(target, metadata = {}, opts = {}) {
 async function executeTarget(target, metadata = {}, opts = {}) {
   let spec = commandSpec(target, opts);
   const machine = resolvedMachine(opts);
-  if (machine && !machine.local && spec.codewithDurableAgent) {
-    return failureResult(nowIso(), "remote Codewith durable background-agent steps require remote status polling support; run this Codewith step locally or add remote durable readback before dispatch");
-  }
   if (machine && !machine.local) {
     const remoteFallbackSpec = spec.worktree?.enabled && spec.worktree.mode === "auto" ? worktreeFallbackSpec(target, opts, spec.worktree.originalCwd) : undefined;
     return executeRemoteSpec(spec, machine, metadata, opts, remoteFallbackSpec);
@@ -5776,9 +5528,6 @@ async function executeTarget(target, metadata = {}, opts = {}) {
   if (worktreeEntry?.fallbackCwd) {
     spec = worktreeFallbackSpec(target, opts, worktreeEntry.fallbackCwd) ?? spec;
   }
-  if (spec.codewithDurableAgent) {
-    return executeCodewithDurableAgent(spec, metadata, opts, env, startedAt);
-  }
   const child = spawn2(spec.command, spec.args, {
     cwd: spec.cwd,
     env,
@@ -7676,7 +7425,7 @@ function realSleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 async function runLoop(opts) {
-  const sleep2 = opts.sleep ?? realSleep;
+  const sleep = opts.sleep ?? realSleep;
   const sliceMs = opts.sliceMs ?? 200;
   while (!opts.shouldStop()) {
     try {
@@ -7687,7 +7436,7 @@ async function runLoop(opts) {
     let waited = 0;
     while (waited < opts.intervalMs && !opts.shouldStop()) {
       const chunk = Math.min(sliceMs, opts.intervalMs - waited);
-      await sleep2(chunk);
+      await sleep(chunk);
       waited += chunk;
     }
   }
@@ -7779,7 +7528,7 @@ function processExists(pid) {
   }
 }
 async function reapProcessGroups(entries, opts = {}) {
-  const sleep2 = opts.sleep ?? realSleep;
+  const sleep = opts.sleep ?? realSleep;
   const graceMs = Math.max(100, opts.graceMs ?? 2000);
   const ownPgid = ownProcessGroupId();
   const targets = new Map;
@@ -7808,7 +7557,7 @@ async function reapProcessGroups(entries, opts = {}) {
   const steps = Math.max(1, Math.ceil(graceMs / 100));
   let remaining = live;
   for (let i = 0;i < steps && remaining.length > 0; i++) {
-    await sleep2(100);
+    await sleep(100);
     remaining = remaining.filter((target) => signalReapTarget(target, 0));
   }
   for (const target of remaining) {
@@ -7850,7 +7599,7 @@ async function stopDaemon(opts = {}) {
   }
   if (!state.running || !state.pid)
     return { wasRunning: false, stopped: false, forced: false };
-  const sleep2 = opts.sleep ?? realSleep;
+  const sleep = opts.sleep ?? realSleep;
   const store = new Store(join5(dirname4(path), "loops.db"));
   try {
     const lease = store.getDaemonLease();
@@ -7863,7 +7612,7 @@ async function stopDaemon(opts = {}) {
     }
     const steps = Math.max(1, Math.ceil((opts.timeoutMs ?? 6000) / 100));
     for (let i = 0;i < steps; i++) {
-      await sleep2(100);
+      await sleep(100);
       if (!isAlive(state.pid, record?.startedAt)) {
         removePid(path);
         return { wasRunning: true, stopped: true, forced: false, pid: state.pid };
@@ -7872,13 +7621,13 @@ async function stopDaemon(opts = {}) {
     try {
       process.kill(state.pid, "SIGKILL");
     } catch {}
-    await sleep2(150);
+    await sleep(150);
     removePid(path);
     let reapedPgids = [];
     if (leaseVerified && lease) {
       const ownedRuns = store.listRuns({ status: "running", limit: 1000 }).filter((run) => run.claimedBy !== undefined && run.claimedBy.endsWith(`:${lease.id}`));
       reapedPgids = await reapProcessGroups(ownedRuns.map(toReapableProcess), {
-        sleep: sleep2,
+        sleep,
         graceMs: opts.reapGraceMs
       });
     }
@@ -7953,7 +7702,7 @@ async function runDaemon(opts = {}) {
   const leaseTtlMs = opts.leaseTtlMs ?? Math.max(60000, intervalMs * 10);
   const concurrency = Math.max(1, opts.concurrency ?? concurrencyFromEnv() ?? 4);
   const log = opts.log ?? defaultDaemonLog;
-  const sleep2 = opts.sleep ?? realSleep;
+  const sleep = opts.sleep ?? realSleep;
   const lease = store.acquireDaemonLease({
     id: leaseId,
     pid: process.pid,
@@ -8017,7 +7766,7 @@ async function runDaemon(opts = {}) {
     const entries = recovered.map(toReapableProcess).filter((entry) => entry.pid !== undefined || entry.pgid !== undefined);
     if (entries.length === 0)
       return;
-    const killed = await reapProcessGroups(entries, { sleep: sleep2, graceMs: opts.reapGraceMs, log });
+    const killed = await reapProcessGroups(entries, { sleep, graceMs: opts.reapGraceMs, log });
     if (killed.length > 0)
       log(`reaped orphan process groups: ${killed.join(", ")}`);
   };
@@ -8092,7 +7841,7 @@ async function runDaemon(opts = {}) {
     }
     await runLoop({
       intervalMs,
-      sleep: sleep2,
+      sleep,
       shouldStop: opts.shouldStop ?? (() => stopFlag),
       onTickError: (err) => log(`tick error: ${err instanceof Error ? err.message : String(err)}`),
       tickFn: async () => {
@@ -8142,10 +7891,10 @@ async function startDaemon(opts) {
     stdio: ["ignore", out, out]
   });
   child.unref();
-  const sleep2 = opts.sleep ?? realSleep;
+  const sleep = opts.sleep ?? realSleep;
   const deadline = Math.max(1, Math.ceil((opts.waitMs ?? 4000) / 100));
   for (let i = 0;i < deadline; i++) {
-    await sleep2(100);
+    await sleep(100);
     const current = isDaemonRunning();
     if (current.running)
       return { started: true, alreadyRunning: false, pid: current.pid };
@@ -11078,7 +10827,7 @@ function eventMetadata(event) {
     return metadata;
   return {};
 }
-function stringField2(value) {
+function stringField(value) {
   return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
 function slugSegment2(value, fallback = "event") {
@@ -11093,14 +10842,14 @@ function stableHash(parts) {
 }
 function taskEventField(data, keys) {
   for (const key of keys) {
-    const direct = stringField2(data[key]);
+    const direct = stringField(data[key]);
     if (direct)
       return direct;
   }
   const task = data.task;
   if (task && typeof task === "object" && !Array.isArray(task)) {
     for (const key of keys) {
-      const direct = stringField2(task[key]);
+      const direct = stringField(task[key]);
       if (direct)
         return direct;
     }
@@ -11108,7 +10857,7 @@ function taskEventField(data, keys) {
   const payload = data.payload;
   if (payload && typeof payload === "object" && !Array.isArray(payload)) {
     for (const key of keys) {
-      const direct = stringField2(payload[key]);
+      const direct = stringField(payload[key]);
       if (direct)
         return direct;
     }
@@ -11612,6 +11361,7 @@ function permissionModeFromOpts(opts, provider) {
   return mode;
 }
 // src/lib/route/pr-review.ts
+import { spawnSync as spawnSync7 } from "child_process";
 var PR_AUTHOR_FIELDS = [
   "github_author",
   "githubAuthor",
@@ -11663,11 +11413,18 @@ var PR_REVIEW_REQUIRED_FIELDS = [
   "branch_protection_review_required",
   "branchProtectionReviewRequired"
 ];
+var GITHUB_USER_LOGIN = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})$/;
 function githubLogin(value) {
   if (!value?.trim())
     return;
-  const login = value.trim().replace(/^@/, "");
-  return /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,38})$/.test(login) ? login : undefined;
+  let login = value.trim().replace(/^@/, "");
+  const appActor = /^app\/([A-Za-z0-9](?:[A-Za-z0-9-]{0,38}))$/.exec(login);
+  if (appActor)
+    login = `${appActor[1]}[bot]`;
+  const bot = /^([A-Za-z0-9](?:[A-Za-z0-9-]{0,38}))\[bot\]$/.exec(login);
+  if (bot)
+    return `${bot[1]}[bot]`;
+  return GITHUB_USER_LOGIN.test(login) ? login : undefined;
 }
 function githubLogins(values) {
   const seen = new Set;
@@ -11726,6 +11483,53 @@ function routeTextFieldValues(record, field) {
   }
   return values;
 }
+var PR_STATE_FIELDS = [
+  "pr_state",
+  "prState",
+  "pull_request_state",
+  "pullRequestState",
+  "state",
+  "pr_status",
+  "prStatus"
+];
+var CLOSED_PR_STATES = new Set(["MERGED", "CLOSED"]);
+function normalizePrState(value) {
+  const trimmed = value?.trim().toUpperCase();
+  return trimmed ? trimmed : undefined;
+}
+function prStateFromEvidence(records, text) {
+  const field = normalizePrState(firstRouteField(records, PR_STATE_FIELDS));
+  if (field)
+    return field;
+  const match = /\b(?:pr[_\s-]?state|pull[_\s-]?request[_\s-]?state|state)\s*[:=]\s*(MERGED|CLOSED|OPEN)\b/i.exec(text);
+  return match ? match[1].toUpperCase() : undefined;
+}
+function prReferenceFrom(text) {
+  const url = /github\.com\/([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\/pull\/(\d+)/i.exec(text);
+  if (url)
+    return { owner: url[1], repo: url[2], number: Number(url[3]) };
+  const short = /github-pr:([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)#(\d+)/i.exec(text);
+  if (short)
+    return { owner: short[1], repo: short[2], number: Number(short[3]) };
+  return;
+}
+function ghAuthorResolver(ref) {
+  const result = spawnSync7("gh", ["pr", "view", String(ref.number), "--repo", `${ref.owner}/${ref.repo}`, "--json", "author", "-q", ".author.login"], { encoding: "utf8", timeout: 20000 });
+  if (result.error || result.status !== 0)
+    return;
+  return githubLogin((result.stdout ?? "").trim());
+}
+function ghStateResolver(ref) {
+  const result = spawnSync7("gh", ["pr", "view", String(ref.number), "--repo", `${ref.owner}/${ref.repo}`, "--json", "state,mergeStateStatus"], { encoding: "utf8", timeout: 20000 });
+  if (result.error || result.status !== 0)
+    return;
+  try {
+    const parsed = JSON.parse(result.stdout ?? "{}");
+    return { state: parsed.state, mergeStateStatus: parsed.mergeStateStatus };
+  } catch {
+    return;
+  }
+}
 function authorFromPrText(text) {
   const patterns = [
     /\bauthor\s+(?:is\s+also|is|=|:)\s+@?([A-Za-z0-9](?:[A-Za-z0-9-]{0,38}))/i,
@@ -11752,7 +11556,7 @@ function reviewersFromPrText(text) {
   }
   return githubLogins(reviewers);
 }
-function prReviewRoutingDecision(data, metadata, opts) {
+function prReviewRoutingDecision(data, metadata, opts, resolveAuthor = ghAuthorResolver, resolveState = ghStateResolver) {
   const records = [...taskEventRecords(data, metadata), ...automationRecords(data, metadata)];
   const text = routeEvidenceText(records);
   const signals = [];
@@ -11772,7 +11576,21 @@ function prReviewRoutingDecision(data, metadata, opts) {
   const required = hasPrReference && (reviewRequiredByField || reviewRequiredByText || mergeBlockedByText || approvalIntent);
   if (!required)
     return { required: false, allowed: true, reviewers: [], signals };
-  const author = githubLogin(firstRouteField(records, PR_AUTHOR_FIELDS)) ?? authorFromPrText(text);
+  const prRef = prReferenceFrom(text);
+  let prState = prStateFromEvidence(records, text);
+  if (!prState && prRef) {
+    const live = resolveState(prRef);
+    prState = normalizePrState(live?.state);
+  }
+  if (prState && CLOSED_PR_STATES.has(prState)) {
+    return {
+      required: true,
+      allowed: false,
+      reason: `PR is already ${prState.toLowerCase()}; skipping merge/review route (freshness gate)`,
+      reviewers: [],
+      signals: [...signals, "pr-not-open"]
+    };
+  }
   const reviewers = githubLogins([
     opts.githubReviewer,
     ...splitList(opts.githubReviewerPool) ?? [],
@@ -11780,6 +11598,14 @@ function prReviewRoutingDecision(data, metadata, opts) {
     ...PR_REVIEWER_POOL_FIELDS.flatMap((field) => routeFieldValues(records, field)),
     ...reviewersFromPrText(text)
   ]);
+  let author = githubLogin(firstRouteField(records, PR_AUTHOR_FIELDS)) ?? authorFromPrText(text);
+  if (!author && prRef) {
+    const derived = githubLogin(resolveAuthor(prRef));
+    if (derived) {
+      author = derived;
+      signals.push("author-derived-gh");
+    }
+  }
   const selectedReviewer = author ? reviewers.find((reviewer) => reviewer.toLowerCase() !== author.toLowerCase()) : undefined;
   if (!author) {
     return {
@@ -11821,7 +11647,7 @@ function prReviewRoutingDecision(data, metadata, opts) {
 }
 // src/lib/route/throttle.ts
 import { realpathSync as realpathSync2 } from "fs";
-import { spawnSync as spawnSync7 } from "child_process";
+import { spawnSync as spawnSync8 } from "child_process";
 import { resolve as resolve6 } from "path";
 function routeThrottleLimitsFromOpts(opts) {
   return {
@@ -11843,7 +11669,7 @@ function normalizeRoutePath(value) {
   } catch {
     return canonical;
   }
-  const gitRoot = spawnSync7("git", ["-C", canonical, "rev-parse", "--show-toplevel"], { encoding: "utf8" });
+  const gitRoot = spawnSync8("git", ["-C", canonical, "rev-parse", "--show-toplevel"], { encoding: "utf8" });
   if (gitRoot.status === 0 && gitRoot.stdout.trim()) {
     try {
       return realpathSync2(gitRoot.stdout.trim());
@@ -11893,7 +11719,7 @@ function routeThrottleDryRunPreview(args) {
   };
 }
 function isExistingGitProjectPath(path) {
-  const result = spawnSync7("git", ["-C", path, "rev-parse", "--is-inside-work-tree"], { encoding: "utf8" });
+  const result = spawnSync8("git", ["-C", path, "rev-parse", "--is-inside-work-tree"], { encoding: "utf8" });
   return result.status === 0;
 }
 function validateRequiredRouteWorktreeProjectPath(opts, projectPath) {
@@ -11973,6 +11799,34 @@ var UNCLEARED_ROUTE_WORK_ITEM_STATUSES = new Set([
 function isUnclearedRouteWorkItem(item) {
   return UNCLEARED_ROUTE_WORK_ITEM_STATUSES.has(item.status);
 }
+var REACTIVATABLE_TERMINAL_STATUSES = new Set([
+  "succeeded",
+  "failed",
+  "dead_letter",
+  "cancelled"
+]);
+var MAX_TODOS_TASK_ROUTE_REDISPATCHES = 8;
+function todosTaskRouteRedispatchBackoffMs(attempts) {
+  const base = 2 * 60000;
+  const cap = 30 * 60000;
+  const exp = Math.max(0, Math.min(attempts - 1, 10));
+  return Math.min(cap, base * 2 ** exp);
+}
+function reactivateStaleTodosTaskWorkItem(store, routeKey, item, now = Date.now()) {
+  if (routeKey !== "todos-task")
+    return;
+  if (!REACTIVATABLE_TERMINAL_STATUSES.has(item.status))
+    return;
+  if (item.attempts >= MAX_TODOS_TASK_ROUTE_REDISPATCHES)
+    return;
+  const finishedAt = Date.parse(item.updatedAt);
+  if (Number.isFinite(finishedAt) && now - finishedAt < todosTaskRouteRedispatchBackoffMs(item.attempts)) {
+    return;
+  }
+  return store.requeueWorkflowWorkItem(item.id, {
+    reason: `re-admitted from ${item.status}: todos task still actionable after prior run (attempt ${item.attempts + 1}/${MAX_TODOS_TASK_ROUTE_REDISPATCHES})`
+  });
+}
 function todosTaskRouteTemplateId(opts) {
   const id = (opts.template ?? TODOS_TASK_WORKER_VERIFIER_TEMPLATE_ID).trim();
   if (!TODOS_TASK_ROUTE_TEMPLATE_IDS.has(id)) {
@@ -11985,11 +11839,11 @@ async function readEventEnvelopeInput(opts = {}) {
   const event = JSON.parse(raw);
   if (!event || typeof event !== "object" || Array.isArray(event))
     throw new ValidationError("event JSON must be an object");
-  if (!stringField2(event.id))
+  if (!stringField(event.id))
     throw new ValidationError("event.id is required");
-  if (!stringField2(event.type))
+  if (!stringField(event.type))
     throw new ValidationError("event.type is required");
-  if (!stringField2(event.source))
+  if (!stringField(event.source))
     throw new ValidationError("event.source is required");
   return event;
 }
@@ -12065,9 +11919,11 @@ function routeEvent(plan) {
       const invocation = store.createWorkflowInvocation(plan.invocationInput);
       const existingItem = store.findWorkflowWorkItem(plan.routeKey, idempotencyKey);
       if (existingItem && isUnclearedRouteWorkItem(existingItem)) {
-        const existingLoop = existingItem.loopId ? store.getLoop(existingItem.loopId) : undefined;
-        const existingWorkflow = existingItem.workflowId ? store.getWorkflow(existingItem.workflowId) : undefined;
-        return { kind: "deduped", existingItem, existingLoop, existingWorkflow, invocation };
+        if (!reactivateStaleTodosTaskWorkItem(store, plan.routeKey, existingItem)) {
+          const existingLoop = existingItem.loopId ? store.getLoop(existingItem.loopId) : undefined;
+          const existingWorkflow = existingItem.workflowId ? store.getWorkflow(existingItem.workflowId) : undefined;
+          return { kind: "deduped", existingItem, existingLoop, existingWorkflow, invocation };
+        }
       }
       const throttle = hasThrottleLimits(plan.throttleLimits) ? routeThrottleDecision(store, { projectPath: plan.routeProjectPath, projectGroup: plan.projectGroup, limits: plan.throttleLimits }) : undefined;
       const workItem = store.upsertWorkflowWorkItem({
@@ -12199,10 +12055,12 @@ function routeTodosTaskEvent(event, opts) {
     try {
       const existingItem = store.findWorkflowWorkItem("todos-task", idempotencyKey);
       if (existingItem && isUnclearedRouteWorkItem(existingItem)) {
-        const existingLoop = existingItem.loopId ? store.getLoop(existingItem.loopId) : undefined;
-        const existingWorkflow = existingItem.workflowId ? store.getWorkflow(existingItem.workflowId) : undefined;
-        const existingInvocation = store.getWorkflowInvocation(existingItem.invocationId);
-        return dedupedRoutePrint({ event, idempotencyKey, dedupeValueExtras: {} }, { existingItem, existingLoop, existingWorkflow, invocation: existingInvocation });
+        if (!reactivateStaleTodosTaskWorkItem(store, "todos-task", existingItem)) {
+          const existingLoop = existingItem.loopId ? store.getLoop(existingItem.loopId) : undefined;
+          const existingWorkflow = existingItem.workflowId ? store.getWorkflow(existingItem.workflowId) : undefined;
+          const existingInvocation = store.getWorkflowInvocation(existingItem.invocationId);
+          return dedupedRoutePrint({ event, idempotencyKey, dedupeValueExtras: {} }, { existingItem, existingLoop, existingWorkflow, invocation: existingInvocation });
+        }
       }
     } finally {
       store.close();
@@ -12360,8 +12218,8 @@ function routeGenericEvent(event, opts) {
     eventId: event.id,
     eventType: event.type,
     eventSource: event.source,
-    eventSubject: stringField2(event.subject),
-    eventMessage: stringField2(event.message),
+    eventSubject: stringField(event.subject),
+    eventMessage: stringField(event.message),
     eventJson: JSON.stringify(event),
     projectPath,
     routeProjectPath,
@@ -12402,9 +12260,9 @@ function routeGenericEvent(event, opts) {
     },
     subjectRef: {
       kind: "event",
-      id: stringField2(event.subject) ?? event.id,
+      id: stringField(event.subject) ?? event.id,
       path: routeProjectPath,
-      raw: { message: stringField2(event.message) }
+      raw: { message: stringField(event.message) }
     },
     intent: "route",
     scope: {
@@ -12433,7 +12291,7 @@ function routeGenericEvent(event, opts) {
     invocationInput,
     routeProjectPath,
     projectGroup,
-    subjectRef: stringField2(event.subject) ?? event.id,
+    subjectRef: stringField(event.subject) ?? event.id,
     loopName,
     loopDescription: `Run ${workflowBody.name} once for event ${event.id}; idempotency=${idempotencyKey}`,
     throttleLimits,
@@ -12455,14 +12313,14 @@ import { resolve as resolve8 } from "path";
 
 // src/lib/route/todos-cli.ts
 import { closeSync, mkdtempSync as mkdtempSync2, openSync as openSync2, readFileSync as readFileSync9, rmSync as rmSync6 } from "fs";
-import { spawnSync as spawnSync8 } from "child_process";
+import { spawnSync as spawnSync9 } from "child_process";
 import { join as join10 } from "path";
 import { homedir as homedir5, tmpdir as tmpdir2 } from "os";
 function defaultLoopsProject() {
   return process.env.LOOPS_TASK_PROJECT || process.env.LOOPS_DATA_DIR || `${process.env.HOME || homedir5()}/.hasna/loops`;
 }
 function runLocalCommand(command, args, opts = {}) {
-  const result = spawnSync8(command, args, {
+  const result = spawnSync9(command, args, {
     input: opts.input,
     encoding: "utf8",
     timeout: opts.timeoutMs ?? 30000,
@@ -12483,7 +12341,7 @@ function runLocalCommandWithStdoutFile(command, args, opts = {}) {
   const stdoutFd = openSync2(stdoutPath, "w");
   let result;
   try {
-    result = spawnSync8(command, args, {
+    result = spawnSync9(command, args, {
       input: opts.input,
       encoding: "utf8",
       timeout: opts.timeoutMs ?? 30000,
@@ -12528,7 +12386,7 @@ function todosMutationSummary(result) {
 // src/lib/route/drain.ts
 function taskField(task, keys) {
   for (const key of keys) {
-    const value = stringField2(task[key]);
+    const value = stringField(task[key]);
     if (value)
       return value;
   }
@@ -12553,9 +12411,9 @@ function taskListValues(task) {
   const taskList = objectField2(task.task_list);
   return [
     taskField(task, ["task_list_id", "taskListId"]),
-    stringField2(task.task_list?.id),
-    stringField2(task.task_list?.slug),
-    stringField2(taskList?.name),
+    stringField(task.task_list?.id),
+    stringField(task.task_list?.slug),
+    stringField(taskList?.name),
     taskField(task, ["task_list", "taskList"])
   ].filter((value) => Boolean(value));
 }
@@ -12629,12 +12487,12 @@ function compactDrainResult(result) {
     kind: result.kind,
     taskId: event?.subject,
     eventId: event?.id,
-    idempotencyKey: stringField2(value.idempotencyKey),
-    reason: stringField2(value.reason) ?? throttle?.reason,
-    loopId: stringField2(loop?.id),
-    loopName: stringField2(loop?.name),
-    workflowId: stringField2(workflow?.id),
-    workflowName: stringField2(workflow?.name),
+    idempotencyKey: stringField(value.idempotencyKey),
+    reason: stringField(value.reason) ?? throttle?.reason,
+    loopId: stringField(loop?.id),
+    loopName: stringField(loop?.name),
+    workflowId: stringField(workflow?.id),
+    workflowName: stringField(workflow?.name),
     providerRouting,
     requeue,
     queuedAtSource: value.queuedAtSource,
@@ -12668,7 +12526,7 @@ function loadTodoProjectPathsFromRegistry(opts) {
   const includeFilters = listFromRepeatedOpts(opts.todosProjectInclude)?.map((entry) => normalizeRoutePath(entry) ?? resolve8(entry)) ?? [];
   const includesPrefix = normalizeRoutePath(opts.projectPathPrefix) ?? (opts.projectPathPrefix ? resolve8(opts.projectPathPrefix) : undefined);
   const fromProjects = projectsPayload.map((entry) => objectField2(entry)).filter((project) => Boolean(project)).map((project) => {
-    const path = stringField2(project.path) ?? stringField2(project.projectPath) ?? stringField2(project.project_path) ?? stringField2(project.dir) ?? stringField2(project.root) ?? stringField2(project.cwd);
+    const path = stringField(project.path) ?? stringField(project.projectPath) ?? stringField(project.project_path) ?? stringField(project.dir) ?? stringField(project.root) ?? stringField(project.cwd);
     if (!path)
       return;
     return { path };
@@ -14063,7 +13921,7 @@ routes.command("show <id>").description("show one admission work item").action(r
 routes.command("requeue <id>").description("requeue a terminal admission work item for the next task/event delivery").option("--reason <text>", "operator reason recorded on the work item").action(runAction((id, opts) => {
   const store = new Store;
   try {
-    const reason = stringField2(opts.reason);
+    const reason = stringField(opts.reason);
     if (!reason)
       throw new ValidationError("routes requeue requires --reason <text>");
     const item = store.requeueWorkflowWorkItem(id, { reason });