@@ -1,9 +1,8 @@
 import type { InvocationHandle } from '../contract.ts';
-import { createContainerProfile, ProfileCreationCleanupError } from '../container/profile.ts';
-import { createVendorNetwork, removeVendorNetwork, VendorNetworkCreationCleanupError,
-  type VendorNetwork } from '../network/network.ts';
 import { createClaudeCommand, createPhasePolicy } from '../policy.ts';
-import { retainNetworkCleanup, retainSetupCleanup, startProfileInvocation } from './supervisor.ts';
+import { launchInvocation } from './supervisor.ts';
+import { setUpProfile } from './setup.ts';
+import { assertBuiltAgentImage } from '../container/image.ts';
 import { createAdapterInvocationBudget, type AgentAdapterOptions, type AgentAdapterRequest } from './types.ts';
 
 export function parseClaudeOutput(raw: Buffer): { text: string; providerFailed: boolean } {
@@ -19,29 +18,11 @@ export function startClaudeInvocation(request: AgentAdapterRequest,
   if (!oauthToken || oauthToken.includes('\0')) throw new Error('Claude OAuth token is malformed.');
   const policy = createPhasePolicy(request.invocation);
   const remaining = createAdapterInvocationBudget(request.invocation, options.timeoutMs);
-  let network: VendorNetwork;
-  try { network = createVendorNetwork(request.invocation, request.imageId, Math.min(60_000, remaining())); }
-  catch (error) {
-    if (error instanceof VendorNetworkCreationCleanupError)
-      return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
-        'network creation cleanup', () => error.resources);
-    throw error;
-  }
-  try {
-    const profile = createContainerProfile({ ...request, policy, network,
-      command: createClaudeCommand(policy, request.prompt), claudeToken: oauthToken,
-      timeoutMs: Math.min(60_000, remaining()) });
-    return startProfileInvocation(profile, { ...options, secrets: { CLAUDE_CODE_OAUTH_TOKEN: oauthToken },
-      invocationBudget: remaining,
-      decode: (_profile, raw) => parseClaudeOutput(raw) });
-  } catch (error) {
-    // Profile creation already tried its cleanup, which removes this network too, and failed. Retry that one cleanup
-    // with the window's budget; removing the network again here would start a second full deadline per retry.
-    if (error instanceof ProfileCreationCleanupError)
-      return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
-        'profile and network cleanup', () => error.resources);
-    try { removeVendorNetwork(network, Math.min(30_000, remaining())); }
-    catch (cleanupError) { return retainNetworkCleanup(request.invocation, network, error, cleanupError); }
-    throw error;
-  }
+  // Invalid input throws here, before anything is allocated; only Docker setup runs inside the handle.
+  assertBuiltAgentImage(request.imageId);
+  return launchInvocation(request.invocation, remaining, (signal, start) => setUpProfile(request, remaining, signal,
+    network => ({ ...request, policy, network, command: createClaudeCommand(policy, request.prompt),
+      claudeToken: oauthToken }),
+    profile => start(profile, { ...options, secrets: { CLAUDE_CODE_OAUTH_TOKEN: oauthToken },
+      invocationBudget: remaining, decode: (_profile, raw) => parseClaudeOutput(raw) })));
 }
@@ -1,11 +1,10 @@
 import type { InvocationHandle } from '../contract.ts';
-import { createContainerProfile, ProfileCreationCleanupError, type ContainerProfile } from '../container/profile.ts';
+import type { ContainerProfile } from '../container/profile.ts';
 import { agentContainerId } from '../container/run.ts';
-import { createVendorNetwork, removeVendorNetwork, VendorNetworkCreationCleanupError,
-  type VendorNetwork } from '../network/network.ts';
 import { createCodexCommand, createPhasePolicy } from '../policy.ts';
-import { readBoundedContainerFile, retainNetworkCleanup, retainSetupCleanup,
-  startProfileInvocation } from './supervisor.ts';
+import { launchInvocation, readBoundedContainerFile } from './supervisor.ts';
+import { setUpProfile } from './setup.ts';
+import { assertBuiltAgentImage } from '../container/image.ts';
 import { createAdapterInvocationBudget, type AgentAdapterOptions, type AgentAdapterRequest } from './types.ts';
 
 export const CODEX_OUTPUT_FILE = '/run/codeboost-output/final.txt';
@@ -28,30 +27,12 @@ export function startCodexInvocation(request: AgentAdapterRequest,
   if (!authFile || authFile.includes('\0')) throw new Error('Codex auth path is malformed.');
   const policy = createPhasePolicy(request.invocation);
   const remaining = createAdapterInvocationBudget(request.invocation, options.timeoutMs);
-  let network: VendorNetwork;
-  try { network = createVendorNetwork(request.invocation, request.imageId, Math.min(60_000, remaining())); }
-  catch (error) {
-    if (error instanceof VendorNetworkCreationCleanupError)
-      return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
-        'network creation cleanup', () => error.resources);
-    throw error;
-  }
-  try {
-    const profile = createContainerProfile({ ...request, policy, network,
-      command: createCodexCommand(policy, request.prompt), codexAuthFile: authFile, deferredOutput: true,
-      timeoutMs: Math.min(60_000, remaining()) });
-    return startProfileInvocation(profile, { ...options,
-      invocationBudget: remaining,
-      decode: (current, _raw, maximum, timeoutMs, signal) =>
-        readCodexOutput(codexContainer(current), maximum, timeoutMs, signal) });
-  } catch (error) {
-    // Profile creation already tried its cleanup, which removes this network too, and failed. Retry that one cleanup
-    // with the window's budget; removing the network again here would start a second full deadline per retry.
-    if (error instanceof ProfileCreationCleanupError)
-      return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
-        'profile and network cleanup', () => error.resources);
-    try { removeVendorNetwork(network, Math.min(30_000, remaining())); }
-    catch (cleanupError) { return retainNetworkCleanup(request.invocation, network, error, cleanupError); }
-    throw error;
-  }
+  // Invalid input throws here, before anything is allocated; only Docker setup runs inside the handle.
+  assertBuiltAgentImage(request.imageId);
+  return launchInvocation(request.invocation, remaining, (signal, start) => setUpProfile(request, remaining, signal,
+    network => ({ ...request, policy, network, command: createCodexCommand(policy, request.prompt),
+      codexAuthFile: authFile, deferredOutput: true }),
+    profile => start(profile, { ...options, invocationBudget: remaining,
+      decode: (current, _raw, maximum, timeoutMs, decodeSignal) =>
+        readCodexOutput(codexContainer(current), maximum, timeoutMs, decodeSignal) })));
 }
@@ -0,0 +1,48 @@
+import type { InvocationHandle } from '../contract.ts';
+import { containerProfileResources, createContainerProfile, disposeContainerProfile, ProfileCreationCleanupError,
+  type ContainerProfile, type ProfileOptions } from '../container/profile.ts';
+import { createVendorNetwork, removeVendorNetwork, vendorNetworkResources,
+  type VendorNetwork } from '../network/network.ts';
+import { AdapterSetupCleanupError } from './supervisor.ts';
+import type { AgentAdapterRequest } from './types.ts';
+
+/** Cleanup is never cancelled and does not share the invocation budget, so an expired budget cannot skip it. */
+const CLEANUP_TIMEOUT_MS = 30_000;
+
+/**
+ * Adapter setup inside `launchInvocation`: create the vendor network, then the container profile, then hand the
+ * profile to the supervisor. `signal` cancels whichever Docker call is in flight. A failure that removed everything
+ * rejects with the startup error; one whose cleanup failed rejects with an error carrying `retryCleanup`, which the
+ * launcher keeps retrying (a `VendorNetworkCreationCleanupError`, `ProfileCreationCleanupError` or
+ * `AdapterSetupCleanupError`).
+ */
+export async function setUpProfile(request: AgentAdapterRequest, remaining: () => number, signal: AbortSignal,
+  profileOptions: (network: VendorNetwork) => Omit<ProfileOptions, 'timeoutMs' | 'signal'>,
+  start: (profile: ContainerProfile) => InvocationHandle): Promise<InvocationHandle> {
+  const network = await createVendorNetwork(request.invocation, request.imageId, Math.min(60_000, remaining()), signal);
+  let profile: ContainerProfile;
+  try {
+    profile = await createContainerProfile({ ...profileOptions(network), timeoutMs: Math.min(60_000, remaining()),
+      signal });
+  } catch (error) {
+    // Profile creation removes the network itself once it has claimed it; otherwise the network is still ours.
+    if (error instanceof ProfileCreationCleanupError) throw error;
+    try { await removeVendorNetwork(network, CLEANUP_TIMEOUT_MS); }
+    catch (cleanupError) {
+      throw new AdapterSetupCleanupError(error, cleanupError,
+        (budgetMs = CLEANUP_TIMEOUT_MS) => removeVendorNetwork(network, budgetMs), () => vendorNetworkResources(network));
+    }
+    throw error;
+  }
+  // The profile owns the network and staging now. If the handoff itself throws, nothing else will release them:
+  // the launcher treats a failure without a handle as "nothing allocated", so release (or retain) them here.
+  try { return start(profile); }
+  catch (error) {
+    try { await disposeContainerProfile(profile, CLEANUP_TIMEOUT_MS); }
+    catch (cleanupError) {
+      throw new AdapterSetupCleanupError(error, cleanupError,
+        (budgetMs = CLEANUP_TIMEOUT_MS) => disposeContainerProfile(profile, budgetMs), () => containerProfileResources(profile));
+    }
+    throw error;
+  }
+}