@cat-factory/server 0.315.2 → 0.317.0

package/dist/agents/ContainerEnvironmentProbeAgent.js

@@ -0,0 +1,414 @@
+import { failureKindFromHarnessCause, getErrorMessage } from '@cat-factory/kernel';
+import { environmentProbeSystemPrompt, environmentProbeUserPrompt, ENVIRONMENT_PROBE_SHAPE_HINT, } from '@cat-factory/agents';
+import { environmentProbeAgentKind, isEnvironmentProbeReportPayload } from '@cat-factory/contracts';
+import { ContainerJobAccounting, } from './containerJobAccounting.js';
+import { providerOf } from './containerJobAddressing.js';
+import { resolveTestCredentials } from './testCredentials.js';
+import { githubRepoOrigin } from './containerAgentBody.js';
+import { RunnerJobClient } from './RunnerJobClient.js';
+import { logger } from '../observability/logger.js';
+// ---------------------------------------------------------------------------
+// The AGENT DRY RUN's dispatcher: one read-only `explore` job pointed at a freshly provisioned
+// ephemeral environment, whose whole product is the structured report on `result.custom`.
+//
+// It implements the kernel {@link EnvironmentProbeAgent} port and is shaped exactly like
+// {@link import('./ContainerEnvConfigRepairer.js').ContainerEnvConfigRepairer}: mint the tokens,
+// build the harness body, dispatch through the shared {@link RunnerJobClient}, poll, reclaim. What
+// differs from that flow is only what the job IS: `mode: 'explore'` with a structured output and
+// NO push (this agent must never change the repository), against `infra: ephemeral`, which stands
+// nothing up and hands the environment's URL to the harness so a container backend can bridge it.
+//
+// Four details are load-bearing and each cost a real bug elsewhere in this codebase first:
+//
+//  - The dispatch DECLARES its environment through `RunnerDispatchOptions.environments`. That is
+//    what feeds the container's hosts entry (`--add-host` / `hostAliases`), and a transport is
+//    documented never to reach into the body for it. Omitted, the local backend cannot bridge the
+//    environment's name and every operation the prober attempts reports `unreachable`.
+//  - The IMAGE is pinned per surface, and the same value rides the `RunnerJobRef` on every poll
+//    and release. A per-run container backend puts a differently-imaged job in its own container,
+//    so a poll that forgot the variant polls a container that was never started, and a release
+//    that forgot it leaves a browser container running for its full lifetime.
+//  - The MODEL is resolved PER DISPATCH, by the same precedence a pipeline step's is (the frame's
+//    pin, else the workspace's model preset for this prober's kind, else the deployment's env
+//    routing), and with it the HARNESS and the credential that opens it. Read at wiring from the
+//    env routing instead, it is whatever that deployment defaults to: a workspace running
+//    everything on its Claude preset had its dry run dispatched at Qwen, which the LLM proxy then
+//    refused for having no key, and the prober's subscription was never asked for at all.
+//  - The TEST SECRETS are resolved ONCE here: the values go on the body's dedicated `testSecrets`
+//    field (the harness turns them into the agent process's environment) and the key +
+//    description pairs of that SAME list are what the prompt advertises. One resolution, so the
+//    prompt cannot name a variable the container does not carry, and the three states that
+//    resolution can END in are stated to the prober rather than collapsed into an empty list.
+//  - What the dispatch RESOLVED rides back on the handle and is persisted by the caller, and what
+//    the job SPENT is filed through the same `ContainerJobAccounting` a pipeline step's is. A
+//    subscription-routed dry run talks straight to the vendor, so the LLM proxy meters none of it:
+//    with no accounting here its whole burn was absent from `llm_call_metrics`, from the leased
+//    token's usage-aware rotation, and from the modeled quota cycle. Free and invisible, on the one
+//    flow whose own admission gate is a budget.
+// ---------------------------------------------------------------------------
+/**
+ * The `provider:model` label a dispatch is recorded under, spelled the same way the step path
+ * spells it (`ContainerAgentExecutor`'s `buildJobBody`), so one reader can parse either.
+ */
+function modelLabel(ref) {
+    return `${ref.provider}:${ref.model}`;
+}
+/** Which executor image each surface needs. */
+const IMAGE_BY_SURFACE = {
+    // The plain harness image: `curl` and the repo's own runtime are all an HTTP prober needs.
+    api: undefined,
+    // The heavier UI image, which bundles Playwright and a browser. A browser prober on the plain
+    // image discovers it has no browser only after the container is up and the model has started
+    // reasoning, and reports it as `tooling_missing`: a spent dispatch that says nothing about the
+    // environment.
+    ui: 'ui',
+};
+export class ContainerEnvironmentProbeAgent {
+    deps;
+    jobs;
+    accounting;
+    constructor(deps) {
+        this.deps = deps;
+        this.jobs = new RunnerJobClient(deps.resolveTransport);
+        this.accounting = new ContainerJobAccounting(deps.accounting ?? {});
+    }
+    /**
+     * Whether the workspace's resolved runner backend can serve this surface's executor image.
+     *
+     * The backend is asked because it is the only thing that knows: a Worker binds container
+     * classes, a local transport pins image tags, and a self-hosted pool resolves images on its own
+     * side and cannot answer at all. That last case answers TRUE (see the port): an unknown is not a
+     * refusal, and a deployment whose pool has no UI image still fails at dispatch exactly as every
+     * other container flow does there.
+     *
+     * A transport that cannot even be RESOLVED is `false`: a dry run needs a runner, and refusing at
+     * admission is the whole point of asking here.
+     */
+    async supports(workspaceId, surface) {
+        const transport = await this.deps.resolveTransport(workspaceId).catch(() => null);
+        if (!transport)
+            return false;
+        return transport.supportsImage?.(IMAGE_BY_SURFACE[surface]) ?? true;
+    }
+    /**
+     * Whether the model this frame's dry run resolves to can actually be dispatched, run at ADMISSION
+     * over the same two steps `start` takes: resolve the model (which refuses a provider the LLM proxy
+     * cannot serve), then ask the auth resolver whether the harness that model names has a credential
+     * to open it.
+     *
+     * Asked here rather than left to the dispatch because both answers are already knowable, and
+     * neither is knowable cheaply later: reached from inside `stage.dispatch`, each one fails the run
+     * at `probing` after a throwaway branch, a full provision and a teardown, to report something the
+     * workspace's own preset said before anything was created.
+     *
+     * A resolution that THROWS is the refusal, carried verbatim: `resolveDispatchRef`'s message
+     * already names the fix (pick a Workers AI model, configure a provider key, add a local runner),
+     * and re-wording it here would hand the operator two spellings of one problem.
+     */
+    async checkDispatchable(subject) {
+        let resolved;
+        try {
+            resolved = await this.resolveModel(subject, subject.surface);
+        }
+        catch (error) {
+            return { ok: false, detail: getErrorMessage(error) };
+        }
+        const gap = await this.deps.auth.describeAuthGap({
+            harness: resolved.harness,
+            subscriptionVendor: resolved.subscriptionVendor,
+            workspaceId: subject.workspaceId,
+            ...(subject.initiatedBy ? { initiatedByUserId: subject.initiatedBy } : {}),
+        });
+        return gap ? { ok: false, detail: gap } : { ok: true, model: modelLabel(resolved.ref) };
+    }
+    async start(request) {
+        const { workspaceId, jobId, surface, repo, environment } = request;
+        const log = logger.child({
+            jobId,
+            workspaceId,
+            surface,
+            repo: `${repo.owner}/${repo.name}`,
+        });
+        const installation = await this.deps.installationRepository.getByWorkspace(workspaceId);
+        if (!installation || installation.deletedAt) {
+            throw new Error(`Workspace '${workspaceId}' is not connected to a source-control provider, so the ` +
+                'agent dry run has no repository to read.');
+        }
+        if (!environment.url) {
+            throw new Error('The environment exposed no URL, so there is nothing for an agent to drive.');
+        }
+        const agentKind = environmentProbeAgentKind(surface);
+        // The model this dispatch runs, then the credential that opens it. Both per dispatch, and in
+        // this order: the harness the model names decides which auth channel there is to resolve.
+        const { ref, harness, subscriptionVendor } = await this.resolveModel(request, surface);
+        const { auth, subscriptionTokenId } = await this.deps.auth.resolve({
+            harness,
+            ref,
+            subscriptionVendor,
+            workspaceId,
+            // The self-test run IS this flow's run, so its id is what the container's calls are metered
+            // under, and (for an individual-usage vendor) the id the initiator's credential activation
+            // was minted against by the start gate.
+            executionId: jobId,
+            agentKind,
+            ...(request.initiatedBy ? { initiatedByUserId: request.initiatedBy } : {}),
+        });
+        // ONE resolution, two consumers: the values become the container's environment variables and
+        // the keys + descriptions of the same list are what the prompt advertises. See the class note.
+        // The SAME resolution the tester step's dispatch uses: one read, two projections (the values
+        // for the container, the state for the prompt). Shared because a dry run's claim is that it
+        // predicts what a tester will be handed, which it cannot do from a different read.
+        const secrets = await resolveTestCredentials({
+            ...(this.deps.resolveTestSecrets ? { resolve: this.deps.resolveTestSecrets } : {}),
+            workspaceId,
+            blockId: request.blockId,
+            logger: log,
+        });
+        const repoIds = await this.resolveRepoScope(workspaceId, repo.owner, repo.name);
+        const ghToken = await this.deps.mintInstallationToken(installation.installationId, {
+            executionId: jobId,
+            workspaceId,
+            repoIds,
+            ...(request.initiatedBy ? { initiatedBy: request.initiatedBy } : {}),
+        });
+        const origin = (this.deps.resolveRepoOrigin ?? githubRepoOrigin)({
+            installationId: installation.installationId,
+            repoId: repoIds[0] ?? '',
+            owner: repo.owner,
+            name: repo.name,
+            baseBranch: repo.branch,
+            ...(repo.provider ? { provider: repo.provider } : {}),
+            ...(repo.serviceDirectory ? { serviceDirectory: repo.serviceDirectory } : {}),
+        });
+        const body = {
+            jobId,
+            workspaceId,
+            // A single-job flow: its run IS its one job, so the correlation id the container logs bind
+            // to is the self-test run id, exactly as bootstrap and config-repair do.
+            executionId: jobId,
+            mode: 'explore',
+            systemPrompt: environmentProbeSystemPrompt(surface),
+            userPrompt: environmentProbeUserPrompt({
+                surface,
+                service: request.service,
+                environment,
+                testSecrets: secrets.brief,
+                repo: {
+                    owner: repo.owner,
+                    name: repo.name,
+                    branch: repo.branch,
+                    ...(repo.serviceDirectory ? { serviceDirectory: repo.serviceDirectory } : {}),
+                },
+            }),
+            model: ref.model,
+            // The resolved auth channel, spread exactly as a pipeline step's body spreads it, so the
+            // harness cannot tell a dry run's dispatch from a step's by how it was authenticated.
+            ...auth,
+            ghToken,
+            repo: {
+                owner: repo.owner,
+                name: repo.name,
+                baseBranch: repo.branch,
+                cloneUrl: origin.cloneUrl,
+                provider: origin.provider,
+                ...(repo.serviceDirectory ? { serviceDirectory: repo.serviceDirectory } : {}),
+            },
+            // The THROWAWAY branch the environment was provisioned from, so the tree the prober reads
+            // is the tree that is running.
+            branch: repo.branch,
+            // `repair: true` because a dry run's whole deliverable is this JSON and a single malformed
+            // field would discard a report somebody has to act on. Deliberately NOT
+            // `failOnUnusableFinal`: the coercion is lenient by design, so a partial report is worth
+            // more than a failed stage, and a reply with nothing in it at all still reaches the caller
+            // as an `inoperable` verdict with no operations, which reads exactly as what happened.
+            output: { kind: 'structured', shapeHint: ENVIRONMENT_PROBE_SHAPE_HINT, repair: true },
+            // Stand NOTHING up: the environment is already deployed and the URL is echoed for context.
+            // The same spec a Tester gets for a provisioned service, which is what keeps the harness
+            // free of any knowledge that this flow exists.
+            infra: { kind: 'service', environment: 'ephemeral', environmentUrl: environment.url },
+            // Narrowed to `{ key, value }`, exactly as the step executor's `testSecretEnv` is: the
+            // DESCRIPTION is prompt-facing metadata, and this is the secret-bearing channel the
+            // agent-context snapshot's allow-list omits. Sending it here would put prose in a field
+            // nothing reads and the harness does not parse.
+            ...(secrets.env.length ? { testSecrets: secrets.env } : {}),
+            ...(this.deps.githubApiBase ? { githubApiBase: this.deps.githubApiBase } : {}),
+        };
+        log.info('environment dry run: dispatching container');
+        await this.jobs.dispatch(workspaceId, this.ref(jobId, surface), body, 'agent', {
+            ...(IMAGE_BY_SURFACE[surface] ? { image: IMAGE_BY_SURFACE[surface] } : {}),
+            // Declared, never read back out of the body: see the class note. `address` rides along
+            // whenever the platform proved one, because a name that resolves nowhere from inside the
+            // container is the whole reason the bridge exists.
+            environments: [
+                {
+                    url: environment.url,
+                    ...(environment.reachability?.address
+                        ? { address: environment.reachability.address }
+                        : {}),
+                },
+            ],
+        });
+        log.info('environment dry run: container accepted job');
+        return {
+            workspaceId,
+            jobId,
+            surface,
+            blockId: request.blockId,
+            initiatedBy: request.initiatedBy,
+            // What only THIS moment knows, handed back for the caller to persist: see
+            // `EnvironmentProbeDispatch`. The leased pooled token id in particular has no second source,
+            // and it is the row the settled job's tokens are attributed back to.
+            dispatch: {
+                model: modelLabel(ref),
+                ...(subscriptionTokenId ? { subscriptionTokenId } : {}),
+                ...(subscriptionVendor ? { subscriptionVendor } : {}),
+            },
+        };
+    }
+    async poll(handle) {
+        const view = await this.jobs.poll(handle.workspaceId, this.ref(handle.jobId, handle.surface));
+        // What the job has SPENT, filed on every poll and on every terminal state alike, exactly as the
+        // step path files it. See `settleAccounting` for why the failed branches below are not
+        // shortcuts past it.
+        await this.accounting.recordCalls(this.jobHandle(handle), view.callMetrics);
+        if (view.state === 'running') {
+            return view.progress ? { state: 'running', subtasks: view.progress } : { state: 'running' };
+        }
+        await this.settleAccounting(handle, view);
+        if (view.state === 'failed') {
+            return {
+                state: 'failed',
+                // The transport's structured eviction verdict first, then the harness's own cause. Both
+                // eviction kinds collapse to `evicted`: a dry run has no recovery budget to split them
+                // with (only the run driver's `recoverContainerEviction` does), so the distinction would
+                // be recorded and never acted on.
+                failureKind: view.evicted
+                    ? 'evicted'
+                    : (failureKindFromHarnessCause(view.failureCause) ?? 'agent'),
+                error: view.error ?? 'The agent dry run job failed.',
+                ...(view.error ? { detail: view.error } : {}),
+            };
+        }
+        const result = view.result ?? {};
+        if (result.error) {
+            return {
+                state: 'failed',
+                failureKind: failureKindFromHarnessCause(view.failureCause) ?? 'agent',
+                error: `The agent dry run failed: ${result.error}`,
+                detail: result.error,
+            };
+        }
+        if (!isEnvironmentProbeReportPayload(result.custom)) {
+            // The job completed and returned nothing a report can be read out of: no `custom` at all, or
+            // a top-level array/string/number the harness's repair pass let through. Reported as a
+            // FAILED dry run rather than as an empty report, and the shape question is asked with the
+            // SAME predicate the coercion applies: an agent that produced nothing has established
+            // nothing about the environment, while an empty report is graded `inoperable` and rendered
+            // as a finding about the service.
+            return {
+                state: 'failed',
+                failureKind: failureKindFromHarnessCause(view.failureCause) ?? 'agent',
+                error: 'The agent dry run finished without returning a usable report, so nothing was ' +
+                    'established about the environment.',
+            };
+        }
+        // The model the container RAN, as the dispatch recorded it and the caller handed it back: never
+        // re-resolved here. A fresh poll process asking the frame and the preset again would answer
+        // about them as they are NOW, so a pin cleared while the container worked stamps the report
+        // with a model nobody ran, which is the one label an operator weighs the verdict by. Absent is
+        // a state the report already documents ("absent when the dispatch did not say"), so a handle
+        // that carries none leaves the field off rather than guessing at one.
+        return {
+            state: 'done',
+            report: result.custom,
+            ...(handle.dispatch?.model ? { model: handle.dispatch.model } : {}),
+        };
+    }
+    /**
+     * Everything a SETTLED job owes the ledger, run once the poll knows the job is terminal and
+     * BEFORE any of the failure branches return.
+     *
+     * Before them deliberately: a dry run that spent tokens and then failed (an evicted container, a
+     * reply with no JSON) is exactly the run an operator most needs the spend for, and it is the one
+     * whose numbers a `return` above this line would drop. The three writes are the step path's own,
+     * each idempotent per job id, so the durable driver's replay of a terminal poll cannot
+     * double-count.
+     *
+     * A Pi job reports none of this: the LLM proxy is its single metering point and files its rows
+     * itself, so every call here is a no-op for it and the whole method exists for the subscription
+     * harnesses, which talk to the vendor direct and are metered nowhere else.
+     */
+    async settleAccounting(handle, view) {
+        const job = this.jobHandle(handle);
+        const result = view.result ?? {};
+        await this.accounting.recordCallsOnce(job, result);
+        await this.accounting.recordPooledUsageOnce(job, result);
+        await this.accounting.recordQuotaUsageOnce(job, result);
+    }
+    /**
+     * The dry run's handle as the shared accounting reads one.
+     *
+     * A self-test is a SINGLE-JOB flow, so the run and the job are one row and `runId` is the job id
+     * (which is what makes the recorded rows join to the self-test run the SPA renders). The model,
+     * the leased token and the initiator all come off the persisted dispatch attribution rather than
+     * being re-derived, for the reason `EnvironmentProbeDispatch` states.
+     */
+    jobHandle(handle) {
+        const model = handle.dispatch?.model;
+        return {
+            jobId: handle.jobId,
+            runId: handle.jobId,
+            workspaceId: handle.workspaceId,
+            agentKind: environmentProbeAgentKind(handle.surface),
+            ...(model ? { model, provider: providerOf(model) } : {}),
+            ...(handle.dispatch?.subscriptionTokenId
+                ? { subscriptionTokenId: handle.dispatch.subscriptionTokenId }
+                : {}),
+            ...(handle.dispatch?.subscriptionVendor
+                ? { subscriptionVendor: handle.dispatch.subscriptionVendor }
+                : {}),
+            ...(handle.initiatedBy ? { initiatedByUserId: handle.initiatedBy } : {}),
+        };
+    }
+    async stop(handle) {
+        await this.jobs.release(handle.workspaceId, this.ref(handle.jobId, handle.surface));
+    }
+    /**
+     * The model + harness + vendor this surface's prober runs on, asked under the prober's OWN agent
+     * kind.
+     *
+     * Its own kind rather than the tester's, which is what {@link environmentProbeAgentKind}
+     * documents: a workspace routes its probers by editing the preset entry named after them, and
+     * the START gate resolves an individual-usage vendor for that same kind. Borrowing `tester-api`
+     * here would put the gate and the dispatch on two different questions.
+     */
+    resolveModel(subject, surface) {
+        return this.deps.resolveModel({
+            workspaceId: subject.workspaceId,
+            blockId: subject.blockId,
+            agentKind: environmentProbeAgentKind(surface),
+            ...(subject.initiatedBy ? { initiatedByUserId: subject.initiatedBy } : {}),
+        });
+    }
+    /**
+     * The job's address. The IMAGE is part of it on every call, not only the dispatch: see the
+     * class note on why a poll or release that drops it addresses the wrong container.
+     */
+    ref(jobId, surface) {
+        const image = IMAGE_BY_SURFACE[surface];
+        return { runId: jobId, jobId, ...(image ? { image } : {}) };
+    }
+    /**
+     * The repo the prober's token may reach, as the neutral id the mint's scope speaks in. An empty
+     * result is returned rather than thrown, for the reason the repairer states: a projection
+     * lagging behind a just-linked repo is a reason to widen the token and report it, not to refuse
+     * a diagnostic the developer asked for.
+     */
+    async resolveRepoScope(workspaceId, owner, repo) {
+        const projected = await this.deps.repoRepository.list(workspaceId);
+        const match = projected.find((row) => row.owner.toLowerCase() === owner.toLowerCase() &&
+            row.name.toLowerCase() === repo.toLowerCase());
+        return match ? [String(match.githubId)] : [];
+    }
+}
+//# sourceMappingURL=ContainerEnvironmentProbeAgent.js.map

package/dist/agents/ContainerEnvironmentProbeAgent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContainerEnvironmentProbeAgent.js","sourceRoot":"","sources":["../../src/agents/ContainerEnvironmentProbeAgent.ts"],"names":[],"mappings":"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"}

package/dist/agents/ModelRouter.d.ts

@@ -1,6 +1,42 @@
-import type { AgentRunContext, ModelFlavor, ModelRef, SubscriptionVendor } from '@cat-factory/kernel';
+import type { LocalModelDeclarations, ModelFlavor, ModelRef, SubscriptionVendor } from '@cat-factory/kernel';
 import type { HarnessKind } from '@cat-factory/kernel';
 import { type AgentRouting } from '@cat-factory/agents';
+/**
+ * Everything the router reads to pick a model: the agent kind, the workspace, whatever the block
+ * pins, and who started the work.
+ *
+ * A structural SUBSET of {@link import('@cat-factory/kernel').AgentRunContext}, which is what the
+ * pipeline path still passes. The point is the caller that has no run context to pass: the AGENT
+ * DRY RUN's prober is not an `ExecutionInstance`: it has a workspace, a frame and an initiator, and
+ * nothing else the run context describes. Asking it for a whole `AgentRunContext` would have it
+ * fabricate a pipeline name, a step index and a final-step flag, and a fabricated run context is a
+ * thing later code reads as one. Taking the subset instead is what lets that dispatch resolve its
+ * model through THIS precedence rather than reaching for the deployment's env routing directly,
+ * which is a model nobody's preset chose.
+ *
+ * The two OTHER single-job container flows still read the env routing at WIRING and do not come
+ * through here: the env-config repairer pins `coder`'s routed ref (and disables itself when it is
+ * not proxyable), and the repo bootstrapper pins `architect`'s. Neither has a frame to resolve
+ * against (`EnvConfigRepairRequest` and a bootstrap both name a REPOSITORY, and a bootstrap runs
+ * before the board has a service block at all), so giving them this precedence is a change to their
+ * ports, not a change here.
+ */
+export interface StepModelSelection {
+    agentKind: string;
+    /** Absent ⇒ no workspace defaults are consulted and the env routing decides. */
+    workspaceId?: string;
+    /** Whoever started the work: whose personal (individual-usage) subscription may be leased. */
+    initiatedByUserId?: string;
+    /** The route order the preset in force states; absent ⇒ the deployment's default order. */
+    providerPreference?: readonly ModelFlavor[];
+    /** The initiator's local-runner declarations, folded onto the resolved ref. */
+    localModelDeclarations?: readonly LocalModelDeclarations[];
+    /** What the block itself pins, if anything. `{}` for a caller whose subject pins nothing. */
+    block: {
+        modelId?: string;
+        modelPresetId?: string;
+    };
+}
 /** The collaborators {@link ModelRouter} needs to resolve a step's model + subscription path. */
 export interface ModelRouterDependencies {
     /** Default model routing; used when the block pins no (usable) model. */
@@ -43,7 +79,7 @@ export declare class ModelRouter {
      * workspace per-kind default > env routing). Side-effect-free and dispatch-free,
      * so it backs both the up-front `resolveModel` preview and `buildJobBody`.
      */
-    resolveRef(context: AgentRunContext): Promise<ModelRef>;
+    resolveRef(context: StepModelSelection): Promise<ModelRef>;
     /**
      * The canonical catalog model id the step resolves to (block pin > workspace
      * per-kind default), or undefined when it falls through to the env routing
@@ -62,7 +98,7 @@ export declare class ModelRouter {
      *    base. So a subscriber runs GLM on their plan while a non-subscriber on the same
      *    workspace falls back to Cloudflare GLM.
      */
-    resolveEffectiveRef(context: AgentRunContext, workspaceId: string): Promise<{
+    resolveEffectiveRef(context: StepModelSelection, workspaceId: string): Promise<{
         ref: ModelRef;
         subscriptionVendor?: SubscriptionVendor;
     }>;
@@ -78,7 +114,7 @@ export declare class ModelRouter {
      * harnesses (Claude Code / Codex) talk direct to the vendor with a pooled token, so the
      * proxyable guard does not apply to them.
      */
-    resolveDispatchRef(context: AgentRunContext, workspaceId: string): Promise<{
+    resolveDispatchRef(context: StepModelSelection, workspaceId: string): Promise<{
         ref: ModelRef;
         harness: HarnessKind;
         subscriptionVendor?: SubscriptionVendor;

package/dist/agents/ModelRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelRouter.d.ts","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,QAAQ,EACR,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,KAAK,YAAY,EAA4C,MAAM,qBAAqB,CAAA;AAEjG,iGAAiG;AACjG,MAAM,WAAW,uBAAuB;IACtC,yEAAyE;IACzE,YAAY,EAAE,YAAY,CAAA;IAC1B,2FAA2F;IAC3F,iBAAiB,EAAE,CACjB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,kBAAkB,CAAC,EAAE,SAAS,WAAW,EAAE,KACxC,QAAQ,GAAG,SAAS,CAAA;IACzB;;;OAGG;IACH,4BAA4B,CAAC,EAAE,CAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5F;;;;;;OAMG;IACH,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3F;AAED;;;;;;GAMG;AACH,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,uBAAuB,EAAI;IAE9D;;;;OAIG;IACH,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4BtD;IAED;;;;;OAKG;YACW,uBAAuB;IAcrC;;;;;;;;;;OAUG;IACG,mBAAmB,CACvB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CA2BrE;IAED;;;;;;;;;;;OAWG;IACG,kBAAkB,CACtB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,WAAW,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CAa3F;CACF"}
+{"version":3,"file":"ModelRouter.d.ts","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,WAAW,EACX,QAAQ,EACR,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,KAAK,YAAY,EAA4C,MAAM,qBAAqB,CAAA;AAEjG;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAA;IACjB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,8FAA8F;IAC9F,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,2FAA2F;IAC3F,kBAAkB,CAAC,EAAE,SAAS,WAAW,EAAE,CAAA;IAC3C,+EAA+E;IAC/E,sBAAsB,CAAC,EAAE,SAAS,sBAAsB,EAAE,CAAA;IAC1D,6FAA6F;IAC7F,KAAK,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACpD;AAED,iGAAiG;AACjG,MAAM,WAAW,uBAAuB;IACtC,yEAAyE;IACzE,YAAY,EAAE,YAAY,CAAA;IAC1B,2FAA2F;IAC3F,iBAAiB,EAAE,CACjB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,kBAAkB,CAAC,EAAE,SAAS,WAAW,EAAE,KACxC,QAAQ,GAAG,SAAS,CAAA;IACzB;;;OAGG;IACH,4BAA4B,CAAC,EAAE,CAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5F;;;;;;OAMG;IACH,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3F;AAED;;;;;;GAMG;AACH,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,uBAAuB,EAAI;IAE9D;;;;OAIG;IACH,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4BzD;IAED;;;;;OAKG;YACW,uBAAuB;IAcrC;;;;;;;;;;OAUG;IACG,mBAAmB,CACvB,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CA2BrE;IAED;;;;;;;;;;;OAWG;IACG,kBAAkB,CACtB,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,WAAW,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CAa3F;CACF"}

package/dist/agents/ModelRouter.js

@@ -110,7 +110,7 @@ export class ModelRouter {
         const { ref, subscriptionVendor } = await this.resolveEffectiveRef(context, workspaceId);
         const harness = ref.harness ?? 'pi';
         if (harness === 'pi' && !isProxyableProvider(ref.provider)) {
-            throw new Error(`Container implementation needs a model the LLM proxy can serve ` +
+            throw new Error(`A container dispatch needs a model the LLM proxy can serve ` +
                 `(Workers AI, a direct OpenAI-compatible provider, or a local runner); ` +
                 `'${ref.provider}' is not supported. Pick a Workers AI model, configure a ` +
                 `provider key (QWEN_API_KEY / DEEPSEEK_API_KEY / MOONSHOT_API_KEY), or add a local ` +

package/dist/agents/ModelRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelRouter.js","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModelRouter.js","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"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"}

package/dist/agents/containerJobAccounting.d.ts

@@ -104,9 +104,16 @@ export declare class ContainerJobAccounting {
     /**
      * Fold the SAME subscription usage into the modeled quota-cycle counters (Part B), for
      * BOTH pooled and personal runs. A subscription run is the one reporting per-call
-     * metrics (Pi is proxy-metered and has none), and the handle's provider is the vendor
-     * slug. Scope = the leased pool token when present, else the run initiator (personal).
-     * Best-effort, once per job id so a replayed poll can't double-count.
+     * metrics (Pi is proxy-metered and has none). Scope = the leased pool token when present,
+     * else the run initiator (personal). Best-effort, once per job id so a replayed poll can't
+     * double-count.
+     *
+     * Keyed on the VENDOR the dispatch resolved, and only then on the provider parsed off the
+     * model. The two differ for four of the five vendors (`claude`⇄`anthropic`, `codex`⇄`openai`,
+     * `glm`⇄`zai`, `kimi`⇄`moonshot`), so a fold that took the provider alone matched DeepSeek and
+     * silently counted nothing for the rest: a quota cycle that reported zero for the vendors the
+     * feature exists to track. The provider stays as the fallback, so a handle minted before the
+     * dispatch carried a vendor still folds exactly as it used to.
      */
     recordQuotaUsageOnce(handle: AgentJobHandle, result: RunnerJobResult): Promise<void>;
 }

package/dist/agents/containerJobAccounting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"containerJobAccounting.d.ts","sourceRoot":"","sources":["../../src/agents/containerJobAccounting.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AAoBzE,wFAAwF;AACxF,MAAM,WAAW,0BAA0B;IACzC,0FAA0F;IAC1F,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,uEAAuE;IACvE,uBAAuB,CAAC,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,mFAAmF;IACnF,4BAA4B,CAAC,EAAE,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,qBAAa,sBAAsB;IA4CrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IA3CjC;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAoB;IAE3D;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAiC;IAElE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD,YAA6B,IAAI,EAAE,0BAA0B,EAAI;IAEjE;;;;;;;;;;;;;;OAcG;IACG,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB/F;IAED;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;;;;;;;;;;OAWG;IACG,eAAe,CACnB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAA;KAAE,GAC5C,OAAO,CAAC,IAAI,CAAC,CAYf;IAED;;;;;OAKG;IACG,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB1F;IAED;;;;;;OAMG;IACG,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzF;CACF"}
+{"version":3,"file":"containerJobAccounting.d.ts","sourceRoot":"","sources":["../../src/agents/containerJobAccounting.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAA;AAoBzE,wFAAwF;AACxF,MAAM,WAAW,0BAA0B;IACzC,0FAA0F;IAC1F,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtE,uEAAuE;IACvE,uBAAuB,CAAC,EAAE,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,mFAAmF;IACnF,4BAA4B,CAAC,EAAE,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,KACjD,OAAO,CAAC,IAAI,CAAC,CAAA;CACnB;AAED,qBAAa,sBAAsB;IA4CrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IA3CjC;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAoB;IAE3D;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAiC;IAElE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD,YAA6B,IAAI,EAAE,0BAA0B,EAAI;IAEjE;;;;;;;;;;;;;;OAcG;IACG,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB/F;IAED;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;;;;;;;;;;OAWG;IACG,eAAe,CACnB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAA;KAAE,GAC5C,OAAO,CAAC,IAAI,CAAC,CAYf;IAED;;;;;OAKG;IACG,qBAAqB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmB1F;IAED;;;;;;;;;;;;;OAaG;IACG,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzF;CACF"}

package/dist/agents/containerJobAccounting.js

@@ -162,12 +162,19 @@ export class ContainerJobAccounting {
     /**
      * Fold the SAME subscription usage into the modeled quota-cycle counters (Part B), for
      * BOTH pooled and personal runs. A subscription run is the one reporting per-call
-     * metrics (Pi is proxy-metered and has none), and the handle's provider is the vendor
-     * slug. Scope = the leased pool token when present, else the run initiator (personal).
-     * Best-effort, once per job id so a replayed poll can't double-count.
+     * metrics (Pi is proxy-metered and has none). Scope = the leased pool token when present,
+     * else the run initiator (personal). Best-effort, once per job id so a replayed poll can't
+     * double-count.
+     *
+     * Keyed on the VENDOR the dispatch resolved, and only then on the provider parsed off the
+     * model. The two differ for four of the five vendors (`claude`⇄`anthropic`, `codex`⇄`openai`,
+     * `glm`⇄`zai`, `kimi`⇄`moonshot`), so a fold that took the provider alone matched DeepSeek and
+     * silently counted nothing for the rest: a quota cycle that reported zero for the vendors the
+     * feature exists to track. The provider stays as the fallback, so a handle minted before the
+     * dispatch carried a vendor still folds exactly as it used to.
      */
     async recordQuotaUsageOnce(handle, result) {
-        const quotaVendor = handle.provider ?? providerOf(handle.model);
+        const quotaVendor = handle.subscriptionVendor ?? handle.provider ?? providerOf(handle.model);
         if (result.callMetrics &&
             result.callMetrics.length > 0 &&
             result.usage &&

package/dist/agents/containerJobAccounting.js.map

@@ -1 +1 @@
-{"version":3,"file":"containerJobAccounting.js","sourceRoot":"","sources":["../../src/agents/containerJobAccounting.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"containerJobAccounting.js","sourceRoot":"","sources":["../../src/agents/containerJobAccounting.ts"],"names":[],"mappings":"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"}