@ai0x0/codex-ts 0.7.0 → 0.8.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/core/src/session/retry.d.ts.map +1 -1
- package/dist/core/src/session/retry.js +10 -3
- package/dist/core/src/session/retry.js.map +1 -1
- package/dist/core/src/state/token_state.d.ts +3 -3
- package/dist/core/src/state/token_state.d.ts.map +1 -1
- package/dist/core/src/state/token_state.js +36 -8
- package/dist/core/src/state/token_state.js.map +1 -1
- package/dist/core/src/tools/handlers/request_user_input_spec.d.ts +2 -7
- package/dist/core/src/tools/handlers/request_user_input_spec.d.ts.map +1 -1
- package/dist/core/src/tools/handlers/request_user_input_spec.js +3 -25
- package/dist/core/src/tools/handlers/request_user_input_spec.js.map +1 -1
- package/dist/core/src/tools/router.d.ts.map +1 -1
- package/dist/core/src/tools/router.js +1 -9
- package/dist/core/src/tools/router.js.map +1 -1
- package/dist/core/tests/suite/goal.test.js +16 -3
- package/dist/core/tests/suite/goal.test.js.map +1 -1
- package/dist/core/tests/suite/request_user_input.test.js +21 -76
- package/dist/core/tests/suite/request_user_input.test.js.map +1 -1
- package/dist/ext/goal/src/spec.js +1 -1
- package/dist/ext/goal/src/spec.js.map +1 -1
- package/dist/ext/goal/src/tool.d.ts +1 -1
- package/dist/ext/goal/src/tool.d.ts.map +1 -1
- package/dist/ext/goal/src/tool.js +37 -10
- package/dist/ext/goal/src/tool.js.map +1 -1
- package/dist/host/src/approvals/policy.d.ts +37 -0
- package/dist/host/src/approvals/policy.d.ts.map +1 -0
- package/dist/host/src/approvals/policy.js +26 -0
- package/dist/host/src/approvals/policy.js.map +1 -0
- package/dist/host/src/backend/types.d.ts +58 -0
- package/dist/host/src/backend/types.d.ts.map +1 -0
- package/dist/host/src/backend/types.js +25 -0
- package/dist/host/src/backend/types.js.map +1 -0
- package/dist/host/src/exec/spec.d.ts +27 -0
- package/dist/host/src/exec/spec.d.ts.map +1 -0
- package/dist/host/src/exec/spec.js +74 -0
- package/dist/host/src/exec/spec.js.map +1 -0
- package/dist/host/src/exec/tools.d.ts +15 -0
- package/dist/host/src/exec/tools.d.ts.map +1 -0
- package/dist/host/src/exec/tools.js +89 -0
- package/dist/host/src/exec/tools.js.map +1 -0
- package/dist/host/src/index.d.ts +8 -0
- package/dist/host/src/index.d.ts.map +1 -0
- package/dist/host/src/index.js +5 -0
- package/dist/host/src/index.js.map +1 -0
- package/dist/protocol/src/protocol.d.ts +20 -0
- package/dist/protocol/src/protocol.d.ts.map +1 -1
- package/dist/protocol/src/request_user_input.d.ts +0 -15
- package/dist/protocol/src/request_user_input.d.ts.map +1 -1
- package/package.json +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../../core/src/session/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH;iFACiF;AACjF,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAErC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;;;;;;;;GASG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;gBAGzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,UAAQ;CAQnB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAkBD;;6EAE6E;AAC7E,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKpE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQxD;
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../../core/src/session/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH;iFACiF;AACjF,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAErC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;;;;;;;;GASG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;gBAGzB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,EACjC,QAAQ,UAAQ;CAQnB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAkBD;;6EAE6E;AAC7E,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKpE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQxD;AAiCD;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,MAAM,GAAG,SAAS,CAcpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,iBAAiB,CA2BnB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKpD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CASzE;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAcpE;AAID;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,GACb,OAAO,mCAAmC,EAAE,cAAc,CAiD5D;AAED;;;GAGG;AACH,wBAAgB,KAAK,CACnB,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,GAC/B,OAAO,CAAC,IAAI,CAAC,CAgBf"}
|
|
@@ -115,6 +115,7 @@ export function isRetryableError(error) {
|
|
|
115
115
|
* - insufficient_quota → CodexErr::QuotaExceeded
|
|
116
116
|
* - usage_not_included → CodexErr::UsageNotIncluded
|
|
117
117
|
* - cyber_policy → CodexErr::CyberPolicy
|
|
118
|
+
* - misalignment_policy_violation → CodexErr::MisalignmentPolicyViolation
|
|
118
119
|
* - invalid_prompt / bio_policy → CodexErr::InvalidRequest
|
|
119
120
|
* - server_is_overloaded / slow_down → CodexErr::ServerOverloaded
|
|
120
121
|
* (context_length_exceeded is terminal too, but is handled separately because
|
|
@@ -124,6 +125,7 @@ const TERMINAL_STREAM_FAILURE_CODES = new Set([
|
|
|
124
125
|
"insufficient_quota",
|
|
125
126
|
"usage_not_included",
|
|
126
127
|
"cyber_policy",
|
|
128
|
+
"misalignment_policy_violation",
|
|
127
129
|
"invalid_prompt",
|
|
128
130
|
"bio_policy",
|
|
129
131
|
"server_is_overloaded",
|
|
@@ -181,9 +183,8 @@ export function classifyStreamFailure(raw) {
|
|
|
181
183
|
return new ResponsesApiError(503, body, retryAfterMs, terminal);
|
|
182
184
|
}
|
|
183
185
|
export function isAbortError(error) {
|
|
184
|
-
return (error instanceof DOMException &&
|
|
185
|
-
error.name === "AbortError")
|
|
186
|
-
(error instanceof Error && error.name === "AbortError");
|
|
186
|
+
return ((error instanceof DOMException && error.name === "AbortError") ||
|
|
187
|
+
(error instanceof Error && error.name === "AbortError"));
|
|
187
188
|
}
|
|
188
189
|
/**
|
|
189
190
|
* Delay before the next attempt: honor a server Retry-After when the error
|
|
@@ -245,6 +246,12 @@ export function codexErrorInfoFor(error) {
|
|
|
245
246
|
if (has("cyber_policy")) {
|
|
246
247
|
return { type: "cyber_policy" };
|
|
247
248
|
}
|
|
249
|
+
if (has("misalignment_policy_violation")) {
|
|
250
|
+
return { type: "misalignment_policy_violation" };
|
|
251
|
+
}
|
|
252
|
+
if (has("rate_limit_exceeded")) {
|
|
253
|
+
return { type: "rate_limit_exceeded" };
|
|
254
|
+
}
|
|
248
255
|
if (has("server_is_overloaded") || has("slow_down")) {
|
|
249
256
|
return { type: "server_overloaded" };
|
|
250
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../../core/src/session/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,0EAA0E;AAC1E,gCAAgC;AAChC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAC7B,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;iFACiF;AACjF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,OAAe;IACrC,MAAM,GAAG,GAAG,cAAc,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,gBAAgB,GAAG,GAAG,CAAC;IACpC,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IACjC,MAAM,CAAS;IACf,YAAY,CAAqB;IACjC,QAAQ,CAAU;IAE3B,YACE,MAAc,EACd,IAAY,EACZ,YAAiC,EACjC,QAAQ,GAAG,KAAK;QAEhB,KAAK,CAAC,iBAAiB,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;AAC7E,CAAC;AAED,iFAAiF;AACjF,4EAA4E;AAC5E,gFAAgF;AAChF,4EAA4E;AAC5E,sEAAsE;AACtE,kFAAkF;AAClF,oEAAoE;AACpE,qEAAqE;AACrE,4EAA4E;AAC5E,8EAA8E;AAC9E,2EAA2E;AAC3E,4EAA4E;AAC5E,iEAAiE;AACjE,MAAM,uBAAuB,GAC3B,sKAAsK,CAAC;AAEzK;;6EAE6E;AAC7E,MAAM,UAAU,2BAA2B,CAAC,IAAY;IACtD,OAAO,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAAC,KAAc;IACzD,OAAO,CACL,KAAK,YAAY,iBAAiB;QAClC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;QACvC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,kFAAkF;AAElF
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../../core/src/session/retry.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,9 @@ import type { ConversationItem } from "../../../thread-store/src/types.js";
|
|
|
14
14
|
* approx_token_count (utils/output-truncation). Good enough for budgeting. */
|
|
15
15
|
export declare function approxTokenCount(text: string): number;
|
|
16
16
|
/**
|
|
17
|
-
* Estimate the token size of
|
|
18
|
-
* mirrors history.estimate_token_count_with_base_instructions
|
|
19
|
-
* per-item
|
|
17
|
+
* Estimate the token size of conversation items from their model-visible
|
|
18
|
+
* content. mirrors history.estimate_token_count_with_base_instructions
|
|
19
|
+
* (history.rs:454): per-item content estimates, summed.
|
|
20
20
|
*/
|
|
21
21
|
export declare function estimateItemsTokenCount(items: ConversationItem[]): number;
|
|
22
22
|
export declare class SessionTokenState {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token_state.d.ts","sourceRoot":"","sources":["../../../../core/src/state/token_state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE3E;+EAC+E;AAC/E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;
|
|
1
|
+
{"version":3,"file":"token_state.d.ts","sourceRoot":"","sources":["../../../../core/src/state/token_state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAE3E;+EAC+E;AAC/E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AA8BD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAIzE;AAED,qBAAa,iBAAiB;IAC5B;8DAC0D;IAC1D,OAAO,CAAC,KAAK,CAAuB;IAEpC,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC,GAAG,IAAI;IAMR;;;;OAIG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAIlC;;;;;OAKG;IACH,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAKjD"}
|
|
@@ -14,17 +14,45 @@
|
|
|
14
14
|
export function approxTokenCount(text) {
|
|
15
15
|
return Math.ceil(text.length / 4);
|
|
16
16
|
}
|
|
17
|
+
function textBytes(text) {
|
|
18
|
+
return new TextEncoder().encode(text).length;
|
|
19
|
+
}
|
|
17
20
|
/**
|
|
18
|
-
*
|
|
19
|
-
* mirrors
|
|
20
|
-
*
|
|
21
|
+
* Approximate the model-visible byte cost of one conversation item.
|
|
22
|
+
* mirrors estimate_response_item_model_visible_bytes (history.rs:830): count
|
|
23
|
+
* content directly and exclude transport IDs, metadata, and outer JSON escaping.
|
|
21
24
|
*/
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
function estimateItemBytes(item) {
|
|
26
|
+
if (item.type !== "message") {
|
|
27
|
+
if (item.type === "function_call") {
|
|
28
|
+
return textBytes(item.name) + textBytes(item.arguments);
|
|
29
|
+
}
|
|
30
|
+
return textBytes(item.output);
|
|
31
|
+
}
|
|
32
|
+
if (typeof item.content === "string") {
|
|
33
|
+
return textBytes(item.content);
|
|
26
34
|
}
|
|
27
|
-
return total
|
|
35
|
+
return item.content.reduce((total, part) => {
|
|
36
|
+
if (part.type === "input_text")
|
|
37
|
+
return total + textBytes(part.text);
|
|
38
|
+
if (part.type === "input_image")
|
|
39
|
+
return total + 7_373;
|
|
40
|
+
// A data URI is not model-visible bytes, but keeps a conservative floor.
|
|
41
|
+
if (part.type === "input_audio")
|
|
42
|
+
return total + 7_373;
|
|
43
|
+
return total;
|
|
44
|
+
}, 0);
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Estimate the token size of conversation items from their model-visible
|
|
48
|
+
* content. mirrors history.estimate_token_count_with_base_instructions
|
|
49
|
+
* (history.rs:454): per-item content estimates, summed.
|
|
50
|
+
*/
|
|
51
|
+
export function estimateItemsTokenCount(items) {
|
|
52
|
+
let bytes = 0;
|
|
53
|
+
for (const item of items)
|
|
54
|
+
bytes += estimateItemBytes(item);
|
|
55
|
+
return Math.ceil(bytes / 4);
|
|
28
56
|
}
|
|
29
57
|
export class SessionTokenState {
|
|
30
58
|
/** Last known active-context size in tokens (server usage, estimate, or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token_state.js","sourceRoot":"","sources":["../../../../core/src/state/token_state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH;+EAC+E;AAC/E,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC;AAED;;;;GAIG;AACH,
|
|
1
|
+
{"version":3,"file":"token_state.js","sourceRoot":"","sources":["../../../../core/src/state/token_state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH;+EAC+E;AAC/E,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AAC/C,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,IAAsB;IAC/C,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAClC,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACzC,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;YAAE,OAAO,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,KAAK,GAAG,KAAK,CAAC;QACtD,yEAAyE;QACzE,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO,KAAK,GAAG,KAAK,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAyB;IAC/D,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,IAAI,IAAI,KAAK;QAAE,KAAK,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,OAAO,iBAAiB;IAC5B;8DAC0D;IAClD,KAAK,GAAkB,IAAI,CAAC;IAEpC,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,KAIf;QACC,MAAM,KAAK,GACT,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,MAAc;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,aAAiC;QACvC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC;QAC7B,CAAC;IACH,CAAC;CACF"}
|
|
@@ -3,14 +3,10 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { ToolSpec } from "../../../../tools/src/tool_spec.js";
|
|
5
5
|
export declare const REQUEST_USER_INPUT_TOOL_NAME = "request_user_input";
|
|
6
|
-
/** mirrors MIN/MAX_AUTO_RESOLUTION_MS (request_user_input_spec.rs:9-10) */
|
|
7
|
-
export declare const MIN_AUTO_RESOLUTION_MS = 60000;
|
|
8
|
-
export declare const MAX_AUTO_RESOLUTION_MS = 240000;
|
|
9
6
|
export declare function createRequestUserInputTool(): ToolSpec;
|
|
10
7
|
/**
|
|
11
|
-
* Normalise args from the model: ensure options exist
|
|
12
|
-
*
|
|
13
|
-
* mirrors normalize_request_user_input_args (request_user_input_spec.rs:104).
|
|
8
|
+
* Normalise args from the model: ensure options exist and set isOther = true.
|
|
9
|
+
* mirrors normalize_request_user_input_tool_args (request_user_input_spec.rs:104).
|
|
14
10
|
*/
|
|
15
11
|
export declare function normalizeRequestUserInputArgs(args: {
|
|
16
12
|
questions?: {
|
|
@@ -27,7 +23,6 @@ export declare function normalizeRequestUserInputArgs(args: {
|
|
|
27
23
|
autoResolutionMs?: unknown;
|
|
28
24
|
}): {
|
|
29
25
|
questions: import("../../../../protocol/src/request_user_input.js").RequestUserInputQuestion[];
|
|
30
|
-
autoResolutionMs?: number | undefined;
|
|
31
26
|
} | {
|
|
32
27
|
error: string;
|
|
33
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_user_input_spec.d.ts","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAGnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,
|
|
1
|
+
{"version":3,"file":"request_user_input_spec.d.ts","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAGnE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,wBAAgB,0BAA0B,IAAI,QAAQ,CAqDrD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACnD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;IACJ,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACG;IACE,SAAS,EAAE,OAAO,gDAAgD,EAAE,wBAAwB,EAAE,CAAC;CAChG,GACD;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA2BpB"}
|
|
@@ -3,9 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import * as S from "../../../../tools/src/json_schema.js";
|
|
5
5
|
export const REQUEST_USER_INPUT_TOOL_NAME = "request_user_input";
|
|
6
|
-
/** mirrors MIN/MAX_AUTO_RESOLUTION_MS (request_user_input_spec.rs:9-10) */
|
|
7
|
-
export const MIN_AUTO_RESOLUTION_MS = 60_000;
|
|
8
|
-
export const MAX_AUTO_RESOLUTION_MS = 240_000;
|
|
9
6
|
export function createRequestUserInputTool() {
|
|
10
7
|
const optionSchema = S.object({
|
|
11
8
|
label: S.string("User-facing label (1-5 words)."),
|
|
@@ -19,12 +16,6 @@ export function createRequestUserInputTool() {
|
|
|
19
16
|
question: S.string("Single-sentence prompt shown to the user."),
|
|
20
17
|
options: optionsSchema,
|
|
21
18
|
}, ["id", "header", "question", "options"], false);
|
|
22
|
-
// mirrors auto_resolution_ms_schema (request_user_input_spec.rs:71)
|
|
23
|
-
const autoResolutionMsSchema = S.number(`Optional auto-resolution window in milliseconds, from ${MIN_AUTO_RESOLUTION_MS} to ${MAX_AUTO_RESOLUTION_MS}. ` +
|
|
24
|
-
"Include this only when the question is useful but non-blocking and continuing with best judgment is acceptable " +
|
|
25
|
-
"if the user does not answer; omit it when explicit user input is required before continuing. " +
|
|
26
|
-
`Use ${MIN_AUTO_RESOLUTION_MS} for lightly helpful context and up to ${MAX_AUTO_RESOLUTION_MS} when the answer ` +
|
|
27
|
-
"would materially unblock better work.");
|
|
28
19
|
return {
|
|
29
20
|
type: "function",
|
|
30
21
|
tool: {
|
|
@@ -32,22 +23,17 @@ export function createRequestUserInputTool() {
|
|
|
32
23
|
// mirrors request_user_input_tool_description (request_user_input_spec.rs:138).
|
|
33
24
|
// The rs "only available in {allowed_modes}" clause is dropped: codex-ts has
|
|
34
25
|
// no collaboration modes, so the tool is always available.
|
|
35
|
-
description: "Request user input for one to three short questions and wait for the response.
|
|
36
|
-
`Set autoResolutionMs, from ${MIN_AUTO_RESOLUTION_MS} to ${MAX_AUTO_RESOLUTION_MS} milliseconds, only when ` +
|
|
37
|
-
"the question is useful but non-blocking and continuing with best judgment is acceptable if the user does " +
|
|
38
|
-
"not answer; omit it when explicit user input is required.",
|
|
26
|
+
description: "Request user input for one to three short questions and wait for the response.",
|
|
39
27
|
parameters: S.object({
|
|
40
28
|
questions: S.array(questionSchema, "Questions to show the user. Prefer 1 and do not exceed 3."),
|
|
41
|
-
autoResolutionMs: autoResolutionMsSchema,
|
|
42
29
|
}, ["questions"], false),
|
|
43
30
|
strict: false,
|
|
44
31
|
},
|
|
45
32
|
};
|
|
46
33
|
}
|
|
47
34
|
/**
|
|
48
|
-
* Normalise args from the model: ensure options exist
|
|
49
|
-
*
|
|
50
|
-
* mirrors normalize_request_user_input_args (request_user_input_spec.rs:104).
|
|
35
|
+
* Normalise args from the model: ensure options exist and set isOther = true.
|
|
36
|
+
* mirrors normalize_request_user_input_tool_args (request_user_input_spec.rs:104).
|
|
51
37
|
*/
|
|
52
38
|
export function normalizeRequestUserInputArgs(args) {
|
|
53
39
|
// The model can omit `questions` (or send a non-array) under strict:false;
|
|
@@ -65,13 +51,6 @@ export function normalizeRequestUserInputArgs(args) {
|
|
|
65
51
|
};
|
|
66
52
|
}
|
|
67
53
|
}
|
|
68
|
-
// mirrors the auto_resolution_ms clamp (request_user_input_spec.rs:123): an
|
|
69
|
-
// out-of-range window is pulled into [MIN, MAX] rather than rejected. A
|
|
70
|
-
// non-numeric value (strict:false lets the model send anything) is dropped.
|
|
71
|
-
const rawAutoResolutionMs = args.autoResolutionMs;
|
|
72
|
-
const autoResolutionMs = typeof rawAutoResolutionMs === "number" && Number.isFinite(rawAutoResolutionMs)
|
|
73
|
-
? Math.min(MAX_AUTO_RESOLUTION_MS, Math.max(MIN_AUTO_RESOLUTION_MS, Math.trunc(rawAutoResolutionMs)))
|
|
74
|
-
: undefined;
|
|
75
54
|
return {
|
|
76
55
|
questions: args.questions.map((q) => ({
|
|
77
56
|
id: q.id,
|
|
@@ -81,7 +60,6 @@ export function normalizeRequestUserInputArgs(args) {
|
|
|
81
60
|
isOther: true,
|
|
82
61
|
isSecret: q.isSecret ?? false,
|
|
83
62
|
})),
|
|
84
|
-
...(autoResolutionMs !== undefined ? { autoResolutionMs } : {}),
|
|
85
63
|
};
|
|
86
64
|
}
|
|
87
65
|
//# sourceMappingURL=request_user_input_spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_user_input_spec.js","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,CAAC,MAAM,sCAAsC,CAAC;AAE1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,
|
|
1
|
+
{"version":3,"file":"request_user_input_spec.js","sourceRoot":"","sources":["../../../../../core/src/tools/handlers/request_user_input_spec.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,CAAC,MAAM,sCAAsC,CAAC;AAE1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,UAAU,0BAA0B;IACxC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAC3B;QACE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,gCAAgC,CAAC;QACjD,WAAW,EAAE,CAAC,CAAC,MAAM,CACnB,4DAA4D,CAC7D;KACF,EACD,CAAC,OAAO,EAAE,aAAa,CAAC,EACxB,KAAK,CACN,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAC3B,YAAY,EACZ,sHAAsH;QACpH,sEAAsE,CACzE,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAC7B;QACE,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,qDAAqD,CAAC;QACnE,MAAM,EAAE,CAAC,CAAC,MAAM,CACd,yDAAyD,CAC1D;QACD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,2CAA2C,CAAC;QAC/D,OAAO,EAAE,aAAa;KACvB,EACD,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,EACvC,KAAK,CACN,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,4BAA4B;YAClC,gFAAgF;YAChF,6EAA6E;YAC7E,2DAA2D;YAC3D,WAAW,EACT,gFAAgF;YAClF,UAAU,EAAE,CAAC,CAAC,MAAM,CAClB;gBACE,SAAS,EAAE,CAAC,CAAC,KAAK,CAChB,cAAc,EACd,2DAA2D,CAC5D;aACF,EACD,CAAC,WAAW,CAAC,EACb,KAAK,CACN;YACD,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAU7C;IAKC,2EAA2E;IAC3E,uEAAuE;IACvE,8DAA8D;IAC9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClE,OAAO;YACL,KAAK,EAAE,2DAA2D;SACnE,CAAC;IACJ,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO;gBACL,KAAK,EACH,kEAAkE;aACrE,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACpC,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,KAAK;SAC9B,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../core/src/tools/router.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAkBjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAOtE,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,mFAAmF;IACnF,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;CACpC;AAUD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,IAAI,IAAI,QAAQ,CAAC;IACjB,2EAA2E;IAC3E,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACjE;AAED,sCAAsC;AACtC,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;gBAE1C,YAAY,EAAE,gBAAgB,EAAE,WAAW,GAAE,UAAU,EAAO;IAK1E,0DAA0D;IAC1D,SAAS,IAAI,QAAQ,EAAE;IAWvB;;;;OAIG;IACG,QAAQ,CACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../core/src/tools/router.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAkBjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAOtE,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,mFAAmF;IACnF,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;CACpC;AAUD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;CACpC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,IAAI,IAAI,QAAQ,CAAC;IACjB,2EAA2E;IAC3E,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACjE;AAED,sCAAsC;AACtC,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;gBAE1C,YAAY,EAAE,gBAAgB,EAAE,WAAW,GAAE,UAAU,EAAO;IAK1E,0DAA0D;IAC1D,SAAS,IAAI,QAAQ,EAAE;IAWvB;;;;OAIG;IACG,QAAQ,CACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,MAAM,CAAC;CA6EnB"}
|
|
@@ -33,9 +33,7 @@ export class ToolRouter {
|
|
|
33
33
|
* returned, so RequestUserInput fires before the turn suspends.
|
|
34
34
|
*/
|
|
35
35
|
async dispatch(toolName, callId, rawArgs, ctx) {
|
|
36
|
-
const args = (typeof rawArgs === "object" && rawArgs !== null
|
|
37
|
-
? rawArgs
|
|
38
|
-
: {});
|
|
36
|
+
const args = (typeof rawArgs === "object" && rawArgs !== null ? rawArgs : {});
|
|
39
37
|
switch (toolName) {
|
|
40
38
|
case GET_GOAL_TOOL_NAME: {
|
|
41
39
|
const { output } = await this.goalExecutor.get();
|
|
@@ -59,18 +57,12 @@ export class ToolRouter {
|
|
|
59
57
|
return JSON.stringify({ error: normalized.error });
|
|
60
58
|
}
|
|
61
59
|
// Emit BEFORE suspending so the client can see the event and answer.
|
|
62
|
-
// autoResolutionMs rides along (mirrors RequestUserInputEvent
|
|
63
|
-
// .auto_resolution_ms) so the host can decide whether the question is
|
|
64
|
-
// blocking or may be auto-resolved after that window.
|
|
65
60
|
ctx.emitEvent({
|
|
66
61
|
type: "RequestUserInput",
|
|
67
62
|
event: {
|
|
68
63
|
call_id: callId,
|
|
69
64
|
turn_id: ctx.turnId,
|
|
70
65
|
questions: normalized.questions,
|
|
71
|
-
...(normalized.autoResolutionMs !== undefined
|
|
72
|
-
? { autoResolutionMs: normalized.autoResolutionMs }
|
|
73
|
-
: {}),
|
|
74
66
|
},
|
|
75
67
|
});
|
|
76
68
|
const response = await handleRequestUserInput({ turnId: ctx.turnId, pendingInputs: ctx.pendingInputs }, normalized.questions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../core/src/tools/router.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AA2CjC,sCAAsC;AACtC,MAAM,OAAO,UAAU;IACJ,YAAY,CAAmB;IAC/B,WAAW,CAA0B;IAEtD,YAAY,YAA8B,EAAE,cAA4B,EAAE;QACxE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,0DAA0D;IAC1D,SAAS;QACP,OAAO;YACL,iBAAiB,EAAE;YACnB,oBAAoB,EAAE;YACtB,oBAAoB,EAAE;YACtB,0BAA0B,EAAE;YAC5B,oBAAoB,EAAE;YACtB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAChE,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CACZ,QAAgB,EAChB,MAAc,EACd,OAAgB,EAChB,GAAsB;QAEtB,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../core/src/tools/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ import { waitForEvent, waitForEventMatch, sseFlat, evFunctionCall, evAssistantMe
|
|
|
9
9
|
// ─── GoalToolExecutor unit tests ──────────────────────────────────────────────
|
|
10
10
|
describe("GoalToolExecutor", () => {
|
|
11
11
|
let ex;
|
|
12
|
-
beforeEach(() => {
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
ex = new GoalToolExecutor("thread-1");
|
|
14
|
+
});
|
|
13
15
|
it("get returns null goal when none exists", async () => {
|
|
14
16
|
const r = JSON.parse((await ex.get()).output);
|
|
15
17
|
expect(r.goal).toBeNull();
|
|
@@ -54,6 +56,12 @@ describe("GoalToolExecutor", () => {
|
|
|
54
56
|
const r = JSON.parse((await ex.update("blocked")).output);
|
|
55
57
|
expect(r.goal.status).toBe("Blocked");
|
|
56
58
|
});
|
|
59
|
+
// mirrors ext/goal/src/tool.rs update_goal accepting ThreadGoalStatus::Paused.
|
|
60
|
+
it("update marks goal Paused", async () => {
|
|
61
|
+
await ex.create("finish");
|
|
62
|
+
const r = JSON.parse((await ex.update("paused")).output);
|
|
63
|
+
expect(r.goal.status).toBe("Paused");
|
|
64
|
+
});
|
|
57
65
|
it("update fails with no goal", async () => {
|
|
58
66
|
const r = JSON.parse((await ex.update("complete")).output);
|
|
59
67
|
expect(r.error).toMatch(/No active goal/);
|
|
@@ -74,7 +82,9 @@ describe("GoalToolExecutor", () => {
|
|
|
74
82
|
});
|
|
75
83
|
// ─── Integration: create_goal tool call through CodexThread ───────────────────
|
|
76
84
|
describe("create_goal tool call", () => {
|
|
77
|
-
beforeEach(() => {
|
|
85
|
+
beforeEach(() => {
|
|
86
|
+
vi.unstubAllGlobals();
|
|
87
|
+
});
|
|
78
88
|
it("emits ThreadGoalUpdated event and TurnComplete", async () => {
|
|
79
89
|
const fetchMock = vi.fn();
|
|
80
90
|
// Turn 1: model calls create_goal
|
|
@@ -91,7 +101,10 @@ describe("create_goal tool call", () => {
|
|
|
91
101
|
])));
|
|
92
102
|
vi.stubGlobal("fetch", fetchMock);
|
|
93
103
|
const codex = new CodexThread({ apiKey: "test", model: "gpt-4o" });
|
|
94
|
-
await codex.submit({
|
|
104
|
+
await codex.submit({
|
|
105
|
+
type: "UserInput",
|
|
106
|
+
items: [{ type: "text", text: "create a goal" }],
|
|
107
|
+
});
|
|
95
108
|
const goalUpdated = await waitForEventMatch(codex, (msg) => msg.type === "ThreadGoalUpdated" ? msg.event : null);
|
|
96
109
|
expect(goalUpdated.goal.objective).toBe("test goal");
|
|
97
110
|
expect(goalUpdated.goal.status).toBe("Active");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goal.test.js","sourceRoot":"","sources":["../../../../core/tests/suite/goal.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,OAAO,EACP,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAE1B,iFAAiF;AAEjF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,EAAoB,CAAC;IACzB,UAAU,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"goal.test.js","sourceRoot":"","sources":["../../../../core/tests/suite/goal.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
5
5
|
import { CodexThread } from "../../src/codex_thread.js";
|
|
6
|
-
import {
|
|
6
|
+
import { createRequestUserInputTool, normalizeRequestUserInputArgs, } from "../../src/tools/handlers/request_user_input_spec.js";
|
|
7
7
|
import { waitForEvent, waitForEventMatch, sseFlat, evFunctionCall, evAssistantMessage, evCompleted, evResponseCreated, makeSseResponse, } from "../common/lib.js";
|
|
8
|
-
beforeEach(() => {
|
|
8
|
+
beforeEach(() => {
|
|
9
|
+
vi.unstubAllGlobals();
|
|
10
|
+
});
|
|
9
11
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
|
10
12
|
function makeRequestUserInputArgs(callId) {
|
|
11
13
|
return sseFlat([
|
|
@@ -44,7 +46,7 @@ describe("request_user_input_round_trip_resolves_pending", () => {
|
|
|
44
46
|
items: [{ type: "text", text: "please confirm" }],
|
|
45
47
|
});
|
|
46
48
|
// Wait for the agent to request user input
|
|
47
|
-
const request = await waitForEventMatch(codex, (msg) => msg.type === "RequestUserInput" ? msg.event : null);
|
|
49
|
+
const request = await waitForEventMatch(codex, (msg) => (msg.type === "RequestUserInput" ? msg.event : null));
|
|
48
50
|
expect(request.call_id).toBe(callId);
|
|
49
51
|
expect(request.questions).toHaveLength(1);
|
|
50
52
|
expect(request.questions[0]?.id).toBe("confirm_path");
|
|
@@ -180,82 +182,25 @@ describe("normalizeRequestUserInputArgs guards a malformed questions field", ()
|
|
|
180
182
|
});
|
|
181
183
|
expect("questions" in result && result.questions[0]?.isOther).toBe(true);
|
|
182
184
|
});
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
id: "q1",
|
|
188
|
-
header: "Q",
|
|
189
|
-
question: "Pick?",
|
|
190
|
-
options: [{ label: "A", description: "a" }],
|
|
191
|
-
};
|
|
192
|
-
it("keeps an in-range window", () => {
|
|
185
|
+
// Upstream removed autoResolutionMs from the tool schema and event contract.
|
|
186
|
+
it("omits autoResolutionMs even when an older model sends it", () => {
|
|
187
|
+
const spec = createRequestUserInputTool().tool;
|
|
188
|
+
expect(Object.keys(spec.parameters.properties ?? {})).not.toContain("autoResolutionMs");
|
|
193
189
|
const result = normalizeRequestUserInputArgs({
|
|
194
|
-
questions: [
|
|
190
|
+
questions: [
|
|
191
|
+
{
|
|
192
|
+
id: "q1",
|
|
193
|
+
header: "Q",
|
|
194
|
+
question: "Pick?",
|
|
195
|
+
options: [{ label: "A", description: "a" }],
|
|
196
|
+
},
|
|
197
|
+
],
|
|
195
198
|
autoResolutionMs: 90_000,
|
|
196
199
|
});
|
|
197
|
-
expect("questions" in result
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
questions: [question],
|
|
202
|
-
autoResolutionMs: 1_000,
|
|
203
|
-
});
|
|
204
|
-
expect("questions" in low && low.autoResolutionMs).toBe(MIN_AUTO_RESOLUTION_MS);
|
|
205
|
-
const high = normalizeRequestUserInputArgs({
|
|
206
|
-
questions: [question],
|
|
207
|
-
autoResolutionMs: 999_999,
|
|
208
|
-
});
|
|
209
|
-
expect("questions" in high && high.autoResolutionMs).toBe(MAX_AUTO_RESOLUTION_MS);
|
|
210
|
-
});
|
|
211
|
-
it("omits the field when absent or non-numeric", () => {
|
|
212
|
-
const absent = normalizeRequestUserInputArgs({ questions: [question] });
|
|
213
|
-
expect("questions" in absent && absent.autoResolutionMs).toBeUndefined();
|
|
214
|
-
const bogus = normalizeRequestUserInputArgs({
|
|
215
|
-
questions: [question],
|
|
216
|
-
autoResolutionMs: "soon",
|
|
217
|
-
});
|
|
218
|
-
expect("questions" in bogus && bogus.autoResolutionMs).toBeUndefined();
|
|
219
|
-
});
|
|
220
|
-
});
|
|
221
|
-
describe("request_user_input forwards autoResolutionMs to the event", () => {
|
|
222
|
-
it("emits the clamped window on RequestUserInput", async () => {
|
|
223
|
-
const callId = "call-rui-auto";
|
|
224
|
-
const fetchMock = vi.fn();
|
|
225
|
-
fetchMock.mockResolvedValueOnce(makeSseResponse(sseFlat([
|
|
226
|
-
evResponseCreated("resp-1"),
|
|
227
|
-
evFunctionCall(callId, "request_user_input", {
|
|
228
|
-
questions: [
|
|
229
|
-
{
|
|
230
|
-
id: "confirm_path",
|
|
231
|
-
header: "Confirm",
|
|
232
|
-
question: "Proceed?",
|
|
233
|
-
options: [{ label: "Yes", description: "Continue." }],
|
|
234
|
-
},
|
|
235
|
-
],
|
|
236
|
-
autoResolutionMs: 10,
|
|
237
|
-
}),
|
|
238
|
-
evCompleted("resp-1"),
|
|
239
|
-
])));
|
|
240
|
-
fetchMock.mockResolvedValue(makeSseResponse(sseFlat([
|
|
241
|
-
evResponseCreated("resp-2"),
|
|
242
|
-
evAssistantMessage("done"),
|
|
243
|
-
evCompleted("resp-2"),
|
|
244
|
-
])));
|
|
245
|
-
vi.stubGlobal("fetch", fetchMock);
|
|
246
|
-
const codex = new CodexThread({ apiKey: "k", model: "m" });
|
|
247
|
-
await codex.submit({
|
|
248
|
-
type: "UserInput",
|
|
249
|
-
items: [{ type: "text", text: "deploy" }],
|
|
250
|
-
});
|
|
251
|
-
const event = await waitForEventMatch(codex, (msg) => (msg.type === "RequestUserInput" ? msg.event : null));
|
|
252
|
-
expect(event.autoResolutionMs).toBe(MIN_AUTO_RESOLUTION_MS);
|
|
253
|
-
await codex.submit({
|
|
254
|
-
type: "UserInputAnswer",
|
|
255
|
-
id: event.turn_id,
|
|
256
|
-
response: { answers: { confirm_path: { answers: ["Yes"] } } },
|
|
257
|
-
});
|
|
258
|
-
await waitForEvent(codex, (m) => m.type === "TurnComplete");
|
|
200
|
+
expect("questions" in result).toBe(true);
|
|
201
|
+
if ("questions" in result) {
|
|
202
|
+
expect("autoResolutionMs" in result).toBe(false);
|
|
203
|
+
}
|
|
259
204
|
});
|
|
260
205
|
});
|
|
261
206
|
//# sourceMappingURL=request_user_input.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request_user_input.test.js","sourceRoot":"","sources":["../../../../core/tests/suite/request_user_input.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request_user_input.test.js","sourceRoot":"","sources":["../../../../core/tests/suite/request_user_input.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export function createUpdateGoalTool() {
|
|
|
54
54
|
"When marking a budgeted goal achieved with status `complete`, report the final token usage from the tool result to the user.",
|
|
55
55
|
].join("\n"),
|
|
56
56
|
parameters: S.object({
|
|
57
|
-
status: S.stringEnum(["complete", "blocked"], "Required. Set to `complete` only when the objective is achieved and no required work remains. " +
|
|
57
|
+
status: S.stringEnum(["complete", "blocked", "paused"], "Required. Set to `complete` only when the objective is achieved and no required work remains. " +
|
|
58
58
|
"Set to `blocked` only after the same blocking condition has recurred for at least three consecutive " +
|
|
59
59
|
"goal turns and the agent is at an impasse. After a previously blocked goal is resumed, the resumed " +
|
|
60
60
|
"run starts a fresh blocked audit."),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../../../ext/goal/src/spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,CAAC,MAAM,mCAAmC,CAAC;AAEvD,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAEnD,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,4HAA4H;YAC9H,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC;YACnC,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE;gBACX,oIAAoI;gBACpI,6GAA6G,qBAAqB,mBAAmB;aACtJ,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,CAAC,CAAC,MAAM,CAClB;gBACE,SAAS,EAAE,CAAC,CAAC,MAAM,CACjB,sDAAsD;oBACpD,qGAAqG,CACxG;gBACD,YAAY,EAAE,CAAC,CAAC,OAAO,CACrB,2EAA2E,CAC5E;aACF,EACD,CAAC,WAAW,CAAC,EACb,KAAK,CACN;YACD,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE;gBACX,2BAA2B;gBAC3B,oEAAoE;gBACpE,2GAA2G;gBAC3G,gSAAgS;gBAChS,gPAAgP;gBAChP,mJAAmJ;gBACnJ,yHAAyH;gBACzH,6GAA6G;gBAC7G,4IAA4I;gBAC5I,8HAA8H;aAC/H,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,CAAC,CAAC,MAAM,CAClB;gBACE,MAAM,EAAE,CAAC,CAAC,UAAU,CAClB,CAAC,UAAU,EAAE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../../../ext/goal/src/spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,CAAC,MAAM,mCAAmC,CAAC;AAEvD,MAAM,CAAC,MAAM,kBAAkB,GAAG,UAAU,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAEnD,MAAM,UAAU,iBAAiB;IAC/B,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,4HAA4H;YAC9H,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC;YACnC,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE;gBACX,oIAAoI;gBACpI,6GAA6G,qBAAqB,mBAAmB;aACtJ,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,CAAC,CAAC,MAAM,CAClB;gBACE,SAAS,EAAE,CAAC,CAAC,MAAM,CACjB,sDAAsD;oBACpD,qGAAqG,CACxG;gBACD,YAAY,EAAE,CAAC,CAAC,OAAO,CACrB,2EAA2E,CAC5E;aACF,EACD,CAAC,WAAW,CAAC,EACb,KAAK,CACN;YACD,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE;YACJ,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE;gBACX,2BAA2B;gBAC3B,oEAAoE;gBACpE,2GAA2G;gBAC3G,gSAAgS;gBAChS,gPAAgP;gBAChP,mJAAmJ;gBACnJ,yHAAyH;gBACzH,6GAA6G;gBAC7G,4IAA4I;gBAC5I,8HAA8H;aAC/H,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,CAAC,CAAC,MAAM,CAClB;gBACE,MAAM,EAAE,CAAC,CAAC,UAAU,CAClB,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,EACjC,gGAAgG;oBAC9F,sGAAsG;oBACtG,qGAAqG;oBACrG,mCAAmC,CACtC;aACF,EACD,CAAC,QAAQ,CAAC,EACV,KAAK,CACN;YACD,MAAM,EAAE,KAAK;SACd;KACF,CAAC;AACJ,CAAC"}
|