humanish 0.100.0 → 0.101.0
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/dist/actor-contract.d.ts +10 -10
- package/dist/actor-contract.js +15 -4
- package/dist/actor-contract.js.map +1 -1
- package/dist/computer-use.d.ts +13 -2
- package/dist/computer-use.js +108 -24
- package/dist/computer-use.js.map +1 -1
- package/dist/cua-actor-lab.js +34 -15
- package/dist/cua-actor-lab.js.map +1 -1
- package/dist/local-agent-cli.d.ts +10 -0
- package/dist/local-agent-cli.js +23 -7
- package/dist/local-agent-cli.js.map +1 -1
- package/dist/observer-app.html +1 -1
- package/dist/restricted-codex-participant-policy.d.ts +11 -7
- package/dist/restricted-codex-participant-policy.js +22 -51
- package/dist/restricted-codex-participant-policy.js.map +1 -1
- package/dist/restricted-codex-participant.d.ts +6 -2
- package/dist/restricted-codex-participant.js +166 -107
- package/dist/restricted-codex-participant.js.map +1 -1
- package/dist/restricted-codex-policy.d.ts +12 -5
- package/dist/restricted-codex-policy.js +62 -37
- package/dist/restricted-codex-policy.js.map +1 -1
- package/dist/restricted-codex-session.d.ts +28 -3
- package/dist/restricted-codex-session.js +440 -218
- package/dist/restricted-codex-session.js.map +1 -1
- package/dist/restricted-codex-transport.d.ts +15 -4
- package/dist/restricted-codex-transport.js +71 -8
- package/dist/restricted-codex-transport.js.map +1 -1
- package/docs/architecture/restricted-codex-analysis.md +17 -5
- package/docs/contracts/schemas.md +1 -1
- package/docs/goals/current.md +3 -3
- package/docs/ramp/README.md +7 -1
- package/docs/release/0.100.1-participant-continuity.md +20 -0
- package/docs/release/0.101.0-codex-ui-tools.md +28 -0
- package/package.json +1 -1
- package/dist/local-agent-appserver.d.ts +0 -44
- package/dist/local-agent-appserver.js +0 -269
- package/dist/local-agent-appserver.js.map +0 -1
package/dist/actor-contract.d.ts
CHANGED
|
@@ -111,10 +111,10 @@ export interface ActorTokenUsage {
|
|
|
111
111
|
* (OpenAI 5.6+ bills these at a surcharge and reports `cache_write_tokens`). Same
|
|
112
112
|
* honestly-absent discipline as `cachedInput` (#334). */
|
|
113
113
|
cacheWriteInput?: number;
|
|
114
|
-
/** Per
|
|
115
|
-
* that re-prices whole requests past
|
|
116
|
-
* only be priced exactly from
|
|
117
|
-
* crossed. Additive and honestly absent on producers that do not record it (#334). */
|
|
114
|
+
/** Per model-inference request usage, in request order. One provider interaction can contain
|
|
115
|
+
* several inferences around native tool calls. A provider that re-prices whole requests past
|
|
116
|
+
* an input-size threshold can only be priced exactly from these sizes; totals cannot say which
|
|
117
|
+
* requests crossed. Additive and honestly absent on producers that do not record it (#334). */
|
|
118
118
|
turns?: Array<{
|
|
119
119
|
input?: number;
|
|
120
120
|
cachedInput?: number;
|
|
@@ -130,12 +130,12 @@ export interface ActorExecutionProfile {
|
|
|
130
130
|
transport: "codex-app-server";
|
|
131
131
|
authentication: "chatgpt-account";
|
|
132
132
|
billing: "account-unknown";
|
|
133
|
-
requestedModel:
|
|
134
|
-
reasoningEffort: "
|
|
133
|
+
requestedModel: string;
|
|
134
|
+
reasoningEffort: import("./reasoning-effort.js").ReasoningEffort;
|
|
135
135
|
cliVersion: "0.154.0";
|
|
136
|
-
toolPolicy: "restricted-codex-v1";
|
|
137
|
-
participantSchema: "humanish.restricted-participant-turn.v1";
|
|
138
|
-
memoryPolicy: "recent-eight-16k-v1";
|
|
136
|
+
toolPolicy: "restricted-codex-v1" | "codex-ui-tools-v1";
|
|
137
|
+
participantSchema: "humanish.restricted-participant-turn.v1" | "humanish.codex-ui-tool.v1";
|
|
138
|
+
memoryPolicy: "recent-eight-16k-v1" | "continuing-thread-v1";
|
|
139
139
|
}
|
|
140
140
|
export interface ProviderRequestReceipt {
|
|
141
141
|
dispatched: boolean | "unknown";
|
|
@@ -145,7 +145,7 @@ export interface ProviderRequestReceipt {
|
|
|
145
145
|
export interface ActorProviderRequest extends ProviderRequestReceipt {
|
|
146
146
|
ordinal: number;
|
|
147
147
|
kind: "interaction" | "debrief";
|
|
148
|
-
/** Launcher version, effective config, account, thread and
|
|
148
|
+
/** Launcher version, effective config, account, thread and tool-policy checks
|
|
149
149
|
* passed before turn/start. Does not attest remote execution or completion. */
|
|
150
150
|
profileVerified: boolean;
|
|
151
151
|
errorCode?: import("./cua-provider-error.js").CuaProviderErrorCode;
|
package/dist/actor-contract.js
CHANGED
|
@@ -16,13 +16,24 @@ export const PARTICIPANT_OUTCOME_STATUSES = ["abandoned", "incomplete"];
|
|
|
16
16
|
/** Durable reader profile. Append new qualified profiles; never rewrite old evidence. */
|
|
17
17
|
export function validActorExecutionProfile(value) {
|
|
18
18
|
const expected = { schema: "humanish.actor-execution-profile.v1", transport: "codex-app-server",
|
|
19
|
-
authentication: "chatgpt-account", billing: "account-unknown",
|
|
20
|
-
cliVersion: "0.154.0"
|
|
21
|
-
memoryPolicy: "recent-eight-16k-v1" };
|
|
19
|
+
authentication: "chatgpt-account", billing: "account-unknown",
|
|
20
|
+
cliVersion: "0.154.0" };
|
|
22
21
|
if (value === null || typeof value !== "object" || Array.isArray(value))
|
|
23
22
|
return false;
|
|
24
23
|
const object = value;
|
|
25
|
-
|
|
24
|
+
if (Object.keys(object).length !== Object.keys(expected).length + 5 ||
|
|
25
|
+
!Object.entries(expected).every(([key, expectedValue]) => object[key] === expectedValue))
|
|
26
|
+
return false;
|
|
27
|
+
const legacy = object.requestedModel === "gpt-6-astra" && object.reasoningEffort === "low"
|
|
28
|
+
&& object.toolPolicy === "restricted-codex-v1"
|
|
29
|
+
&& object.participantSchema === "humanish.restricted-participant-turn.v1"
|
|
30
|
+
&& (object.memoryPolicy === "recent-eight-16k-v1" || object.memoryPolicy === "continuing-thread-v1");
|
|
31
|
+
const uiTools = typeof object.requestedModel === "string" && /^[A-Za-z0-9][A-Za-z0-9._:/-]{0,199}$/.test(object.requestedModel)
|
|
32
|
+
&& typeof object.reasoningEffort === "string" && ["none", "minimal", "low", "medium", "high", "xhigh", "max"].includes(object.reasoningEffort)
|
|
33
|
+
&& object.toolPolicy === "codex-ui-tools-v1"
|
|
34
|
+
&& object.participantSchema === "humanish.codex-ui-tool.v1"
|
|
35
|
+
&& object.memoryPolicy === "continuing-thread-v1";
|
|
36
|
+
return legacy || uiTools;
|
|
26
37
|
}
|
|
27
38
|
/** Closed per-attempt evidence; dollar amounts are never part of account usage. */
|
|
28
39
|
export function validActorProviderRequests(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor-contract.js","sourceRoot":"","sources":["../src/actor-contract.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actor-contract.js","sourceRoot":"","sources":["../src/actor-contract.ts"],"names":[],"mappings":"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"}
|
package/dist/computer-use.d.ts
CHANGED
|
@@ -127,6 +127,8 @@ export interface CuaTurnRequest {
|
|
|
127
127
|
contextHint?: string;
|
|
128
128
|
}
|
|
129
129
|
export interface CuaTurn {
|
|
130
|
+
/** This action proposal yielded from a provider request that remains active. No receipt or usage is settled yet. */
|
|
131
|
+
providerRequestPending?: true;
|
|
130
132
|
providerRequest?: ProviderRequestReceipt;
|
|
131
133
|
/** Continuation handle for the next turn. */
|
|
132
134
|
responseId?: string;
|
|
@@ -144,6 +146,13 @@ export interface CuaTurn {
|
|
|
144
146
|
output?: number;
|
|
145
147
|
cachedInput?: number;
|
|
146
148
|
cacheWriteInput?: number;
|
|
149
|
+
/** Per model inference inside this provider interaction. */
|
|
150
|
+
turns?: Array<{
|
|
151
|
+
input?: number;
|
|
152
|
+
output?: number;
|
|
153
|
+
cachedInput?: number;
|
|
154
|
+
cacheWriteInput?: number;
|
|
155
|
+
}>;
|
|
147
156
|
};
|
|
148
157
|
/** True when the model reported a natural endpoint (no further action). */
|
|
149
158
|
done: boolean;
|
|
@@ -158,10 +167,10 @@ export interface CuaTurn {
|
|
|
158
167
|
export interface CuaProvider {
|
|
159
168
|
/** Single dispatch; the promise includes owned request cleanup. No stall retry. */
|
|
160
169
|
readonly requestPolicy?: "fail_closed";
|
|
161
|
-
readonly executionProfile?: ActorExecutionProfile;
|
|
170
|
+
readonly executionProfile?: ActorExecutionProfile | undefined;
|
|
162
171
|
readonly historyTurnsOmitted?: number;
|
|
163
172
|
readonly id: string;
|
|
164
|
-
readonly version?: string;
|
|
173
|
+
readonly version?: string | undefined;
|
|
165
174
|
/**
|
|
166
175
|
* The request settings this provider will actually send, for the trace to record. `version` says
|
|
167
176
|
* WHICH model; this says how it was asked to run. Optional: a provider with no such settings
|
|
@@ -188,6 +197,8 @@ export interface CuaProvider {
|
|
|
188
197
|
/** Latched uncertainty from hidden interactive attempts (for example, a transport retry).
|
|
189
198
|
* A later success or pre-dispatch refusal cannot make earlier unreported usage complete. */
|
|
190
199
|
readonly interactionUsageIncomplete?: boolean;
|
|
200
|
+
/** Latest known usage for the active, unsettled request. Used only for runtime spend guards. */
|
|
201
|
+
readonly pendingRequestUsage?: CuaTurn["usage"];
|
|
191
202
|
nextTurn(req: CuaTurnRequest, signal: AbortSignal): Promise<CuaTurn>;
|
|
192
203
|
/** Optional read-only closing report. Implementations must disable tools and make no retries. */
|
|
193
204
|
debrief?: ((req: CuaTurnRequest, signal: AbortSignal) => Promise<CuaTurn>) | undefined;
|
package/dist/computer-use.js
CHANGED
|
@@ -20,11 +20,29 @@ export function validClosingReport(value) {
|
|
|
20
20
|
function validTokenCount(value) {
|
|
21
21
|
return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
|
|
22
22
|
}
|
|
23
|
+
function normalizedUsageTurns(usage) {
|
|
24
|
+
if (!Array.isArray(usage.turns) || usage.turns.length === 0)
|
|
25
|
+
return undefined;
|
|
26
|
+
const fields = ["input", "output", "cachedInput", "cacheWriteInput"];
|
|
27
|
+
const turns = [];
|
|
28
|
+
for (const raw of usage.turns) {
|
|
29
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
30
|
+
return undefined;
|
|
31
|
+
if (fields.every(field => raw[field] === undefined) || fields.some(field => raw[field] !== undefined && !validTokenCount(raw[field])))
|
|
32
|
+
return undefined;
|
|
33
|
+
if ((raw.cachedInput ?? 0) + (raw.cacheWriteInput ?? 0) > (raw.input ?? 0))
|
|
34
|
+
return undefined;
|
|
35
|
+
turns.push(Object.fromEntries(fields.flatMap(field => raw[field] === undefined ? [] : [[field, raw[field]]])));
|
|
36
|
+
}
|
|
37
|
+
return fields.every(field => turns.reduce((sum, turn) => sum + (turn[field] ?? 0), 0) === (usage[field] ?? 0))
|
|
38
|
+
? turns : undefined;
|
|
39
|
+
}
|
|
23
40
|
function completeTurnUsage(usage) {
|
|
24
41
|
return usage !== undefined && validTokenCount(usage.input) && validTokenCount(usage.output)
|
|
25
42
|
&& (usage.cachedInput === undefined || validTokenCount(usage.cachedInput))
|
|
26
43
|
&& (usage.cacheWriteInput === undefined || validTokenCount(usage.cacheWriteInput))
|
|
27
|
-
&& (usage.cachedInput ?? 0) + (usage.cacheWriteInput ?? 0) <= usage.input
|
|
44
|
+
&& (usage.cachedInput ?? 0) + (usage.cacheWriteInput ?? 0) <= usage.input
|
|
45
|
+
&& (usage.turns === undefined || normalizedUsageTurns(usage) !== undefined);
|
|
28
46
|
}
|
|
29
47
|
// Waiting is a legitimate strategy, not idleness. A persona told to sign up and verify by email
|
|
30
48
|
// polls its inbox — screenshot, wait, screenshot, wait — and at 6 steps that ended the session as
|
|
@@ -389,9 +407,44 @@ export async function runComputerUseLoop(options) {
|
|
|
389
407
|
let usageInput = 0;
|
|
390
408
|
let usageCachedInput = 0;
|
|
391
409
|
let usageCacheWriteInput = 0;
|
|
392
|
-
|
|
393
|
-
|
|
410
|
+
let usageOutput = 0;
|
|
411
|
+
let sawUsage = false;
|
|
412
|
+
let incompleteInteractionUsage = false;
|
|
413
|
+
let unreportedInteractionUsage = false;
|
|
414
|
+
let interactionRequestPending = false;
|
|
415
|
+
// Per model-inference usage, in order (#334): the recorded fact long-context pricing tiers
|
|
416
|
+
// need. A continuing native tool interaction may contain several inference requests.
|
|
394
417
|
const usageTurns = [];
|
|
418
|
+
const knownPendingUsage = () => {
|
|
419
|
+
const usage = interactionRequestPending ? provider.pendingRequestUsage : undefined;
|
|
420
|
+
if (!completeTurnUsage(usage))
|
|
421
|
+
return undefined;
|
|
422
|
+
const turns = usage.turns === undefined ? undefined : normalizedUsageTurns(usage);
|
|
423
|
+
return { input: usage.input, output: usage.output,
|
|
424
|
+
...(usage.cachedInput === undefined ? {} : { cachedInput: usage.cachedInput }),
|
|
425
|
+
...(usage.cacheWriteInput === undefined ? {} : { cacheWriteInput: usage.cacheWriteInput }),
|
|
426
|
+
...(turns === undefined ? {} : { turns }) };
|
|
427
|
+
};
|
|
428
|
+
const withPendingUsage = (settled) => {
|
|
429
|
+
const pendingUsage = knownPendingUsage();
|
|
430
|
+
if (pendingUsage === undefined)
|
|
431
|
+
return settled;
|
|
432
|
+
const input = (settled.input ?? 0) + pendingUsage.input;
|
|
433
|
+
const output = (settled.output ?? 0) + pendingUsage.output;
|
|
434
|
+
return {
|
|
435
|
+
...settled,
|
|
436
|
+
input,
|
|
437
|
+
output,
|
|
438
|
+
...((settled.cachedInput !== undefined || pendingUsage.cachedInput !== undefined)
|
|
439
|
+
? { cachedInput: (settled.cachedInput ?? 0) + (pendingUsage.cachedInput ?? 0) } : {}),
|
|
440
|
+
...((settled.cacheWriteInput !== undefined || pendingUsage.cacheWriteInput !== undefined)
|
|
441
|
+
? { cacheWriteInput: (settled.cacheWriteInput ?? 0) + (pendingUsage.cacheWriteInput ?? 0) } : {}),
|
|
442
|
+
turns: [...(settled.turns ?? []), ...(pendingUsage.turns ?? [{ input: pendingUsage.input, output: pendingUsage.output,
|
|
443
|
+
...(pendingUsage.cachedInput === undefined ? {} : { cachedInput: pendingUsage.cachedInput }),
|
|
444
|
+
...(pendingUsage.cacheWriteInput === undefined ? {} : { cacheWriteInput: pendingUsage.cacheWriteInput }) }])],
|
|
445
|
+
...(settled.total === undefined ? {} : { total: input + output })
|
|
446
|
+
};
|
|
447
|
+
};
|
|
395
448
|
// The running usage snapshot both spend guards consume: totals plus the per-request ledger,
|
|
396
449
|
// shaped exactly like the trace's final tokenUsage so one estimator prices both identically.
|
|
397
450
|
// Unlike the persisted trace (where absent means "unreported"), this runtime callback arg
|
|
@@ -408,18 +461,16 @@ export async function runComputerUseLoop(options) {
|
|
|
408
461
|
...(providerRequests.length > 0 && providerRequests.every(r => r.usageComplete && completeTurnUsage(r.usage))
|
|
409
462
|
? { total: usageInput + usageOutput } : {})
|
|
410
463
|
});
|
|
411
|
-
const runningUsage = () => provider.executionProfile?.billing === "account-unknown" ? accountUsage() : ({
|
|
464
|
+
const runningUsage = () => withPendingUsage(provider.executionProfile?.billing === "account-unknown" ? accountUsage() : ({
|
|
412
465
|
input: usageInput,
|
|
413
466
|
output: usageOutput,
|
|
414
467
|
cachedInput: usageCachedInput,
|
|
415
468
|
cacheWriteInput: usageCacheWriteInput,
|
|
416
469
|
...(usageTurns.length > 0 ? { turns: usageTurns } : {})
|
|
417
|
-
});
|
|
418
|
-
let usageOutput = 0;
|
|
419
|
-
let sawUsage = false;
|
|
420
|
-
let incompleteInteractionUsage = false;
|
|
421
|
-
let unreportedInteractionUsage = false;
|
|
470
|
+
}));
|
|
422
471
|
const hasUnreportedInteractionUsage = () => unreportedInteractionUsage || provider.interactionUsageIncomplete === true;
|
|
472
|
+
const usageUnavailableForCap = () => incompleteInteractionUsage || unreportedInteractionUsage ||
|
|
473
|
+
(interactionRequestPending ? knownPendingUsage() === undefined : provider.interactionUsageIncomplete === true);
|
|
423
474
|
let lastResponseId;
|
|
424
475
|
let currentPhase = "initializing computer-use loop";
|
|
425
476
|
let lastActionTitle;
|
|
@@ -431,9 +482,14 @@ export async function runComputerUseLoop(options) {
|
|
|
431
482
|
counts[key] = (counts[key] ?? 0) + 1;
|
|
432
483
|
};
|
|
433
484
|
const recordUsage = (turn, interaction = true) => {
|
|
434
|
-
if (
|
|
435
|
-
|
|
485
|
+
if (turn.providerRequestPending === true)
|
|
486
|
+
return;
|
|
436
487
|
const raw = turn.usage;
|
|
488
|
+
const turns = raw?.turns === undefined ? undefined : normalizedUsageTurns(raw);
|
|
489
|
+
if (interaction && (!completeTurnUsage(raw) || turn.providerRequest?.usageComplete === false))
|
|
490
|
+
incompleteInteractionUsage = true;
|
|
491
|
+
if (interaction && raw?.turns !== undefined && turns === undefined)
|
|
492
|
+
unreportedInteractionUsage = true;
|
|
437
493
|
if (raw === undefined)
|
|
438
494
|
return;
|
|
439
495
|
const usage = {
|
|
@@ -449,7 +505,10 @@ export async function runComputerUseLoop(options) {
|
|
|
449
505
|
usageCachedInput += usage.cachedInput ?? 0;
|
|
450
506
|
usageCacheWriteInput += usage.cacheWriteInput ?? 0;
|
|
451
507
|
usageOutput += usage.output ?? 0;
|
|
452
|
-
|
|
508
|
+
if (raw.turns === undefined)
|
|
509
|
+
usageTurns.push(usage);
|
|
510
|
+
else if (turns !== undefined)
|
|
511
|
+
usageTurns.push(...turns);
|
|
453
512
|
};
|
|
454
513
|
/** Marked providers own one attempt through settlement; an outer race never retries it. */
|
|
455
514
|
const markedRequest = async (request, kind, capMs) => {
|
|
@@ -463,6 +522,7 @@ export async function runComputerUseLoop(options) {
|
|
|
463
522
|
let failure;
|
|
464
523
|
let failed = false;
|
|
465
524
|
let accepted;
|
|
525
|
+
let pendingYield = false;
|
|
466
526
|
const pending = Promise.resolve().then(() => {
|
|
467
527
|
if (controller.signal.aborted)
|
|
468
528
|
throw new CuaProviderError("cancelled", { dispatched: false, usageComplete: false, cleanup: "confirmed" });
|
|
@@ -471,9 +531,18 @@ export async function runComputerUseLoop(options) {
|
|
|
471
531
|
void pending.catch(() => undefined);
|
|
472
532
|
try {
|
|
473
533
|
accepted = await raceBounded(`participant ${kind}`, pending, remaining(), capMs, signal);
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
534
|
+
if (accepted.providerRequestPending === true) {
|
|
535
|
+
if (kind !== "interaction" || accepted.done || accepted.actions.length === 0 || accepted.pendingSafetyChecks.length > 0 ||
|
|
536
|
+
accepted.providerRequest !== undefined || accepted.usage !== undefined || accepted.interruption !== undefined || accepted.closingReport !== undefined) {
|
|
537
|
+
throw new CuaProviderError("invalid_response", { dispatched: "unknown", usageComplete: false, cleanup: "unconfirmed" });
|
|
538
|
+
}
|
|
539
|
+
pendingYield = true;
|
|
540
|
+
}
|
|
541
|
+
else {
|
|
542
|
+
const r = accepted.providerRequest;
|
|
543
|
+
if (!r || r.dispatched !== true || typeof r.usageComplete !== "boolean" || r.cleanup !== "confirmed") {
|
|
544
|
+
throw new CuaProviderError("invalid_response", { dispatched: "unknown", usageComplete: false, cleanup: "unconfirmed" }, accepted.usage);
|
|
545
|
+
}
|
|
477
546
|
}
|
|
478
547
|
}
|
|
479
548
|
catch (error) {
|
|
@@ -495,6 +564,10 @@ export async function runComputerUseLoop(options) {
|
|
|
495
564
|
}
|
|
496
565
|
}
|
|
497
566
|
}
|
|
567
|
+
if (!failed && pendingYield) {
|
|
568
|
+
interactionRequestPending = true;
|
|
569
|
+
return accepted;
|
|
570
|
+
}
|
|
498
571
|
const final = settlement;
|
|
499
572
|
const typed = isCuaProviderError(failure) ? failure : final && "error" in final && isCuaProviderError(final.error) ? final.error : undefined;
|
|
500
573
|
const turn = final && "turn" in final ? final.turn : undefined;
|
|
@@ -502,14 +575,15 @@ export async function runComputerUseLoop(options) {
|
|
|
502
575
|
const receipt = raw && (typeof raw.dispatched === "boolean" || raw.dispatched === "unknown") &&
|
|
503
576
|
typeof raw.usageComplete === "boolean" && ["confirmed", "unconfirmed"].includes(raw.cleanup) ? { dispatched: raw.dispatched, usageComplete: raw.usageComplete, cleanup: raw.cleanup }
|
|
504
577
|
: { dispatched: "unknown", usageComplete: false, cleanup: "unconfirmed" };
|
|
505
|
-
const rawUsage = typed?.usage ?? turn?.usage;
|
|
578
|
+
const rawUsage = typed?.usage ?? (turn?.providerRequestPending === true ? undefined : turn?.usage);
|
|
506
579
|
const usage = rawUsage === undefined ? undefined : Object.fromEntries(["input", "output", "cachedInput", "cacheWriteInput", "total"].flatMap(key => {
|
|
507
580
|
const value = rawUsage[key];
|
|
508
581
|
return validTokenCount(value) ? [[key, value]] : [];
|
|
509
582
|
}));
|
|
510
583
|
// restricted-codex-session sets dispatched only after initialize/config/account/
|
|
511
584
|
// thread/MCP admission, immediately before turn/start; it is not a success claim.
|
|
512
|
-
|
|
585
|
+
const settledKind = interactionRequestPending ? "interaction" : kind;
|
|
586
|
+
providerRequests.push({ ordinal: providerRequests.length + 1, kind: settledKind, ...receipt,
|
|
513
587
|
profileVerified: provider.executionProfile !== undefined && receipt.dispatched === true,
|
|
514
588
|
...(typed ? { errorCode: typed.code, ...(typed.failurePhase === undefined ? {} : { failurePhase: typed.failurePhase }) } : {}),
|
|
515
589
|
...(usage === undefined ? {} : { usage: { ...usage } }) });
|
|
@@ -518,11 +592,12 @@ export async function runComputerUseLoop(options) {
|
|
|
518
592
|
record({ id: nextId("notice"), kind: "notice", lifecycle: "completed", status: "error",
|
|
519
593
|
title: "participant request cleanup unconfirmed", text: "The request did not confirm cleanup within the settlement boundary. No further participant request or action is admitted." });
|
|
520
594
|
}
|
|
521
|
-
if (
|
|
595
|
+
if (settledKind === "interaction" && receipt.dispatched !== false && (!receipt.usageComplete || !completeTurnUsage(usage)))
|
|
522
596
|
unreportedInteractionUsage = true;
|
|
597
|
+
interactionRequestPending = false;
|
|
523
598
|
if (failed) {
|
|
524
599
|
if (usage)
|
|
525
|
-
recordUsage({ actions: [], pendingSafetyChecks: [], done: false, usage, providerRequest: receipt },
|
|
600
|
+
recordUsage({ actions: [], pendingSafetyChecks: [], done: false, usage, providerRequest: receipt }, settledKind === "interaction");
|
|
526
601
|
if (failure instanceof CuaAbortError || failure instanceof CuaDeadlineError)
|
|
527
602
|
throw failure;
|
|
528
603
|
if (failure instanceof CuaStallError)
|
|
@@ -880,6 +955,14 @@ export async function runComputerUseLoop(options) {
|
|
|
880
955
|
previousResponseId = turn.responseId ?? previousResponseId;
|
|
881
956
|
lastResponseId = turn.responseId ?? lastResponseId;
|
|
882
957
|
recordUsage(turn);
|
|
958
|
+
// A host-authenticated provider may learn its account billing class during
|
|
959
|
+
// startup. Never price that account usage from an API model rate.
|
|
960
|
+
if (provider.executionProfile?.billing === "account-unknown" &&
|
|
961
|
+
(maxUsd !== undefined || overRunBudget !== undefined || estimateTurnCostUsd !== undefined)) {
|
|
962
|
+
completionReason = "harness_error";
|
|
963
|
+
reason = "Codex is using a ChatGPT account; API dollar caps cannot bound account usage. Use a finite timeout or the OpenAI API participant.";
|
|
964
|
+
break;
|
|
965
|
+
}
|
|
883
966
|
if (turn.interruption !== undefined) {
|
|
884
967
|
// A provider can exhaust its response budget before producing visible text, or midway
|
|
885
968
|
// through an action. Preserve usage and partial narration, but never interpret either as
|
|
@@ -909,7 +992,7 @@ export async function runComputerUseLoop(options) {
|
|
|
909
992
|
title: tokenLimit ? "provider token limit reached" : unexpectedStatus ? "unexpected provider response status" : "provider response incomplete", text: reason });
|
|
910
993
|
break;
|
|
911
994
|
}
|
|
912
|
-
if (requiresUsage && (
|
|
995
|
+
if (requiresUsage && usageUnavailableForCap()) {
|
|
913
996
|
stopForUnreportedUsage();
|
|
914
997
|
break;
|
|
915
998
|
}
|
|
@@ -1434,11 +1517,11 @@ export async function runComputerUseLoop(options) {
|
|
|
1434
1517
|
skip = "the session deadline was reached";
|
|
1435
1518
|
else if (provider.requiresFrame && closingObservation.screenshot === undefined)
|
|
1436
1519
|
skip = "the final observation has no required frame";
|
|
1437
|
-
if (skip === undefined && (maxUsd !== undefined || overRunBudget !== undefined) && (
|
|
1520
|
+
if (skip === undefined && (maxUsd !== undefined || overRunBudget !== undefined) && usageUnavailableForCap()) {
|
|
1438
1521
|
skip = "remaining model budget is unknown because an earlier participant turn did not report complete usage";
|
|
1439
1522
|
}
|
|
1440
1523
|
if (skip === undefined && maxUsd !== undefined) {
|
|
1441
|
-
const estimate = sawUsage ? estimateTurnCostUsd?.(runningUsage()) : undefined;
|
|
1524
|
+
const estimate = sawUsage || knownPendingUsage() !== undefined ? estimateTurnCostUsd?.(runningUsage()) : undefined;
|
|
1442
1525
|
if (estimate === undefined || estimate === null || !Number.isFinite(estimate))
|
|
1443
1526
|
skip = "remaining model budget could not be established";
|
|
1444
1527
|
else if (estimate >= maxUsd)
|
|
@@ -1512,7 +1595,7 @@ export async function runComputerUseLoop(options) {
|
|
|
1512
1595
|
const detail = signal?.aborted ? "cancelled" : controller.signal.aborted || error instanceof CuaDeadlineError || error instanceof CuaStallError
|
|
1513
1596
|
? "closing report deadline reached" : error instanceof Error ? error.message : String(error);
|
|
1514
1597
|
const closingReceipt = provider.requestPolicy === "fail_closed" ? providerRequests.at(-1) : undefined;
|
|
1515
|
-
const usageReported = closingReceipt?.
|
|
1598
|
+
const usageReported = closingReceipt?.usageComplete === true && completeTurnUsage(closingReceipt.usage);
|
|
1516
1599
|
note("failed", `${detail}; closing request usage is ${usageReported ? "reported" : "unreported"}`, usageReported);
|
|
1517
1600
|
}
|
|
1518
1601
|
}
|
|
@@ -1579,7 +1662,8 @@ export async function runComputerUseLoop(options) {
|
|
|
1579
1662
|
...(affordanceObservations.length > 0 ? { affordanceUse: summarizeAffordanceUse(affordanceObservations) } : {}),
|
|
1580
1663
|
...(declaredOutcome === undefined ? {} : { declaredOutcome }),
|
|
1581
1664
|
...(debrief === undefined ? {} : { debrief }),
|
|
1582
|
-
...(hasUnreportedInteractionUsage() || (requiresUsage && incompleteInteractionUsage)
|
|
1665
|
+
...(interactionRequestPending || hasUnreportedInteractionUsage() || (requiresUsage && incompleteInteractionUsage)
|
|
1666
|
+
? { interactionUsageIncomplete: true } : {}),
|
|
1583
1667
|
// The funnel is present exactly when a protocol was declared — including a session that ended
|
|
1584
1668
|
// on turn 0, whose funnel honestly reads 0/N. No tasks declared means no funnel, not an empty one.
|
|
1585
1669
|
...(taskTracker === undefined ? {} : { taskFunnel: taskTracker.funnel() }),
|