Skip to content

D: bound cleanup retries so settlement always ends (#51 item 1) #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mchwang merged 14 commits into from
Sep 28, 2026
Merged

D: bound cleanup retries so settlement always ends (#51 item 1) #69

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7dab51e
Bound D cleanup retries so settlement always ends (#51 item 1)
mchwang Sep 27, 2026
cd53ec6
Fail closed on unreleased resources and report them precisely
mchwang Sep 27, 2026
1c725d2
Keep cleanup retries inside the window and report only unconfirmed parts
mchwang Sep 27, 2026
fa876a0
Remove and control the agent container by its ID, never its name
mchwang Sep 27, 2026
cb57d67
Validate and start the agent container by its ID on every launch path
mchwang Sep 27, 2026
4839206
Release a profile's own resources when its container create was refused
mchwang Sep 27, 2026
fdba990
Do not clean up a vendor network or proxy whose create the daemon ref…
mchwang Sep 28, 2026
1fd5814
Pin the container identity rule for profile-only cleanup retries
mchwang Sep 28, 2026
5a942dc
Remove egress objects by inspected ID; keep a proxy whose start failed
mchwang Sep 28, 2026
b161e52
Refuse every launch path for a profile that settled with leftovers
mchwang Sep 28, 2026
879e62a
Create and start the egress proxy separately; document Ask's host rec…
mchwang Sep 28, 2026
4b1c0f7
Treat a Docker client that never started as having created nothing
mchwang Sep 28, 2026
1ca7e95
Retry the profile cleanup once per attempt in the adapters
mchwang Sep 28, 2026
da89c77
Address review suggestions: shared Docker ID check, accurate bounds
mchwang Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions agents/adapters/claude.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export function startClaudeInvocation(request: AgentAdapterRequest,
try { network = createVendorNetwork(request.invocation, request.imageId, Math.min(60_000, remaining())); }
catch (error) {
if (error instanceof VendorNetworkCreationCleanupError)
return retainSetupCleanup(request.invocation, error.retryCleanup, error.startupError, error,
'network creation cleanup');
return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
'network creation cleanup', () => error.resources);
throw error;
}
try {
Expand All @@ -38,13 +38,13 @@ export function startClaudeInvocation(request: AgentAdapterRequest,
if (error instanceof ProfileCreationCleanupError) {
const retryCleanup = (networkTimeoutMs = 30_000) => {
const failures: unknown[] = [];
try { error.retryCleanup(); } catch (cleanupError) { failures.push(cleanupError); }
try { error.retryCleanup(networkTimeoutMs); } catch (cleanupError) { failures.push(cleanupError); }
try { removeVendorNetwork(network, networkTimeoutMs); } catch (cleanupError) { failures.push(cleanupError); }
if (failures.length) throw new AggregateError(failures, 'Adapter setup cleanup did not settle.');
};
try { retryCleanup(Math.min(30_000, remaining())); }
catch (cleanupError) { return retainSetupCleanup(request.invocation, () => retryCleanup(),
error.startupError, cleanupError, 'profile and network cleanup'); }
catch (cleanupError) { return retainSetupCleanup(request.invocation, budget => retryCleanup(budget),
error.startupError, cleanupError, 'profile and network cleanup', () => error.resources); }
throw error.startupError;
}
try { removeVendorNetwork(network, Math.min(30_000, remaining())); }
Expand Down
21 changes: 14 additions & 7 deletions agents/adapters/codex.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { InvocationHandle } from '../contract.ts';
import { createContainerProfile, ProfileCreationCleanupError } from '../container/profile.ts';
import { createContainerProfile, ProfileCreationCleanupError, 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';
Expand All @@ -8,6 +9,12 @@ import { readBoundedContainerFile, retainNetworkCleanup, retainSetupCleanup,
import { createAdapterInvocationBudget, type AgentAdapterOptions, type AgentAdapterRequest } from './types.ts';

export const CODEX_OUTPUT_FILE = '/run/codeboost-output/final.txt';
// Read the output from the container this invocation created, by ID; a same-named replacement must not answer.
const codexContainer = (profile: ContainerProfile) => {
const id = agentContainerId(profile);
if (!id) throw new Error('The Codex container ID is unknown.');
return id;
};

export async function readCodexOutput(container: string, maximumBytes: number, timeoutMs = 30_000,
signal?: AbortSignal) {
Expand All @@ -25,8 +32,8 @@ export function startCodexInvocation(request: AgentAdapterRequest,
try { network = createVendorNetwork(request.invocation, request.imageId, Math.min(60_000, remaining())); }
catch (error) {
if (error instanceof VendorNetworkCreationCleanupError)
return retainSetupCleanup(request.invocation, error.retryCleanup, error.startupError, error,
'network creation cleanup');
return retainSetupCleanup(request.invocation, budget => error.retryCleanup(budget), error.startupError, error,
'network creation cleanup', () => error.resources);
throw error;
}
try {
Expand All @@ -36,18 +43,18 @@ export function startCodexInvocation(request: AgentAdapterRequest,
return startProfileInvocation(profile, { ...options,
invocationBudget: remaining,
decode: (current, _raw, maximum, timeoutMs, signal) =>
readCodexOutput(current.name, maximum, timeoutMs, signal) });
readCodexOutput(codexContainer(current), maximum, timeoutMs, signal) });
} catch (error) {
if (error instanceof ProfileCreationCleanupError) {
const retryCleanup = (networkTimeoutMs = 30_000) => {
const failures: unknown[] = [];
try { error.retryCleanup(); } catch (cleanupError) { failures.push(cleanupError); }
try { error.retryCleanup(networkTimeoutMs); } catch (cleanupError) { failures.push(cleanupError); }
try { removeVendorNetwork(network, networkTimeoutMs); } catch (cleanupError) { failures.push(cleanupError); }
if (failures.length) throw new AggregateError(failures, 'Adapter setup cleanup did not settle.');
};
try { retryCleanup(Math.min(30_000, remaining())); }
catch (cleanupError) { return retainSetupCleanup(request.invocation, () => retryCleanup(),
error.startupError, cleanupError, 'profile and network cleanup'); }
catch (cleanupError) { return retainSetupCleanup(request.invocation, budget => retryCleanup(budget),
error.startupError, cleanupError, 'profile and network cleanup', () => error.resources); }
throw error.startupError;
}
try { removeVendorNetwork(network, Math.min(30_000, remaining())); }
Expand Down
Loading
Loading