@oxagen/cli 2.1.4 → 2.1.5-22

package/oxagen.mjs

@@ -5776,7 +5776,7 @@ var init_wire = __esm({
         harness: "stella",
         provider: "anthropic",
         prefix: "/stella/anthropic",
-        brokerable: false,
+        brokerable: true,
         baseUrlFile: "$STELLA_HOME/stella.toml"
       }
     ];
@@ -7149,6 +7149,248 @@ var init_tools = __esm({
   }
 });
 
+// ../../packages/tacho/src/claude-code/github-text.ts
+function mentionsOxagenApp(text5) {
+  return OXAGEN_APP_MENTION.test(text5);
+}
+function ghCommands(command2) {
+  const commands = [];
+  for (const piece of splitCommandList(command2)) {
+    const words2 = leadingWords(piece);
+    let i2 = 0;
+    while (i2 < words2.length && /^[A-Za-z_][A-Za-z0-9_]*=/.test(words2[i2] ?? ""))
+      i2 += 1;
+    if (isGh(words2[i2])) commands.push(words2.slice(i2));
+  }
+  return commands;
+}
+function leadingWords(piece) {
+  const words2 = [];
+  let current = "";
+  let started = false;
+  let quote;
+  for (let i2 = 0; i2 < piece.length; i2 += 1) {
+    const char = piece[i2];
+    const substitution = quote !== "'" && (char === "`" || char === "$" && piece[i2 + 1] === "(");
+    if (substitution) return words2;
+    if (quote !== void 0) {
+      if (char === quote) quote = void 0;
+      else current += char;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      started = true;
+      continue;
+    }
+    if (char === "\\" && piece[i2 + 1] !== void 0) {
+      current += piece[i2 + 1];
+      started = true;
+      i2 += 1;
+      continue;
+    }
+    if ("|&()<>".includes(char)) break;
+    if (/\s/.test(char)) {
+      if (started) words2.push(current);
+      current = "";
+      started = false;
+      continue;
+    }
+    current += char;
+    started = true;
+  }
+  if (started && quote === void 0) words2.push(current);
+  return words2;
+}
+function ghSubcommand(words2) {
+  const found = [];
+  for (let j = 1; j < words2.length && found.length < 2; j += 1) {
+    const word = words2[j];
+    if (GH_VALUE_FLAGS.has(word)) j += 1;
+    else if (!word.startsWith("-")) found.push(word);
+  }
+  return [found[0], found[1]];
+}
+function ghApiCall(words2) {
+  let method;
+  let body2 = false;
+  let path2;
+  const start = words2.indexOf("api");
+  for (let j = start + 1; j < words2.length; j += 1) {
+    const word = words2[j];
+    const eq = word.indexOf("=");
+    const flag2 = word.startsWith("--") && eq > 0 ? word.slice(0, eq) : word;
+    const inline = flag2 !== word ? word.slice(eq + 1) : void 0;
+    if (/^-X[A-Za-z]+$/.test(word)) {
+      method = word.slice(2);
+      continue;
+    }
+    if (/^-[fF]./.test(word)) {
+      body2 = true;
+      continue;
+    }
+    if (API_VALUE_FLAGS.has(flag2)) {
+      const value = inline ?? words2[j + 1];
+      if (inline === void 0) j += 1;
+      if (flag2 === "-X" || flag2 === "--method") method = value;
+      if (API_BODY_FLAGS.has(flag2)) body2 = true;
+      continue;
+    }
+    if (word.startsWith("-")) continue;
+    path2 ??= word;
+  }
+  return {
+    method: (method ?? (body2 ? "POST" : "GET")).toUpperCase(),
+    ...path2 !== void 0 ? { path: path2 } : {}
+  };
+}
+function hasBody(words2) {
+  return words2.some(
+    (word) => word === "-b" || word === "--body" || word === "-F" || word === "--body-file" || word.startsWith("--body=") || word.startsWith("--body-file=")
+  );
+}
+function shellWritesComment(command2) {
+  return ghCommands(command2).some((words2) => {
+    const [noun, verb] = ghSubcommand(words2);
+    if ((noun === "pr" || noun === "issue") && verb === "comment")
+      return !words2.includes("--edit-last");
+    if (noun === "pr" && verb === "review") return hasBody(words2);
+    if (noun === "api") {
+      const call2 = ghApiCall(words2);
+      const path2 = call2.path?.split("?", 1)[0];
+      return call2.method === "POST" && path2 !== void 0 && COMMENT_API_PATH.test(path2);
+    }
+    return false;
+  });
+}
+function endsWithAny(tool, suffixes) {
+  const name = nameWords(tool).join("_");
+  return suffixes.some(
+    (suffix) => name === suffix || name.endsWith(`_${suffix}`)
+  );
+}
+function mcpWritesComment(tool, input) {
+  if (endsWithAny(tool, [
+    "add_issue_comment",
+    "add_reply_to_pull_request_comment",
+    "create_pull_request_review"
+  ]))
+    return true;
+  if (endsWithAny(tool, ["pull_request_review_write"])) {
+    const body2 = input["body"];
+    return (input["method"] === "create" || input["method"] === "submit_pending") && typeof body2 === "string" && body2.trim().length > 0;
+  }
+  return false;
+}
+function commentAttrs(toolName3, input, response) {
+  const fields = typeof input === "object" && input !== null ? input : {};
+  let writes = false;
+  if (SHELL_TOOLS.has(toolName3)) {
+    const command2 = fields["command"];
+    writes = typeof command2 === "string" && shellWritesComment(command2);
+  } else {
+    const tool = mcpToolName(toolName3)?.tool;
+    writes = tool !== void 0 && mcpWritesComment(tool, fields);
+  }
+  if (!writes) return {};
+  for (const text5 of responseTexts(response)) {
+    const match = COMMENT_URL.exec(text5);
+    if (match !== null)
+      return { "comment.url": match[0], "comment.action": "created" };
+  }
+  return {};
+}
+function shellWritesGithubText(command2) {
+  return ghCommands(command2).some((words2) => {
+    const [noun, verb] = ghSubcommand(words2);
+    if (noun === "api") return ghApiCall(words2).method !== "GET";
+    if (noun === void 0 || verb === void 0) return false;
+    return GH_TEXT_VERBS[noun]?.has(verb) === true;
+  });
+}
+function mcpWritesGithubText(tool) {
+  return nameWords(tool).some((word) => GITHUB_TEXT_WORDS.has(word)) && mcpToolMutates(tool);
+}
+function strings(value, out = [], depth = 0) {
+  if (depth > 8) return out;
+  if (typeof value === "string") out.push(value);
+  else if (Array.isArray(value))
+    for (const item of value) strings(item, out, depth + 1);
+  else if (typeof value === "object" && value !== null)
+    for (const item of Object.values(value)) strings(item, out, depth + 1);
+  return out;
+}
+function oxagenMentionRefusal(toolName3, shellLine2, input) {
+  if (shellLine2 !== void 0) {
+    return shellWritesGithubText(shellLine2) && mentionsOxagenApp(shellLine2) ? OXAGEN_MENTION_REFUSAL : void 0;
+  }
+  const tool = mcpToolName(toolName3)?.tool;
+  if (tool === void 0 || !mcpWritesGithubText(tool)) return void 0;
+  return strings(input ?? {}).some(mentionsOxagenApp) ? OXAGEN_MENTION_REFUSAL : void 0;
+}
+var OXAGEN_APP_MENTION, OXAGEN_MENTION_REFUSAL, GH_VALUE_FLAGS, API_VALUE_FLAGS, API_BODY_FLAGS, COMMENT_API_PATH, SHELL_TOOLS, COMMENT_URL, GH_TEXT_VERBS, GITHUB_TEXT_WORDS;
+var init_github_text = __esm({
+  "../../packages/tacho/src/claude-code/github-text.ts"() {
+    "use strict";
+    init_tools();
+    OXAGEN_APP_MENTION = /(^|[^\w@/.-])@oxagen(-[a-z0-9-]+)?(\[bot\])?\b/i;
+    OXAGEN_MENTION_REFUSAL = "This agent may not mention the Oxagen App in GitHub text, because a mention asks Oxagen to start or steer an agent. Remove the mention and run the call again.";
+    GH_VALUE_FLAGS = /* @__PURE__ */ new Set(["-R", "--repo"]);
+    API_VALUE_FLAGS = /* @__PURE__ */ new Set([
+      "-X",
+      "--method",
+      "-H",
+      "--header",
+      "-f",
+      "--raw-field",
+      "-F",
+      "--field",
+      "--input",
+      "-q",
+      "--jq",
+      "-t",
+      "--template",
+      "--hostname",
+      "--cache",
+      "-p",
+      "--preview",
+      "-R",
+      "--repo"
+    ]);
+    API_BODY_FLAGS = /* @__PURE__ */ new Set([
+      "-f",
+      "--raw-field",
+      "-F",
+      "--field",
+      "--input"
+    ]);
+    COMMENT_API_PATH = /\/(issues\/\d+\/comments|pulls\/\d+\/comments|pulls\/\d+\/comments\/\d+\/replies|pulls\/\d+\/reviews)\/?$/;
+    SHELL_TOOLS = /* @__PURE__ */ new Set([
+      "Bash",
+      "Shell",
+      "bash",
+      "shell",
+      "local_shell",
+      "exec_command"
+    ]);
+    COMMENT_URL = /https:\/\/github\.com\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+\/(?:pull|issues)\/\d+#(?:issuecomment-\d+|discussion_r\d+|pullrequestreview-\d+)/;
+    GH_TEXT_VERBS = {
+      pr: /* @__PURE__ */ new Set(["create", "edit", "comment", "review", "close", "merge"]),
+      issue: /* @__PURE__ */ new Set(["create", "edit", "comment", "close", "reopen"])
+    };
+    GITHUB_TEXT_WORDS = /* @__PURE__ */ new Set([
+      "issue",
+      "issues",
+      "pull",
+      "comment",
+      "comments",
+      "review",
+      "reviews",
+      "discussion"
+    ]);
+  }
+});
+
 // ../../packages/tacho/src/policy/builtins.ts
 function isCedarHarness(harness) {
   return CEDAR_HARNESSES.includes(harness);
@@ -7877,7 +8119,7 @@ function pathMatches(spec, path2, context) {
   );
 }
 function isShellTool(toolName3) {
-  return SHELL_TOOLS.has(toolName3);
+  return SHELL_TOOLS2.has(toolName3);
 }
 function compiledGlob(glob) {
   let regex = globCache.get(glob);
@@ -8046,6 +8288,12 @@ function evaluatePreToolUse(input) {
       { source: "human" }
     );
   }
+  const mention = oxagenMentionRefusal(
+    toolName3,
+    isShellTool(toolName3) ? shellLineOf(toolInput ?? {}) : void 0,
+    toolInput
+  );
+  if (mention !== void 0) return deny2("oxagen_app_mention", mention);
   if (!input.bundleVerified) {
     if (readOnly) {
       return {
@@ -8293,11 +8541,12 @@ function decideWithCedar(input) {
       };
   }
 }
-var SHELL_OPERATORS, SHELL_LEADING_WORDS, ARGV_SHELLS, WINDOWS_PATH, SHELL_TOOLS, DECLARATION_SYNONYMS, GLOB_CACHE_LIMIT, globCache, parsedRuleCache, WRITE_EFFECTS;
+var SHELL_OPERATORS, SHELL_LEADING_WORDS, ARGV_SHELLS, WINDOWS_PATH, SHELL_TOOLS2, DECLARATION_SYNONYMS, GLOB_CACHE_LIMIT, globCache, parsedRuleCache, WRITE_EFFECTS;
 var init_bundle = __esm({
   "../../packages/tacho/src/host/bundle.ts"() {
     "use strict";
     init_digest();
+    init_github_text();
     init_tools();
     init_builtins();
     init_hook();
@@ -8320,7 +8569,7 @@ var init_bundle = __esm({
     ]);
     ARGV_SHELLS = /* @__PURE__ */ new Set(["bash", "sh", "zsh", "dash"]);
     WINDOWS_PATH = /^(?:[A-Za-z]:[\\/]|\\\\)/;
-    SHELL_TOOLS = /* @__PURE__ */ new Set([
+    SHELL_TOOLS2 = /* @__PURE__ */ new Set([
       "Bash",
       "Shell",
       "bash",
@@ -11907,7 +12156,8 @@ function normalizeHook(raw, env, options) {
         const tool = input.tool_name ?? "";
         const issued = {
           ...issueAttrs(tool, input.tool_input, input.tool_response),
-          ...releaseAttrs(tool, input.tool_input)
+          ...releaseAttrs(tool, input.tool_input),
+          ...commentAttrs(tool, input.tool_input, input.tool_response)
         };
         const named = {
           ...facts["effect_kind"] === "pr_open" ? pullRequestAttrs(input.tool_response) : {},
@@ -12203,6 +12453,7 @@ var init_hooks = __esm({
     init_wire();
     init_context();
     init_payload_members();
+    init_github_text();
     init_tools();
     textMember = external_exports.preprocess((value) => {
       if (typeof value === "number" || typeof value === "boolean")
@@ -15458,7 +15709,7 @@ var init_tool_call_dedupe = __esm({
        * sighting and registers nothing. `owner` is the subagent whose chain the
        * row seals on.
        */
-      judge(toolUseId, source, hasBody, owner) {
+      judge(toolUseId, source, hasBody2, owner) {
         if (toolUseId === void 0 || toolUseId.length === 0)
           return { verdict: { kind: "first" }, commit: () => {
           } };
@@ -15467,13 +15718,13 @@ var init_tool_call_dedupe = __esm({
         const commit = () => {
           const entry2 = seen ?? { sources: [], body: false };
           if (!entry2.sources.includes(source)) entry2.sources.push(source);
-          entry2.body = entry2.body || hasBody;
+          entry2.body = entry2.body || hasBody2;
           if (owner !== void 0) entry2.owner ??= owner;
           this.entries.set(toolUseId, entry2);
           this.trim();
         };
         if (first === void 0) return { verdict: { kind: "first" }, commit };
-        if (hasBody && seen?.body !== true)
+        if (hasBody2 && seen?.body !== true)
           return { verdict: { kind: "body", of: first }, commit };
         return { verdict: { kind: "repeat" }, commit };
       }
@@ -16305,7 +16556,7 @@ var init_otel = __esm({
 function rec2(value) {
   return isRecord2(value) ? value : void 0;
 }
-function strings(value) {
+function strings2(value) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string") : void 0;
 }
 function inventoryFromInit(record) {
@@ -16317,15 +16568,15 @@ function inventoryFromInit(record) {
   const set = (key, value) => {
     if (value !== void 0) out[key] = value;
   };
-  set("tools_available", strings(init["tools"]));
+  set("tools_available", strings2(init["tools"]));
   set("mcp_servers", init["mcp_servers"]);
-  set("agents_available", strings(init["agents"]));
-  set("skills_available", strings(init["skills"]));
-  set("slash_commands", strings(init["slash_commands"]));
+  set("agents_available", strings2(init["agents"]));
+  set("skills_available", strings2(init["skills"]));
+  set("slash_commands", strings2(init["slash_commands"]));
   set("plugins", init["plugins"]);
   set("plugin_errors", init["plugin_errors"]);
   set("mcp_server_errors", init["mcp_server_errors"]);
-  set("harness_capabilities", strings(init["capabilities"]));
+  set("harness_capabilities", strings2(init["capabilities"]));
   set("memory_paths", init["memory_paths"]);
   set("analytics_disabled", bool2(init["analytics_disabled"]));
   set("product_feedback_disabled", bool2(init["product_feedback_disabled"]));
@@ -17828,12 +18079,12 @@ var init_recorder = __esm({
        * sighting could not, and it is stamped so a reader counts one call. See
        * `tool-call-dedupe.ts` and ADR-140.
        */
-      toolCallSighting(body2, source, hasBody) {
+      toolCallSighting(body2, source, hasBody2) {
         const toolUseId = typeof body2["tool_use_id"] === "string" ? body2["tool_use_id"] : void 0;
         const { verdict, commit } = this.toolCallLedger.judge(
           toolUseId,
           source,
-          hasBody,
+          hasBody2,
           this.options.parent?.subagentId
         );
         if (verdict.kind === "repeat") return { attrs: void 0, commit };
@@ -22629,6 +22880,15 @@ import {
 function anthropicCredentialKind(secret, fallback) {
   return secret.trim().startsWith(CLAUDE_OAUTH_TOKEN_PREFIX) ? "oauth" : fallback;
 }
+function harnessOf(entry2) {
+  return entry2.harness ?? defaultHarnessForProvider(entry2.provider);
+}
+function sealingContext(provider, harness) {
+  return harness === defaultHarnessForProvider(provider) ? `${CREDENTIAL_STORE_SCHEMA}:${provider}` : `${CREDENTIAL_STORE_SCHEMA}:${provider}:${harness}`;
+}
+function matches(entry2, provider, harness) {
+  return entry2.provider === provider && harnessOf(entry2) === harness;
+}
 function readKey(path2) {
   try {
     const hex = readFileSync7(path2, "utf8").trim();
@@ -22703,6 +22963,7 @@ function credentialPrefix(secret) {
 function custodyOf(entry2) {
   return {
     provider: entry2.provider,
+    harness: harnessOf(entry2),
     kind: entry2.kind,
     source: entry2.source,
     taken_at: entry2.taken_at,
@@ -22768,49 +23029,56 @@ function openCredentialStore(paths) {
 `
     );
   }
+  const ownerOf = (provider, harness) => harness ?? defaultHarnessForProvider(provider);
   return {
-    has: (provider) => readAll().some((e) => e.provider === provider),
-    read: (provider) => {
-      const entry2 = readAll().find((e) => e.provider === provider);
+    has: (provider, harness) => {
+      const owner = ownerOf(provider, harness);
+      return readAll().some((e) => matches(e, provider, owner));
+    },
+    read: (provider, harness) => {
+      const owner = ownerOf(provider, harness);
+      const entry2 = readAll().find((e) => matches(e, provider, owner));
       if (entry2 === void 0) return void 0;
       return {
         kind: entry2.kind,
         secret: open(
           keyForRead(),
           entry2.sealed,
-          `${CREDENTIAL_STORE_SCHEMA}:${provider}`
+          sealingContext(provider, owner)
         )
       };
     },
-    take: (provider, { kind, secret }, source, now) => {
+    take: (provider, { kind, secret }, source, now, harness) => {
       if (secret.trim().length === 0)
         throw new Error("refusing to take an empty credential into custody");
+      const owner = ownerOf(provider, harness);
       const entry2 = {
         provider,
+        harness: owner,
         kind,
         source,
         taken_at: new Date(now).toISOString(),
         // A ChatGPT login is JSON, whose head says nothing; it is named.
         prefix: kind === "chatgpt" ? "login" : credentialPrefix(secret),
-        sealed: seal(
-          keyForWrite(),
-          secret,
-          `${CREDENTIAL_STORE_SCHEMA}:${provider}`
-        )
+        sealed: seal(keyForWrite(), secret, sealingContext(provider, owner))
       };
-      writeAll2([...readAll().filter((e) => e.provider !== provider), entry2]);
+      writeAll2([
+        ...readAll().filter((e) => !matches(e, provider, owner)),
+        entry2
+      ]);
       return custodyOf(entry2);
     },
-    release: (provider) => {
+    release: (provider, harness) => {
+      const owner = ownerOf(provider, harness);
       const entries2 = readAll();
-      const entry2 = entries2.find((e) => e.provider === provider);
+      const entry2 = entries2.find((e) => matches(e, provider, owner));
       if (entry2 === void 0) return void 0;
       const secret = open(
         keyForRead(),
         entry2.sealed,
-        `${CREDENTIAL_STORE_SCHEMA}:${provider}`
+        sealingContext(provider, owner)
       );
-      writeAll2(entries2.filter((e) => e.provider !== provider));
+      writeAll2(entries2.filter((e) => !matches(e, provider, owner)));
       return { kind: entry2.kind, secret };
     },
     status: () => readAll().map(custodyOf),
@@ -22837,6 +23105,7 @@ var init_credential_store = __esm({
   "../../packages/tacho/src/host/credential-store.ts"() {
     "use strict";
     init_zod();
+    init_wire();
     init_fs();
     init_run_token();
     CREDENTIAL_STORE_SCHEMA = "tacho.credentials.v1";
@@ -22845,6 +23114,8 @@ var init_credential_store = __esm({
       "claude-code:settings.env",
       /** `OPENAI_API_KEY`, or the ChatGPT login's `tokens`, in Codex's `auth.json`. */
       "codex:auth.json",
+      /** `providers.anthropic.api_key` in Stella's `stella.toml` or legacy `settings.json`. */
+      "stella:settings",
       /** A ChatGPT login the gateway refreshed, replacing the one it took. */
       "chatgpt:refresh",
       /**
@@ -22879,6 +23150,12 @@ var init_credential_store = __esm({
     }).strict();
     entrySchema = external_exports.object({
       provider: external_exports.enum(RUN_TOKEN_PROVIDERS),
+      /**
+       * The harness the secret belongs to. Absent on a row written before
+       * custody was keyed by harness; such a row is the provider's default
+       * harness's (`harnessOf`).
+       */
+      harness: external_exports.enum(BROKERABLE_HARNESSES).optional(),
       kind: external_exports.enum(CREDENTIAL_KINDS),
       source: external_exports.enum(CREDENTIAL_SOURCES),
       taken_at: external_exports.string(),
@@ -23120,6 +23397,12 @@ function findTopLevelKey(lines, pattern) {
   return -1;
 }
 function findStellaBaseUrl(lines) {
+  return findStellaKey(lines, BASE_URL_LINE);
+}
+function findStellaApiKey(lines) {
+  return findStellaKey(lines, API_KEY_LINE);
+}
+function findStellaKey(lines, keyLine) {
   let header2 = -1;
   let key = -1;
   for (const line of tomlKeyLines(lines)) {
@@ -23140,11 +23423,11 @@ function findStellaBaseUrl(lines) {
       if (/^\s*["']?anthropic["']?\s*[.=]/.test(text5))
         return { kind: "conflict" };
     } else if (line.table === STELLA_TABLE && key < 0) {
-      if (BASE_URL_LINE.test(text5)) key = line.index;
+      if (keyLine.test(text5)) key = line.index;
     }
   }
   if (header2 < 0) return { kind: "absent" };
-  const rest = key >= 0 ? BASE_URL_LINE.exec(lines[key]?.text ?? "")?.[1] ?? "" : "";
+  const rest = key >= 0 ? keyLine.exec(lines[key]?.text ?? "")?.[1] ?? "" : "";
   return {
     kind: "table",
     header: header2,
@@ -23164,12 +23447,14 @@ function stellaTableIsEmpty(lines, header2) {
   }
   return true;
 }
-var STELLA_TABLE, BASE_URL_LINE;
+var STELLA_TABLE, BASE_URL_LINE, STELLA_API_KEY_LINE, API_KEY_LINE;
 var init_model_base_url_toml = __esm({
   "../../packages/tacho/src/host/model-base-url-toml.ts"() {
     "use strict";
     STELLA_TABLE = "providers.anthropic";
     BASE_URL_LINE = /^\s*(?:base_url|"base_url"|'base_url')\s*=\s*(.*)$/;
+    STELLA_API_KEY_LINE = /^(\s*(?:api_key|"api_key"|'api_key')\s*=\s*)("(?:[^"\\]|\\.)*"|'[^']*')(.*)$/;
+    API_KEY_LINE = /^\s*(?:api_key|"api_key"|'api_key')\s*=\s*(.*)$/;
   }
 });
 
@@ -23865,6 +24150,11 @@ function helperCommandFor(tachoCommand) {
   return `${tachoCommand} credential issue --harness claude-code`;
 }
 function fileFor2(harness, homes) {
+  if (harness === "stella")
+    return modelBaseUrlFile("stella", {
+      home: homes.home,
+      ...homes.stellaHome !== void 0 ? { stellaHome: homes.stellaHome } : {}
+    });
   return harness === "claude-code" ? join15(
     homes.claudeConfigDir ?? harnessConfigDirs(homes.home).claudeConfigDir,
     "settings.json"
@@ -23917,6 +24207,14 @@ function readSidecar2(path2, harness) {
     ) : []
   };
   if (harness === "codex") return { ...common, harness };
+  if (harness === "stella") {
+    const quote = parsed2["quote"];
+    return {
+      ...common,
+      harness,
+      quote: quote === "basic" || quote === "literal" ? quote : null
+    };
+  }
   const helper = parsed2["previous_helper"];
   return {
     ...common,
@@ -23994,6 +24292,23 @@ function describe4(harness, options, { changed, text: text5, reason: reason3, un
     );
     shadow = managed.shadow;
     if (managed.unreadable !== void 0) unreadable.push(managed.unreadable);
+  } else if (harness === "stella") {
+    let at2 = { kind: "absent" };
+    try {
+      at2 = stellaKeyIn(file, text5);
+    } catch (error) {
+      unreadable.push(error instanceof Error ? error.message : String(error));
+    }
+    if (at2.kind === "value") {
+      brokered = looksLikeRunToken(at2.value);
+      if (brokered) {
+        const claims = peekRunTokenClaims(at2.value);
+        if (claims !== void 0)
+          tokenExpiresAt = new Date(claims.exp).toISOString();
+      } else if (why === void 0 && anthropicCredentialKind(at2.value, "api_key") !== "api_key")
+        why = "subscription_login";
+    } else if (why === void 0)
+      why = at2.kind === "unsupported" ? "unsupported_shape" : "no_key";
   } else {
     const auth = parseForReport(text5, file, unreadable);
     const key = codexTokenMember(auth);
@@ -24164,6 +24479,230 @@ function applyCodex(options, taken) {
   writeFileAtomicPreserving(file, next);
   return { changed: true, text: next };
 }
+function isJsonPath(file) {
+  return file.endsWith(".json");
+}
+function objectMember(parent, key) {
+  const value = parent?.[key];
+  if (value === void 0) return void 0;
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+function stellaKeyIn(file, text5) {
+  if (isJsonPath(file)) {
+    const settings = parseJsonObject(text5, file);
+    const providers = objectMember(settings, "providers");
+    if (providers === null) return { kind: "unsupported" };
+    const anthropic = objectMember(providers, "anthropic");
+    if (anthropic === null) return { kind: "unsupported" };
+    const value2 = anthropic?.["api_key"];
+    if (value2 === void 0 || value2 === null || value2 === "")
+      return { kind: "absent" };
+    if (typeof value2 !== "string") return { kind: "unsupported" };
+    return { kind: "value", value: value2, quote: null };
+  }
+  const lines = splitLines(text5);
+  const found = findStellaApiKey(lines);
+  if (found.kind === "conflict") return { kind: "unsupported" };
+  if (found.kind === "absent" || found.key < 0) return { kind: "absent" };
+  const match = STELLA_API_KEY_LINE.exec(lines[found.key]?.text ?? "");
+  const quoted3 = match?.[2];
+  const value = quoted3 !== void 0 ? tomlStringValue(quoted3) : null;
+  if (quoted3 === void 0 || value === null) return { kind: "unsupported" };
+  if (value.length === 0) return { kind: "absent" };
+  return {
+    kind: "value",
+    value,
+    quote: quoted3.startsWith("'") ? "literal" : "basic"
+  };
+}
+function tomlString(value, quote) {
+  return quote === "literal" && !/['\r\n]/.test(value) ? `'${value}'` : JSON.stringify(value);
+}
+function withStellaKey(file, text5, value, quote) {
+  if (isJsonPath(file)) {
+    const settings = parseJsonObject(text5, file);
+    const providers = objectMember(settings, "providers");
+    const anthropic = objectMember(providers ?? void 0, "anthropic");
+    if (providers === null || anthropic === null) return void 0;
+    settings["providers"] = {
+      ...providers ?? {},
+      anthropic: { ...anthropic ?? {}, api_key: value }
+    };
+    return serializeJsonLike(text5, settings);
+  }
+  const lines = splitLines(text5 ?? "");
+  const eol = (text5 ?? "").includes("\r\n") ? "\r\n" : "\n";
+  const found = findStellaApiKey(lines);
+  if (found.kind === "conflict") return void 0;
+  const line = `api_key = ${tomlString(value, quote)}`;
+  if (found.kind === "table" && found.key >= 0) {
+    const at3 = lines[found.key];
+    const match = STELLA_API_KEY_LINE.exec(at3.text);
+    if (match === null) return void 0;
+    at3.text = `${match[1] ?? ""}${tomlString(value, quote)}${match[3] ?? ""}`;
+    return joinLines(lines);
+  }
+  if (found.kind === "table") {
+    const header2 = lines[found.header];
+    const after = header2.eol;
+    if (header2.eol === "") header2.eol = eol;
+    lines.splice(found.header + 1, 0, { text: line, eol: after });
+    return joinLines(lines);
+  }
+  const marker = lines.findIndex((l) => STELLA_BLOCK_MARKER2.test(l.text));
+  const at2 = marker >= 0 ? marker : lines.length;
+  const before = lines[at2 - 1];
+  const added = [];
+  if (before !== void 0) {
+    if (before.eol === "") before.eol = eol;
+    if (before.text.trim().length > 0) added.push({ text: "", eol });
+  }
+  added.push({ text: "[providers.anthropic]", eol }, { text: line, eol });
+  lines.splice(at2, 0, ...added);
+  return joinLines(lines);
+}
+function withoutStellaKey(file, text5) {
+  if (isJsonPath(file)) {
+    const settings = parseJsonObject(text5, file);
+    const anthropic = objectMember(
+      objectMember(settings, "providers") ?? void 0,
+      "anthropic"
+    );
+    if (anthropic === null || anthropic === void 0) return void 0;
+    delete anthropic["api_key"];
+    return serializeJsonLike(text5, settings);
+  }
+  const lines = splitLines(text5);
+  const found = findStellaApiKey(lines);
+  if (found.kind !== "table" || found.key < 0) return void 0;
+  lines.splice(found.key, 1);
+  return joinLines(lines);
+}
+function applyStella(options, taken) {
+  const file = fileFor2("stella", options);
+  const backup = sidecarFor2(file);
+  const text5 = readTextIfExists(file);
+  if (text5 === void 0) return { changed: false, text: text5, reason: "no_file" };
+  const read2 = readSidecar2(backup, "stella");
+  const existing = read2?.harness === "stella" ? read2 : void 0;
+  const at2 = stellaKeyIn(file, text5);
+  if (at2.kind === "unsupported")
+    return { changed: false, text: text5, reason: "unsupported_shape" };
+  if (at2.kind === "absent") return { changed: false, text: text5, reason: "no_key" };
+  const current = at2.value;
+  const ours = looksLikeRunToken(current);
+  if (!ours) {
+    if (anthropicCredentialKind(current, "api_key") !== "api_key")
+      return { changed: false, text: text5, reason: "subscription_login" };
+    taken.push({
+      harness: "stella",
+      provider: "anthropic",
+      credential: { kind: "api_key", secret: current },
+      member: STELLA_API_KEY_MEMBER
+    });
+  }
+  const token = options.staticTokens?.stella;
+  if (token === void 0) {
+    if (!ours) taken.pop();
+    return { changed: false, text: text5, reason: "no_token" };
+  }
+  if (current === token && existing !== void 0)
+    return { changed: false, text: text5 };
+  const next = withStellaKey(file, text5, token, at2.quote);
+  if (next === void 0) {
+    if (!ours) taken.pop();
+    return { changed: false, text: text5, reason: "unsupported_shape" };
+  }
+  const took = ours ? [] : [{ member: STELLA_API_KEY_MEMBER, kind: "api_key" }];
+  const sidecar = existing ? {
+    ...existing,
+    written_sha256: sha256Hex(next),
+    // A key the person put back after enrolling sets the quote again.
+    ...ours ? {} : { quote: at2.quote },
+    taken: [
+      ...existing.taken,
+      ...took.filter(
+        (t) => !existing.taken.some((e) => e.member === t.member)
+      )
+    ]
+  } : {
+    schema: SIDECAR_SCHEMA2,
+    harness: "stella",
+    existed: true,
+    written_sha256: sha256Hex(next),
+    quote: at2.quote,
+    taken: took
+  };
+  writeSidecar(backup, sidecar);
+  writeFileAtomicPreserving(file, next);
+  return { changed: true, text: next };
+}
+function restoreStella(options, released, sidecar) {
+  const file = fileFor2("stella", options);
+  const backup = sidecarFor2(file);
+  const text5 = readTextIfExists(file);
+  const dropSidecar = () => {
+    if (existsSync7(backup)) unlinkSync6(backup);
+  };
+  const quote = sidecar?.quote ?? null;
+  if (text5 === void 0) {
+    if (released !== void 0) {
+      const written2 = withStellaKey(file, void 0, released.secret, quote);
+      if (written2 !== void 0) {
+        writeFileAtomicPreserving(file, written2);
+        dropSidecar();
+        return { changed: true, text: written2, secretRestored: true };
+      }
+    }
+    dropSidecar();
+    return { changed: false, text: text5, secretRestored: false };
+  }
+  const at2 = stellaKeyIn(file, text5);
+  if (at2.kind === "value" && !looksLikeRunToken(at2.value)) {
+    dropSidecar();
+    return {
+      changed: false,
+      text: text5,
+      secretRestored: false,
+      reason: "foreign_key_present"
+    };
+  }
+  if (at2.kind === "unsupported") {
+    dropSidecar();
+    return {
+      changed: false,
+      text: text5,
+      secretRestored: false,
+      reason: "unsupported_shape"
+    };
+  }
+  const next = released !== void 0 ? withStellaKey(
+    file,
+    text5,
+    released.secret,
+    quote ?? (at2.kind === "value" ? at2.quote : null)
+  ) : at2.kind === "value" ? withoutStellaKey(file, text5) : text5;
+  if (next === void 0) {
+    dropSidecar();
+    return {
+      changed: false,
+      text: text5,
+      secretRestored: false,
+      reason: "unsupported_shape"
+    };
+  }
+  if (next === text5) {
+    dropSidecar();
+    return { changed: false, text: text5, secretRestored: false };
+  }
+  writeFileAtomicPreserving(file, next);
+  dropSidecar();
+  return {
+    changed: true,
+    text: next,
+    secretRestored: released !== void 0
+  };
+}
 function restoreClaude(options, released, sidecar) {
   const file = fileFor2("claude-code", options);
   const backup = sidecarFor2(file);
@@ -24291,14 +24830,14 @@ async function applyModelCredentials(options, internals = {}) {
         outcomeOf(harness, options, "symlink"),
         internals
       );
-    const outcome = harness === "claude-code" ? applyClaude(options, taken) : applyCodex(options, taken);
+    const outcome = harness === "claude-code" ? applyClaude(options, taken) : harness === "stella" ? applyStella(options, taken) : applyCodex(options, taken);
     return describe4(harness, options, outcome, internals);
   });
   return { harnesses, taken };
 }
 async function restoreModelCredentials(options, restore = {}, internals = {}) {
   const harnesses = uniqueHarnesses(options.harnesses).map((harness) => {
-    const released = restore.secrets?.[HARNESS_PROVIDER[harness]];
+    const released = restore.secrets?.[harness];
     const { sidecar, unreadable } = sidecarOrWhy2(
       sidecarFor2(fileFor2(harness, options)),
       harness
@@ -24307,6 +24846,10 @@ async function restoreModelCredentials(options, restore = {}, internals = {}) {
       options,
       released,
       sidecar?.harness === "claude-code" ? sidecar : void 0
+    ) : harness === "stella" ? restoreStella(
+      options,
+      released,
+      sidecar?.harness === "stella" ? sidecar : void 0
     ) : restoreCodex(
       options,
       released,
@@ -24326,6 +24869,17 @@ async function peekModelCredentials(options) {
     const file = fileFor2(harness, options);
     const text5 = readTextIfExists(file);
     if (text5 === void 0) continue;
+    if (harness === "stella") {
+      const at2 = stellaKeyIn(file, text5);
+      if (at2.kind === "value" && !looksLikeRunToken(at2.value) && anthropicCredentialKind(at2.value, "api_key") === "api_key")
+        taken.push({
+          harness,
+          provider: "anthropic",
+          credential: { kind: "api_key", secret: at2.value },
+          member: STELLA_API_KEY_MEMBER
+        });
+      continue;
+    }
     const document = parseJsonObject(text5, file);
     if (harness === "claude-code") {
       const env = envOf(document) ?? {};
@@ -24377,6 +24931,10 @@ function hasOrphanedModelCredential(harness, home, dirs = {}) {
   const text5 = readTextIfExists(file);
   if (text5 === void 0) return false;
   try {
+    if (harness === "stella") {
+      const at2 = stellaKeyIn(file, text5);
+      return at2.kind === "value" && looksLikeRunToken(at2.value);
+    }
     const document = parseJsonObject(text5, file);
     if (harness === "claude-code") return isTachoHelper(document[HELPER_KEY]);
     const key = codexTokenMember(document);
@@ -24390,14 +24948,14 @@ function staticTokenRenewWindowMs(host, now) {
   if (!Number.isFinite(notAfter)) return STATIC_TOKEN_RENEW_WINDOW_MS;
   return Math.min(STATIC_TOKEN_RENEW_WINDOW_MS, (notAfter - now) / 2);
 }
-function staticTokenStillGood(token, host, keyPath2, now) {
+function staticTokenStillGood(token, host, keyPath2, now, provider = "openai") {
   if (token === void 0 || !looksLikeRunToken(token)) return false;
   const key = readRunTokenKey(keyPath2);
   if (key === void 0) return false;
   const verdict = verifyRunToken(token, {
     key,
     host: host.host_enrollment_id,
-    provider: "openai",
+    provider,
     now
   });
   return verdict.ok && verdict.claims.exp - now > staticTokenRenewWindowMs(host, now);
@@ -24434,7 +24992,19 @@ function readCodexApiKeyMember(home, dirs = {}) {
     return void 0;
   }
 }
-var HARNESS_PROVIDER, SIDECAR_SCHEMA2, HELPER_KEY, CLAUDE_API_KEY, CLAUDE_AUTH_TOKEN, CLAUDE_OAUTH_TOKEN, CLAUDE_MEMBERS, CODEX_KEY2, CODEX_TOKENS, CODEX_LAST_REFRESH, CHATGPT_REFRESH_HELD, HELPER_MARK, STATIC_TOKEN_RENEW_WINDOW_MS, CODEX_LAST_REFRESH_RESTATE_MS;
+function readStaticTokenMember(harness, home, dirs = {}) {
+  if (harness === "codex") return readCodexApiKeyMember(home, dirs);
+  const file = fileFor2("stella", { ...dirs, home });
+  try {
+    const text5 = readTextIfExists(file);
+    if (text5 === void 0) return void 0;
+    const at2 = stellaKeyIn(file, text5);
+    return at2.kind === "value" ? at2.value : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var HARNESS_PROVIDER, STATIC_TOKEN_HARNESSES, SIDECAR_SCHEMA2, HELPER_KEY, CLAUDE_API_KEY, CLAUDE_AUTH_TOKEN, CLAUDE_OAUTH_TOKEN, CLAUDE_MEMBERS, CODEX_KEY2, CODEX_TOKENS, CODEX_LAST_REFRESH, CHATGPT_REFRESH_HELD, HELPER_MARK, STELLA_API_KEY_MEMBER, STELLA_BLOCK_MARKER2, STATIC_TOKEN_RENEW_WINDOW_MS, CODEX_LAST_REFRESH_RESTATE_MS;
 var init_model_credential = __esm({
   "../../packages/tacho/src/host/model-credential.ts"() {
     "use strict";
@@ -24443,9 +25013,13 @@ var init_model_credential = __esm({
     init_wire();
     init_credential_store();
     init_model_base_url();
+    init_model_base_url_toml();
     init_paths();
     init_run_token();
     HARNESS_PROVIDER = BROKERABLE_HARNESS_PROVIDER;
+    STATIC_TOKEN_HARNESSES = BROKERABLE_HARNESSES.filter(
+      (harness) => harness !== "claude-code"
+    );
     SIDECAR_SCHEMA2 = "oxagen.model-credential.v1";
     HELPER_KEY = "apiKeyHelper";
     CLAUDE_API_KEY = "ANTHROPIC_API_KEY";
@@ -24461,6 +25035,8 @@ var init_model_credential = __esm({
     CODEX_LAST_REFRESH = "last_refresh";
     CHATGPT_REFRESH_HELD = "held-by-oxagen-gateway";
     HELPER_MARK = /\bcredential issue --harness claude-code\s*$/;
+    STELLA_API_KEY_MEMBER = "providers.anthropic.api_key";
+    STELLA_BLOCK_MARKER2 = /^# >>> tacho enrollment /;
     STATIC_TOKEN_RENEW_WINDOW_MS = 7 * 24 * 60 * 6e4;
     CODEX_LAST_REFRESH_RESTATE_MS = 5 * 24 * 60 * 6e4;
   }
@@ -24472,7 +25048,8 @@ import { dirname as dirname8 } from "node:path";
 function harnessDirsOf(deps) {
   return {
     claudeConfigDir: dirname8(deps.paths.claudeSettings),
-    codexHome: dirname8(deps.paths.codexHooks)
+    codexHome: dirname8(deps.paths.codexHooks),
+    stellaHome: dirname8(deps.paths.stellaToml)
   };
 }
 function parseCredentialMode(value) {
@@ -24548,6 +25125,7 @@ async function credentialStatus(options, deps) {
   ].flatMap(
     (agent) => (agent.credentialStore?.status() ?? []).map((c) => ({
       provider: c.provider,
+      harness: c.harness,
       kind: c.kind,
       source: c.source,
       taken_at: c.taken_at,
@@ -24561,6 +25139,7 @@ async function credentialStatus(options, deps) {
   const harnesses = [...new Set(enrolled)].filter(isCredentialHarness);
   const state = deps.modelCredentials !== void 0 && harnesses.length > 0 ? (await deps.modelCredentials.read({
     home: deps.home,
+    stellaHome: dirname8(deps.paths.stellaToml),
     harnesses,
     helperCommand: deps.runtime.credentialHelperCommand
   })).harnesses : [];
@@ -24575,7 +25154,7 @@ async function credentialStatus(options, deps) {
     );
   for (const entry2 of custody)
     deps.out(
-      `Custody     ${entry2.provider}: ${entry2.kind} ${entry2.prefix} from ${entry2.source}, taken ${entry2.taken_at}`
+      `Custody     ${entry2.provider}${entry2.harness === defaultHarnessForProvider(entry2.provider) ? "" : ` (${TACHO_HARNESS_LABELS[entry2.harness]})`}: ${entry2.kind} ${entry2.prefix} from ${entry2.source}, taken ${entry2.taken_at}`
     );
   for (const entry2 of state) deps.out(`            ${describeHarness(entry2)}`);
   return report;
@@ -24585,6 +25164,22 @@ function describeHarness(entry2) {
   if (entry2.brokered) {
     return entry2.shadowedBy !== void 0 ? `${label2}: points at the gateway's run tokens, but ${entry2.shadowedBy.file} sets apiKeyHelper, and managed settings win, so it does not` : `${label2}: holds a run token; the gateway supplies the ${HARNESS_PROVIDER[entry2.harness]} credential`;
   }
+  if (entry2.harness === "stella") {
+    switch (entry2.reason) {
+      case "no_key":
+        return `${label2}: ${entry2.file} holds no providers.anthropic.api_key, so Stella sends the key it reads from ANTHROPIC_API_KEY or its credentials file, and that key crosses the proxy as its own. Put the key in ${entry2.file} and run \`oxagen agent enroll\` to broker it`;
+      case "subscription_login":
+        return `${label2}: ${entry2.file} holds a Claude subscription token in providers.anthropic.api_key, and Stella is brokered only on an API key; it crosses the proxy as its own`;
+      case "unsupported_shape":
+        return `${label2}: ${entry2.file} defines providers.anthropic in a shape a line edit cannot change safely, so it was left alone; its own key crosses the proxy`;
+      case "symlink":
+        return `${label2}: ${entry2.file} is a symbolic link, so it was left alone; its own key crosses the proxy`;
+      case "no_file":
+        return `${label2}: no ${entry2.file} yet; its own key crosses the proxy`;
+      default:
+        return `${label2}: holds its own key, which crosses the proxy (run \`oxagen agent enroll\` to broker it)`;
+    }
+  }
   switch (entry2.reason) {
     case "subscription_login":
       return `${label2}: signed in with a ChatGPT login that crosses the proxy as its own (run \`oxagen credential login --harness codex\` to put it in the gateway's custody)`;
@@ -24598,6 +25193,16 @@ function describeHarness(entry2) {
       return entry2.harness === "claude-code" ? `${label2}: holds its own credential, which crosses the proxy (run \`oxagen credential login\` to put your Claude subscription in the gateway's custody)` : `${label2}: holds its own credential, which crosses the proxy (run \`oxagen agent enroll\` to broker it)`;
   }
 }
+function stellaEnvKeyWarning(entries2, env) {
+  const stella = entries2.find((entry2) => entry2.harness === "stella");
+  if (stella?.brokered !== true) return void 0;
+  if ((env[STELLA_ANTHROPIC_KEY_ENV]?.trim() ?? "").length === 0)
+    return void 0;
+  return `${STELLA_ANTHROPIC_KEY_ENV} is set in this environment. Stella reads it ahead of the run token in ${stella.file}, so an interactive Stella sends that key and the gateway refuses it as foreign_credential. Unset ${STELLA_ANTHROPIC_KEY_ENV} in your shell profile; the gateway supplies Stella's key. Runs Oxagen dispatches are not affected`;
+}
+function fileSourceOf(harness) {
+  return harness === "claude-code" ? "claude-code:settings.env" : harness === "stella" ? "stella:settings" : "codex:auth.json";
+}
 async function brokerCredentials(host, harnesses, deps) {
   const warnings = [];
   const store = deps.credentialStore;
@@ -24607,21 +25212,26 @@ async function brokerCredentials(host, harnesses, deps) {
     return { harnesses: [], taken: [], warnings };
   const helperCommand = deps.runtime.credentialHelperCommand;
   const offered = /* @__PURE__ */ new Map();
+  const stellaHome = dirname8(deps.paths.stellaToml);
   for (const taken of await contract.peek({
     home: deps.home,
+    stellaHome,
     harnesses: targets,
     helperCommand
   })) {
-    offered.set(taken.provider, {
+    offered.set(taken.harness, {
+      provider: taken.provider,
       credential: taken.credential,
-      source: taken.harness === "claude-code" ? "claude-code:settings.env" : "codex:auth.json"
+      source: fileSourceOf(taken.harness)
     });
   }
   for (const harness of targets) {
+    if (harness === "stella") continue;
     const provider = HARNESS_PROVIDER[harness];
     const fromEnv = deps.env[brokerEnvVar(provider)];
-    if (!offered.has(provider) && typeof fromEnv === "string" && fromEnv.trim().length > 0)
-      offered.set(provider, {
+    if (!offered.has(harness) && typeof fromEnv === "string" && fromEnv.trim().length > 0)
+      offered.set(harness, {
+        provider,
         credential: {
           kind: provider === "anthropic" ? anthropicCredentialKind(fromEnv, "api_key") : "bearer",
           secret: fromEnv.trim()
@@ -24629,8 +25239,9 @@ async function brokerCredentials(host, harnesses, deps) {
         source: "enroll:env"
       });
     const oauth = deps.env[CLAUDE_OAUTH_TOKEN_ENV]?.trim();
-    if (provider === "anthropic" && !offered.has(provider) && oauth !== void 0 && isSubscriptionToken(oauth))
-      offered.set(provider, {
+    if (harness === "claude-code" && !offered.has(harness) && oauth !== void 0 && isSubscriptionToken(oauth))
+      offered.set(harness, {
+        provider,
         credential: { kind: "oauth", secret: oauth },
         source: "enroll:env"
       });
@@ -24639,52 +25250,70 @@ async function brokerCredentials(host, harnesses, deps) {
   const staticTokens = {};
   let state;
   try {
-    for (const [provider, offer] of offered) {
-      store.take(provider, offer.credential, offer.source, deps.now());
-      takenNow.push(provider);
+    for (const [harness, offer] of offered) {
+      store.take(
+        offer.provider,
+        offer.credential,
+        offer.source,
+        deps.now(),
+        harness
+      );
+      takenNow.push({ provider: offer.provider, harness });
     }
-    if (targets.includes("codex") && store.has("openai")) {
-      {
-        const current = readCodexApiKeyMember(deps.home, harnessDirsOf(deps));
-        if (!staticTokenStillGood(
-          current,
-          host,
-          deps.paths.runTokenKey,
-          deps.now()
-        )) {
-          const issued = await issueStatic("codex", deps);
-          if (issued.token !== void 0) staticTokens.codex = issued.token;
-          else
-            warnings.push(`Codex keeps its own credential: ${issued.detail}`);
-        }
-      }
+    for (const harness of STATIC_TOKEN_HARNESSES) {
+      if (!targets.includes(harness)) continue;
+      const provider = HARNESS_PROVIDER[harness];
+      if (!store.has(provider, harness)) continue;
+      const current = readStaticTokenMember(
+        harness,
+        deps.home,
+        harnessDirsOf(deps)
+      );
+      if (staticTokenStillGood(
+        current,
+        host,
+        deps.paths.runTokenKey,
+        deps.now(),
+        provider
+      ))
+        continue;
+      const issued = await issueStatic(harness, deps);
+      if (issued.token !== void 0) staticTokens[harness] = issued.token;
+      else
+        warnings.push(
+          `${TACHO_HARNESS_LABELS[harness]} keeps its own credential: ${issued.detail}`
+        );
     }
     state = await contract.apply({
       home: deps.home,
+      stellaHome,
       harnesses: targets,
       helperCommand,
       staticTokens
     });
   } catch (error) {
-    for (const provider of takenNow) store.release(provider);
+    for (const { provider, harness } of takenNow)
+      store.release(provider, harness);
     throw error;
   }
   for (const taken of state.taken) {
-    if (offered.has(taken.provider)) continue;
+    if (offered.has(taken.harness)) continue;
     store.take(
       taken.provider,
       taken.credential,
-      taken.harness === "claude-code" ? "claude-code:settings.env" : "codex:auth.json",
-      deps.now()
+      fileSourceOf(taken.harness),
+      deps.now(),
+      taken.harness
     );
-    takenNow.push(taken.provider);
+    takenNow.push({ provider: taken.provider, harness: taken.harness });
   }
   for (const entry2 of state.harnesses) {
-    const provider = HARNESS_PROVIDER[entry2.harness];
+    const harness = entry2.harness;
+    const provider = HARNESS_PROVIDER[harness];
     if (entry2.brokered) {
-      if (!store.has(provider)) {
+      if (!store.has(provider, harness)) {
         await contract.restore(
-          { home: deps.home, harnesses: [entry2.harness], helperCommand },
+          { home: deps.home, stellaHome, harnesses: [harness], helperCommand },
           {}
         );
         const index = state.harnesses.indexOf(entry2);
@@ -24695,19 +25324,19 @@ async function brokerCredentials(host, harnesses, deps) {
           reason: "no_token"
         };
         warnings.push(
-          provider === "anthropic" ? `${TACHO_HARNESS_LABELS[entry2.harness]} keeps its own login: the gateway holds no Anthropic credential yet. Run \`oxagen credential login\` to sign in with your Claude subscription, or put a key in ${entry2.file} and enroll again` : `${TACHO_HARNESS_LABELS[entry2.harness]} keeps its own login: no ${provider} key was found in ${entry2.file} or ${brokerEnvVar(provider)}, so there is nothing for the gateway to take into custody`
+          harness === "claude-code" ? `${TACHO_HARNESS_LABELS[harness]} keeps its own login: the gateway holds no Anthropic credential yet. Run \`oxagen credential login\` to sign in with your Claude subscription, or put a key in ${entry2.file} and enroll again` : harness === "stella" ? `${TACHO_HARNESS_LABELS[harness]} keeps its own key: the gateway holds no Anthropic key of Stella's. Put the key in providers.anthropic.api_key in ${entry2.file} and enroll again` : `${TACHO_HARNESS_LABELS[harness]} keeps its own login: no ${provider} key was found in ${entry2.file} or ${brokerEnvVar(provider)}, so there is nothing for the gateway to take into custody`
         );
       }
       continue;
     }
-    if (store.has(provider) && takenNow.includes(provider)) {
-      const released = store.release(provider);
-      const index = takenNow.indexOf(provider);
-      if (index >= 0) takenNow.splice(index, 1);
-      const offer = offered.get(provider);
+    const at2 = takenNow.findIndex((t) => t.harness === harness);
+    if (at2 >= 0 && store.has(provider, harness)) {
+      const released = store.release(provider, harness);
+      takenNow.splice(at2, 1);
+      const offer = offered.get(harness);
       if (offer?.source === "enroll:env" || released === void 0) continue;
       warnings.push(
-        `${TACHO_HARNESS_LABELS[entry2.harness]} keeps its own credential (${entry2.reason ?? "not brokered"}), so its ${provider} key was not taken into custody`
+        `${TACHO_HARNESS_LABELS[harness]} keeps its own credential (${entry2.reason ?? "not brokered"}), so its ${provider} key was not taken into custody`
       );
     }
   }
@@ -24754,10 +25383,10 @@ async function restoreCredentials(host, deps, mode = "unenroll", only) {
       let fromLogin = false;
       try {
         fromLogin = store?.status().some(
-          (c) => c.provider === provider && c.source === "claude:setup-token"
+          (c) => c.provider === provider && c.harness === harness && c.source === "claude:setup-token"
         ) === true;
-        if (fromLogin) store?.release(provider);
-        else released = store?.read(provider);
+        if (fromLogin) store?.release(provider, harness);
+        else released = store?.read(provider, harness);
       } catch (error) {
         unreadable = error instanceof Error ? error.message : String(error);
       }
@@ -24774,18 +25403,23 @@ async function restoreCredentials(host, deps, mode = "unenroll", only) {
         );
       }
       const state = await contract.restore(
-        { home: deps.home, harnesses: [harness], helperCommand },
-        released !== void 0 ? { secrets: { [provider]: released } } : {}
+        {
+          home: deps.home,
+          stellaHome: dirname8(deps.paths.stellaToml),
+          harnesses: [harness],
+          helperCommand
+        },
+        released !== void 0 ? { secrets: { [harness]: released } } : {}
       );
       for (const entry2 of state.harnesses) {
         if (entry2.changed) restored.push(entry2.file);
         if (released === void 0) continue;
         if (entry2.secretRestored === true) {
-          store?.release(provider);
+          store?.release(provider, harness);
           continue;
         }
         if (mode === "unenroll") {
-          store?.release(provider);
+          store?.release(provider, harness);
           warnings.push(
             `${entry2.file} already holds a ${provider} credential of its own, so the older one the gateway held was not written back and is discarded with the store`
           );
@@ -24989,7 +25623,7 @@ async function credentialLogin(options, deps) {
     detail: outcome.harnesses.some((h) => h.brokered) ? "Claude Code now holds a run token, and the gateway sends your subscription with every call" : "The subscription is in custody. Run `oxagen agent enroll` to route Claude Code through the gateway"
   };
 }
-var MODEL_CREDENTIAL_HARNESSES, CREDENTIAL_MODES, CLAUDE_OAUTH_TOKEN_ENV;
+var MODEL_CREDENTIAL_HARNESSES, CREDENTIAL_MODES, STELLA_ANTHROPIC_KEY_ENV, CLAUDE_OAUTH_TOKEN_ENV;
 var init_credential = __esm({
   "../../packages/tacho/src/cli/credential.ts"() {
     "use strict";
@@ -25007,6 +25641,7 @@ var init_credential = __esm({
       "brokered",
       "passthrough"
     ];
+    STELLA_ANTHROPIC_KEY_ENV = "ANTHROPIC_API_KEY";
     CLAUDE_OAUTH_TOKEN_ENV = "CLAUDE_CODE_OAUTH_TOKEN";
   }
 });
@@ -25777,7 +26412,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname9, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4";
+  if (true) return "2.1.5-22";
   try {
     const here = dirname9(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -26168,7 +26803,8 @@ function defaultCliDeps(overrides = {}, managed = {}) {
   const harnessFiles = new HarnessFiles(paths.dir);
   const harnessDirs = {
     claudeConfigDir: dirname10(paths.claudeSettings),
-    codexHome: dirname10(paths.codexHooks)
+    codexHome: dirname10(paths.codexHooks),
+    stellaHome: dirname10(paths.stellaToml)
   };
   const daemonGet = async (path2, options) => {
     const host = readHostFile(paths.hostFile);
@@ -30163,6 +30799,7 @@ async function agentStatus(deps) {
       return void 0;
     const state = await deps.modelCredentials.read({
       home: deps.home,
+      stellaHome: dirname11(deps.paths.stellaToml),
       harnesses: routedHarnesses,
       helperCommand: deps.runtime.credentialHelperCommand
     });
@@ -30224,6 +30861,7 @@ async function agentStatus(deps) {
     try {
       credentialCustody = deps.credentialStore.status().map((c) => ({
         provider: c.provider,
+        harness: c.harness,
         kind: c.kind,
         source: c.source,
         taken_at: c.taken_at
@@ -30232,6 +30870,9 @@ async function agentStatus(deps) {
       problems.push(error instanceof Error ? error.message : String(error));
     }
   }
+  const credentialWarnings = [];
+  const envKey = stellaEnvKeyWarning(modelCredentials ?? [], deps.env);
+  if (envKey !== void 0) credentialWarnings.push(envKey);
   const tiers = observedTiers(daemon);
   const retired = host.revoked_at !== null;
   const shipping = retired ? void 0 : shippingHealth(daemon, walStats, deps.now());
@@ -30242,6 +30883,7 @@ async function agentStatus(deps) {
     ...gateway !== void 0 ? { gateway } : {},
     ...modelBaseUrls !== void 0 ? { modelBaseUrls } : {},
     ...modelCredentials !== void 0 ? { modelCredentials } : {},
+    ...credentialWarnings.length > 0 ? { credentialWarnings } : {},
     ...credentialCustody !== void 0 ? { credentialCustody } : {},
     ...Object.keys(tiers).length > 0 ? { tiers } : {},
     host: {
@@ -30391,6 +31033,8 @@ function printStatus(report, deps) {
   }
   for (const entry2 of modelCredentials ?? [])
     deps.out(`Credential  ${describeHarness(entry2)}`);
+  for (const warning of report.credentialWarnings ?? [])
+    deps.out(`Warning     ${warning}`);
   for (const harness of h.harnesses)
     deps.out(
       `Tier        ${harness}: ${tiers[harness] ?? "no run since the collector started"}`
@@ -32248,7 +32892,6 @@ ${problems.map((problem) => `  ${problem}`).join("\n")}`
           if (unhooked.includes(harness)) return false;
           const file = modelBaseUrlFile(harness, {
             home: deps.home,
-            stellaHome,
             ...harnessDirsOf(deps)
           });
           let linked2 = false;
@@ -32308,9 +32951,9 @@ ${problems.map((problem) => `  ${problem}`).join("\n")}`
               const outcome = await brokerCredentials(host, reaching, deps);
               for (const entry2 of outcome.harnesses)
                 deps.out(`      ${describeHarness(entry2)}`);
-              for (const provider of outcome.taken)
+              for (const { provider, harness } of outcome.taken)
                 deps.out(
-                  `      ${provider} credential taken into the gateway's custody (${deps.paths.credentials})`
+                  `      ${harness === "stella" ? "Stella's " : ""}${provider} credential taken into the gateway's custody (${deps.paths.credentials})`
                 );
               warnings.push(...outcome.warnings);
               const unrouted = writable2.filter((h) => !reaching.includes(h));
@@ -34515,14 +35158,20 @@ function headlessArgs(harness, prompt) {
       return ["run", prompt];
   }
 }
-function headlessEnv(harness) {
-  return harness === "stella" ? { STELLA_TRUST_PROJECT: "1" } : {};
+function headlessEnv(harness, stellaRunToken) {
+  if (harness !== "stella") return {};
+  return {
+    STELLA_TRUST_PROJECT: "1",
+    ...stellaRunToken !== void 0 ? { ANTHROPIC_API_KEY: stellaRunToken } : {}
+  };
 }
+var DISPATCHED_STELLA_TOKEN_TTL_MS;
 var init_work_order_start = __esm({
   "../../packages/tacho/src/host/work-order-start.ts"() {
     "use strict";
     init_control_client();
     init_wire();
+    DISPATCHED_STELLA_TOKEN_TTL_MS = 24 * 60 * 6e4;
   }
 });
 
@@ -34899,6 +35548,24 @@ async function workClaim(criterionId, options, deps) {
     );
     return 2;
   }
+  if (options.workOrder === void 0 !== (options.item === void 0)) {
+    deps.err(
+      "Give --work-order and --item together, as the first prompt lists them for each item of a batch."
+    );
+    return 2;
+  }
+  if (options.workOrder !== void 0 && workOrderIdOf(options.workOrder) === void 0) {
+    deps.err(
+      `${JSON.stringify(options.workOrder)} is not a work order id. A work order id starts with wo_, as the first prompt lists it.`
+    );
+    return 2;
+  }
+  if (options.item !== void 0 && !/^wi_[0-9A-Za-z]+$/.test(options.item)) {
+    deps.err(
+      `${JSON.stringify(options.item)} is not a work item id. A work item id starts with wi_, as the first prompt lists it.`
+    );
+    return 2;
+  }
   const workOrderId = workOrderIdOf(deps.env[WORK_ORDER_ENV]);
   if (workOrderId === void 0) {
     deps.err(
@@ -34925,7 +35592,9 @@ async function workClaim(criterionId, options, deps) {
     );
     return 1;
   }
-  const { agent, item } = found;
+  const { agent } = found;
+  const item = options.item ?? found.item;
+  const claimOrder = options.workOrder ?? workOrderId;
   if (item === void 0) {
     deps.err(
       `The run of ${workOrderId} on this machine does not record its work item, because an older oxagen started it. Claims work in the next run that \`oxagen work start\` starts.`
@@ -34944,7 +35613,7 @@ async function workClaim(criterionId, options, deps) {
   try {
     answer = await client.claimWorkCriterion({
       item_id: item,
-      work_order_id: workOrderId,
+      work_order_id: claimOrder,
       criterion_id: criterionId,
       head_sha: head2,
       text: text5
@@ -34962,7 +35631,7 @@ async function workClaim(criterionId, options, deps) {
       );
     return 1;
   }
-  deps.out(claimAnswerMessage(answer, criterionId, workOrderId, head2));
+  deps.out(claimAnswerMessage(answer, criterionId, claimOrder, head2));
   return 0;
 }
 var NOT_ENROLLED;
@@ -34989,6 +35658,7 @@ __export(cli_exports, {
   CURSOR_COVERAGE_NOTE: () => CURSOR_COVERAGE_NOTE,
   MODEL_CREDENTIAL_HARNESSES: () => MODEL_CREDENTIAL_HARNESSES,
   SHIPPING_STALL_MS: () => SHIPPING_STALL_MS,
+  STELLA_ANTHROPIC_KEY_ENV: () => STELLA_ANTHROPIC_KEY_ENV,
   acquireSubscriptionToken: () => acquireSubscriptionToken,
   addMissingClaudeCodeMcp: () => addMissingClaudeCodeMcp,
   agentNameFromCommand: () => agentNameFromCommand,
@@ -35052,6 +35722,7 @@ __export(cli_exports, {
   spawnAgent: () => spawnAgent,
   stableExecutablePath: () => stableExecutablePath,
   status: () => status,
+  stellaEnvKeyWarning: () => stellaEnvKeyWarning,
   stopGateway: () => stopGateway,
   streamDaemon: () => streamDaemon,
   stripEnrollmentHooks: () => stripEnrollmentHooks,
@@ -40627,6 +41298,69 @@ var init_runner = __esm({
   }
 });
 
+// ../../packages/tacho/src/collector/static-token-renewal.ts
+async function renewStaticToken(harness, deps) {
+  const provider = HARNESS_PROVIDER[harness];
+  const label2 = TACHO_HARNESS_LABELS[harness];
+  if (deps.host.host_status !== "active" || !deps.inCustody(provider, harness))
+    return "skipped";
+  const dirs = deps.stellaHome !== void 0 ? { stellaHome: deps.stellaHome } : {};
+  let brokered = false;
+  try {
+    brokered = (await readModelCredentialState({
+      home: deps.home,
+      ...dirs,
+      harnesses: [harness]
+    })).harnesses[0]?.brokered === true;
+  } catch (error) {
+    deps.log(
+      `static token renewal: cannot read ${label2}'s credential file: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return "failed";
+  }
+  if (!brokered) return "skipped";
+  const current = readStaticTokenMember(harness, deps.home, dirs);
+  if (staticTokenStillGood(
+    current,
+    deps.host,
+    deps.runTokenKeyPath,
+    deps.now(),
+    provider
+  ))
+    return "still_good";
+  const issued = deps.issue?.({ harness, placement: "static" });
+  if (issued === void 0 || issued.status !== 200) {
+    deps.log(
+      `static token renewal: not issued for ${label2} (${issued?.body.error ?? "no issuer"})`
+    );
+    return "not_issued";
+  }
+  try {
+    await applyModelCredentials({
+      home: deps.home,
+      ...dirs,
+      harnesses: [harness],
+      staticTokens: { [harness]: issued.body.token }
+    });
+    deps.log(
+      `renewed ${label2}'s static run token ${issued.body.token_id}, expires ${issued.body.expires_at}`
+    );
+    return "renewed";
+  } catch (error) {
+    deps.log(
+      `static token renewal: could not write ${label2}'s credential file: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return "failed";
+  }
+}
+var init_static_token_renewal = __esm({
+  "../../packages/tacho/src/collector/static-token-renewal.ts"() {
+    "use strict";
+    init_model_credential();
+    init_wire();
+  }
+});
+
 // ../../packages/tacho/src/host/chatgpt-refresh.ts
 function jwtExpiryMs(token) {
   const payload = token.split(".")[1];
@@ -41532,6 +42266,20 @@ function createWorkOrderAutostart(deps) {
     }
     return searchPath;
   };
+  const stellaRunToken = (id2) => {
+    const answer = deps.issueRunToken?.({
+      harness: "stella",
+      placement: "static",
+      ttl_ms: DISPATCHED_STELLA_TOKEN_TTL_MS
+    });
+    if (answer === void 0) return void 0;
+    if (answer.status === 200) return answer.body.token;
+    if (answer.body.code !== "credential_unavailable")
+      log(
+        `work order ${id2}: no run token for Stella (${answer.body.error}); it starts on its own key`
+      );
+    return void 0;
+  };
   const lookup = deps.findCheckout ?? ((repository) => findCheckout(paths, repository, deps.host()));
   const retry = /* @__PURE__ */ new Map();
   const cleanups = /* @__PURE__ */ new Set();
@@ -41778,7 +42526,10 @@ function createWorkOrderAutostart(deps) {
         env: {
           ...deps.env,
           PATH: pathForHarness(),
-          ...headlessEnv(harness),
+          ...headlessEnv(
+            harness,
+            harness === "stella" ? stellaRunToken(id2) : void 0
+          ),
           [WORK_ORDER_ENV]: id2
         },
         logPath: workspace.log
@@ -46001,10 +46752,10 @@ function createGithubProxy(deps) {
           error: "GitHub custody is not configured for this repository and harness"
         }
       };
-    const matches = deps.registry.live().filter(
+    const matches2 = deps.registry.live().filter(
       (s2) => !s2.pendingTerminal && s2.cwd && resolve13(s2.cwd) === resolve13(input.cwd) && deps.registry.agentOf(s2).harness === input.harness
     );
-    if (matches.length !== 1)
+    if (matches2.length !== 1)
       return {
         status: 409,
         body: {
@@ -46021,7 +46772,7 @@ function createGithubProxy(deps) {
     return grant(
       {
         repository: input.repository,
-        session: matches[0].recorder.sessionUuid
+        session: matches2[0].recorder.sessionUuid
       },
       host
     );
@@ -50028,11 +50779,11 @@ function providerForHarness(harness) {
 function issueRunToken(input, deps) {
   const harness = typeof input.harness === "string" ? input.harness : "";
   const provider = providerForHarness(harness);
-  if (provider === void 0)
+  if (provider === void 0 || !isBrokerableHarness(harness))
     return {
       status: 400,
       body: {
-        error: "run tokens are issued for claude-code and codex, the harnesses whose model calls the gateway routes",
+        error: `run tokens are issued for ${BROKERABLE_HARNESSES.join(", ")}, the harnesses whose model calls the gateway routes`,
         code: "harness_not_brokered"
       }
     };
@@ -50057,7 +50808,7 @@ function issueRunToken(input, deps) {
     };
   let held;
   try {
-    held = deps.store.read(provider);
+    held = deps.store.read(provider, harness);
   } catch (error) {
     deps.log(
       `credential issuer: cannot read custody: ${error instanceof Error ? error.message : String(error)}`
@@ -50074,7 +50825,7 @@ function issueRunToken(input, deps) {
     return {
       status: 403,
       body: {
-        error: `the gateway holds no ${provider} credential in custody, so a run token would buy nothing; run \`oxagen agent enroll\` again`,
+        error: `the gateway holds no ${provider} credential in custody${harness === "stella" ? " for Stella" : ""}, so a run token would buy nothing; run \`oxagen agent enroll\` again`,
         code: "credential_unavailable"
       }
     };
@@ -51503,6 +52254,9 @@ function createModelProxy(deps) {
   function harnessFor(provider) {
     return defaultHarnessForProvider(provider);
   }
+  function custodyHarnessFor(route) {
+    return route.harness !== void 0 && isBrokerableHarness(route.harness) ? route.harness : defaultHarnessForProvider(route.provider);
+  }
   function correlate(req, route, body2) {
     const harness = route.harness ?? harnessFor(route.provider);
     const explicit = header(req, TACHO_MODEL_SESSION_HEADER);
@@ -51622,7 +52376,8 @@ function createModelProxy(deps) {
   function resolveCredential(req, route) {
     const broker = deps.credentials;
     const presented = presentedCredential(req);
-    const brokered = broker !== void 0 && route.harness !== "stella" && broker.brokered(route.provider) && route.upstream === "chatgpt" === (broker.kind?.(route.provider) === "chatgpt");
+    const owner = custodyHarnessFor(route);
+    const brokered = broker !== void 0 && broker.brokered(route.provider, owner) && route.upstream === "chatgpt" === (broker.kind?.(route.provider, owner) === "chatgpt");
     if (broker === void 0 || !brokered) {
       if (presented !== void 0 && looksLikeRunToken(presented.value)) {
         const claims = peekRunTokenClaims(presented.value);
@@ -51666,7 +52421,17 @@ function createModelProxy(deps) {
         }
       };
     }
-    const held2 = broker.custody(route.provider);
+    if ((owner === "stella" || verdict.claims.harness === "stella") && verdict.claims.harness !== owner) {
+      return {
+        basis: TACHO_CREDENTIAL_GATEWAY_BROKERED,
+        claims: verdict.claims,
+        refusal: {
+          code: "run_token_mismatch",
+          message: CREDENTIAL_MESSAGES.run_token_mismatch
+        }
+      };
+    }
+    const held2 = broker.custody(route.provider, owner);
     if (held2 === void 0) {
       return {
         basis: TACHO_CREDENTIAL_GATEWAY_BROKERED,
@@ -53032,7 +53797,7 @@ var init_model_proxy = __esm({
       run_token_expired: "The run token this call carried has expired. The harness fetches a new one from the Oxagen gateway on its next attempt.",
       run_token_mismatch: "The run token this call carried was issued for another host or another model provider. Run `oxagen agent enroll` again on this machine so the harness fetches run tokens from this host's gateway.",
       run_token_required: "This machine brokers model credentials through the Oxagen gateway, and this call carried none. Run `oxagen agent enroll` again to point the harness at the gateway's run tokens.",
-      foreign_credential: "This machine brokers model credentials through the Oxagen gateway, and this call brought its own. Unset the provider's API key (ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN or OPENAI_API_KEY) in the shell and in the env block of any .claude/settings.json or .claude/settings.local.json the harness reads; the gateway supplies the credential.",
+      foreign_credential: "This machine brokers model credentials through the Oxagen gateway, and this call brought its own. Unset the provider's API key (ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN or OPENAI_API_KEY) in the shell and in the env block of any .claude/settings.json or .claude/settings.local.json the harness reads; the gateway supplies the credential. Stella reads ANTHROPIC_API_KEY from the shell ahead of its stella.toml, so unset it there too.",
       credential_unavailable: "The run token is valid, but the Oxagen gateway holds no credential for this model provider. Run `oxagen agent enroll` again, or `oxagen credential status` to see what is in custody."
     };
   }
@@ -54720,10 +55485,11 @@ function cloudGatewayCredentialStore(disk, runToken) {
     kind: provider === "anthropic" ? "api_key" : "bearer",
     secret: runToken
   });
+  const ours = (provider, harness) => harness === void 0 || harness === defaultHarnessForProvider(provider);
   return {
     ...disk,
-    has: () => true,
-    read: (provider) => held(provider),
+    has: (provider, harness) => ours(provider, harness),
+    read: (provider, harness) => ours(provider, harness) ? held(provider) : void 0,
     take: () => {
       throw new Error(
         "A sandbox's local gateway holds no model credential. The cloud gateway attaches the operator's key."
@@ -55091,9 +55857,9 @@ async function initializeDaemon(options, server, port, ready) {
   ) : diskCredentialStore;
   const runTokenKey = () => readRunTokenKey(paths.runTokenKey) ?? loadOrCreateRunTokenKey(paths.runTokenKey).key;
   runTokenKey();
-  function inCustody(provider) {
+  function inCustody(provider, harness) {
     try {
-      return credentialStore.has(provider);
+      return harness !== void 0 ? credentialStore.has(provider, harness) : credentialStore.status().some((c) => c.provider === provider) || credentialStore.has(provider);
     } catch (error) {
       log(
         `credential store unreadable: ${error instanceof Error ? error.message : String(error)}; check ${paths.credentials} and ${paths.credentialsKey}, then run \`oxagen credential status\``
@@ -55187,6 +55953,11 @@ async function initializeDaemon(options, server, port, ready) {
     env: options.workOrders?.env ?? process.env,
     now,
     log,
+    // Bound late: `api` is built below, and a start runs only after a poll.
+    issueRunToken: (input) => api.issueRunToken?.(input) ?? {
+      status: 403,
+      body: { error: "no issuer", code: "credential_unavailable" }
+    },
     ...options.workOrders?.spawn !== void 0 ? { spawn: options.workOrders.spawn } : {},
     ...options.workOrders?.isAlive !== void 0 ? { isAlive: options.workOrders.isAlive } : {},
     ...options.workOrders?.findCheckout !== void 0 ? { findCheckout: options.workOrders.findCheckout } : {}
@@ -56958,17 +57729,19 @@ async function initializeDaemon(options, server, port, ready) {
     ...options.beforeForward !== void 0 ? { beforeForward: options.beforeForward } : {},
     ...options.pauseHold,
     credentials: {
-      brokered: (provider) => inCustody(provider),
-      kind: (provider) => {
+      brokered: (provider, harness) => inCustody(provider, harness),
+      kind: (provider, harness) => {
         try {
-          return credentialStore.status().find((entry2) => entry2.provider === provider)?.kind;
+          return credentialStore.status().find(
+            (entry2) => entry2.provider === provider && entry2.harness === harness
+          )?.kind;
         } catch {
           return void 0;
         }
       },
-      custody: (provider) => {
+      custody: (provider, harness) => {
         try {
-          return credentialStore.read(provider);
+          return credentialStore.read(provider, harness);
         } catch (error) {
           log(
             `credential store unreadable: ${error instanceof Error ? error.message : String(error)}; check ${paths.credentials} and ${paths.credentialsKey}, then run \`oxagen credential status\``
@@ -57669,8 +58442,11 @@ async function initializeDaemon(options, server, port, ready) {
   let lastStaticRenewalAt = 0;
   let lastLoginRefreshAt = 0;
   async function renewStaticTokens() {
-    if (!host.harnesses.includes("codex")) return;
-    if (now() - lastLoginRefreshAt >= CHATGPT_LOGIN_CHECK_MS) {
+    const harnesses = STATIC_TOKEN_HARNESSES.filter(
+      (h) => host.harnesses.includes(h)
+    );
+    if (harnesses.length === 0) return;
+    if (harnesses.includes("codex") && now() - lastLoginRefreshAt >= CHATGPT_LOGIN_CHECK_MS) {
       lastLoginRefreshAt = now();
       try {
         const refreshed = await refreshChatGptCustody(
@@ -57692,44 +58468,17 @@ async function initializeDaemon(options, server, port, ready) {
     }
     if (now() - lastStaticRenewalAt < STATIC_TOKEN_RENEWAL_CHECK_MS) return;
     lastStaticRenewalAt = now();
-    if (host.host_status !== "active" || !inCustody("openai")) return;
-    const home = options.home ?? homedir7();
-    let state;
-    try {
-      state = (await readModelCredentialState({ home, harnesses: ["codex"] })).harnesses[0];
-    } catch (error) {
-      log(
-        `static token renewal: cannot read Codex's auth file: ${error instanceof Error ? error.message : String(error)}`
-      );
-      return;
-    }
-    if (state === void 0 || !state.brokered) return;
-    const current = readCodexApiKeyMember(home);
-    if (staticTokenStillGood(current, host, paths.runTokenKey, now())) return;
-    const issued = api.issueRunToken?.({
-      harness: "codex",
-      placement: "static"
-    });
-    if (issued === void 0 || issued.status !== 200) {
-      log(
-        `static token renewal: not issued (${issued?.body.error ?? "no issuer"})`
-      );
-      return;
-    }
-    try {
-      await applyModelCredentials({
-        home,
-        harnesses: ["codex"],
-        staticTokens: { codex: issued.body.token }
+    for (const harness of harnesses)
+      await renewStaticToken(harness, {
+        home: options.home ?? homedir7(),
+        stellaHome: dirname24(paths.stellaToml),
+        host,
+        runTokenKeyPath: paths.runTokenKey,
+        now,
+        inCustody,
+        issue: api.issueRunToken,
+        log
       });
-      log(
-        `renewed Codex's static run token ${issued.body.token_id}, expires ${issued.body.expires_at}`
-      );
-    } catch (error) {
-      log(
-        `static token renewal: could not write Codex's auth file: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
   }
   async function tick() {
     await controlTick();
@@ -57929,6 +58678,7 @@ var init_daemon = __esm({
     init_claude_code_mcp_writer();
     init_model_base_url();
     init_model_credential();
+    init_static_token_renewal();
     init_chatgpt_refresh();
     init_run_token();
     init_process_scan();
@@ -60294,7 +61044,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4",
+      version: "2.1.5-22",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -66533,13 +67283,13 @@ function ruleIssues(rule, value) {
   }
 }
 function testJson(test) {
-  const matches = {
+  const matches2 = {
     properties: {
       [test.field]: { const: "is" in test ? test.is : test.isNot }
     },
     required: [test.field]
   };
-  return "is" in test ? matches : { not: matches };
+  return "is" in test ? matches2 : { not: matches2 };
 }
 function nested(path2, leaf) {
   return path2.reduceRight(
@@ -77639,10 +78389,10 @@ function verifyRunExport(files2) {
     const shipped = parseJson2(redactionsText, "redactions", checks);
     if (shipped !== null) {
       const recomputed = summarizeRunExportRedactions(frames);
-      const matches = digestJcs(recomputed) === digestJcs(shipped);
+      const matches2 = digestJcs(recomputed) === digestJcs(shipped);
       hold(
         "redactions",
-        matches,
+        matches2,
         `${recomputed.redacted_total} redaction(s) summarised`,
         "redactions.json does not match what the frames record"
       );
@@ -79282,7 +80032,7 @@ var init_run_shared = __esm({
 });
 
 // ../../packages/oxagen/src/contracts/run.list.ts
-var runPublicIdSchema, frameSeqSchema, runSourceSchema, runStatusSchema, runOutcomeSchema, runCostSchema, replayGradeSchema, generatedRunSummarySchema, editedRunSummarySchema, runSummarySchema, operatorKindSchema, RUN_OPERATOR_ROLES, runOperatorRoleSchema, runModelSchema, runMachineSnapshotSchema, runMachineSchema, COMMAND_BLOCKS, STEER_BLOCKS, HOST_POLL_WINDOW_MS, RUN_PULL_REQUEST_MAX, runPullRequestSchema, runDiffSchema, runAttributionSchema, RUN_PULL_REQUEST_FILTERS, RUN_PAUSE_STATES, runPauseSchema, RUN_REPLAY_FILTERS, RUN_SORT_KEYS, RUN_LIST_TOTAL_BOUND, RUN_LABEL_MAX, runItemSchema, runList;
+var runPublicIdSchema, frameSeqSchema, runSourceSchema, runStatusSchema, runOutcomeSchema, runCostSchema, replayGradeSchema, generatedRunSummarySchema, editedRunSummarySchema, runSummarySchema, operatorKindSchema, RUN_OPERATOR_ROLES, runOperatorRoleSchema, runModelSchema, runMachineSnapshotSchema, runMachineSchema, COMMAND_BLOCKS, HOST_POLL_WINDOW_MS, RUN_PULL_REQUEST_MAX, runPullRequestSchema, runDiffSchema, runAttributionSchema, RUN_PULL_REQUEST_FILTERS, RUN_PAUSE_STATES, runPauseSchema, RUN_REPLAY_FILTERS, RUN_SORT_KEYS, RUN_LIST_TOTAL_BOUND, RUN_LABEL_MAX, runItemSchema, runList;
 var init_run_list = __esm({
   "../../packages/oxagen/src/contracts/run.list.ts"() {
     "use strict";
@@ -79368,7 +80118,6 @@ var init_run_list = __esm({
       "host_offline",
       "daemon_chain"
     ];
-    STEER_BLOCKS = ["no_prompt_carrier"];
     HOST_POLL_WINDOW_MS = 5 * 6e4;
     RUN_PULL_REQUEST_MAX = 10;
     runPullRequestSchema = external_exports.object({
@@ -79628,13 +80377,6 @@ var init_run_list = __esm({
        * resume, steer or cancel on it. Absent reads as false.
        */
       inApp: external_exports.boolean().optional(),
-      /**
-       * Why a steer or message cannot reach this run when the other commands
-       * can, or null when it can. `dispatch_command` refuses on the same rule
-       * (`steerBlockOf`). Null for a ledger run. Optional, read like
-       * `commandBlock`: absent means not known.
-       */
-      steerBlock: external_exports.enum(STEER_BLOCKS).nullable().optional(),
       /**
        * The model the run ended on, falling back to the one it started on; null
        * when the store recorded no model, which is every ledger run.
@@ -81095,7 +81837,7 @@ function opposite(a, b3) {
 }
 function similarStatements(entries2) {
   const bySize = entries2.map(compared).sort((a, b3) => a.set.size - b3.set.size);
-  const matches = [];
+  const matches2 = [];
   for (let i2 = 0; i2 < bySize.length; i2 += 1) {
     const a = bySize[i2];
     for (let j = i2 + 1; j < bySize.length; j += 1) {
@@ -81103,14 +81845,14 @@ function similarStatements(entries2) {
       if (a.normalized !== b3.normalized && a.set.size < b3.set.size * NEAR_DUPLICATE_SIMILARITY)
         break;
       if (!alike(a, b3)) continue;
-      matches.push({
+      matches2.push({
         a: a.entry,
         b: b3.entry,
         opposite: opposite(a.entry, b3.entry)
       });
     }
   }
-  return matches;
+  return matches2;
 }
 function active(lineage, kind, effect, file, statement) {
   return { lineage, kind, effect, file, statement };
@@ -89802,17 +90544,17 @@ function registryLaunch({
       ]
     };
   }
-  const matches = (entry2.server.packages ?? []).filter(
+  const matches2 = (entry2.server.packages ?? []).filter(
     (candidate) => candidate.registryType === type
   );
-  const [pkg] = matches;
-  if (pkg === void 0 || matches.length > 1) {
+  const [pkg] = matches2;
+  if (pkg === void 0 || matches2.length > 1) {
     return {
       ok: false,
       problems: [
         {
           field: "source.registry_type",
-          message: pkg === void 0 ? `the entry lists no ${type} package` : `the entry lists ${matches.length} ${type} packages, so source.registry_type cannot pick one`
+          message: pkg === void 0 ? `the entry lists no ${type} package` : `the entry lists ${matches2.length} ${type} packages, so source.registry_type cannot pick one`
         }
       ]
     };
@@ -95833,13 +96575,13 @@ function timestampFromJson(timestamp2, json2) {
   if (typeof json2 !== "string") {
     throw new Error(`cannot decode message ${timestamp2.$typeName} from JSON: ${formatVal(json2)}`);
   }
-  const matches = json2.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]{1,9}))?(?:Z|([+-][0-9][0-9]:[0-9][0-9]))$/);
-  if (!matches) {
+  const matches2 = json2.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]{1,9}))?(?:Z|([+-][0-9][0-9]:[0-9][0-9]))$/);
+  if (!matches2) {
     throw new Error(`cannot decode message ${timestamp2.$typeName} from JSON: invalid RFC 3339 string`);
   }
   const ms = Date.parse(
     // biome-ignore format: want this to read well
-    matches[1] + "-" + matches[2] + "-" + matches[3] + "T" + matches[4] + ":" + matches[5] + ":" + matches[6] + (matches[8] ? matches[8] : "Z")
+    matches2[1] + "-" + matches2[2] + "-" + matches2[3] + "T" + matches2[4] + ":" + matches2[5] + ":" + matches2[6] + (matches2[8] ? matches2[8] : "Z")
   );
   if (Number.isNaN(ms)) {
     throw new Error(`cannot decode message ${timestamp2.$typeName} from JSON: invalid RFC 3339 string`);
@@ -95849,8 +96591,8 @@ function timestampFromJson(timestamp2, json2) {
   }
   timestamp2.seconds = protoInt64.parse(ms / 1e3);
   timestamp2.nanos = 0;
-  if (matches[7]) {
-    timestamp2.nanos = parseInt("1" + matches[7] + "0".repeat(9 - matches[7].length)) - 1e9;
+  if (matches2[7]) {
+    timestamp2.nanos = parseInt("1" + matches2[7] + "0".repeat(9 - matches2[7].length)) - 1e9;
   }
 }
 function durationFromJson(duration, json2) {
@@ -106166,18 +106908,18 @@ function lintRegistry(folder, report) {
 function lintPackage(source, entry2, type, report) {
   const other = otherChoice(source, entry2, type);
   const packages = entry2.server.packages ?? [];
-  const matches = packages.filter(
+  const matches2 = packages.filter(
     (candidate) => candidate.registryType === type
   );
-  const [pkg] = matches;
-  if (pkg === void 0 || matches.length > 1) {
+  const [pkg] = matches2;
+  if (pkg === void 0 || matches2.length > 1) {
     const bundle2 = packages.some(
       (candidate) => candidate.registryType === "mcpb"
     );
     report("package_cannot_run", {
       tool: void 0,
       field: "source.registry_type",
-      message: pkg === void 0 ? `The catalog entry lists no ${type} package${bundle2 ? ", and the local gateway cannot run its mcpb bundle" : ""}, so nothing could start the server.` : `The catalog entry lists ${matches.length} ${type} packages, so source.registry_type cannot pick one.`,
+      message: pkg === void 0 ? `The catalog entry lists no ${type} package${bundle2 ? ", and the local gateway cannot run its mcpb bundle" : ""}, so nothing could start the server.` : `The catalog entry lists ${matches2.length} ${type} packages, so source.registry_type cannot pick one.`,
       fix: other
     });
     return;
@@ -138560,10 +139302,15 @@ function buildProgram() {
   });
   work.command("claim").description(
     "From inside a work order's run, claim that the pushed head commit meets one criterion of the brief. A person still decides."
-  ).argument("<criterion>", "The criterion's id from the brief, such as c1").requiredOption("--text <text>", "How the commit meets the criterion").action(async (criterionId, opts) => {
-    const { handleWorkClaim: handleWorkClaim2 } = await Promise.resolve().then(() => (init_tacho(), tacho_exports));
-    process.exitCode = await handleWorkClaim2(criterionId, opts);
-  });
+  ).argument("<criterion>", "The criterion's id from the brief, such as c1").requiredOption("--text <text>", "How the commit meets the criterion").option(
+    "--work-order <id>",
+    "The work order of a batch item, as the first prompt lists it"
+  ).option("--item <id>", "The work item of that work order").action(
+    async (criterionId, opts) => {
+      const { handleWorkClaim: handleWorkClaim2 } = await Promise.resolve().then(() => (init_tacho(), tacho_exports));
+      process.exitCode = await handleWorkClaim2(criterionId, opts);
+    }
+  );
   const env = program2.command("env").description("Manage workspace environments");
   env.command("list").description("List environments in the active workspace").option("--json", "Output JSON").action(async (opts) => {
     const { handleEnvList: handleEnvList2 } = await Promise.resolve().then(() => (init_env2(), env_exports));