@cat-factory/worker 0.192.0 → 0.194.1

package/dist/infrastructure/containers/CloudflareContainerTransport.js

@@ -1,4 +1,4 @@
-import { composePostMortem, CONTAINER_EVICTION_ERROR, HARNESS_SHUTDOWN_ERROR, harnessDispatchError, readRunnerDispatchAck, } from '@cat-factory/kernel';
+import { composePostMortem, CONTAINER_EVICTION_ERROR, HARNESS_SHUTDOWN_ERROR, harnessDispatchError, readRunnerDispatchAck, containerKeyForRef, } from '@cat-factory/kernel';
 import { describeContainerExit, isRolloutSignal, } from './stopCause';
 // The human-readable message for a failed poll the transport maps to a container eviction. The
 // eviction verdict the engine acts on rides the STRUCTURED `RunnerJobView.evicted` field
@@ -98,19 +98,29 @@ const STOP_TIMEOUT_MS = 30_000;
 // (matches the harness server + the local Docker transport). Sent on every harness
 // call so a container that requires the secret accepts the Worker's dispatch/poll.
 const HARNESS_SECRET_HEADER = 'x-harness-secret';
+/**
+ * The resolver a transport DEDICATED to one container class is built with: the deploy adapter's,
+ * and every test that drives the transport over a single fake namespace. It ignores the variant
+ * because such a transport is chosen by its caller, not by the job.
+ *
+ * It lives beside the transport rather than beside the resolver TYPE because constructing one is
+ * its only purpose.
+ */
+export function fixedContainerNamespace(namespace) {
+    return () => namespace;
+}
 export class CloudflareContainerTransport {
-    namespace;
+    resolveNamespace;
     registry;
     sharedSecret;
     /** Backend id recorded in run diagnostics (per-run Cloudflare Container). */
     backend = 'cloudflare-container';
     constructor(
-    // Either per-run container class: `ExecutionContainer` (the agent harness, bound as
-    // `EXEC_CONTAINER`) or `DeployContainer` (the deploy harness, bound as `DEPLOY_CONTAINER`).
-    // Both expose the same `/jobs` HTTP contract on 8080 plus `recentStopObservation`/`shutdown`,
-    // so this transport drives either unchanged — a deploy-dedicated instance simply gets the
-    // deploy namespace.
-    namespace, 
+    // Which per-run container class serves a given image variant. Every class (executor, UI
+    // tester, deploy harness) exposes the same `/jobs` HTTP contract on 8080 plus
+    // `recentStopObservation`/`shutdown`, so this transport drives any of them unchanged: a
+    // deploy-dedicated instance is simply built over a resolver pinned to that one namespace.
+    resolveNamespace, 
     /** Live-container inventory + reaper kill path; absent in tests (reaping off). */
     registry, 
     /**
@@ -121,7 +131,7 @@ export class CloudflareContainerTransport {
      * the local transport's behaviour.
      */
     sharedSecret) {
-        this.namespace = namespace;
+        this.resolveNamespace = resolveNamespace;
         this.registry = registry;
         this.sharedSecret = sharedSecret;
     }
@@ -129,17 +139,36 @@ export class CloudflareContainerTransport {
     secretHeader() {
         return this.sharedSecret ? { [HARNESS_SECRET_HEADER]: this.sharedSecret } : {};
     }
-    // NB: the `RunnerDispatchOptions` (provisioning hints) the port allows are
-    // intentionally ignored here. A Cloudflare Container's instance type is fixed per
-    // container class by the wrangler `[[containers]] instance_type` — there is no
-    // per-DO/per-request sizing API — so a resolved instance-type id is meaningless on
-    // this backend. Per-service sizing applies only to the backends that can honour it
-    // (the self-hosted pool and the local Docker transport).
+    /**
+     * The Durable Object id addressing this job's container: the class that serves the ref's image
+     * variant, named by `containerKeyForRef`.
+     *
+     * Both halves of that come off the REF, which is why the variant rides there rather than only
+     * on the dispatch options: `poll`, `release` and `stopJob` get no options, and a run whose
+     * `tester-ui` step sits in its own container would otherwise be polled at the container its
+     * coder step is running in, reading as an evicted job while the browser one worked on.
+     */
+    stubFor(ref) {
+        const namespace = this.resolveNamespace(ref.image ?? 'default');
+        const id = namespace.idFromName(containerKeyForRef(ref));
+        return { id, stub: namespace.get(id) };
+    }
+    // NB: the SIZING hints in `RunnerDispatchOptions` are intentionally ignored here. A
+    // Cloudflare Container's instance type is fixed per container class by the wrangler
+    // `[[containers]] instance_type`, with no per-DO/per-request sizing API, so a resolved
+    // instance-type id is meaningless on this backend. Per-service sizing applies only to the
+    // backends that can honour it (the self-hosted pool and the local Docker transport).
+    //
+    // The `image` hint is NOT in that group: it selects the container class, which this backend
+    // does honour. It is read off the REF rather than the options, so `poll`/`release`/`stopJob`
+    // (which get no options) address the same container the dispatch started.
     async dispatch(ref, spec, kind = 'agent') {
-        // The container is per-RUN (one Durable Object per run id), so every step of a run
-        // dispatches to the same instance; the harness keys the job by `ref.jobId` (in the
-        // spec body), unique per step, so siblings never collide in its registries.
-        const stub = this.namespace.get(this.namespace.idFromName(ref.runId));
+        // The container is per-RUN AND per image variant, so every step of a run on the same image
+        // dispatches to the same instance; the harness keys the job by `ref.jobId` (in the spec
+        // body), unique per step, so siblings never collide in its registries. A step declaring a
+        // different image gets its own container, which is why the inventory key below is the
+        // variant-qualified one rather than the bare run id.
+        const { stub } = this.stubFor(ref);
         // One harness endpoint for every kind: POST /jobs with the kind in the body. The
         // harness reads `kind` to pick the validator + registry; the rest is the job spec.
         const res = await stub.fetch('http://container/jobs', {
@@ -162,7 +191,7 @@ export class CloudflareContainerTransport {
         // the reaper can find it if its run record ever diverges from reality. Idempotent
         // across a run's steps — the store preserves the earliest startedAt for a key.
         // Best-effort — the registry swallows store errors.
-        await this.registry?.register(ref.runId, kind);
+        await this.registry?.register({ containerKey: containerKeyForRef(ref), kind, image: ref.image });
         // The harness's capability handshake rides the acceptance body. Read AFTER the registry
         // write so a malformed/absent body can never cost the reaper its record of a live container.
         return readRunnerDispatchAck(await safeJson(res));
@@ -191,8 +220,7 @@ export class CloudflareContainerTransport {
         // the closest thing to a stable "container id" to surface in the run's details (a
         // Cloudflare Container has no public URL). Derived here so the executor can show WHICH
         // container the run is on. Cheap (no extra round-trip): `idFromName` is local.
-        const doId = this.namespace.idFromName(ref.runId);
-        const stub = this.namespace.get(doId);
+        const { id: doId, stub } = this.stubFor(ref);
         let res;
         try {
             res = await stub.fetch(`http://container/jobs/${encodeURIComponent(ref.jobId)}`, {
@@ -241,10 +269,10 @@ export class CloudflareContainerTransport {
         // single step within it, so the whole run's container goes regardless).
         if (this.registry) {
             // The registry owns the single kill path (shutdown + inventory removal).
-            await this.registry.release(ref.runId);
+            await this.registry.release(containerKeyForRef(ref), ref.image);
             return;
         }
-        const stub = this.namespace.get(this.namespace.idFromName(ref.runId));
+        const { stub } = this.stubFor(ref);
         await stub.shutdown();
     }
     /**
@@ -259,7 +287,7 @@ export class CloudflareContainerTransport {
      * telling them to go and look.
      */
     async stopJob(ref) {
-        const stub = this.namespace.get(this.namespace.idFromName(ref.runId));
+        const { stub } = this.stubFor(ref);
         try {
             const res = await stub.fetch(`http://container/jobs/${encodeURIComponent(ref.jobId)}`, {
                 method: 'DELETE',

package/dist/infrastructure/containers/CloudflareContainerTransport.js.map

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

package/dist/infrastructure/containers/ContainerInstanceRegistry.d.ts

@@ -1,14 +1,21 @@
-import type { Clock } from '@cat-factory/kernel';
-import type { DurableObjectNamespace } from '@cloudflare/workers-types';
-import type { ExecutionContainer } from './ExecutionContainer';
+import type { Clock, RunnerImageVariant } from '@cat-factory/kernel';
+import type { ResolveRunContainerNamespace } from './runContainerNamespace';
 /** One live per-run container, as the registry records it. */
 export interface LiveContainerRecord {
-    /** The idFromName() argument: the execution/bootstrap job id (also the run id). */
+    /** The idFromName() argument (kernel's `containerKeyForRef`): the run id, variant-qualified. */
     containerKey: string;
     /** The dispatch kind ('run' | 'blueprint' | 'bootstrap'); diagnostic only. */
     kind: string;
     /** Owning workspace, when known (the transport seam carries only the job id). */
     workspaceId?: string;
+    /**
+     * The executor image variant, which is WHICH CONTAINER CLASS holds this instance. Not
+     * diagnostic: the reaper kills through a Durable Object namespace, and the key alone cannot
+     * say which one, so a leaked UI-tester container would be looked up in the executor namespace,
+     * where `idFromName` happily returns a stub for a container that never existed and the kill
+     * reads as a success. Absent ⇒ the default executor class.
+     */
+    image?: RunnerImageVariant;
     /** Epoch ms of the FIRST dispatch = the container's true age. */
     startedAt: number;
 }
@@ -30,16 +37,24 @@ export interface LiveContainerStore {
  * reaper alike, so the two can never diverge.
  */
 export declare class ContainerInstanceRegistry {
-    private readonly namespace;
+    /** Resolves the container class an image variant lives in, shared with the transport. */
+    private readonly resolveNamespace;
     private readonly store;
     private readonly clock;
-    constructor(namespace: DurableObjectNamespace<ExecutionContainer>, store: LiveContainerStore, clock: Clock);
+    constructor(
+    /** Resolves the container class an image variant lives in, shared with the transport. */
+    resolveNamespace: ResolveRunContainerNamespace, store: LiveContainerStore, clock: Clock);
     /**
      * Record a freshly-dispatched container in the inventory. Best-effort: a write
      * failure must never break the dispatch it is bookkeeping for, and the earliest
      * `startedAt` is preserved across replayed dispatches (so age stays truthful).
      */
-    register(containerKey: string, kind: string, workspaceId?: string): Promise<void>;
+    register(record: {
+        containerKey: string;
+        kind: string;
+        workspaceId?: string;
+        image?: RunnerImageVariant;
+    }): Promise<void>;
     /**
      * Reclaim a container now and drop its inventory row — the single kill path.
      * Idempotent: `ExecutionContainer.shutdown` swallows "already gone", so this is a
@@ -47,16 +62,18 @@ export declare class ContainerInstanceRegistry {
      * SIGKILL resolves, so a (rare) transport-level failure leaves the row for the
      * reaper to retry rather than silently dropping a still-live container.
      */
-    release(containerKey: string): Promise<void>;
+    release(containerKey: string, image?: RunnerImageVariant): Promise<void>;
     /**
      * The load-bearing backstop: kill every container whose first dispatch is older
      * than `epochMs` (its legitimate maximum lifetime has elapsed). With normal runs
      * self-reclaiming on their terminal path, a reaped container is a genuine LEAK, so
      * each kill is logged loudly. One wedged container never aborts the sweep — each
-     * release is isolated. Returns how many were actually reaped.
+     * release is isolated. Returns how many were actually reaped, and how many the sweep
+     * could not even address (see below).
      */
     reapStaleBefore(epochMs: number): Promise<{
         reaped: number;
+        unreachable: number;
     }>;
 }
 //# sourceMappingURL=ContainerInstanceRegistry.d.ts.map

package/dist/infrastructure/containers/ContainerInstanceRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContainerInstanceRegistry.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/containers/ContainerInstanceRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAW9D,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC,mFAAmF;IACnF,YAAY,EAAE,MAAM,CAAA;IACpB,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAA;IACZ,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3C,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAA;CACnE;AAED;;;;;;GAMG;AACH,qBAAa,yBAAyB;IAElC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHxB,YACmB,SAAS,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,EACrD,KAAK,EAAE,kBAAkB,EACzB,KAAK,EAAE,KAAK,EAC3B;IAEJ;;;;OAIG;IACG,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUtF;IAED;;;;;;OAMG;IACG,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGjD;IAED;;;;;;OAMG;IACG,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAsBlE;CACF"}
+{"version":3,"file":"ContainerInstanceRegistry.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/containers/ContainerInstanceRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAA;AAW3E,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC,gGAAgG;IAChG,YAAY,EAAE,MAAM,CAAA;IACpB,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAA;IACZ,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,kBAAkB,CAAA;IAC1B,iEAAiE;IACjE,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/C,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3C,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAA;CACnE;AAED;;;;;;GAMG;AACH,qBAAa,yBAAyB;IAElC,yFAAyF;IACzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB;IACE,yFAAyF;IACxE,gBAAgB,EAAE,4BAA4B,EAC9C,KAAK,EAAE,kBAAkB,EACzB,KAAK,EAAE,KAAK,EAC3B;IAEJ;;;;OAIG;IACG,QAAQ,CAAC,MAAM,EAAE;QACrB,YAAY,EAAE,MAAM,CAAA;QACpB,IAAI,EAAE,MAAM,CAAA;QACZ,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,KAAK,CAAC,EAAE,kBAAkB,CAAA;KAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhB;IAED;;;;;;OAMG;IACG,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7E;IAED;;;;;;;OAOG;IACG,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CA4CvF;CACF"}

package/dist/infrastructure/containers/ContainerInstanceRegistry.js

@@ -1,4 +1,4 @@
-import { getErrorMessage } from '@cat-factory/kernel';
+import { getErrorMessage, getErrorReason, RUNNER_IMAGE_UNWIRED_REASON } from '@cat-factory/kernel';
 import { logger } from '../observability/logger';
 /**
  * Owns the per-run container namespace + the live-container inventory. It is the
@@ -8,11 +8,13 @@ import { logger } from '../observability/logger';
  * reaper alike, so the two can never diverge.
  */
 export class ContainerInstanceRegistry {
-    namespace;
+    resolveNamespace;
     store;
     clock;
-    constructor(namespace, store, clock) {
-        this.namespace = namespace;
+    constructor(
+    /** Resolves the container class an image variant lives in, shared with the transport. */
+    resolveNamespace, store, clock) {
+        this.resolveNamespace = resolveNamespace;
         this.store = store;
         this.clock = clock;
     }
@@ -21,14 +23,15 @@ export class ContainerInstanceRegistry {
      * failure must never break the dispatch it is bookkeeping for, and the earliest
      * `startedAt` is preserved across replayed dispatches (so age stays truthful).
      */
-    async register(containerKey, kind, workspaceId) {
+    async register(record) {
         try {
-            await this.store.add({ containerKey, kind, workspaceId, startedAt: this.clock.now() });
+            await this.store.add({ ...record, startedAt: this.clock.now() });
         }
         catch (error) {
             logger.warn('container-registry: failed to record live container (continuing)', {
-                containerKey,
-                kind,
+                containerKey: record.containerKey,
+                kind: record.kind,
+                image: record.image,
                 err: getErrorMessage(error),
             });
         }
@@ -40,8 +43,9 @@ export class ContainerInstanceRegistry {
      * SIGKILL resolves, so a (rare) transport-level failure leaves the row for the
      * reaper to retry rather than silently dropping a still-live container.
      */
-    async release(containerKey) {
-        await this.namespace.get(this.namespace.idFromName(containerKey)).shutdown();
+    async release(containerKey, image) {
+        const namespace = this.resolveNamespace(image ?? 'default');
+        await namespace.get(namespace.idFromName(containerKey)).shutdown();
         await this.store.remove(containerKey);
     }
     /**
@@ -49,23 +53,43 @@ export class ContainerInstanceRegistry {
      * than `epochMs` (its legitimate maximum lifetime has elapsed). With normal runs
      * self-reclaiming on their terminal path, a reaped container is a genuine LEAK, so
      * each kill is logged loudly. One wedged container never aborts the sweep — each
-     * release is isolated. Returns how many were actually reaped.
+     * release is isolated. Returns how many were actually reaped, and how many the sweep
+     * could not even address (see below).
      */
     async reapStaleBefore(epochMs) {
         const stale = await this.store.listStartedBefore(epochMs);
         let reaped = 0;
+        let unreachable = 0;
         for (const record of stale) {
             logger.warn('container-reaper: killing leaked container past its max lifetime', {
                 containerKey: record.containerKey,
                 kind: record.kind,
+                image: record.image,
                 workspaceId: record.workspaceId,
                 ageMs: this.clock.now() - record.startedAt,
             });
             try {
-                await this.release(record.containerKey);
+                await this.release(record.containerKey, record.image);
                 reaped++;
             }
             catch (error) {
+                if (getErrorReason(error) === RUNNER_IMAGE_UNWIRED_REASON) {
+                    // The class this row's variant lives in is no longer BOUND (the binding was removed, or
+                    // the Worker rolled back past it), so there is no namespace to get a stub from and no
+                    // retry can produce one. Left in place the row re-throws on every pass for ever, which
+                    // is a permanent error rate that names nothing new and still never kills the container.
+                    // So it is dropped, and the fact the reaper cannot act on it is stated ONCE, loudly,
+                    // with the binding to restore.
+                    unreachable++;
+                    logger.error('container-reaper: cannot address a leaked container, its class is not bound', {
+                        containerKey: record.containerKey,
+                        image: record.image,
+                        workspaceId: record.workspaceId,
+                        err: getErrorMessage(error),
+                    });
+                    await this.store.remove(record.containerKey);
+                    continue;
+                }
                 // Leave the row in place so the next pass retries this one.
                 logger.error('container-reaper: failed to kill leaked container (will retry next pass)', {
                     containerKey: record.containerKey,
@@ -73,7 +97,7 @@ export class ContainerInstanceRegistry {
                 });
             }
         }
-        return { reaped };
+        return { reaped, unreachable };
     }
 }
 //# sourceMappingURL=ContainerInstanceRegistry.js.map

package/dist/infrastructure/containers/ContainerInstanceRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContainerInstanceRegistry.js","sourceRoot":"","sources":["../../../src/infrastructure/containers/ContainerInstanceRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAIrD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAiChD;;;;;;GAMG;AACH,MAAM,OAAO,yBAAyB;IAEjB,SAAS;IACT,KAAK;IACL,KAAK;IAHxB,YACmB,SAAqD,EACrD,KAAyB,EACzB,KAAY;yBAFZ,SAAS;qBACT,KAAK;qBACL,KAAK;IACrB,CAAC;IAEJ;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CAAC,YAAoB,EAAE,IAAY,EAAE,WAAoB;QACrE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QACxF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,kEAAkE,EAAE;gBAC9E,YAAY;gBACZ,IAAI;gBACJ,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC;aAC5B,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,YAAoB;QAChC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC5E,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IACvC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CAAC,OAAe;QACnC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;QACzD,IAAI,MAAM,GAAG,CAAC,CAAA;QACd,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,kEAAkE,EAAE;gBAC9E,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS;aAC3C,CAAC,CAAA;YACF,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBACvC,MAAM,EAAE,CAAA;YACV,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,4DAA4D;gBAC5D,MAAM,CAAC,KAAK,CAAC,0EAA0E,EAAE;oBACvF,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC;iBAC5B,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,CAAA;IACnB,CAAC;CACF"}
+{"version":3,"file":"ContainerInstanceRegistry.js","sourceRoot":"","sources":["../../../src/infrastructure/containers/ContainerInstanceRegistry.ts"],"names":[],"mappings":"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"}

package/dist/infrastructure/containers/UiTesterContainer.d.ts

@@ -0,0 +1,4 @@
+import { RunContainer } from './RunContainer';
+export declare class UiTesterContainer extends RunContainer {
+}
+//# sourceMappingURL=UiTesterContainer.d.ts.map

package/dist/infrastructure/containers/UiTesterContainer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UiTesterContainer.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/containers/UiTesterContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAgB7C,qBAAa,iBAAkB,SAAQ,YAAY;CAAG"}

package/dist/infrastructure/containers/UiTesterContainer.js

@@ -0,0 +1,18 @@
+import { RunContainer } from './RunContainer';
+// One UI-TESTER container per run, mirroring {@link ExecutionContainer} but pulling the heavier
+// UI image (`Dockerfile.ui`: the executor harness plus Playwright + Chromium, pnpm/yarn, the
+// `serve` static server and a headless JRE + WireMock) instead of the plain executor image. A
+// Cloudflare Container's image is pinned per container CLASS, so the `image: 'ui'` dispatch
+// variant needs its own class; this one is bound as `UI_CONTAINER`, so the browser and the JRE
+// never bloat the cold start of every coder/merger/ci-fixer run.
+//
+// It is a SECOND container for the same run rather than a replacement: a run mixes ordinary
+// agent steps with a `tester-ui` step, and a per-run container cannot change image mid-run. The
+// two are addressed by `containerKeyForRef`, which qualifies the run id with the variant.
+//
+// The UI image serves the SAME `POST /jobs` + `GET /jobs/{id}` contract on 8080 (it layers onto
+// the same harness), so the generic `CloudflareContainerTransport` drives it unchanged, and its
+// lifecycle behaviour is {@link RunContainer}'s, shared byte-for-byte with the agent one.
+export class UiTesterContainer extends RunContainer {
+}
+//# sourceMappingURL=UiTesterContainer.js.map

package/dist/infrastructure/containers/UiTesterContainer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UiTesterContainer.js","sourceRoot":"","sources":["../../../src/infrastructure/containers/UiTesterContainer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,gGAAgG;AAChG,6FAA6F;AAC7F,8FAA8F;AAC9F,4FAA4F;AAC5F,+FAA+F;AAC/F,iEAAiE;AACjE,EAAE;AACF,4FAA4F;AAC5F,gGAAgG;AAChG,0FAA0F;AAC1F,EAAE;AACF,gGAAgG;AAChG,gGAAgG;AAChG,0FAA0F;AAC1F,MAAM,OAAO,iBAAkB,SAAQ,YAAY;CAAG"}

package/dist/infrastructure/containers/deployJobDeps.d.ts

@@ -0,0 +1,20 @@
+import type { Clock } from '@cat-factory/kernel';
+import type { CoreDependencies } from '@cat-factory/orchestration';
+import type { D1Database } from '@cloudflare/workers-types';
+import type { AppConfig } from '../config';
+import type { Env } from '../env';
+/**
+ * Wire the async, container-backed Kubernetes deploy lifecycle (slice 9's
+ * `EnvironmentProvisioningService` seams) onto the Worker facade: a `deployJobClient` that
+ * dispatches/polls/releases a `deploy`-kind job on the per-run `DeployContainer` (the separate
+ * deploy-harness image — real `kubectl`/`kustomize`/`helm`), plus `resolveDeployCloneTarget` to
+ * hand the container concrete manifests-repo clone coords + a short-lived install token.
+ *
+ * Gated on the environments module, the `DEPLOY_CONTAINER` binding AND the GitHub App
+ * (the clone-target seam needs to mint install tokens + resolve a block's repo). Absent any
+ * prerequisite ⇒ `{}` — a render-needing config then fails loudly (the synchronous raw-manifest
+ * REST path is unaffected), exactly the unwired behaviour slice 9 shipped. Mirrors Node's pool
+ * deploy wiring; the deploy container is the Worker's analogue of Node's self-hosted pool.
+ */
+export declare function selectDeployDeps(env: Env, config: AppConfig, db: D1Database, clock: Clock): Partial<CoreDependencies>;
+//# sourceMappingURL=deployJobDeps.d.ts.map

package/dist/infrastructure/containers/deployJobDeps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deployJobDeps.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/containers/deployJobDeps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAQjC;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,SAAS,EACjB,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,gBAAgB,CAAC,CA4B3B"}

package/dist/infrastructure/containers/deployJobDeps.js

@@ -0,0 +1,38 @@
+import { makeResolveDeployCloneTarget, RunnerJobClient } from '@cat-factory/server';
+import { buildAppRegistry, buildResolveRepoTarget } from '../container-vcs-identity';
+import { workerDispatchTokenMint } from '../dispatchTokenMint';
+import { CloudflareContainerTransport, fixedContainerNamespace, } from './CloudflareContainerTransport';
+/**
+ * Wire the async, container-backed Kubernetes deploy lifecycle (slice 9's
+ * `EnvironmentProvisioningService` seams) onto the Worker facade: a `deployJobClient` that
+ * dispatches/polls/releases a `deploy`-kind job on the per-run `DeployContainer` (the separate
+ * deploy-harness image — real `kubectl`/`kustomize`/`helm`), plus `resolveDeployCloneTarget` to
+ * hand the container concrete manifests-repo clone coords + a short-lived install token.
+ *
+ * Gated on the environments module, the `DEPLOY_CONTAINER` binding AND the GitHub App
+ * (the clone-target seam needs to mint install tokens + resolve a block's repo). Absent any
+ * prerequisite ⇒ `{}` — a render-needing config then fails loudly (the synchronous raw-manifest
+ * REST path is unaffected), exactly the unwired behaviour slice 9 shipped. Mirrors Node's pool
+ * deploy wiring; the deploy container is the Worker's analogue of Node's self-hosted pool.
+ */
+export function selectDeployDeps(env, config, db, clock) {
+    if (!config.environments.encryptionKey ||
+        !env.DEPLOY_CONTAINER ||
+        !config.github.enabled ||
+        !env.GITHUB_APP_PRIVATE_KEY) {
+        return {};
+    }
+    // A deploy-DEDICATED transport: the deploy job's `ref.runId` addresses a `DeployContainer`
+    // instance in its own DO namespace (no collision with the agent `EXEC_CONTAINER`), and the
+    // harness keys the job by `ref.jobId`. No instance registry is wired (the `sleepAfter` idle
+    // timer + explicit `release` reclaim it), so cross-namespace reaping stays the exec
+    // container's concern. The client is deploy-only, so `poll`/`release` need no per-ref routing.
+    const deployTransport = new CloudflareContainerTransport(fixedContainerNamespace(env.DEPLOY_CONTAINER), undefined, env.HARNESS_SHARED_SECRET?.trim() || undefined);
+    const registry = buildAppRegistry(env, config, db, clock);
+    return {
+        deployJobClient: new RunnerJobClient(async () => deployTransport),
+        // Narrowed to the repo being rendered, like every other container dispatch.
+        resolveDeployCloneTarget: makeResolveDeployCloneTarget(buildResolveRepoTarget(db), workerDispatchTokenMint(registry)),
+    };
+}
+//# sourceMappingURL=deployJobDeps.js.map

package/dist/infrastructure/containers/deployJobDeps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deployJobDeps.js","sourceRoot":"","sources":["../../../src/infrastructure/containers/deployJobDeps.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAInF,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,gCAAgC,CAAA;AAEvC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,MAAiB,EACjB,EAAc,EACd,KAAY;IAEZ,IACE,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa;QAClC,CAAC,GAAG,CAAC,gBAAgB;QACrB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;QACtB,CAAC,GAAG,CAAC,sBAAsB,EAC3B,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACD,2FAA2F;IAC3F,2FAA2F;IAC3F,4FAA4F;IAC5F,oFAAoF;IACpF,+FAA+F;IAC/F,MAAM,eAAe,GAAG,IAAI,4BAA4B,CACtD,uBAAuB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAC7C,SAAS,EACT,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,SAAS,CAC/C,CAAA;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;IACzD,OAAO;QACL,eAAe,EAAE,IAAI,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC;QACjE,4EAA4E;QAC5E,wBAAwB,EAAE,4BAA4B,CACpD,sBAAsB,CAAC,EAAE,CAAC,EAC1B,uBAAuB,CAAC,QAAQ,CAAC,CAClC;KACF,CAAA;AACH,CAAC"}

package/dist/infrastructure/containers/runContainerNamespace.d.ts

@@ -0,0 +1,38 @@
+import type { RunnerImageVariant } from '@cat-factory/kernel';
+import type { DurableObjectNamespace } from '@cloudflare/workers-types';
+import type { DeployContainer } from './DeployContainer';
+import type { ExecutionContainer } from './ExecutionContainer';
+import type { UiTesterContainer } from './UiTesterContainer';
+/**
+ * Any per-run container class. The three exist only because a Cloudflare Container's image is
+ * pinned per container CLASS by the wrangler `[[containers]]` block; each serves the same
+ * `/jobs` HTTP contract and the same `RunContainer` lifecycle, so a namespace of any of them
+ * drives the same transport.
+ */
+export type RunContainerNamespace = DurableObjectNamespace<ExecutionContainer> | DurableObjectNamespace<DeployContainer> | DurableObjectNamespace<UiTesterContainer>;
+/**
+ * Picks the container class that serves an image variant. A transport built for ONE class (the
+ * deploy path) ignores the variant; the agent path routes `ui` to its own class.
+ *
+ * It THROWS for a variant this deployment has not wired, and that refusal is the point. The
+ * alternative, falling back to the default class, is what this seam exists to stop: a
+ * browser-driven tester silently lands on an image with no browser, pays for a checkout, an
+ * install and the model's first turns, then reports an `abort` a reader cannot tell apart from
+ * an app that would not boot. Refusing costs one dispatch and names the binding to add.
+ */
+export type ResolveRunContainerNamespace = (variant: RunnerImageVariant) => RunContainerNamespace;
+/**
+ * The agent path's resolver: the plain executor class for everything, the UI class for the `ui`
+ * variant (today only `tester-ui` declares it).
+ *
+ * `deploy` never reaches here. The deploy adapter builds its own dedicated transport over
+ * `DEPLOY_CONTAINER`, so a `deploy` variant arriving on the AGENT path is a wiring mistake in a
+ * kind's registration rather than a missing binding. It is refused too, and separately, because
+ * the two need different fixes: one is an operator adding a binding, the other a developer
+ * correcting a registry entry.
+ */
+export declare function agentContainerNamespace(bindings: {
+    exec: DurableObjectNamespace<ExecutionContainer>;
+    ui?: DurableObjectNamespace<UiTesterContainer>;
+}): ResolveRunContainerNamespace;
+//# sourceMappingURL=runContainerNamespace.d.ts.map

package/dist/infrastructure/containers/runContainerNamespace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runContainerNamespace.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/containers/runContainerNamespace.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE5D;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,GAC7B,sBAAsB,CAAC,kBAAkB,CAAC,GAC1C,sBAAsB,CAAC,eAAe,CAAC,GACvC,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;AAE7C;;;;;;;;;GASG;AACH,MAAM,MAAM,4BAA4B,GAAG,CAAC,OAAO,EAAE,kBAAkB,KAAK,qBAAqB,CAAA;AAEjG;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE;IAChD,IAAI,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAA;IAChD,EAAE,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAA;CAC/C,GAAG,4BAA4B,CA8B/B"}

package/dist/infrastructure/containers/runContainerNamespace.js

@@ -0,0 +1,37 @@
+import { RUNNER_IMAGE_UNWIRED_REASON, UnavailableError, unservableImageVariant, } from '@cat-factory/kernel';
+/**
+ * The agent path's resolver: the plain executor class for everything, the UI class for the `ui`
+ * variant (today only `tester-ui` declares it).
+ *
+ * `deploy` never reaches here. The deploy adapter builds its own dedicated transport over
+ * `DEPLOY_CONTAINER`, so a `deploy` variant arriving on the AGENT path is a wiring mistake in a
+ * kind's registration rather than a missing binding. It is refused too, and separately, because
+ * the two need different fixes: one is an operator adding a binding, the other a developer
+ * correcting a registry entry.
+ */
+export function agentContainerNamespace(bindings) {
+    return (variant) => {
+        if (variant === 'ui') {
+            if (bindings.ui)
+                return bindings.ui;
+            throw new UnavailableError('This step runs on the UI-tester executor image (Playwright + a browser), but this ' +
+                'deployment binds no UI-tester container class, so there is nothing to dispatch it to. ' +
+                'Add a `[[containers]]` class named UiTesterContainer pinned to the published ' +
+                'cat-factory-executor-ui image plus its UI_CONTAINER durable-object binding, then ' +
+                'redeploy. Until then, drop the `tester-ui` step from the pipeline: the ' +
+                'visual-confirmation gate still runs on screenshots a person uploads.', RUNNER_IMAGE_UNWIRED_REASON, { image: variant, binding: 'UI_CONTAINER' });
+        }
+        if (variant === 'deploy') {
+            throw new UnavailableError('An agent step declared the `deploy` executor image, which the agent runner path does ' +
+                'not serve: deploy jobs run through the environment-provisioning adapter and its own ' +
+                'DEPLOY_CONTAINER transport. Correct the agent kind’s registration.', RUNNER_IMAGE_UNWIRED_REASON, { image: variant, binding: 'DEPLOY_CONTAINER' });
+        }
+        if (variant === 'default')
+            return bindings.exec;
+        // Exhaustive, so a variant added to the union fails the BUILD here rather than routing
+        // silently to the executor class — the same fall-through the local transport's `imageFor`
+        // had, and the one this whole seam exists to refuse.
+        return unservableImageVariant(variant);
+    };
+}
+//# sourceMappingURL=runContainerNamespace.js.map

package/dist/infrastructure/containers/runContainerNamespace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runContainerNamespace.js","sourceRoot":"","sources":["../../../src/infrastructure/containers/runContainerNamespace.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AA8B5B;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAGvC;IACC,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,EAAE;gBAAE,OAAO,QAAQ,CAAC,EAAE,CAAA;YACnC,MAAM,IAAI,gBAAgB,CACxB,oFAAoF;gBAClF,wFAAwF;gBACxF,+EAA+E;gBAC/E,mFAAmF;gBACnF,yEAAyE;gBACzE,sEAAsE,EACxE,2BAA2B,EAC3B,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAC5C,CAAA;QACH,CAAC;QACD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,gBAAgB,CACxB,uFAAuF;gBACrF,sFAAsF;gBACtF,oEAAoE,EACtE,2BAA2B,EAC3B,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAChD,CAAA;QACH,CAAC;QACD,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAC,IAAI,CAAA;QAC/C,uFAAuF;QACvF,0FAA0F;QAC1F,qDAAqD;QACrD,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC,CAAA;AACH,CAAC"}

package/dist/infrastructure/dispatchTokenMint.d.ts

@@ -0,0 +1,17 @@
+import { type GitHubAppRegistry, type MintInstallationToken } from '@cat-factory/server';
+/**
+ * The clone/push credential for a Worker container dispatch: the App registry's mint, narrowed by
+ * the shared builder to the repos that dispatch resolved. Every Worker site that hands a container
+ * a GitHub token goes through this, so none of them can quietly fall back to an installation-wide
+ * one. No `resolveRunInitiatorToken`: the step executor composes its own mint with that chain (see
+ * `container-executor-deps.ts`), while bootstrap, repair and the deploy clone have no initiator to
+ * act as, and saying so once here beats three call sites each omitting it by accident.
+ *
+ * It sits in a LEAF module rather than in the composition root because three of its callers are
+ * modules the root itself pulls in: importing it back out of `container.ts` made each of them
+ * depend on the whole root, and for `containers/deployJobDeps.ts` (which the root re-exported) it
+ * closed a genuine cycle that only stayed harmless while every reference sat inside a function
+ * body.
+ */
+export declare function workerDispatchTokenMint(registry: GitHubAppRegistry): MintInstallationToken;
+//# sourceMappingURL=dispatchTokenMint.d.ts.map

package/dist/infrastructure/dispatchTokenMint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dispatchTokenMint.d.ts","sourceRoot":"","sources":["../../src/infrastructure/dispatchTokenMint.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EAEtB,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAA;AAE5B;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,qBAAqB,CAM1F"}