@whittlelabs/sifter 0.33.3 → 0.34.0

package/bin.js

@@ -3122,6 +3122,37 @@ var require_registry = __commonJS({
   }
 });
 
+// ../../packages/loom/dist/runtime/requirements.js
+var require_requirements = __commonJS({
+  "../../packages/loom/dist/runtime/requirements.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.REQUIRES_EXECUTOR_TAG = exports2.EXECUTOR_ID = void 0;
+    exports2.requirementTags = requirementTags;
+    exports2.readRequiredExecutor = readRequiredExecutor;
+    exports2.EXECUTOR_ID = /^[a-z][a-z0-9-]{0,63}$/;
+    exports2.REQUIRES_EXECUTOR_TAG = "requires-executor:";
+    function requirementTags(requires) {
+      if (!requires?.executor)
+        return [];
+      if (!exports2.EXECUTOR_ID.test(requires.executor)) {
+        throw new Error(`prompt-execution: requires.executor "${requires.executor}" is not an executor id`);
+      }
+      return [`${exports2.REQUIRES_EXECUTOR_TAG}${requires.executor}`];
+    }
+    function readRequiredExecutor(tags) {
+      for (const tag of tags ?? []) {
+        if (!tag.startsWith(exports2.REQUIRES_EXECUTOR_TAG))
+          continue;
+        const executor = tag.slice(exports2.REQUIRES_EXECUTOR_TAG.length);
+        if (exports2.EXECUTOR_ID.test(executor))
+          return executor;
+      }
+      return null;
+    }
+  }
+});
+
 // ../../packages/loom/dist/runtime/prompt-execution.js
 var require_prompt_execution = __commonJS({
   "../../packages/loom/dist/runtime/prompt-execution.js"(exports2) {
@@ -3131,6 +3162,7 @@ var require_prompt_execution = __commonJS({
     exports2.renderPromptExecution = renderPromptExecution;
     exports2.pickProviderHints = pickProviderHints;
     exports2.renderTemplate = renderTemplate;
+    var requirements_1 = require_requirements();
     function readPromptExecutionSpec(inputs) {
       const specRow = inputs.find((i) => i.label === "spec");
       if (!specRow)
@@ -3162,6 +3194,15 @@ var require_prompt_execution = __commonJS({
           }
         }
       }
+      if (spec.requires !== void 0) {
+        const req = spec.requires;
+        if (typeof req !== "object" || req === null || Array.isArray(req)) {
+          throw new Error("prompt-execution: spec.requires must be an object when present");
+        }
+        if (req.executor !== void 0 && (typeof req.executor !== "string" || !requirements_1.EXECUTOR_ID.test(req.executor))) {
+          throw new Error("prompt-execution: spec.requires.executor must be an executor id");
+        }
+      }
       if (spec.gates !== void 0) {
         if (!Array.isArray(spec.gates)) {
           throw new Error("prompt-execution: spec.gates must be an array when present");
@@ -3337,7 +3378,7 @@ var require_runtime = __commonJS({
   "../../packages/loom/dist/runtime/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.validateAgainstSchema = exports2.readShuttleStrategy = exports2.shuttleStrategyInput = exports2.PROMPT_EXECUTION_STRATEGY = exports2.SHUTTLE_STRATEGY_LABEL = exports2.pickProviderHints = exports2.renderTemplate = exports2.renderPromptExecution = exports2.readPromptExecutionSpec = void 0;
+    exports2.validateAgainstSchema = exports2.readRequiredExecutor = exports2.requirementTags = exports2.REQUIRES_EXECUTOR_TAG = exports2.EXECUTOR_ID = exports2.readShuttleStrategy = exports2.shuttleStrategyInput = exports2.PROMPT_EXECUTION_STRATEGY = exports2.SHUTTLE_STRATEGY_LABEL = exports2.pickProviderHints = exports2.renderTemplate = exports2.renderPromptExecution = exports2.readPromptExecutionSpec = void 0;
     var prompt_execution_1 = require_prompt_execution();
     Object.defineProperty(exports2, "readPromptExecutionSpec", { enumerable: true, get: function() {
       return prompt_execution_1.readPromptExecutionSpec;
@@ -3364,6 +3405,19 @@ var require_runtime = __commonJS({
     Object.defineProperty(exports2, "readShuttleStrategy", { enumerable: true, get: function() {
       return strategy_1.readShuttleStrategy;
     } });
+    var requirements_1 = require_requirements();
+    Object.defineProperty(exports2, "EXECUTOR_ID", { enumerable: true, get: function() {
+      return requirements_1.EXECUTOR_ID;
+    } });
+    Object.defineProperty(exports2, "REQUIRES_EXECUTOR_TAG", { enumerable: true, get: function() {
+      return requirements_1.REQUIRES_EXECUTOR_TAG;
+    } });
+    Object.defineProperty(exports2, "requirementTags", { enumerable: true, get: function() {
+      return requirements_1.requirementTags;
+    } });
+    Object.defineProperty(exports2, "readRequiredExecutor", { enumerable: true, get: function() {
+      return requirements_1.readRequiredExecutor;
+    } });
     var validate_1 = require_validate();
     Object.defineProperty(exports2, "validateAgainstSchema", { enumerable: true, get: function() {
       return validate_1.validateAgainstSchema;
@@ -3377,7 +3431,9 @@ var require_prompt_execution2 = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.buildPromptExecutionInputs = buildPromptExecutionInputs;
+    exports2.promptExecutionTags = promptExecutionTags;
     var strategy_1 = require_strategy();
+    var requirements_1 = require_requirements();
     function buildPromptExecutionInputs(options) {
       const spec = {
         rendering: options.rendering,
@@ -3386,6 +3442,10 @@ var require_prompt_execution2 = __commonJS({
       };
       if (options.workspace)
         spec.workspace = options.workspace;
+      if (options.requires?.executor) {
+        (0, requirements_1.requirementTags)(options.requires);
+        spec.requires = { executor: options.requires.executor };
+      }
       if (options.providerHints)
         spec.providerHints = options.providerHints;
       if (options.costCapHint)
@@ -3423,6 +3483,10 @@ var require_prompt_execution2 = __commonJS({
       }
       return inputs;
     }
+    function promptExecutionTags(options) {
+      const tags = [.../* @__PURE__ */ new Set([...options.tags ?? [], ...(0, requirements_1.requirementTags)(options.requires)])];
+      return tags.length > 0 ? tags : void 0;
+    }
   }
 });
 
@@ -9780,12 +9844,15 @@ var require_dist = __commonJS({
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SeedWorkflowsError = exports2.WorkflowBuilderError = exports2.seedWorkflows = exports2.canonicaliseWorkflow = exports2.synthesiseLinearChain = exports2.describeJobPoolRef = exports2.literalJobPool = exports2.principalJobPool = exports2.jobsCreateNode = exports2.httpNode = exports2.promptNode = exports2.defineWorkflow = exports2.buildPromptExecutionInputs = void 0;
+    exports2.SeedWorkflowsError = exports2.WorkflowBuilderError = exports2.seedWorkflows = exports2.canonicaliseWorkflow = exports2.synthesiseLinearChain = exports2.describeJobPoolRef = exports2.literalJobPool = exports2.principalJobPool = exports2.jobsCreateNode = exports2.httpNode = exports2.promptNode = exports2.defineWorkflow = exports2.promptExecutionTags = exports2.buildPromptExecutionInputs = void 0;
     __exportStar(require_runtime(), exports2);
     var prompt_execution_1 = require_prompt_execution2();
     Object.defineProperty(exports2, "buildPromptExecutionInputs", { enumerable: true, get: function() {
       return prompt_execution_1.buildPromptExecutionInputs;
     } });
+    Object.defineProperty(exports2, "promptExecutionTags", { enumerable: true, get: function() {
+      return prompt_execution_1.promptExecutionTags;
+    } });
     var define_workflow_1 = require_define_workflow();
     Object.defineProperty(exports2, "defineWorkflow", { enumerable: true, get: function() {
       return define_workflow_1.defineWorkflow;
@@ -9837,8 +9904,9 @@ var require_types2 = __commonJS({
   "../../packages/shuttle/dist/executors/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ExecutorEnvironmentError = void 0;
+    exports2.MODEL_UNAVAILABLE = exports2.ExecutorModelUnavailableError = exports2.ExecutorEnvironmentError = void 0;
     exports2.isExecutorEnvironmentError = isExecutorEnvironmentError;
+    exports2.isExecutorModelUnavailableError = isExecutorModelUnavailableError;
     var ExecutorEnvironmentError = class extends Error {
       /** What the operator should do, as one clause: "run `claude` and sign in". */
       remedy;
@@ -9852,6 +9920,17 @@ var require_types2 = __commonJS({
     function isExecutorEnvironmentError(err) {
       return err instanceof Error && err.name === "ExecutorEnvironmentError";
     }
+    var ExecutorModelUnavailableError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "ExecutorModelUnavailableError";
+      }
+    };
+    exports2.ExecutorModelUnavailableError = ExecutorModelUnavailableError;
+    function isExecutorModelUnavailableError(err) {
+      return err instanceof Error && err.name === "ExecutorModelUnavailableError";
+    }
+    exports2.MODEL_UNAVAILABLE = "model-unavailable";
   }
 });
 
@@ -10070,6 +10149,7 @@ var require_agent_process = __commonJS({
     exports2.firstLine = firstLine;
     exports2.keepTranscript = keepTranscript;
     exports2.classifyAgentFault = classifyAgentFault;
+    exports2.isModelUnavailable = isModelUnavailable;
     exports2.agentFailure = agentFailure;
     var types_1 = require_types2();
     var child_process_1 = require("child_process");
@@ -10187,11 +10267,16 @@ var require_agent_process = __commonJS({
       }
       return null;
     }
+    function isModelUnavailable(failure, vocab) {
+      return failure.apiErrorStatus === 404 || vocab.modelUnavailable.test(failure.text ?? "");
+    }
     function agentFailure(local, message, facts, vocab) {
-      if (!local)
-        return new Error(message);
-      const remedy = classifyAgentFault(facts, vocab);
-      return remedy ? new types_1.ExecutorEnvironmentError(message, remedy) : new Error(message);
+      const remedy = local ? classifyAgentFault(facts, vocab) : null;
+      if (remedy)
+        return new types_1.ExecutorEnvironmentError(message, remedy);
+      if (isModelUnavailable(facts, vocab))
+        return new types_1.ExecutorModelUnavailableError(message);
+      return new Error(message);
     }
   }
 });
@@ -10611,7 +10696,10 @@ var require_claude_code = __commonJS({
       loginRemedy: LOGIN_REMEDY,
       limitRemedy: LIMIT_REMEDY,
       signedOut: SIGNED_OUT,
-      outOfUsage: OUT_OF_USAGE
+      outOfUsage: OUT_OF_USAGE,
+      // claude 2.x: "There's an issue with the selected model (x). It may not
+      // exist or you may not have access to it." beside the provider's 404.
+      modelUnavailable: /issue with the selected model|may not exist or you may not have access/i
     };
     function classifyEnvironmentFault(failure) {
       return (0, agent_process_1.classifyAgentFault)(failure, CLAUDE_FAULTS);
@@ -11306,7 +11394,10 @@ var require_codex = __commonJS({
       loginRemedy: "run `codex login` and sign in (or `codex login --with-api-key`)",
       limitRemedy: "wait for the plan's usage limit to reset, or raise it",
       signedOut: /not logged in|run `?codex login|401 unauthorized|invalid api key|refresh token|token (?:has )?expired|sign in again/i,
-      outOfUsage: /usage limit|hit your (?:\w+ )?limit|insufficient_quota|exceeded your current quota|429 too many requests/i
+      outOfUsage: /usage limit|hit your (?:\w+ )?limit|insufficient_quota|exceeded your current quota|429 too many requests/i,
+      // OpenAI's words for a model the key may not use, and codex's for one a
+      // ChatGPT sign-in does not include.
+      modelUnavailable: /model_not_found|model .*(?:does not exist|you do not have access to it)|model is not supported|404 not found.*model/i
     };
     var READINESS_PROMPT = "Reply with the single word: ok";
     var READINESS_TIMEOUT_MS = 12e4;
@@ -11727,6 +11818,10 @@ var require_copilot = __commonJS({
       limitRemedy: "the account has no Copilot allowance left: on an organization seat, an owner must allow paid usage in the organization's Copilot policies and fund a budget for it; otherwise wait for the monthly reset",
       signedOut: /not (?:logged|signed) in|run `?copilot login|no authentication|authentication (?:failed|required)|bad credentials/i,
       outOfUsage: /exceeded your monthly quota|premium request|usage limit|hit your (?:\w+ )?limit|exceeded .*(?:allowance|limit)/i,
+      // copilot 1.0.98 offers only the models the account may use, so a model
+      // that does not exist and one a policy disables both read: Model "x" from
+      // --model flag is not available.
+      modelUnavailable: /model "?[^"\n]*"? (?:from --model flag )?is not available|model .*is not (?:enabled|supported)/i,
       notEntitled: {
         pattern: /access denied by policy|not authorized to use this copilot feature/i,
         remedy: "this account's Copilot does not allow the Copilot CLI: on an organization seat, an owner must assign the seat and enable the Copilot CLI policy, then run `copilot login` again so the new seat is picked up"
@@ -13135,6 +13230,7 @@ var require_anthropic_api = __commonJS({
     var keep_1 = require_dist2();
     var env_ref_1 = require_env_ref();
     var validate_output_1 = require_validate_output();
+    var types_1 = require_types2();
     var models_1 = require_models();
     var DEFAULT_BASE_URL = "https://api.anthropic.com/v1/messages";
     var DEFAULT_MODEL = "claude-sonnet-4-6";
@@ -13251,7 +13347,11 @@ var require_anthropic_api = __commonJS({
             const apiErr = envelope?.error;
             if (apiErr?.message) {
               const kind = apiErr.type ? ` (${apiErr.type})` : "";
-              throw new Error(`Anthropic API error${kind}: ${apiErr.message} [HTTP ${response.status}]`);
+              const message = `Anthropic API error${kind}: ${apiErr.message} [HTTP ${response.status}]`;
+              if (response.status === 404 && apiErr.type === "not_found_error") {
+                throw new types_1.ExecutorModelUnavailableError(message);
+              }
+              throw new Error(message);
             }
             throw new Error(`HTTP ${response.status}${bodyText ? `: ${bodyText}` : ""}`);
           }
@@ -13832,10 +13932,11 @@ var require_scaffold = __commonJS({
     function planScaffold2(brand, setupOptions, existing) {
       const pools = Array.isArray(existing.pools) ? existing.pools : [];
       const first = pools[0];
-      const prior = first !== null && typeof first === "object" && typeof first.executor === "string" ? first.executor : void 0;
+      const pooled = first !== null && typeof first === "object" && typeof first.executor === "string" ? first.executor : void 0;
+      const executors = existing.executors !== null && typeof existing.executors === "object" ? existing.executors : {};
+      const prior = pooled ?? Object.keys(executors)[0];
       const executor = setupOptions.executor ?? prior ?? brand.defaultExecutor;
       const source = setupOptions.executor !== void 0 ? "flag" : prior !== void 0 ? "existing" : "default";
-      const executors = existing.executors !== null && typeof existing.executors === "object" ? existing.executors : {};
       const block = executor === void 0 ? void 0 : executors[executor];
       const keptBlock = setupOptions.executor === void 0 && block !== null && typeof block === "object" ? block : void 0;
       return { executor, source, keptBlock };
@@ -13910,7 +14011,7 @@ var require_checks = __commonJS({
     }
     function activeAgent(config) {
       const configured = configuredExecutors(config);
-      const pooled = config.pools.map((p) => p.executor).find((e) => AGENT_EXECUTORS2.includes(e) && configured.includes(e));
+      const pooled = config.pools.map((p) => p.executor).find((e) => e !== void 0 && AGENT_EXECUTORS2.includes(e) && configured.includes(e));
       return pooled ?? configured.find((e) => AGENT_EXECUTORS2.includes(e)) ?? null;
     }
     function agentSettings(config, subject) {
@@ -22240,6 +22341,8 @@ var require_subscribe = __commonJS({
       return outcome;
     }
     var STOPPED = Symbol("stopped");
+    var DECLINE_WINDOW = 25;
+    var DECLINED_MEMORY = 1e3;
     function subscribe(opts) {
       const logger = opts.logger ?? NULL_LOGGER;
       const pollIntervalMs = opts.pollIntervalMs ?? 2e3;
@@ -22257,6 +22360,16 @@ var require_subscribe = __commonJS({
       let wakeStartup = null;
       let unavailableSince = null;
       let rateLimited = null;
+      const accepts = opts.accepts;
+      const declined = /* @__PURE__ */ new Set();
+      function noteDeclined(jobId) {
+        if (declined.has(jobId))
+          return;
+        if (declined.size >= DECLINED_MEMORY)
+          declined.clear();
+        declined.add(jobId);
+        logger.debug?.("declined a job this subscriber cannot run; it stays queued for another member", { jobId });
+      }
       function noteReachable() {
         if (unavailableSince !== null) {
           logger.info(`Sift is reachable again after ${formatDuration(Date.now() - unavailableSince)}`);
@@ -22422,9 +22535,10 @@ var require_subscribe = __commonJS({
         }
         try {
           const paused = holds.size > 0;
+          const free = maxConcurrency - inflight;
           const { data, directives } = await opts.jobsClient.listDispatchableJobs({
             pools: resolvedPoolIds,
-            limit: paused ? 1 : maxConcurrency - inflight,
+            limit: paused ? 1 : accepts ? Math.max(free, DECLINE_WINDOW) : free,
             sort: "priority:desc,queued_at:asc"
           });
           noteReachable();
@@ -22447,6 +22561,10 @@ var require_subscribe = __commonJS({
             for (const job of data) {
               if (inflight >= maxConcurrency)
                 break;
+              if (accepts && !accepts(job)) {
+                noteDeclined(job.id);
+                continue;
+              }
               inflight++;
               void runOnce(job).finally(() => {
                 inflight--;
@@ -22542,7 +22660,8 @@ var require_subscribe = __commonJS({
           }
           await opts.jobsClient.submit(dispatch.job.id, {
             status: result.status,
-            ...result.reason !== void 0 ? { reason: result.reason } : {}
+            ...result.reason !== void 0 ? { reason: result.reason } : {},
+            ...result.status === "failed" && result.failureCode !== void 0 ? { failureCode: result.failureCode } : {}
           });
         } catch (err) {
           if (isFatal(err)) {
@@ -22664,7 +22783,12 @@ var require_schema4 = __commonJS({
       name: zod_1.z.string().optional(),
       tags: zod_1.z.array(zod_1.z.string()).optional(),
       minPriority: zod_1.z.number().int().optional(),
-      executor: zod_1.z.string()
+      /**
+       * Deprecated (whittlelabs ADR 0118): a Sifter chooses the executor for
+       * each job from `executors`, in their order. A pool that still names one,
+       * as configs before 0.34 did, tries it first for its own jobs.
+       */
+      executor: zod_1.z.string().optional()
     }).refine((pool) => pool.id !== void 0 || pool.name !== void 0, {
       message: 'Each pool must specify at least one of "id" or "name"'
     });
@@ -22704,6 +22828,11 @@ var require_schema4 = __commonJS({
       concurrency: zod_1.z.object({
         maxJobs: zod_1.z.number().int().positive().default(defaults_1.DEFAULTS.concurrency.maxJobs)
       }).default(defaults_1.DEFAULTS.concurrency),
+      /**
+       * The executors this runner may run jobs on, keyed by id. The order they
+       * are written in is the order a job tries them (ADR 0118): a job that
+       * requires none runs on the first that can run jobs on this machine.
+       */
       executors: zod_1.z.record(zod_1.z.string(), executorSchema),
       logging: zod_1.z.object({
         level: zod_1.z.enum(["debug", "info", "warn", "error"]).default(defaults_1.DEFAULTS.logging.level),
@@ -22719,6 +22848,7 @@ var require_loader = __commonJS({
   "../../packages/shuttle/dist/config/loader.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.resolveConfigPath = resolveConfigPath;
     exports2.loadConfig = loadConfig;
     var fs_1 = require("fs");
     var path_1 = require("path");
@@ -26837,32 +26967,51 @@ var require_logger = __commonJS({
   }
 });
 
-// ../../packages/shuttle/dist/core/demux.js
-var require_demux = __commonJS({
-  "../../packages/shuttle/dist/core/demux.js"(exports2) {
+// ../../packages/shuttle/dist/core/executor-choice.js
+var require_executor_choice = __commonJS({
+  "../../packages/shuttle/dist/core/executor-choice.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createDemux = createDemux;
-    function createDemux(executors, pools) {
-      const byStrategy = /* @__PURE__ */ new Map();
-      for (const executor of executors) {
-        for (const strategy of executor.strategies)
-          byStrategy.set(strategy, executor);
-      }
+    exports2.createExecutorChooser = createExecutorChooser;
+    var loom_1 = require_dist();
+    function createExecutorChooser(executors, pools) {
       const byName = new Map(executors.map((e) => [e.capability.id, e]));
-      const byPool = /* @__PURE__ */ new Map();
+      const legacyFirst = /* @__PURE__ */ new Map();
       for (const pool of pools) {
-        const named = byName.get(pool.executor);
-        if (!named)
+        if (!pool.executor || !byName.has(pool.executor))
           continue;
         if (pool.id)
-          byPool.set(`id:${pool.id}`, named);
+          legacyFirst.set(`id:${pool.id}`, pool.executor);
         if (pool.name)
-          byPool.set(`name:${pool.name}`, named);
+          legacyFirst.set(`name:${pool.name}`, pool.executor);
       }
-      return (pool, strategy) => {
-        const named = byPool.get(`id:${pool.id}`) ?? byPool.get(`name:${pool.name}`);
-        return named && named.strategies.includes(strategy) ? named : byStrategy.get(strategy);
+      const orderFor = (pool) => {
+        const first = (pool.id !== void 0 ? legacyFirst.get(`id:${pool.id}`) : void 0) ?? (pool.name !== void 0 ? legacyFirst.get(`name:${pool.name}`) : void 0);
+        const head = first ? byName.get(first) : void 0;
+        return head ? [head, ...executors.filter((e) => e !== head)] : [...executors];
+      };
+      return {
+        accepts(tags) {
+          const required = (0, loom_1.readRequiredExecutor)(tags);
+          return required === null || byName.has(required);
+        },
+        choose({ pool, strategy, required }) {
+          if (required !== null) {
+            const named = byName.get(required);
+            if (!named) {
+              return { ok: false, reason: `this job requires the ${required} executor, which this runner does not have` };
+            }
+            if (!named.strategies.includes(strategy)) {
+              return { ok: false, reason: `this job requires the ${required} executor, which does not run "${strategy}" jobs` };
+            }
+            return { ok: true, executors: [named], required };
+          }
+          const capable = orderFor(pool).filter((e) => e.strategies.includes(strategy));
+          if (capable.length === 0)
+            return { ok: false, reason: `no executor for shuttle strategy "${strategy}"` };
+          return { ok: true, executors: capable, required: null };
+        },
+        orderFor
       };
     }
   }
@@ -27389,7 +27538,7 @@ var require_shuttle = __commonJS({
     var logger_1 = require_logger();
     var registry_1 = require_registry();
     var claude_code_1 = require_claude_code();
-    var demux_1 = require_demux();
+    var executor_choice_1 = require_executor_choice();
     var codex_1 = require_codex();
     var copilot_1 = require_copilot();
     var http_api_1 = require_http_api();
@@ -27402,6 +27551,15 @@ var require_shuttle = __commonJS({
     var store_1 = require_store();
     var GATE_REPAIR_BUDGET = 2;
     var ENVIRONMENT_HOLD = "executor-environment";
+    function requiredExecutor(dispatch, strategy) {
+      if (strategy !== loom_1.PROMPT_EXECUTION_STRATEGY)
+        return null;
+      try {
+        return (0, loom_1.readPromptExecutionSpec)(dispatch.inputs).requires?.executor ?? null;
+      } catch {
+        return null;
+      }
+    }
     var RECHECK_INITIAL_MS = 15e3;
     var RECHECK_MAX_MS = 3e5;
     var KEEP_RETRY_INITIAL_MS = 2e3;
@@ -27511,8 +27669,15 @@ var require_shuttle = __commonJS({
       lifetime = deferred();
       /** Aborted by `stop()`: ends the startup waits and the readiness re-checks. */
       stopping = new AbortController();
-      /** When claiming was paused on an executor environment fault; null while claiming. */
-      environmentPausedAt = null;
+      /**
+       * The executors that cannot run jobs on this machine just now (signed out,
+       * missing, out of plan), with why and since when. Empty while every one can.
+       */
+      unwell = /* @__PURE__ */ new Map();
+      /** Every configured executor, in the configured order. */
+      executors = [];
+      /** Whether claiming is paused because no executor can run jobs. */
+      environmentHeld = false;
       constructor(options) {
         this.brand = options.brand;
         this.config = options.config;
@@ -27596,7 +27761,8 @@ var require_shuttle = __commonJS({
         const registry = new registry_1.ExecutorRegistry(this.brand.executorAllowlist);
         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);
+        this.executors = executors;
+        const chooser = (0, executor_choice_1.createExecutorChooser)(executors, this.config.pools);
         const modelsByExecutor = await listExecutorModels(executors, this.stopping.signal);
         if (this.stopping.signal.aborted)
           return;
@@ -27621,12 +27787,31 @@ var require_shuttle = __commonJS({
           const attendanceId = dispatch.attendanceId;
           const startedAt = Date.now();
           const strategy = (0, loom_1.readShuttleStrategy)(dispatch.inputs) ?? "";
-          const executor = executorFor(dispatch.pool, strategy);
-          if (!executor) {
-            const reason = `no executor for shuttle strategy "${strategy}"`;
-            await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "failed", reason, totalDurationMs: Date.now() - startedAt }, onObserverError);
-            return { status: "failed", reason };
+          const close = async (result) => {
+            await observerChain.notify({
+              kind: "attendance.closed",
+              jobId,
+              attendanceId,
+              status: result.status === "completed" ? "completed" : "failed",
+              ...result.reason !== void 0 ? { reason: result.reason } : {},
+              totalDurationMs: Date.now() - startedAt
+            }, onObserverError);
+            return result;
+          };
+          const choice = chooser.choose({ pool: dispatch.pool, strategy, required: requiredExecutor(dispatch, strategy) });
+          if (!choice.ok)
+            return close({ status: "failed", reason: choice.reason });
+          if (choice.required !== null) {
+            const fault = this.unwell.get(choice.required);
+            if (fault) {
+              return close({
+                status: "failed",
+                reason: `executor failed: ${choice.required} cannot run jobs on this machine (${fault.err.message}). To fix it, ${fault.err.remedy}.`
+              });
+            }
           }
+          const well = choice.executors.filter((e) => !this.unwell.has(e.capability.id));
+          const candidates = well.length > 0 ? well : choice.executors;
           await observerChain.notify({
             kind: "job.claimed",
             jobId,
@@ -27637,9 +27822,9 @@ var require_shuttle = __commonJS({
             dispatch
           }, onObserverError);
           let estimate = {};
-          if (executor.estimate) {
+          if (candidates[0].estimate) {
             try {
-              estimate = await executor.estimate(dispatch);
+              estimate = await candidates[0].estimate(dispatch);
             } catch {
             }
           }
@@ -27647,85 +27832,102 @@ var require_shuttle = __commonJS({
             await observerChain.notify({ kind: "spend.preflight", jobId, attendanceId, estimate });
           } catch (err) {
             const reason = err instanceof chain_1.SpendCapExceeded ? "refused_over_cap" : `preflight rejected: ${err instanceof Error ? err.message : String(err)}`;
-            await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "failed", reason, totalDurationMs: Date.now() - startedAt }, onObserverError);
-            return { status: "failed", reason };
-          }
-          await observerChain.notify({ kind: "executor.dispatch.started", jobId, attendanceId, executor: executor.capability.id, strategy }, onObserverError);
-          const dispatchStartedAt = Date.now();
-          const environment = executor.prepareEnvironment ? await executor.prepareEnvironment(dispatch) : void 0;
-          let preparedWorkspace = null;
-          if (environment?.workspaceRequest) {
+            return close({ status: "failed", reason });
+          }
+          const runOn = async (executor) => {
+            await observerChain.notify({ kind: "executor.dispatch.started", jobId, attendanceId, executor: executor.capability.id, strategy }, onObserverError);
+            const dispatchStartedAt = Date.now();
+            const environment = executor.prepareEnvironment ? await executor.prepareEnvironment(dispatch) : void 0;
+            let preparedWorkspace = null;
+            if (environment?.workspaceRequest) {
+              try {
+                preparedWorkspace = await (0, workspace_1.materializeWorkspace)(environment.workspaceRequest, {
+                  ...environment.materializeOptions ?? {},
+                  credentials: this.broker,
+                  signal
+                });
+              } catch (err) {
+                (0, logger_1.getLogger)().warn("workspace materialization failed; running prompt-only", {
+                  jobId,
+                  error: err instanceof Error ? err.message : String(err)
+                });
+                preparedWorkspace = null;
+              }
+            }
+            const executionCtx = {
+              reportProgress: (channel, frames) => {
+                void jobsClient.postProgress(jobId, { channel, frames }).then(() => activity.record()).catch(() => {
+                });
+              },
+              workspace: preparedWorkspace,
+              credentials: this.broker
+            };
+            let response;
             try {
-              preparedWorkspace = await (0, workspace_1.materializeWorkspace)(environment.workspaceRequest, {
-                ...environment.materializeOptions ?? {},
-                credentials: this.broker,
-                signal
-              });
+              response = await executor.execute(dispatch, signal, executionCtx);
             } catch (err) {
-              (0, logger_1.getLogger)().warn("workspace materialization failed; running prompt-only", {
-                jobId,
-                error: err instanceof Error ? err.message : String(err)
-              });
-              preparedWorkspace = null;
+              const reason = `executor failed: ${err instanceof Error ? err.message : String(err)}`;
+              if (this.broker === null && (0, types_1.isExecutorEnvironmentError)(err)) {
+                this.markUnwell(executor, err, subscribeLogger);
+                return { kind: "environment", reason };
+              }
+              if ((0, types_1.isExecutorModelUnavailableError)(err)) {
+                return { kind: "result", result: { status: "failed", reason, failureCode: types_1.MODEL_UNAVAILABLE } };
+              }
+              return { kind: "result", result: { status: "failed", reason } };
+            } finally {
+              if (preparedWorkspace)
+                await preparedWorkspace.cleanup();
             }
-          }
-          const executionCtx = {
-            reportProgress: (channel, frames) => {
-              void jobsClient.postProgress(jobId, { channel, frames }).then(() => activity.record()).catch(() => {
+            const gated = await runOutputGates(dispatch, response, executor, signal, executionCtx);
+            if (!gated.ok)
+              return { kind: "result", result: { status: "failed", reason: gated.reason } };
+            response = gated.response;
+            await observerChain.notify({
+              kind: "executor.dispatch.completed",
+              jobId,
+              attendanceId,
+              executor: executor.capability.id,
+              response: { rawText: response.rawText ?? "", parsed: response.parsed, usage: response.usage },
+              durationMs: Date.now() - dispatchStartedAt
+            }, onObserverError);
+            const outputs = [...response.outputs];
+            if (response.usage) {
+              outputs.push({
+                label: "usage",
+                content: { ...response.usage, executor: executor.capability.id }
               });
-            },
-            workspace: preparedWorkspace,
-            credentials: this.broker
-          };
-          let response;
-          try {
-            response = await executor.execute(dispatch, signal, executionCtx);
-          } catch (err) {
-            const reason = `executor failed: ${err instanceof Error ? err.message : String(err)}`;
-            if (this.broker === null && (0, types_1.isExecutorEnvironmentError)(err)) {
-              this.pauseForEnvironment(executor, err, subscribeLogger);
             }
-            await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "failed", reason, totalDurationMs: Date.now() - startedAt }, onObserverError);
-            return { status: "failed", reason };
-          } finally {
-            if (preparedWorkspace)
-              await preparedWorkspace.cleanup();
-          }
-          const gated = await runOutputGates(dispatch, response, executor, signal, executionCtx);
-          if (!gated.ok) {
-            await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "failed", reason: gated.reason, totalDurationMs: Date.now() - startedAt }, onObserverError);
-            return { status: "failed", reason: gated.reason };
-          }
-          response = gated.response;
-          await observerChain.notify({
-            kind: "executor.dispatch.completed",
-            jobId,
-            attendanceId,
-            executor: executor.capability.id,
-            response: { rawText: response.rawText ?? "", parsed: response.parsed, usage: response.usage },
-            durationMs: Date.now() - dispatchStartedAt
-          }, onObserverError);
-          const outputs = [...response.outputs];
-          if (response.usage) {
-            outputs.push({
-              label: "usage",
-              content: { ...response.usage, executor: executor.capability.id }
-            });
-          }
-          for (const output of outputs) {
-            await observerChain.notify({ kind: "output.submitted", jobId, attendanceId, label: output.label, content: output.content }, onObserverError);
-          }
-          await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "completed", totalDurationMs: Date.now() - startedAt }, onObserverError);
-          return { status: "completed", outputs };
+            for (const output of outputs) {
+              await observerChain.notify({ kind: "output.submitted", jobId, attendanceId, label: output.label, content: output.content }, onObserverError);
+            }
+            return { kind: "result", result: { status: "completed", outputs } };
+          };
+          for (const [i, executor] of candidates.entries()) {
+            const outcome = await runOn(executor);
+            if (outcome.kind === "result")
+              return close(outcome.result);
+            const next = candidates[i + 1];
+            if (!next)
+              return close({ status: "failed", reason: outcome.reason });
+            subscribeLogger.info(`${executor.capability.id} cannot run jobs on this machine, so job ${jobId} runs on ${next.capability.id} instead.`);
+          }
+          return close({ status: "failed", reason: `no executor for shuttle strategy "${strategy}"` });
         };
         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)
+          const reported = chooser.orderFor(ref).map((e) => {
+            const models = modelsByExecutor.get(e.capability.id) ?? [];
+            return { id: e.capability.id, ...models.length > 0 ? { models } : {} };
+          });
+          const [first] = reported;
+          if (!first)
             return void 0;
-          return { executor, ...models.length > 0 ? { models } : {} };
+          return {
+            executors: reported,
+            executor: first.id,
+            ...first.models ? { models: first.models } : {}
+          };
         };
         const attemptedUpgrades = /* @__PURE__ */ new Set();
         this.subscription = (0, jobs_1.subscribe)({
@@ -27747,6 +27949,9 @@ var require_shuttle = __commonJS({
             poolMetadata
           },
           onJob,
+          // Decline, at discovery, a job that requires an executor this runner
+          // does not have; it stays queued for a member that has it (ADR 0118).
+          accepts: (job) => chooser.accepts(job.tags),
           onDirectives: async (directives) => {
             const decommission = (0, decommission_1.readDecommissionDirective)(directives);
             if (decommission) {
@@ -27831,20 +28036,31 @@ var require_shuttle = __commonJS({
         this.subscription?.done().catch((err) => this.lifetime.reject(err));
       }
       /**
-       * Stop claiming because the executor says this machine cannot run jobs,
-       * and keep checking until it can. One warning says why and what to do; the
-       * re-checks stay at debug; one line says when claiming resumes. Idempotent:
-       * a second failing job while paused (maxJobs > 1) changes nothing.
+       * Note that an executor cannot run jobs on this machine, and keep checking
+       * until it can. While another executor can, jobs that do not require this
+       * one run there; once none can, claiming pauses, so a signed-out laptop does
+       * not burn a queue of reviews one failure at a time. One warning says why
+       * and what to do; the re-checks stay at debug; one line says when it works
+       * again. Idempotent: a second failing job on the same executor changes
+       * nothing.
        */
-      pauseForEnvironment(executor, err, logger) {
-        if (this.environmentPausedAt !== null || !this.subscription)
+      markUnwell(executor, err, logger) {
+        const id = executor.capability.id;
+        if (this.unwell.has(id) || !this.subscription)
           return;
-        this.environmentPausedAt = Date.now();
-        this.subscription.pause(ENVIRONMENT_HOLD);
-        logger.warn(`Claiming paused: ${executor.capability.id} cannot run jobs on this machine (${err.message}). To fix it, ${err.remedy}. The ${this.brand.product.title} checks again on its own and resumes claiming when it works.`);
+        this.unwell.set(id, { since: Date.now(), err });
+        const others = this.executors.filter((e) => !this.unwell.has(e.capability.id)).map((e) => e.capability.id);
+        if (others.length === 0) {
+          this.environmentHeld = true;
+          this.subscription.pause(ENVIRONMENT_HOLD);
+          logger.warn(`Claiming paused: ${id} cannot run jobs on this machine (${err.message}). To fix it, ${err.remedy}. The ${this.brand.product.title} checks again on its own and resumes claiming when it works.`);
+        } else {
+          logger.warn(`${id} cannot run jobs on this machine (${err.message}). To fix it, ${err.remedy}. Until then, jobs that do not require ${id} run on ${others.join(", ")}; the ${this.brand.product.title} checks ${id} again on its own.`);
+        }
         void this.recheckEnvironment(executor, logger);
       }
       async recheckEnvironment(executor, logger) {
+        const id = executor.capability.id;
         const signal = this.stopping.signal;
         let delay = this.environmentRecheck.initialMs;
         for (; ; ) {
@@ -27860,15 +28076,21 @@ var require_shuttle = __commonJS({
           if (signal.aborted)
             return;
           if (readiness.ready) {
-            const pausedFor = formatDuration(Date.now() - (this.environmentPausedAt ?? Date.now()));
-            this.environmentPausedAt = null;
-            this.subscription?.resume(ENVIRONMENT_HOLD);
-            logger.info(`${executor.capability.id} can run jobs again; claiming resumed after ${pausedFor} paused.`);
+            const since = this.unwell.get(id)?.since ?? Date.now();
+            this.unwell.delete(id);
+            const lasted = formatDuration(Date.now() - since);
+            if (this.environmentHeld) {
+              this.environmentHeld = false;
+              this.subscription?.resume(ENVIRONMENT_HOLD);
+              logger.info(`${id} can run jobs again; claiming resumed after ${lasted} paused.`);
+            } else {
+              logger.info(`${id} can run jobs again after ${lasted}.`);
+            }
             return;
           }
           delay = Math.min(delay * 2, this.environmentRecheck.maxMs);
           logger.debug?.("executor still cannot run jobs", {
-            executor: executor.capability.id,
+            executor: id,
             reason: readiness.reason,
             nextCheckIn: formatDuration(delay)
           });
@@ -28356,6 +28578,212 @@ var require_revoke = __commonJS({
   }
 });
 
+// ../../packages/shuttle/dist/config/executor-order.js
+var require_executor_order = __commonJS({
+  "../../packages/shuttle/dist/config/executor-order.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.executorOrder = executorOrder;
+    exports2.foldPoolExecutors = foldPoolExecutors;
+    exports2.addExecutor = addExecutor;
+    exports2.removeExecutor = removeExecutor;
+    var yaml_1 = require_dist3();
+    function executorOrder(doc) {
+      const map = doc.get("executors", true);
+      if (!(0, yaml_1.isMap)(map))
+        return [];
+      return map.items.flatMap((pair) => (0, yaml_1.isScalar)(pair.key) ? [String(pair.key.value)] : []);
+    }
+    function executorsMap(doc) {
+      const existing = doc.get("executors", true);
+      if ((0, yaml_1.isMap)(existing))
+        return existing;
+      const created = doc.createNode({});
+      doc.set("executors", created);
+      return created;
+    }
+    function indexOf(map, id) {
+      return map.items.findIndex((pair) => (0, yaml_1.isScalar)(pair.key) && pair.key.value === id);
+    }
+    function foldPoolExecutors(doc) {
+      const pools = doc.get("pools", true);
+      if (!(0, yaml_1.isSeq)(pools))
+        return null;
+      let named = null;
+      for (const pool of pools.items) {
+        if (!(0, yaml_1.isMap)(pool))
+          continue;
+        const value = pool.get("executor");
+        if (typeof value === "string" && named === null)
+          named = value;
+        pool.delete("executor");
+      }
+      if (named === null)
+        return null;
+      const map = executorsMap(doc);
+      const at = indexOf(map, named);
+      if (at > 0) {
+        const [pair] = map.items.splice(at, 1);
+        map.items.unshift(pair);
+      }
+      return named;
+    }
+    function addExecutor(doc, id, block, options = {}) {
+      const map = executorsMap(doc);
+      const at = indexOf(map, id);
+      if (at >= 0) {
+        if (!options.first || at === 0)
+          return "unchanged";
+        const [pair2] = map.items.splice(at, 1);
+        map.items.unshift(pair2);
+        return "moved";
+      }
+      const pair = doc.createPair(id, block);
+      if (options.first)
+        map.items.unshift(pair);
+      else
+        map.items.push(pair);
+      return "added";
+    }
+    function removeExecutor(doc, id) {
+      const map = executorsMap(doc);
+      const at = indexOf(map, id);
+      if (at < 0)
+        return "absent";
+      if (map.items.length === 1)
+        return "last";
+      map.items.splice(at, 1);
+      return "removed";
+    }
+  }
+});
+
+// ../../packages/shuttle/dist/cli/executors.js
+var require_executors = __commonJS({
+  "../../packages/shuttle/dist/cli/executors.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.buildAddCommand = buildAddCommand;
+    exports2.buildRemoveCommand = buildRemoveCommand;
+    var fs_1 = require("fs");
+    var commander_1 = require_commander();
+    var yaml_1 = require_dist3();
+    var apply_1 = require_apply();
+    var loader_1 = require_loader();
+    var executor_order_1 = require_executor_order();
+    var preflight_1 = require_preflight();
+    function target(brand, options) {
+      const profile = (0, apply_1.resolveProfile)(brand, options.profile);
+      try {
+        const path = (0, loader_1.resolveConfigPath)({
+          explicitPath: options.config,
+          searchPaths: (0, apply_1.runConfigSearchPaths)(brand, profile),
+          productId: brand.product.id
+        });
+        return { path, profile };
+      } catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        console.error(`Run \`${brand.product.cliBinary} init\` first: it writes the config this edits.`);
+        process.exit(1);
+      }
+    }
+    function allowed(brand, id) {
+      return brand.executorAllowlist[0] === "*" || brand.executorAllowlist.includes(id);
+    }
+    function orderLine(order) {
+      return order.length === 1 ? `Every job runs on ${order[0]}.` : `A job that names no executor tries them in this order: ${order.join(", ")}. A job that names one runs on that one or fails.`;
+    }
+    function foldedLine(folded) {
+      return folded === null ? [] : [`Your pools named ${folded} as their executor, a setting from before 0.34; it is first in the order instead now.`];
+    }
+    async function newFailures(brand, t, write, restore) {
+      const paths = (0, apply_1.resolvePaths)(brand, t.profile);
+      const run = () => (0, preflight_1.runPreflight)((0, preflight_1.createProbes)({
+        brand,
+        paths,
+        configSearchPaths: (0, apply_1.runConfigSearchPaths)(brand, t.profile),
+        explicitConfigPath: t.path
+      }), { brand, paths, phase: "doctor", deep: false });
+      const before = await run();
+      write();
+      try {
+        const after = await run();
+        const failedBefore = new Set(before.verdicts.filter((v) => v.status === "FAIL").map((v) => v.name));
+        return after.verdicts.filter((v) => v.status === "FAIL" && !failedBefore.has(v.name));
+      } catch (err) {
+        restore();
+        throw err;
+      }
+    }
+    function buildAddCommand(brand) {
+      const add = new commander_1.Command("add").description(`Add to this ${brand.product.title}'s setup`);
+      add.command("executor <id>").description(`Add an executor this ${brand.product.title} may run jobs on`).option("--first", "Put it first in the order, so a job that names no executor tries it first").option("--tmp-dir <dir>", "Base directory for each job's throwaway checkout (agent executors)").option("--config <path>", "Path to the runtime YAML to edit").option("-p, --profile <name>", 'Config profile to edit (default "default")').action(async (id, options) => {
+        if (!allowed(brand, id)) {
+          console.error(`${id} is not an executor this build runs. It runs: ${brand.executorAllowlist.join(", ")}.`);
+          process.exit(1);
+        }
+        const t = target(brand, options);
+        const original = (0, fs_1.readFileSync)(t.path, "utf8");
+        const doc = (0, yaml_1.parseDocument)(original);
+        const folded = (0, executor_order_1.foldPoolExecutors)(doc);
+        const block = brand.executorBlock?.(id, { ...options.tmpDir ? { tmpDir: options.tmpDir } : {} }) ?? { type: id };
+        const outcome = (0, executor_order_1.addExecutor)(doc, id, block, { first: options.first === true });
+        if (outcome === "unchanged" && folded === null) {
+          console.log(`${id} is already set up. ${orderLine((0, executor_order_1.executorOrder)(doc))}`);
+          return;
+        }
+        const write = () => (0, fs_1.writeFileSync)(t.path, doc.toString());
+        const restore = () => (0, fs_1.writeFileSync)(t.path, original);
+        if (outcome === "added") {
+          const failures = await newFailures(brand, t, write, restore);
+          if (failures.length > 0) {
+            restore();
+            (0, preflight_1.printReport)(failures, false);
+            console.error("");
+            console.error(`${id} was not added: it could not run jobs on this machine. Fix what is above, then run this again.`);
+            process.exit(preflight_1.PREFLIGHT_EXIT_CODE);
+          }
+        } else {
+          write();
+        }
+        const verb = outcome === "added" ? "Added" : outcome === "moved" ? "Moved" : "Kept";
+        console.log(`${verb} ${id}${outcome === "moved" ? " to the front" : ""} in ${t.path}.`);
+        for (const line of foldedLine(folded))
+          console.log(line);
+        console.log(orderLine((0, executor_order_1.executorOrder)(doc)));
+        console.log(`Restart \`${brand.product.cliBinary} run\` for it to take effect.`);
+      });
+      return add;
+    }
+    function buildRemoveCommand(brand) {
+      const remove = new commander_1.Command("remove").description(`Remove from this ${brand.product.title}'s setup`);
+      remove.command("executor <id>").description(`Stop this ${brand.product.title} running jobs on an executor`).option("--config <path>", "Path to the runtime YAML to edit").option("-p, --profile <name>", 'Config profile to edit (default "default")').action((id, options) => {
+        const t = target(brand, options);
+        const doc = (0, yaml_1.parseDocument)((0, fs_1.readFileSync)(t.path, "utf8"));
+        const folded = (0, executor_order_1.foldPoolExecutors)(doc);
+        const outcome = (0, executor_order_1.removeExecutor)(doc, id);
+        if (outcome === "last") {
+          console.error(`${id} is the only executor set up, so it stays: with none, nothing could run.`);
+          console.error(`Add another first with \`${brand.product.cliBinary} add executor <id>\`.`);
+          process.exit(1);
+        }
+        if (outcome === "absent" && folded === null) {
+          console.log(`${id} is not set up. ${orderLine((0, executor_order_1.executorOrder)(doc))}`);
+          return;
+        }
+        (0, fs_1.writeFileSync)(t.path, doc.toString());
+        if (outcome === "removed")
+          console.log(`Removed ${id} from ${t.path}.`);
+        for (const line of foldedLine(folded))
+          console.log(line);
+        console.log(orderLine((0, executor_order_1.executorOrder)(doc)));
+        console.log(`Restart \`${brand.product.cliBinary} run\` for it to take effect.`);
+      });
+      return remove;
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/cli.js
 var require_cli = __commonJS({
   "../../packages/shuttle/dist/cli.js"(exports2) {
@@ -28371,6 +28799,7 @@ var require_cli = __commonJS({
     var caps_1 = require_caps();
     var list_1 = require_list();
     var revoke_1 = require_revoke();
+    var executors_1 = require_executors();
     function createCli2(brand) {
       const program = new commander_1.Command();
       program.name(brand.product.cliBinary).description(brand.product.description).version(brand.product.version);
@@ -28382,6 +28811,8 @@ var require_cli = __commonJS({
       program.addCommand((0, caps_1.buildCapsCommand)(brand));
       program.addCommand((0, list_1.buildListCommand)(brand));
       program.addCommand((0, revoke_1.buildRevokeCommand)(brand));
+      program.addCommand((0, executors_1.buildAddCommand)(brand));
+      program.addCommand((0, executors_1.buildRemoveCommand)(brand));
       return program;
     }
   }
@@ -28392,8 +28823,8 @@ var require_dist5 = __commonJS({
   "../../packages/shuttle/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.DEFAULT_DAILY_PERIOD = exports2.SUBSTRATE_BRAND = exports2.verificationJson = exports2.resolveEnvironment = exports2.renderVerificationLine = exports2.renderEnvironmentReport = exports2.isWorthReporting = exports2.hostOf = exports2.executorDefaultsFor = exports2.environmentReportJson = exports2.environmentPolledBy = exports2.applyEnvironment = exports2.renderTemplate = exports2.expandHome = exports2.resolvePaths = exports2.SpendStore = exports2.AuditLogStore = exports2.createSpendTrackerObserver = exports2.createAuditLogObserver = exports2.createLoggerObserver = exports2.SpendCapExceeded = exports2.ObserverChain = exports2.createCustomScriptExecutor = exports2.createWebhookExecutor = exports2.createHttpApiExecutor = exports2.createCopilotExecutor = exports2.createCodexExecutor = exports2.createClaudeCodeExecutor = exports2.ExecutorEnvironmentError = exports2.ExecutorRegistry = exports2.AgentCredentialRevokedError = exports2.runPreflight = exports2.renderLines = exports2.renderJson = exports2.printReport = exports2.hasFailure = exports2.createProbes = exports2.checksFor = exports2.PREFLIGHT_FLOORS = exports2.PREFLIGHT_EXIT_CODE = exports2.CHECKS = exports2.readResponseLatestVersion = exports2.checkResponseMinVersion = exports2.compareSemver = exports2.UpgradeRequiredError = exports2.LATEST_VERSION_HEADER = exports2.MIN_VERSION_HEADER = exports2.loadConfig = exports2.Shuttle = exports2.createCli = void 0;
-    exports2.revokePairing = exports2.listPairings = exports2.PairingConfigStore = exports2.pair = exports2.scaffoldedConfigPath = exports2.planScaffold = exports2.DEFAULT_REFUSAL_MESSAGE = exports2.DEFAULT_MONTHLY_PERIOD = void 0;
+    exports2.verificationJson = exports2.resolveEnvironment = exports2.renderVerificationLine = exports2.renderEnvironmentReport = exports2.isWorthReporting = exports2.hostOf = exports2.executorDefaultsFor = exports2.environmentReportJson = exports2.environmentPolledBy = exports2.applyEnvironment = exports2.renderTemplate = exports2.expandHome = exports2.resolvePaths = exports2.SpendStore = exports2.AuditLogStore = exports2.createSpendTrackerObserver = exports2.createAuditLogObserver = exports2.createLoggerObserver = exports2.SpendCapExceeded = exports2.ObserverChain = exports2.createCustomScriptExecutor = exports2.createWebhookExecutor = exports2.createHttpApiExecutor = exports2.createCopilotExecutor = exports2.createCodexExecutor = exports2.createClaudeCodeExecutor = exports2.MODEL_UNAVAILABLE = exports2.ExecutorModelUnavailableError = exports2.ExecutorEnvironmentError = exports2.ExecutorRegistry = exports2.AgentCredentialRevokedError = exports2.runPreflight = exports2.renderLines = exports2.renderJson = exports2.printReport = exports2.hasFailure = exports2.createProbes = exports2.checksFor = exports2.PREFLIGHT_FLOORS = exports2.PREFLIGHT_EXIT_CODE = exports2.CHECKS = exports2.readResponseLatestVersion = exports2.checkResponseMinVersion = exports2.compareSemver = exports2.UpgradeRequiredError = exports2.LATEST_VERSION_HEADER = exports2.MIN_VERSION_HEADER = exports2.loadConfig = exports2.Shuttle = exports2.createCli = void 0;
+    exports2.revokePairing = exports2.listPairings = exports2.PairingConfigStore = exports2.pair = exports2.scaffoldedConfigPath = exports2.planScaffold = exports2.DEFAULT_REFUSAL_MESSAGE = exports2.DEFAULT_MONTHLY_PERIOD = exports2.DEFAULT_DAILY_PERIOD = exports2.SUBSTRATE_BRAND = void 0;
     var cli_1 = require_cli();
     Object.defineProperty(exports2, "createCli", { enumerable: true, get: function() {
       return cli_1.createCli;
@@ -28468,6 +28899,12 @@ var require_dist5 = __commonJS({
     Object.defineProperty(exports2, "ExecutorEnvironmentError", { enumerable: true, get: function() {
       return types_1.ExecutorEnvironmentError;
     } });
+    Object.defineProperty(exports2, "ExecutorModelUnavailableError", { enumerable: true, get: function() {
+      return types_1.ExecutorModelUnavailableError;
+    } });
+    Object.defineProperty(exports2, "MODEL_UNAVAILABLE", { enumerable: true, get: function() {
+      return types_1.MODEL_UNAVAILABLE;
+    } });
     var claude_code_1 = require_claude_code();
     Object.defineProperty(exports2, "createClaudeCodeExecutor", { enumerable: true, get: function() {
       return claude_code_1.createClaudeCodeExecutor;
@@ -28606,7 +29043,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.33.3" : pkg.version;
+var buildVersion = true ? "0.34.0" : pkg.version;
 var AGENT_EXECUTORS = ["claude-code", "codex", "copilot"];
 var sifterBrand = {
   product: {
@@ -28635,6 +29072,8 @@ var sifterBrand = {
   // sifter.yaml names one. The init pre-flight reads it too, to check git and
   // claude before the pairing code is spent.
   defaultExecutor: "claude-code",
+  // The block a fresh executor gets, from `init` and from `add executor`.
+  executorBlock: buildExecutorBlock,
   // Floors the pre-flight enforces on the binaries the claude-code executor
   // spawns. Both are deliberately conservative — below the floor FAILS, so a
   // number chosen for tidiness rather than necessity would refuse a working
@@ -28778,7 +29217,8 @@ var sifterBrand = {
         const executorBlock = plan.keptBlock !== void 0 ? {
           ...plan.keptBlock,
           ...AGENT_EXECUTORS.includes(executor) && ctx.setupOptions.tmpDir ? { tmpDir: ctx.setupOptions.tmpDir } : {}
-        } : await buildExecutorBlock(executor, ctx);
+        } : buildExecutorBlock(executor, { ...ctx.setupOptions.tmpDir ? { tmpDir: ctx.setupOptions.tmpDir } : {} });
+        const { [executor]: _replaced, ...otherExecutors } = existingExecutors;
         const doc = {
           auth: {
             jobsApiUrl: pairing.jobsApiUrl
@@ -28789,12 +29229,11 @@ var sifterBrand = {
           },
           pools: pairing.jobPools.map((p) => ({
             id: p.id,
-            name: p.name,
-            executor
+            name: p.name
           })),
           executors: {
-            ...existingExecutors,
-            [executor]: executorBlock
+            [executor]: executorBlock,
+            ...otherExecutors
           }
         };
         const pollIntervalMs = ctx.setupOptions.pollIntervalMs ?? existing.polling?.intervalMs;
@@ -28813,14 +29252,14 @@ var sifterBrand = {
 function overlayOrigin(origin) {
   return Object.fromEntries(AGENT_EXECUTORS.map((e) => [e, { overlayAllowedHosts: [origin] }]));
 }
-async function buildExecutorBlock(executor, ctx) {
+function buildExecutorBlock(executor, options) {
   switch (executor) {
     case "claude-code":
     case "codex":
     case "copilot": {
       return {
         type: executor,
-        ...ctx.setupOptions.tmpDir ? { tmpDir: ctx.setupOptions.tmpDir } : {}
+        ...options.tmpDir ? { tmpDir: options.tmpDir } : {}
       };
     }
     case "anthropic-api": {