@whittlelabs/sifter 0.31.0 → 0.32.0

package/bin.js

@@ -10263,6 +10263,54 @@ var require_json_answer = __commonJS({
   }
 });
 
+// ../../packages/shuttle/dist/executors/models.js
+var require_models = __commonJS({
+  "../../packages/shuttle/dist/executors/models.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.LIST_MODELS_TIMEOUT_MS = exports2.CLAUDE_CODE_EFFORTS = exports2.REASONING_EFFORTS = void 0;
+    exports2.parseReasoningEffort = parseReasoningEffort;
+    exports2.hintedEffort = hintedEffort;
+    exports2.runListing = runListing;
+    var os_1 = __importDefault(require("os"));
+    var agent_process_1 = require_agent_process();
+    exports2.REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
+    exports2.CLAUDE_CODE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
+    function parseReasoningEffort(value, levels) {
+      if (value === void 0)
+        return void 0;
+      if (!levels.includes(value)) {
+        throw new Error(`"reasoningEffort" must be one of ${levels.join(", ")}`);
+      }
+      return value;
+    }
+    function hintedEffort(hints) {
+      const effort = hints.effort;
+      return typeof effort === "string" && /^[a-z]+$/.test(effort) ? effort : void 0;
+    }
+    exports2.LIST_MODELS_TIMEOUT_MS = 15e3;
+    async function runListing(bin, args, signal, env) {
+      try {
+        const run = await (0, agent_process_1.runAgentProcess)({
+          bin,
+          args,
+          cwd: os_1.default.tmpdir(),
+          ...env ? { env } : {},
+          idleTimeoutMs: exports2.LIST_MODELS_TIMEOUT_MS,
+          toolName: bin,
+          signal
+        });
+        return run.spawnError || run.code !== 0 ? null : run.stdout;
+      } catch {
+        return null;
+      }
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/executors/workspace-telemetry.js
 var require_workspace_telemetry = __commonJS({
   "../../packages/shuttle/dist/executors/workspace-telemetry.js"(exports2) {
@@ -10499,6 +10547,7 @@ var require_claude_code = __commonJS({
     var progress_1 = require_progress();
     var agent_process_1 = require_agent_process();
     var json_answer_1 = require_json_answer();
+    var models_1 = require_models();
     var workspace_telemetry_1 = require_workspace_telemetry();
     var apply_1 = require_apply();
     var DEFAULT_TIMEOUT = 6e5;
@@ -10544,6 +10593,12 @@ var require_claude_code = __commonJS({
       const subtype = meta.subtype && meta.subtype !== "success" ? `: ${meta.subtype}` : "";
       return `${fallback}${subtype}${status}`;
     }
+    var CLAUDE_CODE_MODELS = [
+      { id: "opus", label: "Claude Opus (latest)", efforts: [...models_1.CLAUDE_CODE_EFFORTS] },
+      { id: "fable", label: "Claude Fable (latest)", efforts: [...models_1.CLAUDE_CODE_EFFORTS] },
+      { id: "sonnet", label: "Claude Sonnet (latest)", efforts: [...models_1.CLAUDE_CODE_EFFORTS] },
+      { id: "haiku", label: "Claude Haiku (latest)", efforts: [...models_1.CLAUDE_CODE_EFFORTS] }
+    ];
     var READINESS_PROMPT = "Reply with the single word: ok";
     var READINESS_TIMEOUT_MS = 12e4;
     var INSTALL_REMEDY = "install Claude Code (npm install -g @anthropic-ai/claude-code) where this process can find it on PATH";
@@ -10624,6 +10679,7 @@ var require_claude_code = __commonJS({
           const childEnv = buildChildEnv(modelKey, configDir);
           const claudeHints = (0, loom_1.pickProviderHints)(spec, "claude-code");
           const hintedModel = typeof claudeHints.model === "string" && claudeHints.model.length > 0 ? claudeHints.model : void 0;
+          const effort = (0, models_1.hintedEffort)(claudeHints);
           if (!workspace) {
             promptOnlyScratch = await fs_1.promises.mkdtemp(path_1.default.join(tmpBase, "shuttle-cc-run-"));
           }
@@ -10641,7 +10697,8 @@ var require_claude_code = __commonJS({
             // Local mode is the operator's own login: a failure of THAT is the
             // machine's, and the runner pauses on it. With a revealed key it is one
             // customer's, and only their job fails.
-            modelKey === null
+            modelKey === null,
+            effort
           );
           if (workspace) {
             response.outputs.push(...(0, workspace_telemetry_1.workspaceOutputs)(workspace, runCwd, readPaths, toolInputs));
@@ -10677,7 +10734,7 @@ var require_claude_code = __commonJS({
             outputLabel: handle.outputLabel,
             outputSchema: handle.outputSchema
           };
-          const { response } = await this.runClaude(followUp, spec, scratch, handle.childEnv, signal, handle.model, null, handle.sessionId, `${handle.sessionId}-repair`, handle.childEnv === void 0);
+          const { response } = await this.runClaude(followUp, spec, scratch, handle.childEnv, signal, handle.model, null, handle.sessionId, `${handle.sessionId}-repair`, handle.childEnv === void 0, handle.effort);
           return response;
         } finally {
           await fs_1.promises.rm(scratch, { recursive: true, force: true }).catch(() => {
@@ -10723,9 +10780,14 @@ var require_claude_code = __commonJS({
         const said = meta?.detail ?? (0, agent_process_1.firstLine)(run.stderr) ?? (0, agent_process_1.firstLine)(run.stdout);
         return { ready: false, reason: said ?? `the claude CLI exited with code ${run.code}` };
       }
-      async runClaude(prompt, spec, cwd, childEnv, signal, modelOverride, reporter, resumeSessionId, transcriptName, local = false) {
+      /** The CLI's aliases (see CLAUDE_CODE_MODELS); nothing to ask, so nothing can fail. */
+      async listModels() {
+        return CLAUDE_CODE_MODELS;
+      }
+      async runClaude(prompt, spec, cwd, childEnv, signal, modelOverride, reporter, resumeSessionId, transcriptName, local = false, effortOverride) {
         const outputLabel = spec.outputLabel;
         const model = modelOverride ?? this.config.model;
+        const effort = effortOverride ?? this.config.reasoningEffort;
         const allowedTools = local ? this.config.allowedTools : checkoutScopedTools(this.config.allowedTools);
         if (!local && this.config.claudeSettings === "user") {
           throw new Error("claude-code: `claudeSettings: user` is for an installed Sifter whose login lives in Claude Code settings; a hosted run authenticates with the key it is handed and loads no settings");
@@ -10739,6 +10801,8 @@ var require_claude_code = __commonJS({
         }
         if (model)
           args.push("--model", model);
+        if (effort)
+          args.push("--effort", effort);
         if (this.config.maxTurns !== void 0)
           args.push("--max-turns", String(this.config.maxTurns));
         if (allowedTools && allowedTools.length > 0) {
@@ -10810,7 +10874,9 @@ var require_claude_code = __commonJS({
             parsed,
             usage: {
               aiProvider: "claude-code",
-              ...model ? { aiModel: model } : {},
+              // The model that ran (an alias resolved), over the one asked for.
+              ...stream.model ?? model ? { aiModel: stream.model ?? model } : {},
+              ...effort ? { aiEffort: effort } : {},
               ...stream.usage ?? {}
             },
             // In-session repair handle (ADR 0017): present only when the run
@@ -10819,6 +10885,7 @@ var require_claude_code = __commonJS({
               continuation: {
                 sessionId: stream.sessionId,
                 model,
+                effort,
                 childEnv,
                 outputLabel,
                 outputSchema: spec.outputSchema
@@ -10843,6 +10910,9 @@ var require_claude_code = __commonJS({
           throw new Error('"model" must be a string');
         validated.model = config.model;
       }
+      const effort = (0, models_1.parseReasoningEffort)(config.reasoningEffort, models_1.CLAUDE_CODE_EFFORTS);
+      if (effort)
+        validated.reasoningEffort = effort;
       if (config.maxTurns !== void 0) {
         if (typeof config.maxTurns !== "number" || !Number.isInteger(config.maxTurns) || config.maxTurns < 1) {
           throw new Error('"maxTurns" must be a positive integer');
@@ -10917,6 +10987,7 @@ var require_claude_code = __commonJS({
       let resultMeta = null;
       let structuredOutput = null;
       let sessionId = null;
+      let model = null;
       const toolInputs = [];
       for (const line of stdout.split("\n")) {
         const trimmed = line.trim();
@@ -10930,7 +11001,9 @@ var require_claude_code = __commonJS({
         }
         if (typeof event.session_id === "string")
           sessionId = event.session_id;
-        if (event.type === "assistant") {
+        if (event.type === "system" && event.subtype === "init" && typeof event.model === "string" && event.model) {
+          model = event.model;
+        } else if (event.type === "assistant") {
           const content = event.message?.content;
           if (!Array.isArray(content))
             continue;
@@ -10971,7 +11044,7 @@ var require_claude_code = __commonJS({
           };
         }
       }
-      return { finalText, readPaths, usage, resultMeta, structuredOutput, sessionId, toolInputs };
+      return { finalText, readPaths, usage, resultMeta, structuredOutput, sessionId, model, toolInputs };
     }
   }
 });
@@ -11142,6 +11215,7 @@ var require_codex = __commonJS({
     exports2.resolveCodex = resolveCodex;
     exports2.codexReviewArgs = codexReviewArgs;
     exports2.parseCodexEvents = parseCodexEvents;
+    exports2.parseCodexModels = parseCodexModels;
     exports2.createCodexExecutor = createCodexExecutor;
     var fs_1 = require("fs");
     var os_1 = __importDefault(require("os"));
@@ -11153,6 +11227,7 @@ var require_codex = __commonJS({
     var agent_process_1 = require_agent_process();
     var agent_common_1 = require_agent_common();
     var json_answer_1 = require_json_answer();
+    var models_1 = require_models();
     var strict_schema_1 = require_strict_schema();
     var workspace_telemetry_1 = require_workspace_telemetry();
     var apply_1 = require_apply();
@@ -11226,7 +11301,6 @@ var require_codex = __commonJS({
         ...DISABLED_FEATURES.flatMap((f) => ["--disable", f])
       ];
     }
-    var REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
     var CODEX_FAULTS = {
       installRemedy: "install Codex (brew install codex, or npm install -g @openai/codex) where this process can find it on PATH",
       loginRemedy: "run `codex login` and sign in (or `codex login --with-api-key`)",
@@ -11260,6 +11334,7 @@ var require_codex = __commonJS({
         const workspace = ctx?.workspace ?? null;
         const hints = (0, loom_1.pickProviderHints)(spec, "codex");
         const model = typeof hints.model === "string" && hints.model.length > 0 ? hints.model : this.config.model;
+        const effort = (0, models_1.hintedEffort)(hints) ?? this.config.reasoningEffort;
         const reporter = spec.progressChannel && ctx?.reportProgress ? new progress_1.ProgressReporter((frames) => ctx.reportProgress(spec.progressChannel, frames)) : null;
         const codex = requireCodex();
         const scratch = await fs_1.promises.mkdtemp(path_1.default.join(this.tmpBase(), "shuttle-codex-"));
@@ -11277,6 +11352,7 @@ var require_codex = __commonJS({
             cwd: runCwd,
             scratch,
             model,
+            effort,
             signal,
             reporter,
             transcriptName: dispatch.job.id
@@ -11319,6 +11395,7 @@ var require_codex = __commonJS({
             cwd: scratch,
             scratch,
             model: handle.model,
+            effort: handle.effort,
             signal,
             reporter: null,
             transcriptName: `${handle.threadId}-repair`
@@ -11373,11 +11450,24 @@ var require_codex = __commonJS({
           });
         }
       }
+      /**
+       * The catalog `codex debug models` prints: the models codex itself offers
+       * in its picker, each with the reasoning levels it supports. A `debug`
+       * subcommand, so not a stable contract; any failure or unknown shape
+       * reports nothing.
+       */
+      async listModels(signal) {
+        const codex = resolveCodex();
+        if (!codex)
+          return [];
+        const stdout = await (0, models_1.runListing)(codex.bin, ["debug", "models"], signal);
+        return stdout === null ? [] : parseCodexModels(stdout);
+      }
       tmpBase() {
         return this.config.tmpDir ? (0, apply_1.expandHome)(this.config.tmpDir) : os_1.default.tmpdir();
       }
       async runCodex(opts) {
-        const { spec, model } = opts;
+        const { spec, model, effort } = opts;
         const args = [...opts.args];
         const hasSchema = spec.outputSchema && typeof spec.outputSchema === "object" && Object.keys(spec.outputSchema).length > 0;
         if (hasSchema) {
@@ -11387,8 +11477,8 @@ var require_codex = __commonJS({
         }
         if (model)
           args.push("-m", model);
-        if (this.config.reasoningEffort)
-          args.push("-c", `model_reasoning_effort="${this.config.reasoningEffort}"`);
+        if (effort)
+          args.push("-c", `model_reasoning_effort="${effort}"`);
         args.push("-");
         const tap = opts.reporter ? codexProgressTap(opts.reporter) : null;
         const run = await (0, agent_process_1.runAgentProcess)({
@@ -11435,12 +11525,14 @@ var require_codex = __commonJS({
             usage: {
               aiProvider: "codex",
               ...model ? { aiModel: model } : {},
+              ...effort ? { aiEffort: effort } : {},
               ...events.usage ?? {}
             },
             ...events.threadId ? {
               continuation: {
                 threadId: events.threadId,
                 model,
+                effort,
                 outputLabel: spec.outputLabel,
                 outputSchema: spec.outputSchema
               }
@@ -11544,14 +11636,40 @@ var require_codex = __commonJS({
         failure: turnFailure ?? (finalText === null ? lastError : null)
       };
     }
+    function parseCodexModels(stdout) {
+      let body;
+      try {
+        body = JSON.parse(stdout);
+      } catch {
+        return [];
+      }
+      const entries = body?.models;
+      if (!Array.isArray(entries))
+        return [];
+      const listed = entries.flatMap((entry) => {
+        if (!entry || typeof entry !== "object")
+          return [];
+        const e = entry;
+        if (typeof e.slug !== "string" || e.slug.length === 0 || e.visibility !== "list")
+          return [];
+        const levels = Array.isArray(e.supported_reasoning_levels) ? e.supported_reasoning_levels.flatMap((level) => {
+          const effort = level?.effort;
+          return typeof effort === "string" && /^[a-z]+$/.test(effort) ? [effort] : [];
+        }) : [];
+        const model = {
+          id: e.slug,
+          label: typeof e.display_name === "string" && e.display_name ? e.display_name : e.slug,
+          ...levels.length > 0 ? { efforts: levels } : {}
+        };
+        return [{ model, priority: typeof e.priority === "number" ? e.priority : Number.MAX_SAFE_INTEGER }];
+      });
+      return listed.sort((a, b) => a.priority - b.priority).map((entry) => entry.model);
+    }
     function createCodexExecutor(config, capabilityId = "codex") {
       const validated = (0, agent_common_1.parseAgentCommonConfig)(config, capabilityId);
-      if (config.reasoningEffort !== void 0) {
-        if (!REASONING_EFFORTS.includes(config.reasoningEffort)) {
-          throw new Error(`"reasoningEffort" must be one of ${REASONING_EFFORTS.join(", ")}`);
-        }
-        validated.reasoningEffort = config.reasoningEffort;
-      }
+      const effort = (0, models_1.parseReasoningEffort)(config.reasoningEffort, models_1.REASONING_EFFORTS);
+      if (effort)
+        validated.reasoningEffort = effort;
       return new CodexExecutor(validated);
     }
   }
@@ -11569,6 +11687,7 @@ var require_copilot = __commonJS({
     exports2.withSchema = withSchema;
     exports2.usageOf = usageOf;
     exports2.parseCopilotEvents = parseCopilotEvents;
+    exports2.parseCopilotModels = parseCopilotModels;
     exports2.createCopilotExecutor = createCopilotExecutor;
     var crypto_1 = require("crypto");
     var fs_1 = require("fs");
@@ -11581,6 +11700,7 @@ var require_copilot = __commonJS({
     var agent_process_1 = require_agent_process();
     var agent_common_1 = require_agent_common();
     var json_answer_1 = require_json_answer();
+    var models_1 = require_models();
     var workspace_telemetry_1 = require_workspace_telemetry();
     var apply_1 = require_apply();
     var REVIEW_TOOLS = ["view", "grep", "glob"];
@@ -11601,7 +11721,6 @@ var require_copilot = __commonJS({
       ];
     }
     var RUN_SETTINGS = { disableAllHooks: true, autoUpdate: false };
-    var REASONING_EFFORTS = ["none", "minimal", "low", "medium", "high", "xhigh", "max"];
     var COPILOT_FAULTS = {
       installRemedy: "install GitHub Copilot CLI (brew install --cask copilot-cli, or npm install -g @github/copilot) where this process can find it on PATH",
       loginRemedy: "run `copilot login` and sign in with a GitHub account that has a Copilot seat (a COPILOT_GITHUB_TOKEN, GH_TOKEN or GITHUB_TOKEN in the environment wins over that login)",
@@ -11639,6 +11758,7 @@ var require_copilot = __commonJS({
         const workspace = ctx?.workspace ?? null;
         const hints = (0, loom_1.pickProviderHints)(spec, "copilot");
         const model = typeof hints.model === "string" && hints.model.length > 0 ? hints.model : this.config.model;
+        const effort = (0, models_1.hintedEffort)(hints) ?? this.config.reasoningEffort;
         const reporter = spec.progressChannel && ctx?.reportProgress ? new progress_1.ProgressReporter((frames) => ctx.reportProgress(spec.progressChannel, frames)) : null;
         const runs = path_1.default.join(this.tmpBase(), "shuttle-copilot-runs");
         await fs_1.promises.mkdir(runs, { recursive: true, mode: 448 });
@@ -11661,6 +11781,7 @@ var require_copilot = __commonJS({
             home,
             scratch,
             model,
+            effort,
             signal,
             reporter,
             transcriptName: dispatch.job.id
@@ -11669,6 +11790,7 @@ var require_copilot = __commonJS({
             sessionId,
             home,
             model,
+            effort,
             outputLabel: spec.outputLabel,
             outputSchema: spec.outputSchema
           };
@@ -11706,6 +11828,7 @@ var require_copilot = __commonJS({
           home: handle.home,
           scratch,
           model: handle.model,
+          effort: handle.effort,
           signal,
           reporter: null,
           transcriptName: `${handle.sessionId}-repair`
@@ -11751,17 +11874,27 @@ var require_copilot = __commonJS({
           });
         }
       }
+      /**
+       * The `model` setting's values as `copilot help config` lists them: the
+       * CLI's built-in set. It does not reflect an organization's model policy,
+       * so a model listed here can still be refused for one account, and that
+       * review fails in copilot's own words. Each takes the CLI-wide effort list.
+       */
+      async listModels(signal) {
+        const stdout = await (0, models_1.runListing)("copilot", ["help", "config"], signal);
+        return stdout === null ? [] : parseCopilotModels(stdout);
+      }
       tmpBase() {
         return this.config.tmpDir ? (0, apply_1.expandHome)(this.config.tmpDir) : os_1.default.tmpdir();
       }
       async runCopilot(opts) {
-        const { spec, model } = opts;
+        const { spec, model, effort } = opts;
         const usageFile = path_1.default.join(opts.scratch, `usage-${(0, crypto_1.randomUUID)()}.json`);
         const args = [...opts.args, `--usage-output-file=${usageFile}`, `--log-dir=${path_1.default.join(opts.home, "logs")}`];
         if (model)
           args.push(`--model=${model}`);
-        if (this.config.reasoningEffort)
-          args.push(`--reasoning-effort=${this.config.reasoningEffort}`);
+        if (effort)
+          args.push(`--reasoning-effort=${effort}`);
         const tap = opts.reporter ? copilotProgressTap(opts.reporter) : null;
         const run = await withOperatorLogin(opts.home, () => (0, agent_process_1.runAgentProcess)({
           bin: "copilot",
@@ -11807,7 +11940,12 @@ var require_copilot = __commonJS({
             rawText: answerText,
             parsed,
             // The model the session actually ran, from its usage file, over the one asked for.
-            usage: { aiProvider: "copilot", ...model ? { aiModel: model } : {}, ...usage ?? {} }
+            usage: {
+              aiProvider: "copilot",
+              ...model ? { aiModel: model } : {},
+              ...effort ? { aiEffort: effort } : {},
+              ...usage ?? {}
+            }
           },
           reads: events.readPaths,
           toolInputs: events.toolInputs
@@ -11995,14 +12133,25 @@ ${JSON.stringify(spec.outputSchema)}
       }
       return { finalText, readPaths, toolInputs, failure: finalText === null ? lastError : null };
     }
+    function parseCopilotModels(helpText) {
+      const lines = helpText.split("\n");
+      const start = lines.findIndex((line) => /^\s*`model`:/.test(line));
+      if (start === -1)
+        return [];
+      const models = [];
+      for (const line of lines.slice(start + 1)) {
+        const value = /^\s+-\s+"([^"]+)"\s*$/.exec(line);
+        if (!value)
+          break;
+        models.push({ id: value[1], label: value[1], efforts: [...models_1.REASONING_EFFORTS] });
+      }
+      return models;
+    }
     function createCopilotExecutor(config, capabilityId = "copilot") {
       const validated = (0, agent_common_1.parseAgentCommonConfig)(config, capabilityId);
-      if (config.reasoningEffort !== void 0) {
-        if (!REASONING_EFFORTS.includes(config.reasoningEffort)) {
-          throw new Error(`"reasoningEffort" must be one of ${REASONING_EFFORTS.join(", ")}`);
-        }
-        validated.reasoningEffort = config.reasoningEffort;
-      }
+      const effort = (0, models_1.parseReasoningEffort)(config.reasoningEffort, models_1.REASONING_EFFORTS);
+      if (effort)
+        validated.reasoningEffort = effort;
       return new CopilotExecutor(validated);
     }
   }
@@ -12033,6 +12182,14 @@ var require_http_api = __commonJS({
           outputTokens: spec.costCapHint?.estimatedOutputTokens
         };
       }
+      /**
+       * The one model it runs. This executor takes no model hint (every call
+       * names the configured model), so reporting the endpoint's catalog would
+       * offer picks it would silently ignore.
+       */
+      async listModels() {
+        return [{ id: this.config.model, label: this.config.model }];
+      }
       async execute(dispatch, signal) {
         const { prompt, spec } = (0, loom_1.renderPromptExecution)(dispatch.inputs);
         const outputLabel = spec.outputLabel;
@@ -12973,10 +13130,12 @@ var require_anthropic_api = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createAnthropicApiExecutor = createAnthropicApiExecutor;
+    exports2.parseAnthropicModels = parseAnthropicModels;
     var loom_1 = require_dist();
     var keep_1 = require_dist2();
     var env_ref_1 = require_env_ref();
     var validate_output_1 = require_validate_output();
+    var models_1 = require_models();
     var DEFAULT_BASE_URL = "https://api.anthropic.com/v1/messages";
     var DEFAULT_MODEL = "claude-sonnet-4-6";
     var DEFAULT_MAX_TOKENS = 4096;
@@ -13032,6 +13191,37 @@ var require_anthropic_api = __commonJS({
         };
         return this.callApi(handle.apiKey, body, spec, handle.outputLabel, signal);
       }
+      /**
+       * The provider's own catalog, `/v1/models` beside the configured Messages
+       * URL, asked with the operator's key. Dynamic mode reports nothing: its key
+       * is a customer's, revealed per job, and there is none to ask with at start.
+       */
+      async listModels(signal) {
+        const apiKey = this.instance.staticKey;
+        if (!apiKey)
+          return [];
+        const url = modelsUrl(this.instance.baseUrl);
+        if (!url)
+          return [];
+        const controller = new AbortController();
+        const abort = () => controller.abort();
+        const timer = setTimeout(abort, models_1.LIST_MODELS_TIMEOUT_MS);
+        signal.addEventListener("abort", abort, { once: true });
+        try {
+          const response = await fetch(url, {
+            headers: { "x-api-key": apiKey, "anthropic-version": ANTHROPIC_API_VERSION },
+            signal: controller.signal
+          });
+          if (!response.ok)
+            return [];
+          return parseAnthropicModels(await response.json());
+        } catch {
+          return [];
+        } finally {
+          clearTimeout(timer);
+          signal.removeEventListener("abort", abort);
+        }
+      }
       /** Shared Messages-API call + parse + validate, used by execute and continue. */
       async callApi(apiKey, body, spec, outputLabel, signal) {
         const timeoutController = new AbortController();
@@ -13073,7 +13263,8 @@ var require_anthropic_api = __commonJS({
             inputTokens: u.input_tokens,
             outputTokens: u.output_tokens,
             aiProvider: "anthropic",
-            aiModel: this.instance.model
+            // The model this call ran, which a hint may have chosen.
+            aiModel: body.model
           } : void 0;
           const parsed = safeJsonParse(rawText);
           (0, validate_output_1.assertOutputValid)(spec, parsed);
@@ -13105,7 +13296,8 @@ var require_anthropic_api = __commonJS({
       if (rawApiKeyFrom !== void 0 && rawApiKey !== void 0) {
         throw new Error('AnthropicApiExecutor accepts either "apiKey" (static) or "apiKeyFrom" (dynamic), not both');
       }
-      const resolveKey = rawApiKeyFrom !== void 0 ? buildDynamicResolver(config, deps) : buildStaticResolver(rawApiKey);
+      const staticKey = rawApiKeyFrom === void 0 ? resolveStaticKey(rawApiKey) : null;
+      const resolveKey = staticKey === null ? buildDynamicResolver(config, deps) : async () => staticKey;
       let baseUrl = DEFAULT_BASE_URL;
       if (config.baseUrl !== void 0) {
         if (typeof config.baseUrl !== "string" || config.baseUrl.length === 0) {
@@ -13136,6 +13328,7 @@ var require_anthropic_api = __commonJS({
       }
       return new AnthropicApiExecutor({
         resolveKey,
+        staticKey,
         baseUrl,
         model,
         maxTokens,
@@ -13143,12 +13336,25 @@ var require_anthropic_api = __commonJS({
         capabilityId
       });
     }
-    function buildStaticResolver(rawApiKey) {
+    function resolveStaticKey(rawApiKey) {
       if (typeof rawApiKey !== "string" || rawApiKey.length === 0) {
         throw new Error('AnthropicApiExecutor requires a non-empty "apiKey" string in config (or "apiKeyFrom: \\"job-metadata\\"" for dynamic key mode)');
       }
-      const resolved = (0, env_ref_1.resolveEnvRef)(rawApiKey, "apiKey");
-      return async () => resolved;
+      return (0, env_ref_1.resolveEnvRef)(rawApiKey, "apiKey");
+    }
+    function modelsUrl(messagesUrl) {
+      return /\/messages\/?$/.test(messagesUrl) ? messagesUrl.replace(/\/messages\/?$/, "/models") : null;
+    }
+    function parseAnthropicModels(body) {
+      const data = body?.data;
+      if (!Array.isArray(data))
+        return [];
+      return data.flatMap((entry) => {
+        const { id, display_name: displayName } = entry ?? {};
+        if (typeof id !== "string" || id.length === 0)
+          return [];
+        return [{ id, label: typeof displayName === "string" && displayName ? displayName : id }];
+      });
     }
     function buildDynamicResolver(config, deps) {
       if (config.apiKeyFrom !== "job-metadata") {
@@ -22142,12 +22348,14 @@ var require_subscribe = __commonJS({
             if (id === STOPPED)
               return;
             resolvedPoolIds.push(id);
+            const perPool = opts.subscriber.poolMetadata?.(ref);
+            const metadata = opts.subscriber.metadata !== void 0 || perPool !== void 0 ? { ...opts.subscriber.metadata, ...perPool } : void 0;
             const registered = await untilAvailable(() => opts.jobsClient.registerMember(id, {
               identityType: opts.subscriber.identityType,
               identityId: opts.subscriber.identityId,
               intelligence: opts.subscriber.intelligence,
               ...opts.subscriber.displayName !== void 0 ? { displayName: opts.subscriber.displayName } : {},
-              ...opts.subscriber.metadata !== void 0 ? { metadata: opts.subscriber.metadata } : {}
+              ...metadata !== void 0 ? { metadata } : {}
             }), mySession);
             if (registered === STOPPED)
               return;
@@ -27234,6 +27442,13 @@ var require_shuttle = __commonJS({
       });
       return { promise, resolve, reject };
     }
+    async function listExecutorModels(executors, signal) {
+      const listed = await Promise.all(executors.map(async (executor) => {
+        const models = executor.listModels ? await executor.listModels(signal).catch(() => []) : [];
+        return [executor.capability.id, models];
+      }));
+      return new Map(listed);
+    }
     function isKeepUnavailable(err) {
       return err instanceof Error && err.name === "KeepUnavailableError";
     }
@@ -27382,6 +27597,10 @@ var require_shuttle = __commonJS({
         registerBuiltInExecutors(registry, this.brand.executorAllowlist);
         const executors = registry.build(mergeExecutorDefaults((0, environment_1.executorDefaultsFor)(this.brand, this.config.auth.jobsApiUrl), this.config.executors));
         const executorFor = (0, demux_1.createDemux)(executors, this.config.pools);
+        const modelsByExecutor = await listExecutorModels(executors, this.stopping.signal);
+        if (this.stopping.signal.aborted)
+          return;
+        logger.info("executor models listed", Object.fromEntries([...modelsByExecutor].map(([id, m]) => [id, m.length])));
         this.spendTracker = (0, spend_tracker_1.createSpendTrackerObserver)(this.brand, paths.spendStateFile);
         const observers = [
           (0, logger_2.createLoggerObserver)(),
@@ -27497,6 +27716,14 @@ var require_shuttle = __commonJS({
           return { status: "completed", outputs };
         };
         const pools = this.config.pools.map((p) => p.id ? { id: p.id } : { name: p.name });
+        const poolExecutors = new Map(pools.map((ref, i) => [ref, this.config.pools[i].executor]));
+        const poolMetadata = (ref) => {
+          const executor = poolExecutors.get(ref);
+          const models = executor ? modelsByExecutor.get(executor) : void 0;
+          if (!executor || !models)
+            return void 0;
+          return { executor, ...models.length > 0 ? { models } : {} };
+        };
         const attemptedUpgrades = /* @__PURE__ */ new Set();
         this.subscription = (0, jobs_1.subscribe)({
           jobsClient,
@@ -27513,7 +27740,8 @@ var require_shuttle = __commonJS({
               ...this.config.agent.metadata,
               client_version: this.brand.product.version,
               hostname: (0, os_1.hostname)()
-            }
+            },
+            poolMetadata
           },
           onJob,
           onDirectives: async (directives) => {
@@ -28375,7 +28603,7 @@ var import_path = require("path");
 var import_promises = require("fs/promises");
 var import_yaml = __toESM(require_dist3());
 var import_shuttle = __toESM(require_dist5());
-var buildVersion = true ? "0.31.0" : pkg.version;
+var buildVersion = true ? "0.32.0" : pkg.version;
 var AGENT_EXECUTORS = ["claude-code", "codex", "copilot"];
 var sifterBrand = {
   product: {