@botiverse/oar 0.88.0 → 0.90.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.
Files changed (122) hide show
  1. package/dist/contracts/input.d.ts +8 -0
  2. package/dist/contracts/input.d.ts.map +1 -1
  3. package/dist/contracts/records.d.ts +25 -17
  4. package/dist/contracts/records.d.ts.map +1 -1
  5. package/dist/contracts/session-options.d.ts +5 -4
  6. package/dist/contracts/session-options.d.ts.map +1 -1
  7. package/dist/observe/adapter-queue.d.ts.map +1 -1
  8. package/dist/observe/adapter-queue.js +11 -0
  9. package/dist/observe/adapter-queue.js.map +1 -1
  10. package/dist/observe/agent-status.d.ts.map +1 -1
  11. package/dist/observe/agent-status.js +12 -3
  12. package/dist/observe/agent-status.js.map +1 -1
  13. package/dist/observe/conversation.d.ts +10 -0
  14. package/dist/observe/conversation.d.ts.map +1 -1
  15. package/dist/observe/conversation.js +34 -7
  16. package/dist/observe/conversation.js.map +1 -1
  17. package/dist/observe/events.d.ts +1 -1
  18. package/dist/observe/events.d.ts.map +1 -1
  19. package/dist/observe/events.js +2 -1
  20. package/dist/observe/events.js.map +1 -1
  21. package/dist/observe/index.d.ts +2 -2
  22. package/dist/observe/index.d.ts.map +1 -1
  23. package/dist/observe/input-admission.d.ts +20 -0
  24. package/dist/observe/input-admission.d.ts.map +1 -0
  25. package/dist/observe/input-admission.js +64 -0
  26. package/dist/observe/input-admission.js.map +1 -0
  27. package/dist/observe/input-delivery.d.ts.map +1 -1
  28. package/dist/observe/input-delivery.js +3 -0
  29. package/dist/observe/input-delivery.js.map +1 -1
  30. package/dist/observe/input-wait.d.ts +15 -0
  31. package/dist/observe/input-wait.d.ts.map +1 -0
  32. package/dist/observe/input-wait.js +125 -0
  33. package/dist/observe/input-wait.js.map +1 -0
  34. package/dist/observe/session-view-events.js +1 -1
  35. package/dist/observe/session-view-events.js.map +1 -1
  36. package/dist/observe/session-view-fold.js +1 -1
  37. package/dist/observe/session-view-fold.js.map +1 -1
  38. package/dist/observe/session-view-inputs.d.ts.map +1 -1
  39. package/dist/observe/session-view-inputs.js +31 -3
  40. package/dist/observe/session-view-inputs.js.map +1 -1
  41. package/dist/observe/status-state.d.ts +2 -0
  42. package/dist/observe/status-state.d.ts.map +1 -1
  43. package/dist/observe/status-state.js +1 -1
  44. package/dist/observe/status-state.js.map +1 -1
  45. package/dist/observe/turns.d.ts +31 -6
  46. package/dist/observe/turns.d.ts.map +1 -1
  47. package/dist/observe/turns.js +74 -57
  48. package/dist/observe/turns.js.map +1 -1
  49. package/dist/runtimes/codex/failure.d.ts.map +1 -1
  50. package/dist/runtimes/codex/failure.js +5 -2
  51. package/dist/runtimes/codex/failure.js.map +1 -1
  52. package/dist/runtimes/codex/messages.d.ts +17 -0
  53. package/dist/runtimes/codex/messages.d.ts.map +1 -0
  54. package/dist/runtimes/codex/messages.js +37 -0
  55. package/dist/runtimes/codex/messages.js.map +1 -0
  56. package/dist/runtimes/codex/projection.d.ts +5 -0
  57. package/dist/runtimes/codex/projection.d.ts.map +1 -1
  58. package/dist/runtimes/codex/projection.js +31 -17
  59. package/dist/runtimes/codex/projection.js.map +1 -1
  60. package/dist/runtimes/dsh/bridge.d.ts.map +1 -1
  61. package/dist/runtimes/dsh/bridge.js +15 -2
  62. package/dist/runtimes/dsh/bridge.js.map +1 -1
  63. package/dist/runtimes/dsh/launch.d.ts +2 -1
  64. package/dist/runtimes/dsh/launch.d.ts.map +1 -1
  65. package/dist/runtimes/dsh/launch.js +2 -2
  66. package/dist/runtimes/dsh/launch.js.map +1 -1
  67. package/dist/runtimes/dsh/mcp.d.ts +5 -0
  68. package/dist/runtimes/dsh/mcp.d.ts.map +1 -0
  69. package/dist/runtimes/dsh/mcp.js +20 -0
  70. package/dist/runtimes/dsh/mcp.js.map +1 -0
  71. package/dist/runtimes/dsh/options.js +1 -1
  72. package/dist/runtimes/dsh/options.js.map +1 -1
  73. package/dist/runtimes/dsh/session.d.ts.map +1 -1
  74. package/dist/runtimes/dsh/session.js +8 -3
  75. package/dist/runtimes/dsh/session.js.map +1 -1
  76. package/dist/runtimes/pi/input-disposition.d.ts +24 -0
  77. package/dist/runtimes/pi/input-disposition.d.ts.map +1 -0
  78. package/dist/runtimes/pi/input-disposition.js +15 -0
  79. package/dist/runtimes/pi/input-disposition.js.map +1 -0
  80. package/dist/runtimes/pi/open.d.ts +1 -1
  81. package/dist/runtimes/pi/open.d.ts.map +1 -1
  82. package/dist/runtimes/pi/open.js +2 -2
  83. package/dist/runtimes/pi/open.js.map +1 -1
  84. package/dist/runtimes/pi/projection.d.ts +2 -1
  85. package/dist/runtimes/pi/projection.d.ts.map +1 -1
  86. package/dist/runtimes/pi/projection.js +18 -6
  87. package/dist/runtimes/pi/projection.js.map +1 -1
  88. package/dist/runtimes/pi/queue-barrier.d.ts +12 -0
  89. package/dist/runtimes/pi/queue-barrier.d.ts.map +1 -0
  90. package/dist/runtimes/pi/queue-barrier.js +35 -0
  91. package/dist/runtimes/pi/queue-barrier.js.map +1 -0
  92. package/dist/runtimes/pi/rpc/control.d.ts +1 -1
  93. package/dist/runtimes/pi/rpc/control.d.ts.map +1 -1
  94. package/dist/runtimes/pi/rpc/control.js +4 -1
  95. package/dist/runtimes/pi/rpc/control.js.map +1 -1
  96. package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
  97. package/dist/runtimes/pi/rpc/session.js +95 -61
  98. package/dist/runtimes/pi/rpc/session.js.map +1 -1
  99. package/dist/runtimes/pi/session.d.ts.map +1 -1
  100. package/dist/runtimes/pi/session.js +133 -94
  101. package/dist/runtimes/pi/session.js.map +1 -1
  102. package/dist/shared/acp/process.d.ts +1 -0
  103. package/dist/shared/acp/process.d.ts.map +1 -1
  104. package/dist/shared/acp/process.js +1 -0
  105. package/dist/shared/acp/process.js.map +1 -1
  106. package/dist/shared/acp/session.d.ts +1 -1
  107. package/dist/shared/acp/session.d.ts.map +1 -1
  108. package/dist/shared/acp/session.js +3 -2
  109. package/dist/shared/acp/session.js.map +1 -1
  110. package/dist/shared/acp/shared-session.js +1 -1
  111. package/dist/shared/acp/shared-session.js.map +1 -1
  112. package/dist/shared/acp/terminal-launch.d.ts +7 -0
  113. package/dist/shared/acp/terminal-launch.d.ts.map +1 -0
  114. package/dist/shared/acp/terminal-launch.js +41 -0
  115. package/dist/shared/acp/terminal-launch.js.map +1 -0
  116. package/dist/shared/acp/terminal.d.ts +2 -0
  117. package/dist/shared/acp/terminal.d.ts.map +1 -1
  118. package/dist/shared/acp/terminal.js +8 -7
  119. package/dist/shared/acp/terminal.js.map +1 -1
  120. package/dist/shared/stream-json/session.js +2 -2
  121. package/dist/shared/stream-json/session.js.map +1 -1
  122. package/package.json +1 -1
@@ -2,7 +2,7 @@
2
2
  export const initialStatus = { kind: "idle" };
3
3
  /** Separate display state from the checkpoint needed by incremental folds. */
4
4
  export function statusValue(state) {
5
- const { compactionState: _compactionState, adapterQueue: _adapterQueue, ...value } = state;
5
+ const { compactionState: _compactionState, adapterQueue: _adapterQueue, inputAdmission: _inputAdmission, ...value } = state;
6
6
  return value;
7
7
  }
8
8
  //# sourceMappingURL=status-state.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"status-state.js","sources":["../../src/observe/status-state.ts"],"names":[],"mappings":"AAkBA,gFAAgF;AAChF,MAAM,CAAC,MAAM,aAAa,GAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAE3D,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,KAAkB;IAC5C,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IAC3F,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"status-state.js","sources":["../../src/observe/status-state.ts"],"names":[],"mappings":"AAmBA,gFAAgF;AAChF,MAAM,CAAC,MAAM,aAAa,GAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AAE3D,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,KAAkB;IAC5C,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;IAC5H,OAAO,KAAK,CAAC;AACf,CAAC"}
@@ -20,18 +20,35 @@ import type { ControlOutcome, InputImage, RejectionCode, Session, RawEvent, Turn
20
20
  * is given, only that session's records count. inputId gates on a matching
21
21
  * native input_queued until its turn_active; without that evidence, the first
22
22
  * end wins. A matching input drop resolves as aborted for interruption or
23
- * failed for refusal.
23
+ * failed for refusal. A native handled receipt instead returns InputHandled.
24
+ * Accepted withdrawal of held input resolves as aborted; rejection of its
25
+ * recorded dispatch resolves as failed, including logs without a drop frame.
26
+ * Requests marked admission: "native" wait for their own admission evidence,
27
+ * excluding independent native ends while preflight is still pending.
24
28
  */
25
- export declare function turnEndAfter(records: readonly RawEvent[], afterSeq: number, sessionId?: string, inputId?: string): TurnOutcome | null;
29
+ export declare function turnEndAfter(records: readonly RawEvent[], afterSeq: number, sessionId?: string, inputId?: undefined): TurnOutcome | null;
30
+ export declare function turnEndAfter(records: readonly RawEvent[], afterSeq: number, sessionId: string | undefined, inputId: string | undefined): TurnOutcome | InputHandled | null;
31
+ /** Native input disposition, deliberately separate from a TurnOutcome. */
32
+ export interface InputHandled {
33
+ readonly kind: "handled";
34
+ readonly requestId: string;
35
+ readonly inputId?: string;
36
+ /** Cursor of the frame carrying the native handling evidence. */
37
+ readonly seq: number;
38
+ }
26
39
  /**
27
40
  * Resolve with the first turn end of the session's root agent recorded after
28
41
  * `afterSeq`, from the retained log if it already happened, otherwise live.
29
42
  * An observed process exit or session release also resolves it; release does
30
43
  * not prove native work stopped, and late native frames cannot revise its outcome.
31
44
  * A derived child session's turn end never satisfies it. With inputId, native
32
- * queue/start evidence excludes intervening turns. Without it, behavior is unchanged.
45
+ * queue/start evidence excludes intervening turns; explicit native admission
46
+ * also excludes turns that finish during that input's preflight. Handled input
47
+ * returns InputHandled. Unscoped next-turn waits keep their existing behavior.
48
+ * A withdrawn held input or refused dispatch also resolves its scoped wait.
33
49
  */
34
- export declare function awaitTurnEnd(session: Session, afterSeq: number, inputId?: string): Promise<TurnOutcome>;
50
+ export declare function awaitTurnEnd(session: Session, afterSeq: number, inputId?: undefined): Promise<TurnOutcome>;
51
+ export declare function awaitTurnEnd(session: Session, afterSeq: number, inputId: string | undefined): Promise<TurnOutcome | InputHandled>;
35
52
  /**
36
53
  * Resolve once the root agent is idle: at once (null) when `session.status()`
37
54
  * already says so, otherwise with the outcome when the owned input and any
@@ -52,8 +69,14 @@ export interface PromptRunOptions {
52
69
  readonly images?: readonly InputImage[];
53
70
  }
54
71
  export type PromptRun =
55
- /** The prompt did not begin a turn (busy, dead runtime); nothing was waited for. */
72
+ /** Native input handling without a model turn. Handler failures remain separate records; this is not success. */
56
73
  {
74
+ readonly kind: "handled";
75
+ readonly result: ControlOutcome;
76
+ readonly disposition: InputHandled;
77
+ }
78
+ /** The prompt did not begin a turn (busy, dead runtime); nothing was waited for. */
79
+ | {
57
80
  readonly kind: "rejected";
58
81
  readonly result: ControlOutcome;
59
82
  readonly code: RejectionCode;
@@ -84,7 +107,9 @@ export type PromptRun =
84
107
  * After an accepted abort the turn's end is awaited with no further limit:
85
108
  * a native turn end keeps its outcome; exit or release after that accepted abort is
86
109
  * `aborted`. A native before-start input drop resolves as `aborted` for interruption or `failed` for refusal.
87
- * Without one of these facts the helper continues waiting.
110
+ * Native input handling returns the separate handled branch, without borrowing
111
+ * an independent run's text or outcome. Without one of these facts the helper
112
+ * continues waiting.
88
113
  */
89
114
  export declare function promptAndWait(session: Session, input: string, options?: PromptRunOptions): Promise<PromptRun>;
90
115
  //# sourceMappingURL=turns.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"turns.d.ts","sources":["../../src/observe/turns.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEzH;;;;;;;;;;;;;GAaG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,SAAS,QAAQ,EAAE,EAC5B,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,WAAW,GAAG,IAAI,CAOpB;AAsCD;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAG7G;AAeD;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAQ7E;AAED,MAAM,WAAW,gBAAgB;IAC/B,qFAAqF;IACrF,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,+HAA+H;IAC/H,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,oFAAoF;IACpF,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;CACzC;AAED,MAAM,MAAM,SAAS;AACnB,oFAAoF;AAClF;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AACvH,wJAAwJ;GACtJ;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AACnH,qKAAqK;GACnK;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/J;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAsBvH"}
1
+ {"version":3,"file":"turns.d.ts","sources":["../../src/observe/turns.ts"],"names":[],"mappings":"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"}
@@ -1,30 +1,8 @@
1
+ import { droppedOutcome, inputRequestAt, inputWait } from "./input-wait.js";
1
2
  import { initialStatus, reduceStatus } from "./agent-status.js";
2
3
  import { exitTurnOutcome, releaseTurnOutcome } from "./turn-stop.js";
3
- /**
4
- * Turn helpers for consumers. A turn is a SPAN on the stream, not a control
5
- * object: a prompt request is its fallback start; native input_queued and
6
- * turn_active with inputId can establish its actual start. It ends at the runtime's own
7
- * `turn_ended` event or at an observed process exit. Session release also ends OAR's wait,
8
- * without proving native work stopped. A native before-start input drop
9
- * also resolves an input-scoped wait (aborted for interruption, failed for refusal), without synthesizing a turn end.
10
- *
11
- * Scope: the ROOT SESSION's ROOT AGENT. A derived child session's records
12
- * (codex child threads, grok child sessions) carry the child's own `sessionId`
13
- * and `agentPath []`; its `turn_ended` is that child's turn, not the root's.
14
- * Observed live on codex 0.149.0, where the child's `turn/completed` reached
15
- * the stream BEFORE the root's.
16
- */
17
- /**
18
- * The root-agent turn end after `afterSeq`, if the stream already holds one:
19
- * the runtime's turn_ended event, an observed process exit, or session release.
20
- * Release ends the wait without proving native work stopped. When `sessionId`
21
- * is given, only that session's records count. inputId gates on a matching
22
- * native input_queued until its turn_active; without that evidence, the first
23
- * end wins. A matching input drop resolves as aborted for interruption or
24
- * failed for refusal.
25
- */
26
4
  export function turnEndAfter(records, afterSeq, sessionId, inputId) {
27
- const read = turnEndReader(afterSeq, sessionId, inputId);
5
+ const read = turnEndReader(afterSeq, sessionId, inputId, undefined, inputRequestAt(records, afterSeq, sessionId, inputId));
28
6
  for (const record of records) {
29
7
  const outcome = read(record);
30
8
  if (outcome !== null) {
@@ -34,38 +12,29 @@ export function turnEndAfter(records, afterSeq, sessionId, inputId) {
34
12
  return null;
35
13
  }
36
14
  /** Keep request/response correlation across both the retained prefix and live records. */
37
- function turnEndReader(afterSeq, sessionId, inputId, onText, onlyWhenIdle = false) {
15
+ function turnEndReader(afterSeq, sessionId, inputId, onText, boundRequest) {
38
16
  let status = initialStatus;
39
- let waitingForInput = false;
17
+ const input = inputWait(afterSeq, inputId, boundRequest);
40
18
  return (record) => {
41
19
  if (record.agentPath.length > 0 || (sessionId !== undefined && record.sessionId !== sessionId)) {
42
20
  return null;
43
21
  }
22
+ const disposition = input.read(record);
44
23
  const previous = status;
45
24
  status = reduceStatus(previous, record, sessionId);
46
25
  if (previous.kind === "idle" && previous.released === true) {
47
26
  return record.seq > afterSeq && record.kind === "response" && record.body.kind === "exited"
48
27
  ? exitTurnOutcome(undefined, record.body.reason) : null;
49
28
  }
29
+ if (disposition !== null) {
30
+ return disposition;
31
+ }
50
32
  if (record.kind === "frame") {
51
33
  for (const event of record.body.events) {
52
- if (inputId !== undefined && event.kind === "input_queued" && event.inputId === inputId) {
53
- waitingForInput = true;
54
- }
55
- if (inputId !== undefined && event.kind === "turn_active" && event.inputId === inputId) {
56
- waitingForInput = false;
57
- }
58
- if (inputId !== undefined && event.kind === "input_dropped" && event.inputId === inputId) {
59
- waitingForInput = false;
60
- if (record.seq > afterSeq && (!onlyWhenIdle || status.kind === "idle")) {
61
- return event.reason === "turn_interrupted" ? { kind: "aborted" }
62
- : { kind: "failed", failure: event.failure ?? "unknown", reason: event.message ?? "runtime refused the input" };
63
- }
64
- }
65
- if (record.seq > afterSeq && !waitingForInput && event.kind === "text_delta") {
34
+ if (record.seq > afterSeq && !input.waiting() && event.kind === "text_delta") {
66
35
  onText?.(event.text);
67
36
  }
68
- if (record.seq > afterSeq && !waitingForInput && event.kind === "turn_ended" && (!onlyWhenIdle || status.kind === "idle")) {
37
+ if (record.seq > afterSeq && !input.waiting() && event.kind === "turn_ended") {
69
38
  return event.outcome;
70
39
  }
71
40
  }
@@ -80,23 +49,15 @@ function turnEndReader(afterSeq, sessionId, inputId, onText, onlyWhenIdle = fals
80
49
  return record.body.kind === "exited" ? exitTurnOutcome(stop, record.body.reason) : null;
81
50
  };
82
51
  }
83
- /**
84
- * Resolve with the first turn end of the session's root agent recorded after
85
- * `afterSeq`, from the retained log if it already happened, otherwise live.
86
- * An observed process exit or session release also resolves it; release does
87
- * not prove native work stopped, and late native frames cannot revise its outcome.
88
- * A derived child session's turn end never satisfies it. With inputId, native
89
- * queue/start evidence excludes intervening turns. Without it, behavior is unchanged.
90
- */
91
52
  export async function awaitTurnEnd(session, afterSeq, inputId) {
92
53
  const outcome = await watchTurn(session, afterSeq, inputId);
93
54
  return outcome;
94
55
  }
95
56
  /** One reader owns both the turn boundary and its text, including replay before subscription. */
96
- async function watchTurn(session, afterSeq, inputId, onText, onlyWhenIdle = false) {
57
+ async function watchTurn(session, afterSeq, inputId, onText, requestId) {
97
58
  const { promise, resolve } = Promise.withResolvers();
98
59
  let done = false;
99
- const read = turnEndReader(afterSeq, session.id, inputId, onText, onlyWhenIdle);
60
+ const read = turnEndReader(afterSeq, session.id, inputId, onText, requestId ?? inputRequestAt(session.records(), afterSeq, session.id, inputId));
100
61
  const unsubscribe = session.rawEvents((record) => {
101
62
  if (done) {
102
63
  return;
@@ -127,9 +88,38 @@ export async function awaitIdle(session) {
127
88
  if (status.value.kind === "idle" && status.value.pendingPrompt === undefined) {
128
89
  return null;
129
90
  }
130
- const inputId = status.value.pendingPrompt?.inputId ?? (status.value.kind === "running" ? status.value.inputId : undefined);
131
- const outcome = await watchTurn(session, status.seq, inputId, undefined, true);
132
- return outcome;
91
+ const { promise, resolve } = Promise.withResolvers();
92
+ let state = initialStatus;
93
+ const unsubscribe = session.rawEvents(record => {
94
+ const previous = state;
95
+ state = reduceStatus(state, record, session.id);
96
+ if (record.seq <= status.seq || record.sessionId !== session.id || record.agentPath.length > 0
97
+ || state.kind !== "idle" || state.pendingPrompt !== undefined) {
98
+ return;
99
+ }
100
+ if (record.kind === "frame") {
101
+ const ended = record.body.events.find(event => event.kind === "turn_ended");
102
+ const dropped = record.body.events.find(event => event.kind === "input_dropped");
103
+ resolve(ended?.kind === "turn_ended" ? ended.outcome : (dropped?.kind === "input_dropped" ? droppedOutcome(dropped) : null));
104
+ return;
105
+ }
106
+ const stop = previous.kind === "running" ? previous.stop ?? previous.pendingPrompt?.stop : previous.pendingPrompt?.stop;
107
+ if (record.kind === "response" && record.body.kind === "exited") {
108
+ resolve(exitTurnOutcome(stop, record.body.reason));
109
+ }
110
+ else if (record.kind === "response" && record.body.kind === "released") {
111
+ resolve(releaseTurnOutcome(stop));
112
+ }
113
+ else {
114
+ resolve(null);
115
+ }
116
+ }, { sessionId: session.id, afterSeq: -1 });
117
+ try {
118
+ return await promise;
119
+ }
120
+ finally {
121
+ unsubscribe();
122
+ }
133
123
  }
134
124
  /**
135
125
  * Prompt, then wait for the runtime to end the turn it opened. A rejected
@@ -141,7 +131,9 @@ export async function awaitIdle(session) {
141
131
  * After an accepted abort the turn's end is awaited with no further limit:
142
132
  * a native turn end keeps its outcome; exit or release after that accepted abort is
143
133
  * `aborted`. A native before-start input drop resolves as `aborted` for interruption or `failed` for refusal.
144
- * Without one of these facts the helper continues waiting.
134
+ * Native input handling returns the separate handled branch, without borrowing
135
+ * an independent run's text or outcome. Without one of these facts the helper
136
+ * continues waiting.
145
137
  */
146
138
  export async function promptAndWait(session, input, options = {}) {
147
139
  const inputId = options.inputId ?? globalThis.crypto.randomUUID();
@@ -149,16 +141,29 @@ export async function promptAndWait(session, input, options = {}) {
149
141
  if (result.kind === "rejected") {
150
142
  return { kind: "rejected", result, code: result.code, reason: result.reason };
151
143
  }
144
+ const disposition = handledAttempt(session, result.requestId);
145
+ if (disposition !== undefined) {
146
+ return { kind: "handled", result, disposition };
147
+ }
152
148
  let text = "";
153
149
  const limit = armLimits(options);
154
150
  try {
155
- const ended = watchTurn(session, result.seq, inputId, (delta) => { text += delta; });
151
+ const ended = watchTurn(session, result.seq, inputId, (delta) => { text += delta; }, result.request.id);
156
152
  const first = await Promise.race([ended, limit.fired]);
157
153
  if (typeof first !== "string") {
158
- return { kind: "ended", result, outcome: first, text };
154
+ return first.kind === "handled" ? { kind: "handled", result, disposition: first } : { kind: "ended", result, outcome: first, text };
155
+ }
156
+ // A receipt may have arrived while the caller's already-fired limit and
157
+ // the live reader were settling. Never abort an unrelated extension run.
158
+ const handledNow = handledAttempt(session, result.requestId);
159
+ if (handledNow !== undefined) {
160
+ return { kind: "handled", result, disposition: handledNow };
159
161
  }
160
162
  const abort = await session.abort();
161
163
  const outcome = await ended;
164
+ if (outcome.kind === "handled") {
165
+ return { kind: "handled", result, disposition: outcome };
166
+ }
162
167
  return abort.kind === "accepted"
163
168
  ? { kind: "interrupted", by: first, result, outcome, text }
164
169
  : { kind: "ended", result, outcome, text };
@@ -167,6 +172,18 @@ export async function promptAndWait(session, input, options = {}) {
167
172
  limit.disarm();
168
173
  }
169
174
  }
175
+ function handledAttempt(session, requestId) {
176
+ for (const record of session.records()) {
177
+ if (record.kind !== "frame" || record.sessionId !== session.id || record.agentPath.length > 0) {
178
+ continue;
179
+ }
180
+ const event = record.body.events.find(item => item.kind === "input_handled" && item.requestId === requestId);
181
+ if (event?.kind === "input_handled") {
182
+ return { kind: "handled", requestId, ...(event.inputId === undefined ? {} : { inputId: event.inputId }), seq: record.seq };
183
+ }
184
+ }
185
+ return undefined;
186
+ }
170
187
  /** The caller's limits as one promise that settles with whichever fires first (never, when none is set), and the disarm for when the turn ends first. */
171
188
  function armLimits(options) {
172
189
  const { promise: fired, resolve } = Promise.withResolvers();
@@ -1 +1 @@
1
- {"version":3,"file":"turns.js","sources":["../../src/observe/turns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"turns.js","sources":["../../src/observe/turns.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/codex/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AA2C7D,oFAAoF;AACpF,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU,CAI3E"}
1
+ {"version":3,"file":"failure.d.ts","sources":["../../../src/runtimes/codex/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AA8C7D,oFAAoF;AACpF,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU,CAI3E"}
@@ -7,10 +7,13 @@ import { asNumber, asRecord } from "../../shared/json.js";
7
7
  * `other` (an HTTP 400 codex does not name) carries the provider's JSON body
8
8
  * as its message, read for its code. A usage limit and an exhausted credit
9
9
  * balance are the same `usageLimitExceeded`, so both are `quota`. Declared
10
- * values no run produced (`unauthorized`, `badRequest`,
10
+ * `unauthorized` is the native auth variant in the 0.167.0 generated schema;
11
+ * unlike an HTTP transport error it carries no status or credential detail.
12
+ * Other declared values no run produced (`badRequest`,
11
13
  * `sessionBudgetExceeded`, `cyberPolicy`, …) stay `unknown`.
12
14
  */
13
15
  const NAMED = {
16
+ unauthorized: "auth",
14
17
  modelNotFound: "model_unavailable",
15
18
  usageLimitExceeded: "quota",
16
19
  rateLimitExceeded: "rate_limited",
@@ -22,7 +25,7 @@ const TRANSPORT = ["httpConnectionFailed", "responseStreamConnectionFailed", "re
22
25
  /** What `codexErrorInfo` says: a class, and the HTTP status a transport variant carries. */
23
26
  function fromInfo(info, message) {
24
27
  if (typeof info === "string") {
25
- const named = NAMED[info];
28
+ const named = Object.hasOwn(NAMED, info) ? NAMED[info] : undefined;
26
29
  if (named !== undefined) {
27
30
  return { failure: named };
28
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"failure.js","sources":["../../../src/runtimes/codex/failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAmB,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;;;GASG;AAEH,MAAM,KAAK,GAA6D;IACtE,aAAa,EAAE,mBAAmB;IAClC,kBAAkB,EAAE,OAAO;IAC3B,iBAAiB,EAAE,cAAc;IACjC,gBAAgB,EAAE,YAAY;IAC9B,mBAAmB,EAAE,UAAU;IAC/B,qBAAqB,EAAE,iBAAiB;CACzC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,sBAAsB,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,+BAA+B,CAAU,CAAC;AAErJ,4FAA4F;AAC5F,SAAS,QAAQ,CAAC,IAAa,EAAE,OAAe;IAC9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAAC,CAAC;QACvD,OAAO,EAAE,OAAO,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAChG,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QACxD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,SAAkB;IAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;AACjF,CAAC"}
1
+ {"version":3,"file":"failure.js","sources":["../../../src/runtimes/codex/failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAmB,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;;;;;GAWG;AAEH,MAAM,KAAK,GAA6D;IACtE,YAAY,EAAE,MAAM;IACpB,aAAa,EAAE,mBAAmB;IAClC,kBAAkB,EAAE,OAAO;IAC3B,iBAAiB,EAAE,cAAc;IACjC,gBAAgB,EAAE,YAAY;IAC9B,mBAAmB,EAAE,UAAU;IAC/B,qBAAqB,EAAE,iBAAiB;CACzC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,sBAAsB,EAAE,gCAAgC,EAAE,4BAA4B,EAAE,+BAA+B,CAAU,CAAC;AAErJ,4FAA4F;AAC5F,SAAS,QAAQ,CAAC,IAAa,EAAE,OAAe;IAC9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAAC,CAAC;QACvD,OAAO,EAAE,OAAO,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAChG,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QACxD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,SAAkB;IAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,OAAO,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC;AACjF,CAAC"}
@@ -0,0 +1,17 @@
1
+ import type { RuntimeEventBody } from "../../contracts/session.js";
2
+ import { type JsonRecord } from "../../shared/json.js";
3
+ interface MessageObservation {
4
+ readonly threadId: string;
5
+ readonly turnId: string | null;
6
+ readonly phase?: string;
7
+ readonly streamed: boolean;
8
+ readonly completed: boolean;
9
+ }
10
+ /** Message evidence is scoped by native thread, turn and item, never by text or arrival order. */
11
+ export type CodexMessages = ReadonlyMap<string, MessageObservation>;
12
+ export declare function foldCodexMessages(previous: CodexMessages, threadId: string, method: string, params: JsonRecord): {
13
+ readonly messages: CodexMessages;
14
+ readonly events: readonly RuntimeEventBody[];
15
+ };
16
+ export {};
17
+ //# sourceMappingURL=messages.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages.d.ts","sources":["../../../src/runtimes/codex/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEjE,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,kGAAkG;AAClG,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEpE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAC5E;IAAE,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,CA8BpF"}
@@ -0,0 +1,37 @@
1
+ import { asRecord } from "../../shared/json.js";
2
+ export function foldCodexMessages(previous, threadId, method, params) {
3
+ const turnId = typeof params.turnId === "string" ? params.turnId : null;
4
+ if (method === "turn/completed") {
5
+ const ended = asRecord(params.turn)?.id;
6
+ return { messages: new Map([...previous].filter(([, value]) => value.threadId !== threadId || (value.turnId !== ended && value.turnId !== null))), events: [] };
7
+ }
8
+ const item = asRecord(params.item);
9
+ const delta = method === "item/agentMessage/delta";
10
+ const lifecycle = (method === "item/started" || method === "item/completed") && item?.type === "agentMessage";
11
+ if (!delta && !lifecycle) {
12
+ return { messages: previous, events: [] };
13
+ }
14
+ const id = delta ? params.itemId : item?.id;
15
+ const messageId = typeof id === "string" ? id : undefined;
16
+ const key = messageId === undefined ? undefined : JSON.stringify([threadId, turnId, messageId]);
17
+ const known = key === undefined ? undefined : previous.get(key);
18
+ // Deltas carry no phase. Only that same item's earlier native report can supply it.
19
+ const phase = delta ? known?.phase : (typeof item?.phase === "string" ? item.phase : undefined);
20
+ const events = [];
21
+ const text = delta ? params.delta : (method === "item/completed" ? item?.text : undefined);
22
+ if (typeof text === "string" && (delta || (text.length > 0 && known?.streamed !== true && known?.completed !== true))) {
23
+ events.push({ kind: "text_delta", text,
24
+ ...(messageId === undefined ? {} : { messageId }), ...(phase === undefined ? {} : { phase }),
25
+ });
26
+ }
27
+ if (key === undefined) {
28
+ return { messages: previous, events };
29
+ }
30
+ const messages = new Map([...previous, [key, {
31
+ threadId, turnId, ...(phase === undefined ? {} : { phase }),
32
+ streamed: known?.streamed === true || (delta && typeof text === "string" && text.length > 0),
33
+ completed: known?.completed === true || method === "item/completed",
34
+ }]]);
35
+ return { messages, events };
36
+ }
37
+ //# sourceMappingURL=messages.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages.js","sources":["../../../src/runtimes/codex/messages.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { type CodexInputs } from "./input-delivery.js";
2
2
  import type { FrameBody, SessionEdge } from "../../contracts/session.js";
3
+ import { type CodexMessages } from "./messages.js";
3
4
  import { type JsonRecord } from "../../shared/json.js";
4
5
  import { type CodexOpenMethod } from "./open.js";
5
6
  import { type SubagentThreads } from "./tasks.js";
@@ -21,9 +22,13 @@ export type ProjectionCommand = {
21
22
  */
22
23
  export interface CodexProjectionState {
23
24
  readonly rootThreadId: string;
25
+ /** Native message phases and text already streamed, scoped to their owning thread and turn. */
26
+ readonly messages: CodexMessages;
24
27
  /** Accepted steers and native echoes, keyed by the turn that owns them. */
25
28
  readonly inputs: CodexInputs;
26
29
  readonly lastErrorDetail: string | null;
30
+ /** Reconnects announced by each thread's current turn: native gives the attempt only in display text. */
31
+ readonly retries: ReadonlyMap<string, number>;
27
32
  /**
28
33
  * A root-thread compaction is open (its `contextCompaction` item started).
29
34
  * codex says "compacted" twice, as the item's completion and as the
@@ -1 +1 @@
1
- {"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/codex/projection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EACV,SAAS,EAET,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAEzE,OAAO,EAAmD,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACnG,OAAO,EAA4E,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAmBrI,MAAM,MAAM,iBAAiB,GACzB;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,oFAAoF;IACpF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,2EAA2E;IAC3E,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,qFAAqF;IACrF,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,gGAAgG;IAChG,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;CAC5C;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,GAAE,eAAgC,GAAG,oBAAoB,CAE3H;AA8JD,qEAAqE;AACrE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,GACjB;IAAE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAA;CAAE,CAsC3F"}
1
+ {"version":3,"file":"projection.d.ts","sources":["../../../src/runtimes/codex/projection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EACV,SAAS,EAET,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAEzE,OAAO,EAAmD,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AACnG,OAAO,EAA4E,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAmBrI,MAAM,MAAM,iBAAiB,GACzB;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,oFAAoF;IACpF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,+FAA+F;IAC/F,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC;IACjC,2EAA2E;IAC3E,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,yGAAyG;IACzG,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,qFAAqF;IACrF,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,gGAAgG;IAChG,QAAQ,CAAC,aAAa,EAAE,kBAAkB,CAAC;CAC5C;AAED,uGAAuG;AACvG,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,GAAE,eAAgC,GAAG,oBAAoB,CAE3H;AAuKD,qEAAqE;AACrE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,GACjB;IAAE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAA;CAAE,CAyC3F"}
@@ -2,6 +2,7 @@
2
2
  import { codexGoalEvents } from "./goal.js";
3
3
  import { foldCodexInputs } from "./input-delivery.js";
4
4
  import { codexFailure } from "./failure.js";
5
+ import { foldCodexMessages } from "./messages.js";
5
6
  import { asRecord } from "../../shared/json.js";
6
7
  import { noTokens } from "../../shared/token-totals.js";
7
8
  import { codexItemExitCode, codexItemInput, codexToolContent } from "./item-detail.js";
@@ -26,7 +27,7 @@ const TOOL_ITEM_TYPES = new Set(["commandExecution", "fileChange", "mcpToolCall"
26
27
  const COLLAB_ITEM_TYPES = new Set(["collabAgentToolCall", "collabToolCall", "subAgentActivity"]);
27
28
  /** The projection of a Session opened by `opened`: a resume awaits codex's re-reported token total. */
28
29
  export function initialCodexProjection(rootThreadId, opened = "thread/start") {
29
- return { inputs: new Map(), rootThreadId, lastErrorDetail: null, compacting: false, subagents: new Map(), tokenBaseline: initialTokenBaseline(opened === "thread/resume") };
30
+ return { inputs: new Map(), messages: new Map(), rootThreadId, lastErrorDetail: null, retries: new Map(), compacting: false, subagents: new Map(), tokenBaseline: initialTokenBaseline(opened === "thread/resume") };
30
31
  }
31
32
  const COMPACTION_ITEM_TYPE = "contextCompaction";
32
33
  function isCompactionItem(params) {
@@ -57,9 +58,11 @@ function toolViews(method, item) {
57
58
  const itemId = typeof item?.id === "string" ? item.id : "unknown";
58
59
  if (method === "item/started") {
59
60
  const input = item === null ? undefined : codexItemInput(item);
60
- return [input === undefined
61
- ? { kind: "tool_call_started", callId: itemId, tool: itemType }
62
- : { kind: "tool_call_started", callId: itemId, tool: itemType, input }];
61
+ return [{ kind: "tool_call_started", callId: itemId, tool: itemType,
62
+ ...(input === undefined ? {} : { input }),
63
+ ...(itemType === "mcpToolCall" && typeof item?.server === "string" ? { server: item.server } : {}),
64
+ ...(itemType === "mcpToolCall" && typeof item?.tool === "string" ? { toolName: item.tool } : {}),
65
+ }];
63
66
  }
64
67
  const content = item === null ? undefined : codexToolContent(item);
65
68
  const exitCode = item === null ? undefined : codexItemExitCode(item);
@@ -118,18 +121,26 @@ function spanIdOf(params) {
118
121
  const turnId = asRecord(params.turn)?.id;
119
122
  return typeof turnId === "string" ? turnId : undefined;
120
123
  }
124
+ function errorDetail(params) {
125
+ const error = asRecord(params.error);
126
+ const message = typeof error?.message === "string" ? error.message : "";
127
+ const details = typeof error?.additionalDetails === "string" ? error.additionalDetails : "";
128
+ return [message, details].filter((part) => part.length > 0).join(": ");
129
+ }
121
130
  function viewsFor(state, reporter, method, params) {
122
131
  switch (method) {
132
+ case "error": {
133
+ if (params.willRetry !== true) {
134
+ return [];
135
+ }
136
+ const reason = errorDetail(params);
137
+ return [{ kind: "retry", attempt: (state.retries.get(reporter) ?? 0) + 1, ...(reason.length > 0 ? { reason } : {}) }];
138
+ }
123
139
  case "thread/goal/updated":
124
140
  case "thread/goal/cleared":
125
141
  return codexGoalEvents(method, params);
126
142
  case "turn/started":
127
143
  return [{ kind: "turn_active" }];
128
- case "item/agentMessage/delta":
129
- // `itemId` names the agentMessage item: one turn can say several.
130
- return typeof params.delta === "string"
131
- ? [{ kind: "text_delta", text: params.delta, ...(typeof params.itemId === "string" ? { messageId: params.itemId } : {}) }]
132
- : [];
133
144
  case "item/commandExecution/outputDelta":
134
145
  // Streamed stdout of a running command item; `itemId` is the tool call.
135
146
  return typeof params.itemId === "string"
@@ -183,11 +194,12 @@ export function foldCodexNotification(previous, method, params) {
183
194
  // Before the views: a re-reported total is read against itself (zero).
184
195
  const tokenBaseline = threadId === previous.rootThreadId ? nextTokenBaseline(previous.tokenBaseline, method, params) : previous.tokenBaseline;
185
196
  const input = threadId === previous.rootThreadId ? foldCodexInputs(previous.inputs, method, params) : { inputs: previous.inputs, events: [] };
186
- const state = { ...previous, tokenBaseline, inputs: input.inputs };
197
+ const observed = foldCodexMessages(previous.messages, threadId, method, params);
198
+ const state = { ...previous, tokenBaseline, inputs: input.inputs, messages: observed.messages };
187
199
  const spanId = spanIdOf(params);
188
200
  const event = {
189
201
  kind: "frame",
190
- body: { type: method, native: params, events: [...input.events, ...viewsFor(state, threadId, method, params)] },
202
+ body: { type: method, native: params, events: [...input.events, ...observed.events, ...viewsFor(state, threadId, method, params)] },
191
203
  ...(spanId === undefined ? {} : { spanId }),
192
204
  ...(threadId === state.rootThreadId ? {} : { sessionId: threadId }),
193
205
  };
@@ -196,16 +208,18 @@ export function foldCodexNotification(previous, method, params) {
196
208
  : [];
197
209
  let next = state;
198
210
  if (method === "error") {
199
- const error = asRecord(params.error);
200
- const message = typeof error?.message === "string" ? error.message : "";
201
- const details = typeof error?.additionalDetails === "string" ? error.additionalDetails : "";
202
- const combined = [message, details].filter((part) => part.length > 0).join(": ");
211
+ const combined = errorDetail(params);
203
212
  if (combined.length > 0) {
204
213
  next = { ...state, lastErrorDetail: combined };
205
214
  }
215
+ if (params.willRetry === true) {
216
+ next = { ...next, retries: new Map(next.retries).set(threadId, (next.retries.get(threadId) ?? 0) + 1) };
217
+ }
206
218
  }
207
- else if (method === "turn/completed" && threadId === state.rootThreadId) {
208
- next = { ...state, lastErrorDetail: null };
219
+ else if (method === "turn/completed") {
220
+ const retries = new Map(state.retries);
221
+ retries.delete(threadId);
222
+ next = { ...state, retries, ...(threadId === state.rootThreadId ? { lastErrorDetail: null } : {}) };
209
223
  }
210
224
  else if (threadId === state.rootThreadId && isCompactionItem(params) && (method === "item/started" || method === "item/completed")) {
211
225
  next = { ...state, compacting: method === "item/started" };