@fitlab-ai/agent-infra 0.9.7 → 0.9.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/README.zh-CN.md +1 -1
- package/dist/bin/internal-cli.js +11 -1
- package/dist/lib/agent-clients/adapters/claude-code.js +3 -3
- package/dist/lib/agent-clients/adapters/codex-lifecycle/app-server.js +60 -22
- package/dist/lib/agent-clients/adapters/codex-lifecycle/build-identity.js +8 -1
- package/dist/lib/agent-clients/adapters/codex-lifecycle/capability-store.js +175 -11
- package/dist/lib/agent-clients/adapters/codex-lifecycle/controller-context.js +147 -0
- package/dist/lib/agent-clients/adapters/codex-lifecycle/evidence.js +14 -0
- package/dist/lib/agent-clients/adapters/codex-lifecycle/sandbox-controller.js +86 -69
- package/dist/lib/agent-clients/adapters/codex-lifecycle/store.js +2 -1
- package/dist/lib/decide.js +68 -14
- package/dist/lib/git/workflow.js +10 -1
- package/dist/lib/init.js +1 -1
- package/dist/lib/internal/codex-lifecycle.js +19 -5
- package/dist/lib/internal/codex-sandbox-controller.js +6 -13
- package/dist/lib/internal/git-workflow.js +5 -7
- package/dist/lib/internal/platform-pr.js +20 -7
- package/dist/lib/internal/release-workflow.js +3 -4
- package/dist/lib/internal/sandbox-control.js +79 -2
- package/dist/lib/internal/task-activity.js +57 -7
- package/dist/lib/internal/task-event.js +57 -4
- package/dist/lib/internal/task-finalization.js +54 -0
- package/dist/lib/internal/task-ledger.js +59 -5
- package/dist/lib/internal/task-lifecycle.js +59 -8
- package/dist/lib/internal/task-orchestration.js +161 -288
- package/dist/lib/internal/task-override.js +131 -0
- package/dist/lib/internal/task-review.js +64 -6
- package/dist/lib/internal/task-verify.js +65 -3
- package/dist/lib/internal/task-warning.js +57 -4
- package/dist/lib/platform/pr-summary.js +53 -13
- package/dist/lib/platform/pull-requests.js +205 -41
- package/dist/lib/runtime/agent-runtime.js +56 -0
- package/dist/lib/sandbox/commands/create.js +389 -311
- package/dist/lib/sandbox/commands/rm.js +316 -55
- package/dist/lib/sandbox/control/client.js +190 -6
- package/dist/lib/sandbox/control/container-identity.js +1 -1
- package/dist/lib/sandbox/control/controller-registration.js +273 -0
- package/dist/lib/sandbox/control/executor.js +145 -5
- package/dist/lib/sandbox/control/lifecycle.js +395 -73
- package/dist/lib/sandbox/control/protocol.js +67 -6
- package/dist/lib/sandbox/control/state.js +27 -11
- package/dist/lib/sandbox/engine.js +14 -7
- package/dist/lib/sandbox/index.js +5 -3
- package/dist/lib/sandbox/managed-fs.js +5 -0
- package/dist/lib/sandbox/mounts.js +20 -5
- package/dist/lib/sandbox/recovery.js +78 -10
- package/dist/lib/sandbox/task-resolver.js +50 -6
- package/dist/lib/sandbox/workspace-identity.js +27 -0
- package/dist/lib/sandbox/workspace-view.js +62 -40
- package/dist/lib/sandbox/worktree-safety.js +215 -2
- package/dist/lib/server/process-state.js +51 -1
- package/dist/lib/task/activity-intent.js +4 -1
- package/dist/lib/task/codex-orchestration.js +158 -33
- package/dist/lib/task/commands/status.js +59 -1
- package/dist/lib/task/commit-operation.js +335 -0
- package/dist/lib/task/commit-policy.js +18 -0
- package/dist/lib/task/decision-intents.js +4 -2
- package/dist/lib/task/delegation-receipts.js +279 -17
- package/dist/lib/task/events.js +9 -5
- package/dist/lib/task/finalization.js +567 -0
- package/dist/lib/task/guard-override.js +31 -0
- package/dist/lib/task/human-override.js +1240 -0
- package/dist/lib/task/ledger-intents.js +6 -3
- package/dist/lib/task/lifecycle.js +69 -14
- package/dist/lib/task/operation-outcome.js +33 -0
- package/dist/lib/task/orchestration.js +199 -719
- package/dist/lib/task/review-finalization.js +3 -2
- package/dist/lib/task/short-id.js +59 -1
- package/dist/lib/task/task-execution-lock.js +6 -1
- package/dist/lib/task/verification-engine.js +138 -59
- package/dist/lib/task/verification.js +15 -2
- package/dist/lib/task/workflow-warning-intents.js +54 -3
- package/dist/lib/task/write.js +2 -1
- package/dist/lifecycle-build-manifest.json +3 -3
- package/lib/agent-clients/adapters/claude-code.ts +3 -3
- package/lib/agent-clients/adapters/codex-lifecycle/app-server.ts +63 -20
- package/lib/agent-clients/adapters/codex-lifecycle/build-identity.ts +12 -0
- package/lib/agent-clients/adapters/codex-lifecycle/capability-store.ts +278 -13
- package/lib/agent-clients/adapters/codex-lifecycle/controller-context.ts +180 -0
- package/lib/agent-clients/adapters/codex-lifecycle/evidence.ts +19 -0
- package/lib/agent-clients/adapters/codex-lifecycle/manifest-files.json +9 -1
- package/lib/agent-clients/adapters/codex-lifecycle/sandbox-controller.ts +112 -93
- package/lib/agent-clients/adapters/codex-lifecycle/store.ts +2 -1
- package/lib/decide.ts +59 -14
- package/lib/git/workflow.ts +11 -2
- package/lib/init.ts +1 -1
- package/lib/internal/codex-lifecycle.ts +18 -5
- package/lib/internal/codex-sandbox-controller.ts +6 -12
- package/lib/internal/git-workflow.ts +5 -6
- package/lib/internal/platform-pr.ts +14 -7
- package/lib/internal/release-workflow.ts +3 -4
- package/lib/internal/sandbox-control.ts +92 -2
- package/lib/internal/task-activity.ts +46 -6
- package/lib/internal/task-event.ts +53 -4
- package/lib/internal/task-finalization.ts +68 -0
- package/lib/internal/task-ledger.ts +48 -4
- package/lib/internal/task-lifecycle.ts +56 -12
- package/lib/internal/task-orchestration.ts +32 -107
- package/lib/internal/task-override.ts +138 -0
- package/lib/internal/task-review.ts +51 -6
- package/lib/internal/task-verify.ts +52 -3
- package/lib/internal/task-warning.ts +44 -3
- package/lib/platform/pr-summary.ts +65 -14
- package/lib/platform/pull-requests.ts +211 -41
- package/lib/runtime/agent-runtime.ts +76 -0
- package/lib/sandbox/commands/create.ts +88 -4
- package/lib/sandbox/commands/rm.ts +413 -61
- package/lib/sandbox/config.ts +2 -1
- package/lib/sandbox/control/client.ts +255 -6
- package/lib/sandbox/control/container-identity.ts +3 -3
- package/lib/sandbox/control/controller-registration.ts +347 -0
- package/lib/sandbox/control/executor.ts +172 -6
- package/lib/sandbox/control/lifecycle.ts +465 -77
- package/lib/sandbox/control/protocol.ts +85 -9
- package/lib/sandbox/control/state.ts +35 -18
- package/lib/sandbox/engine.ts +20 -9
- package/lib/sandbox/index.ts +5 -3
- package/lib/sandbox/managed-fs.ts +5 -0
- package/lib/sandbox/mounts.ts +23 -5
- package/lib/sandbox/recovery.ts +90 -9
- package/lib/sandbox/task-resolver.ts +58 -7
- package/lib/sandbox/workspace-identity.ts +50 -2
- package/lib/sandbox/workspace-view.ts +73 -43
- package/lib/sandbox/worktree-safety.ts +236 -2
- package/lib/server/process-state.ts +48 -1
- package/lib/task/activity-intent.ts +4 -2
- package/lib/task/codex-orchestration.ts +167 -33
- package/lib/task/commands/status.ts +78 -1
- package/lib/task/commit-operation.ts +430 -0
- package/lib/task/commit-policy.ts +30 -0
- package/lib/task/decision-intents.ts +4 -2
- package/lib/task/delegation-receipts.ts +304 -19
- package/lib/task/events.ts +10 -5
- package/lib/task/finalization.ts +719 -0
- package/lib/task/guard-override.ts +50 -0
- package/lib/task/human-override.ts +1503 -0
- package/lib/task/ledger-intents.ts +6 -3
- package/lib/task/lifecycle.ts +71 -14
- package/lib/task/operation-outcome.ts +48 -0
- package/lib/task/orchestration.ts +239 -922
- package/lib/task/review-finalization.ts +6 -2
- package/lib/task/short-id.ts +65 -1
- package/lib/task/task-execution-lock.ts +10 -1
- package/lib/task/verification-engine.ts +145 -64
- package/lib/task/verification.ts +18 -3
- package/lib/task/workflow-warning-intents.ts +61 -4
- package/lib/task/write.ts +4 -1
- package/package.json +2 -2
- package/templates/.agents/QUICKSTART.en.md +2 -2
- package/templates/.agents/QUICKSTART.zh-CN.md +2 -2
- package/templates/.agents/hooks/lifecycle-delegation.js +9 -24
- package/templates/.agents/rules/lifecycle-orchestration.en.md +4 -3
- package/templates/.agents/rules/lifecycle-orchestration.zh-CN.md +4 -3
- package/templates/.agents/rules/task-management.en.md +2 -2
- package/templates/.agents/rules/task-management.zh-CN.md +2 -2
- package/templates/.agents/skills/block-task/SKILL.en.md +2 -4
- package/templates/.agents/skills/block-task/SKILL.zh-CN.md +2 -4
- package/templates/.agents/skills/cancel-task/SKILL.en.md +3 -3
- package/templates/.agents/skills/cancel-task/SKILL.zh-CN.md +3 -3
- package/templates/.agents/skills/close-codescan/SKILL.en.md +6 -2
- package/templates/.agents/skills/close-codescan/SKILL.zh-CN.md +6 -2
- package/templates/.agents/skills/close-dependabot/SKILL.en.md +6 -2
- package/templates/.agents/skills/close-dependabot/SKILL.zh-CN.md +6 -2
- package/templates/.agents/skills/commit/SKILL.en.md +41 -125
- package/templates/.agents/skills/commit/SKILL.zh-CN.md +52 -123
- package/templates/.agents/skills/commit/reference/commit-message.en.md +1 -1
- package/templates/.agents/skills/commit/reference/commit-message.zh-CN.md +1 -1
- package/templates/.agents/skills/commit/reference/commit-orchestration.en.md +14 -43
- package/templates/.agents/skills/commit/reference/commit-orchestration.zh-CN.md +14 -49
- package/templates/.agents/skills/commit/reference/pr-summary-sync.en.md +1 -1
- package/templates/.agents/skills/commit/reference/pr-summary-sync.zh-CN.md +1 -1
- package/templates/.agents/skills/commit/reference/task-status-update.en.md +2 -35
- package/templates/.agents/skills/commit/reference/task-status-update.zh-CN.md +2 -35
- package/templates/.agents/skills/complete-task/SKILL.en.md +31 -38
- package/templates/.agents/skills/complete-task/SKILL.zh-CN.md +31 -38
- package/templates/.agents/skills/complete-task/config/verify.en.json +1 -0
- package/templates/.agents/skills/complete-task/config/verify.zh-CN.json +1 -0
- package/templates/.agents/skills/complete-task/reference/external-delivery.en.md +1 -1
- package/templates/.agents/skills/complete-task/reference/external-delivery.zh-CN.md +1 -1
- package/templates/.agents/skills/create-pr/SKILL.en.md +6 -4
- package/templates/.agents/skills/create-pr/SKILL.zh-CN.md +6 -4
- package/templates/.agents/skills/create-pr/reference/comment-publish.en.md +2 -2
- package/templates/.agents/skills/create-pr/reference/comment-publish.zh-CN.md +2 -2
- package/templates/.agents/skills/run-task/SKILL.en.md +5 -5
- package/templates/.agents/skills/run-task/SKILL.zh-CN.md +5 -5
- package/templates/.agents/skills/run-task/reference/host-validation.en.md +3 -1
- package/templates/.agents/skills/run-task/reference/host-validation.zh-CN.md +3 -1
- package/templates/.agents/skills/watch-pr/reference/monitor-and-heal.en.md +1 -1
- package/templates/.agents/skills/watch-pr/reference/monitor-and-heal.zh-CN.md +1 -1
- package/templates/.codex/hooks.json +4 -4
- package/dist/lib/task/commit-finalization.js +0 -305
- package/dist/lib/task/commit-intent.js +0 -165
- package/lib/task/commit-finalization.ts +0 -419
- package/lib/task/commit-intent.ts +0 -230
|
@@ -2,6 +2,7 @@ import fs from 'node:fs';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { randomUUID } from 'node:crypto';
|
|
4
4
|
import { SANDBOX_CONTROL_ADMISSION_WINDOW_MS, SANDBOX_CONTROL_MAX_BYTES, SANDBOX_CONTROL_STATUS_STALE_MS, isSandboxControlFamily } from './protocol.js';
|
|
5
|
+
import { normalizeAgentToken } from '../../agent-clients/tokens.js';
|
|
5
6
|
import { readSandboxControlStatus } from './state.js';
|
|
6
7
|
const SANDBOX_CONTROL_RESPONSE_SETTLE_MS = 250;
|
|
7
8
|
export class SandboxControlClientError extends Error {
|
|
@@ -150,24 +151,207 @@ function authority(params) {
|
|
|
150
151
|
export function requestSandboxControl(params) {
|
|
151
152
|
if (!isSandboxControlFamily(params.family))
|
|
152
153
|
clientError('SANDBOX_CONTROL_COMMAND_DENIED', `'${params.family}' is not allowed`, false);
|
|
153
|
-
if (params.family === 'task-create')
|
|
154
|
-
clientError('SANDBOX_CONTROL_COMMAND_DENIED',
|
|
154
|
+
if (params.family === 'task-create' || params.family === 'codex-controller' || params.family === 'task-finalization') {
|
|
155
|
+
clientError('SANDBOX_CONTROL_COMMAND_DENIED', `'${params.family}' requires a typed request`, false);
|
|
156
|
+
}
|
|
157
|
+
const auth = authority(params);
|
|
158
|
+
const issuedAt = Date.now();
|
|
159
|
+
const request = {
|
|
160
|
+
version: 3, id: randomUUID(), ...auth, issuedAt,
|
|
161
|
+
expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
|
|
162
|
+
family: params.family, args: params.args,
|
|
163
|
+
controllerProcess: null,
|
|
164
|
+
controllerProof: null
|
|
165
|
+
};
|
|
166
|
+
return exchangeSandboxControl(request, params);
|
|
167
|
+
}
|
|
168
|
+
export function requestSandboxTaskControl(params) {
|
|
155
169
|
const auth = authority(params);
|
|
156
170
|
const issuedAt = Date.now();
|
|
157
171
|
const request = {
|
|
158
|
-
version:
|
|
172
|
+
version: 3,
|
|
173
|
+
id: randomUUID(),
|
|
174
|
+
...auth,
|
|
175
|
+
issuedAt,
|
|
159
176
|
expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
|
|
160
|
-
family: params.family,
|
|
177
|
+
family: params.family,
|
|
178
|
+
args: params.args,
|
|
179
|
+
controllerProcess: null,
|
|
180
|
+
controllerProof: params.controllerProof
|
|
161
181
|
};
|
|
162
182
|
return exchangeSandboxControl(request, params);
|
|
163
183
|
}
|
|
184
|
+
export function requestSandboxTaskFinalization(params) {
|
|
185
|
+
const agent = normalizeAgentToken(params.agent);
|
|
186
|
+
if (!agent)
|
|
187
|
+
clientError('SANDBOX_CONTROL_REQUEST_INVALID', 'task-finalization agent is invalid', false);
|
|
188
|
+
const auth = authority(params);
|
|
189
|
+
const issuedAt = Date.now();
|
|
190
|
+
const request = {
|
|
191
|
+
version: 3,
|
|
192
|
+
id: randomUUID(),
|
|
193
|
+
...auth,
|
|
194
|
+
issuedAt,
|
|
195
|
+
expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
|
|
196
|
+
family: 'task-finalization',
|
|
197
|
+
operation: 'complete',
|
|
198
|
+
agent,
|
|
199
|
+
args: [],
|
|
200
|
+
controllerProcess: null,
|
|
201
|
+
controllerProof: null
|
|
202
|
+
};
|
|
203
|
+
return exchangeSandboxControl(request, params);
|
|
204
|
+
}
|
|
205
|
+
function exactKeys(value, keys) {
|
|
206
|
+
return Object.keys(value).sort().join(',') === [...keys].sort().join(',');
|
|
207
|
+
}
|
|
208
|
+
function validProcess(value) {
|
|
209
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
210
|
+
return false;
|
|
211
|
+
const identity = value;
|
|
212
|
+
return exactKeys(identity, ['pid', 'startTime'])
|
|
213
|
+
&& Number.isSafeInteger(identity.pid) && identity.pid > 0
|
|
214
|
+
&& Number.isSafeInteger(identity.startTime) && identity.startTime >= 0;
|
|
215
|
+
}
|
|
216
|
+
function validBuild(value) {
|
|
217
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
218
|
+
return false;
|
|
219
|
+
const build = value;
|
|
220
|
+
return exactKeys(build, ['internalExecutableBuildHash', 'lifecycleContractHash', 'packageVersion', 'protocolVersion'])
|
|
221
|
+
&& build.protocolVersion === 3
|
|
222
|
+
&& typeof build.packageVersion === 'string' && build.packageVersion.length > 0
|
|
223
|
+
&& typeof build.internalExecutableBuildHash === 'string' && /^[a-f0-9]{64}$/u.test(build.internalExecutableBuildHash)
|
|
224
|
+
&& typeof build.lifecycleContractHash === 'string' && /^[a-f0-9]{64}$/u.test(build.lifecycleContractHash);
|
|
225
|
+
}
|
|
226
|
+
export function parseCodexControllerResult(response) {
|
|
227
|
+
if (response.phase !== 'completed' || response.error !== null || response.stderr !== '') {
|
|
228
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller result outer response is invalid', false, true);
|
|
229
|
+
}
|
|
230
|
+
let value;
|
|
231
|
+
try {
|
|
232
|
+
if (!response.stdout.endsWith('\n') || response.stdout.slice(0, -1).includes('\n'))
|
|
233
|
+
throw new Error('not canonical');
|
|
234
|
+
value = JSON.parse(response.stdout);
|
|
235
|
+
}
|
|
236
|
+
catch {
|
|
237
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller result payload is invalid', false, true);
|
|
238
|
+
}
|
|
239
|
+
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
|
240
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller result payload is invalid', false, true);
|
|
241
|
+
}
|
|
242
|
+
const result = value;
|
|
243
|
+
const resultKeys = result.status === 'verified'
|
|
244
|
+
? ['binding', 'changed', 'error', 'lease', 'status', 'version']
|
|
245
|
+
: ['changed', 'error', 'lease', 'status', 'version'];
|
|
246
|
+
if (!exactKeys(result, resultKeys)
|
|
247
|
+
|| result.version !== 1 || !['opened', 'closed', 'failed', 'verified'].includes(result.status)) {
|
|
248
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller result schema is invalid', false, true);
|
|
249
|
+
}
|
|
250
|
+
if (result.status === 'failed') {
|
|
251
|
+
const error = result.error;
|
|
252
|
+
if (response.exitCode !== 1 || result.changed !== false || result.lease !== null
|
|
253
|
+
|| !error || !exactKeys(error, ['code', 'message', 'retryable'])
|
|
254
|
+
|| typeof error.code !== 'string' || !/^[A-Z][A-Z0-9_]+$/u.test(error.code)
|
|
255
|
+
|| typeof error.message !== 'string' || error.retryable !== false) {
|
|
256
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller failure result is invalid', false, true);
|
|
257
|
+
}
|
|
258
|
+
clientError(error.code, error.message, false, true);
|
|
259
|
+
}
|
|
260
|
+
if (response.exitCode !== 0 || result.error !== null) {
|
|
261
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller success result is invalid', false, true);
|
|
262
|
+
}
|
|
263
|
+
if (result.status === 'closed') {
|
|
264
|
+
if (typeof result.changed !== 'boolean' || result.lease !== null) {
|
|
265
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller close result is invalid', false, true);
|
|
266
|
+
}
|
|
267
|
+
return result;
|
|
268
|
+
}
|
|
269
|
+
if (result.status === 'verified') {
|
|
270
|
+
const binding = result.binding;
|
|
271
|
+
if (result.changed !== false || result.lease !== null || !binding
|
|
272
|
+
|| !exactKeys(binding, ['controllerInstanceDigest', 'controlGeneration', 'taskId'])
|
|
273
|
+
|| typeof binding.taskId !== 'string' || binding.taskId.length === 0
|
|
274
|
+
|| typeof binding.controlGeneration !== 'string' || binding.controlGeneration.length === 0
|
|
275
|
+
|| typeof binding.controllerInstanceDigest !== 'string' || !/^[a-f0-9]{64}$/u.test(binding.controllerInstanceDigest)) {
|
|
276
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller verify result is invalid', false, true);
|
|
277
|
+
}
|
|
278
|
+
return result;
|
|
279
|
+
}
|
|
280
|
+
const lease = result.lease;
|
|
281
|
+
if (result.changed !== true || !lease
|
|
282
|
+
|| !exactKeys(lease, [
|
|
283
|
+
'buildIdentity', 'controlGeneration', 'controllerInstanceDigest', 'controllerProcess',
|
|
284
|
+
'expiresAt', 'issuedAt', 'leaseId', 'leaseSecret', 'taskId', 'version'
|
|
285
|
+
])
|
|
286
|
+
|| lease.version !== 1
|
|
287
|
+
|| typeof lease.leaseId !== 'string' || !/^[a-f0-9]{64}$/u.test(lease.leaseId)
|
|
288
|
+
|| typeof lease.leaseSecret !== 'string' || !/^[a-f0-9]{64}$/u.test(lease.leaseSecret)
|
|
289
|
+
|| typeof lease.taskId !== 'string' || lease.taskId.length === 0
|
|
290
|
+
|| typeof lease.controlGeneration !== 'string' || lease.controlGeneration.length === 0
|
|
291
|
+
|| typeof lease.controllerInstanceDigest !== 'string' || !/^[a-f0-9]{64}$/u.test(lease.controllerInstanceDigest)
|
|
292
|
+
|| !validProcess(lease.controllerProcess) || !validBuild(lease.buildIdentity)
|
|
293
|
+
|| !Number.isSafeInteger(lease.issuedAt) || !Number.isSafeInteger(lease.expiresAt)
|
|
294
|
+
|| lease.expiresAt <= lease.issuedAt) {
|
|
295
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller open result is invalid', false, true);
|
|
296
|
+
}
|
|
297
|
+
return result;
|
|
298
|
+
}
|
|
299
|
+
function requestCodexController(params) {
|
|
300
|
+
const auth = authority(params);
|
|
301
|
+
const issuedAt = Date.now();
|
|
302
|
+
const request = {
|
|
303
|
+
version: 3,
|
|
304
|
+
id: randomUUID(),
|
|
305
|
+
...auth,
|
|
306
|
+
issuedAt,
|
|
307
|
+
expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
|
|
308
|
+
family: 'codex-controller',
|
|
309
|
+
command: params.command,
|
|
310
|
+
args: [],
|
|
311
|
+
controllerProcess: params.controllerProcess,
|
|
312
|
+
controllerProof: params.controllerProof
|
|
313
|
+
};
|
|
314
|
+
const result = parseCodexControllerResult(exchangeSandboxControl(request, params));
|
|
315
|
+
if (result.status === 'opened'
|
|
316
|
+
&& (result.lease.controlGeneration !== auth.generation
|
|
317
|
+
|| result.lease.controllerProcess.pid !== params.controllerProcess.pid
|
|
318
|
+
|| result.lease.controllerProcess.startTime !== params.controllerProcess.startTime)) {
|
|
319
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller result does not match the request', false, true);
|
|
320
|
+
}
|
|
321
|
+
return result;
|
|
322
|
+
}
|
|
323
|
+
export function requestCodexControllerOpen(params) {
|
|
324
|
+
const result = requestCodexController({ ...params, command: 'open', controllerProof: null });
|
|
325
|
+
if (result.status !== 'opened')
|
|
326
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller open returned the wrong result', false, true);
|
|
327
|
+
return result;
|
|
328
|
+
}
|
|
329
|
+
export function requestCodexControllerClose(params) {
|
|
330
|
+
const result = requestCodexController({ ...params, command: 'close' });
|
|
331
|
+
if (result.status !== 'closed')
|
|
332
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller close returned the wrong result', false, true);
|
|
333
|
+
return result;
|
|
334
|
+
}
|
|
335
|
+
export function requestCodexControllerVerify(params) {
|
|
336
|
+
const result = requestCodexController({
|
|
337
|
+
...params,
|
|
338
|
+
controllerProcess: params.controllerProof.controllerProcess,
|
|
339
|
+
command: 'verify'
|
|
340
|
+
});
|
|
341
|
+
if (result.status !== 'verified') {
|
|
342
|
+
clientError('SANDBOX_CONTROL_RESULT_INVALID', 'controller verify returned the wrong result', false, true);
|
|
343
|
+
}
|
|
344
|
+
return result;
|
|
345
|
+
}
|
|
164
346
|
export function requestSandboxTaskCreate(params) {
|
|
165
347
|
const auth = authority(params);
|
|
166
348
|
const issuedAt = Date.now();
|
|
167
349
|
const request = {
|
|
168
|
-
version:
|
|
350
|
+
version: 3, id: randomUUID(), ...auth, issuedAt,
|
|
169
351
|
expiresAt: issuedAt + SANDBOX_CONTROL_ADMISSION_WINDOW_MS,
|
|
170
|
-
family: 'task-create', candidate: params.candidate
|
|
352
|
+
family: 'task-create', candidate: params.candidate,
|
|
353
|
+
controllerProcess: null,
|
|
354
|
+
controllerProof: null
|
|
171
355
|
};
|
|
172
356
|
return exchangeSandboxControl(request, { ...params, timeoutMs: params.timeoutMs ?? 120_000 });
|
|
173
357
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { commandForEngine, runEngine, runProbe } from '../shell.js';
|
|
2
2
|
function isAuthoritativeNotFound(error) {
|
|
3
3
|
const message = error instanceof Error ? error.message : String(error);
|
|
4
|
-
return /(?:no such container|container .* not found|cannot find container)/i.test(message);
|
|
4
|
+
return /(?:no such (?:container|object)|container .* not found|cannot find container)/i.test(message);
|
|
5
5
|
}
|
|
6
6
|
export function classifySandboxContainerInspection(expected, inspection) {
|
|
7
7
|
if ('notFound' in inspection)
|
|
@@ -0,0 +1,273 @@
|
|
|
1
|
+
import crypto from 'node:crypto';
|
|
2
|
+
import fs from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { parseLinuxProcessStat } from '../../server/process-state.js';
|
|
5
|
+
import { commandForEngine, runProbe } from '../shell.js';
|
|
6
|
+
const CONTROLLER_TTL_MS = 4 * 60 * 60 * 1_000;
|
|
7
|
+
const HEX_256 = /^[a-f0-9]{64}$/u;
|
|
8
|
+
const REGISTRATION_KEYS = [
|
|
9
|
+
'buildIdentity', 'containerId', 'controlGeneration', 'controllerInstanceDigest',
|
|
10
|
+
'controllerProcess', 'expiresAt', 'issuedAt', 'leaseId', 'leaseSecretHash',
|
|
11
|
+
'taskId', 'version'
|
|
12
|
+
].sort().join(',');
|
|
13
|
+
export class CodexControllerRegistrationError extends Error {
|
|
14
|
+
code;
|
|
15
|
+
constructor(code, message) {
|
|
16
|
+
super(`${code}: ${message}`);
|
|
17
|
+
this.name = code;
|
|
18
|
+
this.code = code;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function fail(code, message) {
|
|
22
|
+
throw new CodexControllerRegistrationError(code, message);
|
|
23
|
+
}
|
|
24
|
+
function exactKeys(value, keys) {
|
|
25
|
+
return Object.keys(value).sort().join(',') === [...keys].sort().join(',');
|
|
26
|
+
}
|
|
27
|
+
function validProcess(value) {
|
|
28
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
29
|
+
return false;
|
|
30
|
+
const processValue = value;
|
|
31
|
+
return exactKeys(processValue, ['pid', 'startTime'])
|
|
32
|
+
&& Number.isSafeInteger(processValue.pid) && processValue.pid > 0
|
|
33
|
+
&& Number.isSafeInteger(processValue.startTime) && processValue.startTime >= 0;
|
|
34
|
+
}
|
|
35
|
+
function validBuild(value) {
|
|
36
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
37
|
+
return false;
|
|
38
|
+
const build = value;
|
|
39
|
+
return exactKeys(build, [
|
|
40
|
+
'internalExecutableBuildHash', 'lifecycleContractHash', 'packageVersion', 'protocolVersion'
|
|
41
|
+
])
|
|
42
|
+
&& build.protocolVersion === 3
|
|
43
|
+
&& typeof build.packageVersion === 'string' && build.packageVersion.length > 0
|
|
44
|
+
&& typeof build.internalExecutableBuildHash === 'string' && HEX_256.test(build.internalExecutableBuildHash)
|
|
45
|
+
&& typeof build.lifecycleContractHash === 'string' && HEX_256.test(build.lifecycleContractHash);
|
|
46
|
+
}
|
|
47
|
+
function parseRegistration(raw) {
|
|
48
|
+
let value;
|
|
49
|
+
try {
|
|
50
|
+
value = JSON.parse(raw);
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_INVALID', 'controller registration is malformed');
|
|
54
|
+
}
|
|
55
|
+
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
|
56
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_INVALID', 'controller registration is invalid');
|
|
57
|
+
}
|
|
58
|
+
const registration = value;
|
|
59
|
+
if (Object.keys(registration).sort().join(',') !== REGISTRATION_KEYS
|
|
60
|
+
|| registration.version !== 1
|
|
61
|
+
|| typeof registration.taskId !== 'string'
|
|
62
|
+
|| typeof registration.controlGeneration !== 'string'
|
|
63
|
+
|| typeof registration.containerId !== 'string'
|
|
64
|
+
|| typeof registration.leaseId !== 'string' || !HEX_256.test(registration.leaseId)
|
|
65
|
+
|| typeof registration.leaseSecretHash !== 'string' || !HEX_256.test(registration.leaseSecretHash)
|
|
66
|
+
|| typeof registration.controllerInstanceDigest !== 'string' || !HEX_256.test(registration.controllerInstanceDigest)
|
|
67
|
+
|| !validProcess(registration.controllerProcess)
|
|
68
|
+
|| !validBuild(registration.buildIdentity)
|
|
69
|
+
|| !Number.isSafeInteger(registration.issuedAt)
|
|
70
|
+
|| !Number.isSafeInteger(registration.expiresAt)
|
|
71
|
+
|| registration.expiresAt <= registration.issuedAt) {
|
|
72
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_INVALID', 'controller registration schema is invalid');
|
|
73
|
+
}
|
|
74
|
+
return registration;
|
|
75
|
+
}
|
|
76
|
+
function registrationPath(manifestPath) {
|
|
77
|
+
return path.join(path.dirname(path.resolve(manifestPath)), 'codex-controller.json');
|
|
78
|
+
}
|
|
79
|
+
function readRaw(file) {
|
|
80
|
+
try {
|
|
81
|
+
const stat = fs.lstatSync(file);
|
|
82
|
+
if (!stat.isFile() || stat.isSymbolicLink()
|
|
83
|
+
|| (process.platform !== 'win32' && (stat.mode & 0o777) !== 0o600)) {
|
|
84
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_INVALID', 'controller registration file is unsafe');
|
|
85
|
+
}
|
|
86
|
+
return { raw: fs.readFileSync(file, 'utf8'), stat };
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
if (error.code === 'ENOENT')
|
|
90
|
+
return null;
|
|
91
|
+
throw error;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
function sameFile(left, right) {
|
|
95
|
+
return left.dev === right.dev && left.ino === right.ino && left.mode === right.mode
|
|
96
|
+
&& left.size === right.size && left.mtimeMs === right.mtimeMs;
|
|
97
|
+
}
|
|
98
|
+
function secretHash(secret) {
|
|
99
|
+
return crypto.createHash('sha256')
|
|
100
|
+
.update('agent-infra/codex-controller-lease/v1\0')
|
|
101
|
+
.update(secret)
|
|
102
|
+
.digest('hex');
|
|
103
|
+
}
|
|
104
|
+
function safeEqual(left, right) {
|
|
105
|
+
if (!HEX_256.test(left) || !HEX_256.test(right))
|
|
106
|
+
return false;
|
|
107
|
+
return crypto.timingSafeEqual(Buffer.from(left, 'hex'), Buffer.from(right, 'hex'));
|
|
108
|
+
}
|
|
109
|
+
function defaultProbe(manifest, identity) {
|
|
110
|
+
const command = commandForEngine(manifest.engine, 'docker', [
|
|
111
|
+
'exec', manifest.containerIdentity.id, 'cat', `/proc/${identity.pid}/stat`
|
|
112
|
+
]);
|
|
113
|
+
const result = runProbe(command.cmd, command.args, { timeout: 2_000 });
|
|
114
|
+
if (result.status !== 0) {
|
|
115
|
+
const stderr = typeof result.stderr === 'string' ? result.stderr : result.stderr?.toString('utf8') ?? '';
|
|
116
|
+
return /no such (?:file|container)|not found|does not exist/iu.test(stderr) ? 'dead' : 'unknown';
|
|
117
|
+
}
|
|
118
|
+
const stdout = typeof result.stdout === 'string' ? result.stdout : result.stdout?.toString('utf8') ?? '';
|
|
119
|
+
const stat = parseLinuxProcessStat(stdout);
|
|
120
|
+
if (!stat)
|
|
121
|
+
return 'unknown';
|
|
122
|
+
if (stat.state === 'Z' || stat.startTime !== identity.startTime)
|
|
123
|
+
return 'dead';
|
|
124
|
+
return 'alive';
|
|
125
|
+
}
|
|
126
|
+
function assertRegistrationBinding(registration, manifest, buildIdentity) {
|
|
127
|
+
if (registration.taskId !== manifest.taskId
|
|
128
|
+
|| registration.controlGeneration !== manifest.generation
|
|
129
|
+
|| registration.containerId !== manifest.containerIdentity.id
|
|
130
|
+
|| JSON.stringify(registration.buildIdentity) !== JSON.stringify(buildIdentity)) {
|
|
131
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_INVALID', 'controller registration binding is invalid');
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
function atomicWrite(file, value) {
|
|
135
|
+
const temporary = path.join(path.dirname(file), `.${path.basename(file)}.${process.pid}.${crypto.randomUUID()}.tmp`);
|
|
136
|
+
try {
|
|
137
|
+
fs.writeFileSync(temporary, `${JSON.stringify(value)}\n`, { mode: 0o600, flag: 'wx' });
|
|
138
|
+
fs.chmodSync(temporary, 0o600);
|
|
139
|
+
fs.renameSync(temporary, file);
|
|
140
|
+
}
|
|
141
|
+
finally {
|
|
142
|
+
fs.rmSync(temporary, { force: true });
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
export function readCodexControllerRegistration(manifestPath) {
|
|
146
|
+
const existing = readRaw(registrationPath(manifestPath));
|
|
147
|
+
if (!existing)
|
|
148
|
+
fail('CODEX_SANDBOX_CONTROLLER_REGISTRATION_MISSING', 'controller registration is missing');
|
|
149
|
+
return parseRegistration(existing.raw);
|
|
150
|
+
}
|
|
151
|
+
export function openCodexControllerRegistration(params, options = {}) {
|
|
152
|
+
if (params.manifest.mode !== 'task-bound' || !params.manifest.taskId) {
|
|
153
|
+
fail('SANDBOX_CONTROL_BRANCH_ONLY', 'branch-only sandboxes cannot register a Codex controller');
|
|
154
|
+
}
|
|
155
|
+
if (!validProcess(params.controllerProcess)) {
|
|
156
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_INACTIVE', 'requested controller process is invalid');
|
|
157
|
+
}
|
|
158
|
+
const file = registrationPath(params.manifestPath);
|
|
159
|
+
const now = (options.now ?? Date.now)();
|
|
160
|
+
const initial = readRaw(file);
|
|
161
|
+
if (initial) {
|
|
162
|
+
const existing = parseRegistration(initial.raw);
|
|
163
|
+
assertRegistrationBinding(existing, params.manifest, params.buildIdentity);
|
|
164
|
+
if (existing.expiresAt > now) {
|
|
165
|
+
const oldState = (options.probeProcess ?? ((identity) => defaultProbe(params.manifest, identity)))(existing.controllerProcess);
|
|
166
|
+
if (oldState === 'alive')
|
|
167
|
+
fail('CODEX_SANDBOX_CONTROLLER_BUSY', 'an active controller registration already exists');
|
|
168
|
+
if (oldState === 'unknown')
|
|
169
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_UNKNOWN', 'existing controller process state is unknown');
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
const requestedState = (options.probeProcess ?? ((identity) => defaultProbe(params.manifest, identity)))(params.controllerProcess);
|
|
173
|
+
if (requestedState === 'dead')
|
|
174
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_INACTIVE', 'requested controller process is not alive');
|
|
175
|
+
if (requestedState === 'unknown')
|
|
176
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_UNKNOWN', 'requested controller process state is unknown');
|
|
177
|
+
const randomHex = options.randomHex ?? (() => crypto.randomBytes(32).toString('hex'));
|
|
178
|
+
const leaseId = randomHex();
|
|
179
|
+
const leaseSecret = randomHex();
|
|
180
|
+
const controllerInstanceDigest = randomHex();
|
|
181
|
+
if (![leaseId, leaseSecret, controllerInstanceDigest].every((value) => HEX_256.test(value))) {
|
|
182
|
+
fail('CODEX_SANDBOX_CONTROLLER_CREDENTIAL_INVALID', 'generated controller credential is invalid');
|
|
183
|
+
}
|
|
184
|
+
const registration = Object.freeze({
|
|
185
|
+
version: 1,
|
|
186
|
+
taskId: params.manifest.taskId,
|
|
187
|
+
controlGeneration: params.manifest.generation,
|
|
188
|
+
containerId: params.manifest.containerIdentity.id,
|
|
189
|
+
leaseId,
|
|
190
|
+
leaseSecretHash: secretHash(leaseSecret),
|
|
191
|
+
controllerInstanceDigest,
|
|
192
|
+
controllerProcess: params.controllerProcess,
|
|
193
|
+
buildIdentity: params.buildIdentity,
|
|
194
|
+
issuedAt: now,
|
|
195
|
+
expiresAt: now + CONTROLLER_TTL_MS
|
|
196
|
+
});
|
|
197
|
+
options.beforeCommit?.();
|
|
198
|
+
const current = readRaw(file);
|
|
199
|
+
if ((!initial && current)
|
|
200
|
+
|| (initial && (!current || current.raw !== initial.raw || !sameFile(current.stat, initial.stat)))) {
|
|
201
|
+
fail('CODEX_SANDBOX_CONTROLLER_OWNERSHIP_LOST', 'controller registration changed before commit');
|
|
202
|
+
}
|
|
203
|
+
atomicWrite(file, registration);
|
|
204
|
+
return Object.freeze({
|
|
205
|
+
version: 1,
|
|
206
|
+
status: 'opened',
|
|
207
|
+
changed: true,
|
|
208
|
+
lease: Object.freeze({
|
|
209
|
+
version: 1,
|
|
210
|
+
leaseId,
|
|
211
|
+
leaseSecret,
|
|
212
|
+
taskId: registration.taskId,
|
|
213
|
+
controlGeneration: registration.controlGeneration,
|
|
214
|
+
controllerInstanceDigest,
|
|
215
|
+
controllerProcess: registration.controllerProcess,
|
|
216
|
+
buildIdentity: registration.buildIdentity,
|
|
217
|
+
issuedAt: registration.issuedAt,
|
|
218
|
+
expiresAt: registration.expiresAt
|
|
219
|
+
}),
|
|
220
|
+
error: null
|
|
221
|
+
});
|
|
222
|
+
}
|
|
223
|
+
export function closeCodexControllerRegistration(params) {
|
|
224
|
+
if (params.manifest.mode !== 'task-bound' || !params.manifest.taskId) {
|
|
225
|
+
fail('SANDBOX_CONTROL_BRANCH_ONLY', 'branch-only sandboxes cannot close a Codex controller registration');
|
|
226
|
+
}
|
|
227
|
+
const file = registrationPath(params.manifestPath);
|
|
228
|
+
const existingRaw = readRaw(file);
|
|
229
|
+
if (!existingRaw)
|
|
230
|
+
return Object.freeze({ version: 1, status: 'closed', changed: false, lease: null, error: null });
|
|
231
|
+
const existing = parseRegistration(existingRaw.raw);
|
|
232
|
+
if (existing.taskId !== params.manifest.taskId
|
|
233
|
+
|| existing.controlGeneration !== params.manifest.generation
|
|
234
|
+
|| existing.containerId !== params.manifest.containerIdentity.id
|
|
235
|
+
|| params.proof.version !== 1
|
|
236
|
+
|| existing.leaseId !== params.proof.leaseId
|
|
237
|
+
|| !safeEqual(existing.leaseSecretHash, secretHash(params.proof.leaseSecret))
|
|
238
|
+
|| JSON.stringify(existing.controllerProcess) !== JSON.stringify(params.proof.controllerProcess)) {
|
|
239
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROOF_INVALID', 'controller close proof is invalid');
|
|
240
|
+
}
|
|
241
|
+
const current = readRaw(file);
|
|
242
|
+
if (!current || current.raw !== existingRaw.raw || !sameFile(current.stat, existingRaw.stat)) {
|
|
243
|
+
fail('CODEX_SANDBOX_CONTROLLER_OWNERSHIP_LOST', 'controller registration changed before close');
|
|
244
|
+
}
|
|
245
|
+
fs.unlinkSync(file);
|
|
246
|
+
return Object.freeze({ version: 1, status: 'closed', changed: true, lease: null, error: null });
|
|
247
|
+
}
|
|
248
|
+
export function resolveCodexControllerBinding(params) {
|
|
249
|
+
if (params.manifest.mode !== 'task-bound' || !params.manifest.taskId) {
|
|
250
|
+
fail('SANDBOX_CONTROL_BRANCH_ONLY', 'branch-only sandboxes cannot resolve a Codex controller registration');
|
|
251
|
+
}
|
|
252
|
+
const registration = readCodexControllerRegistration(params.manifestPath);
|
|
253
|
+
assertRegistrationBinding(registration, params.manifest, params.buildIdentity);
|
|
254
|
+
if (registration.expiresAt <= (params.now ?? Date.now())) {
|
|
255
|
+
fail('CODEX_SANDBOX_CONTROLLER_LEASE_EXPIRED', 'controller lease is expired');
|
|
256
|
+
}
|
|
257
|
+
if (params.proof.version !== 1
|
|
258
|
+
|| registration.leaseId !== params.proof.leaseId
|
|
259
|
+
|| !safeEqual(registration.leaseSecretHash, secretHash(params.proof.leaseSecret))
|
|
260
|
+
|| JSON.stringify(registration.controllerProcess) !== JSON.stringify(params.proof.controllerProcess)) {
|
|
261
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROOF_INVALID', 'controller proof is invalid');
|
|
262
|
+
}
|
|
263
|
+
const state = (params.probeProcess ?? ((identity) => defaultProbe(params.manifest, identity)))(registration.controllerProcess);
|
|
264
|
+
if (state === 'dead')
|
|
265
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_INACTIVE', 'controller process is not alive');
|
|
266
|
+
if (state === 'unknown')
|
|
267
|
+
fail('CODEX_SANDBOX_CONTROLLER_PROCESS_UNKNOWN', 'controller process state is unknown');
|
|
268
|
+
return Object.freeze({
|
|
269
|
+
instanceDigest: registration.controllerInstanceDigest,
|
|
270
|
+
controlGeneration: registration.controlGeneration
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
//# sourceMappingURL=controller-registration.js.map
|