@sapiom/harness 0.8.5 → 0.8.6
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/CHANGELOG.md +13 -0
- package/dist/core/adapters/codex.d.ts +9 -15
- package/dist/core/adapters/codex.d.ts.map +1 -1
- package/dist/core/adapters/codex.js +77 -27
- package/dist/core/adapters/codex.js.map +1 -1
- package/dist/core/session-manager.d.ts +70 -31
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +285 -65
- package/dist/core/session-manager.js.map +1 -1
- package/dist/shared/types.d.ts +38 -22
- package/dist/shared/types.d.ts.map +1 -1
- package/dist/shared/types.js.map +1 -1
- package/dist/web/assets/{index-BAW1BY7L.js → index-DWzHeT4k.js} +30 -30
- package/dist/web/index.html +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @sapiom/harness
|
|
2
2
|
|
|
3
|
+
## 0.8.6
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 3d79aab: Release held Agent Studio prompts into Codex once its terminal has rendered a
|
|
8
|
+
stable, non-blocking screen. Partial terminal repaints retain recognized
|
|
9
|
+
blockers until the empty composer is positively identified, while a bounded
|
|
10
|
+
fallback prevents animation or an incomplete repaint from waiting forever.
|
|
11
|
+
Initial prompts remain held through Codex trust, sign-in, and setup flows, and
|
|
12
|
+
Claude Code's SessionStart readiness behavior is unchanged. Codex may now
|
|
13
|
+
report `ready: true` before its first rollout/transcript exists: readiness
|
|
14
|
+
describes an input-safe TUI, not durable conversation metadata.
|
|
15
|
+
|
|
3
16
|
## 0.8.5
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -39,24 +39,18 @@ export declare class CodexAdapter implements HarnessAdapter {
|
|
|
39
39
|
launch(opts: LaunchOpts): SpawnSpec;
|
|
40
40
|
resume(agentSessionId: string, opts: LaunchOpts): SpawnSpec;
|
|
41
41
|
/**
|
|
42
|
-
* See `HarnessAdapter.detectBlockingPrompt`. Codex
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
* injection that needs it — a scrollback check is the only thing that
|
|
51
|
-
* can stand in for it up to that point.
|
|
52
|
-
*/
|
|
53
|
-
/**
|
|
54
|
-
* See `HarnessAdapter.readyFallback`: `isReadyEnough` may trust a settled,
|
|
55
|
-
* prompt-free scrollback immediately — Codex's real readiness signal cannot
|
|
56
|
-
* arrive before the first injection needs it (see detectBlockingPrompt).
|
|
42
|
+
* See `HarnessAdapter.readyFallback` and `detectBlockingPrompt`. Codex's
|
|
43
|
+
* rollout file — and therefore the SessionStart-equivalent event
|
|
44
|
+
* `SessionManager` otherwise waits on — isn't written until the first turn
|
|
45
|
+
* is submitted. Confirmed empirically against codex-cli 0.134.0: an idle,
|
|
46
|
+
* fully-interactive session produces no rollout for as long as nothing is
|
|
47
|
+
* submitted. SessionManager therefore publishes fallback readiness after a
|
|
48
|
+
* non-blocking frame settles (or reaches its bounded liveness ceiling),
|
|
49
|
+
* while retaining the same check at request time.
|
|
57
50
|
*/
|
|
58
51
|
readonly readyFallback: "immediate";
|
|
59
52
|
detectBlockingPrompt(scrollback: string): boolean;
|
|
53
|
+
detectReadyPrompt(terminalOutput: string): boolean;
|
|
60
54
|
/**
|
|
61
55
|
* See `HarnessAdapter.canResume`. Reuses the same rollout walk +
|
|
62
56
|
* `session_meta` read `listPastSessions` is built on, so "codex has this
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AASH,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,SAAS,EACV,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AASH,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,SAAS,EACV,MAAM,uBAAuB,CAAC;AAiF/B,MAAM,WAAW,mBAAmB;IAClC,6BAA6B;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAuHD,qBAAa,YAAa,YAAW,cAAc;IACjD,QAAQ,CAAC,EAAE,EAAG,OAAO,CAAU;IAC/B,QAAQ,CAAC,WAAW,EAAG,iBAAiB,CAAU;IAClD;;;0EAGsE;IACtE,QAAQ,CAAC,oBAAoB,EAAG,aAAa,CAAU;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,GAAE,mBAAwB;IAKvC,MAAM,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAetC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS;IAWnC,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,SAAS;IAS3D;;;;;;;;;OASG;IACH,QAAQ,CAAC,aAAa,EAAG,WAAW,CAAU;IAE9C,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAOjD,iBAAiB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;IAKlD;;;;;;;;;;;;OAYG;IACG,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhE,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;CAyClE;AA8DD,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,cAAc,CAEhF"}
|
|
@@ -33,18 +33,70 @@ const execFileAsync = promisify(execFile);
|
|
|
33
33
|
const ROLLOUT_HEAD_BYTES = 65536;
|
|
34
34
|
const MAX_SCAN_DEPTH = 4; // ~/.codex/sessions/YYYY/MM/DD/*.jsonl
|
|
35
35
|
/**
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
* so even a stripped buffer runs the words together with no separator at
|
|
42
|
-
* all; `\s*` between them tolerates that (and ordinary whitespace, in case
|
|
43
|
-
* a future TUI revision renders differently). See `detectBlockingPrompt`
|
|
44
|
-
* for why this exists at all (Codex's own structured readiness signal can't
|
|
45
|
-
* be relied on standalone, unlike Claude Code's).
|
|
36
|
+
* Turn a rendered phrase into a pattern that also matches Codex's cursor-
|
|
37
|
+
* positioned output. Confirmed against real captures: the TUI can position
|
|
38
|
+
* each *word* separately instead of emitting literal spaces
|
|
39
|
+
* (`trust\x1b[3;16Hthe\x1b[3;20H...`), so `stripAnsi()` leaves adjacent words.
|
|
40
|
+
* `\s*` accepts both that representation and ordinary terminal text.
|
|
46
41
|
*/
|
|
47
|
-
|
|
42
|
+
function tuiPhrase(phrase) {
|
|
43
|
+
const escapedWords = phrase
|
|
44
|
+
.trim()
|
|
45
|
+
.split(/\s+/)
|
|
46
|
+
.map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
|
|
47
|
+
return new RegExp(escapedWords.join("\\s*"), "i");
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Recognizable signatures for Codex screens that need a human choice before
|
|
51
|
+
* the composer is safe for injected input. A signature may require multiple
|
|
52
|
+
* phrases so ordinary agent output mentioning one short label does not hold
|
|
53
|
+
* later programmatic input indefinitely.
|
|
54
|
+
*
|
|
55
|
+
* These strings are verified against codex-cli 0.147.0's onboarding, auth,
|
|
56
|
+
* model-migration, personality, and theme-picker sources. Detection remains
|
|
57
|
+
* deliberately best-effort: when Codex adds a new interactive startup screen,
|
|
58
|
+
* its stable rendered copy must be added here.
|
|
59
|
+
*/
|
|
60
|
+
const BLOCKING_PROMPT_SIGNATURES = [
|
|
61
|
+
[
|
|
62
|
+
tuiPhrase("trust the contents of this directory"),
|
|
63
|
+
tuiPhrase("Yes, continue"),
|
|
64
|
+
tuiPhrase("No, quit"),
|
|
65
|
+
],
|
|
66
|
+
[
|
|
67
|
+
tuiPhrase("Sign in with ChatGPT to use Codex as part of your paid plan"),
|
|
68
|
+
tuiPhrase("connect an API key for usage-based billing"),
|
|
69
|
+
],
|
|
70
|
+
[
|
|
71
|
+
tuiPhrase("Finish signing in via your browser"),
|
|
72
|
+
tuiPhrase("open the following link to authenticate"),
|
|
73
|
+
],
|
|
74
|
+
[
|
|
75
|
+
tuiPhrase("Preparing device code login"),
|
|
76
|
+
tuiPhrase("Open this link in your browser and sign in"),
|
|
77
|
+
],
|
|
78
|
+
[
|
|
79
|
+
tuiPhrase("Use your own OpenAI API key for usage-based billing"),
|
|
80
|
+
tuiPhrase("Paste or type your API key"),
|
|
81
|
+
],
|
|
82
|
+
[
|
|
83
|
+
tuiPhrase("Before you start"),
|
|
84
|
+
tuiPhrase("Decide how much autonomy you want to grant Codex"),
|
|
85
|
+
],
|
|
86
|
+
[
|
|
87
|
+
tuiPhrase("Codex just got an upgrade"),
|
|
88
|
+
tuiPhrase("Choose how you'd like Codex to proceed"),
|
|
89
|
+
],
|
|
90
|
+
[
|
|
91
|
+
tuiPhrase("Select Personality"),
|
|
92
|
+
tuiPhrase("Choose a communication style for Codex"),
|
|
93
|
+
],
|
|
94
|
+
[tuiPhrase("Select Syntax Theme"), tuiPhrase("Type to filter themes")],
|
|
95
|
+
];
|
|
96
|
+
/** Stable empty-composer copy from codex-cli 0.147.0. This is not required
|
|
97
|
+
* for the ordinary already-trusted path; SessionManager uses it to prove that
|
|
98
|
+
* a previously detected onboarding screen has actually been replaced. */
|
|
99
|
+
const READY_PROMPT_PATTERNS = [tuiPhrase("Ask Codex to do anything")];
|
|
48
100
|
/** Read only the head of a (possibly huge) rollout file and extract its
|
|
49
101
|
* `session_meta` entry. Codex always writes `session_meta` as the first
|
|
50
102
|
* line, but this tolerates a few leading blank/malformed lines defensively. */
|
|
@@ -169,21 +221,14 @@ export class CodexAdapter {
|
|
|
169
221
|
* too and neither adapter needs a rehydration-specific code path. */
|
|
170
222
|
this.systemPromptDelivery = "launch-flag";
|
|
171
223
|
/**
|
|
172
|
-
* See `HarnessAdapter.detectBlockingPrompt`. Codex
|
|
173
|
-
*
|
|
174
|
-
*
|
|
175
|
-
*
|
|
176
|
-
*
|
|
177
|
-
*
|
|
178
|
-
*
|
|
179
|
-
*
|
|
180
|
-
* injection that needs it — a scrollback check is the only thing that
|
|
181
|
-
* can stand in for it up to that point.
|
|
182
|
-
*/
|
|
183
|
-
/**
|
|
184
|
-
* See `HarnessAdapter.readyFallback`: `isReadyEnough` may trust a settled,
|
|
185
|
-
* prompt-free scrollback immediately — Codex's real readiness signal cannot
|
|
186
|
-
* arrive before the first injection needs it (see detectBlockingPrompt).
|
|
224
|
+
* See `HarnessAdapter.readyFallback` and `detectBlockingPrompt`. Codex's
|
|
225
|
+
* rollout file — and therefore the SessionStart-equivalent event
|
|
226
|
+
* `SessionManager` otherwise waits on — isn't written until the first turn
|
|
227
|
+
* is submitted. Confirmed empirically against codex-cli 0.134.0: an idle,
|
|
228
|
+
* fully-interactive session produces no rollout for as long as nothing is
|
|
229
|
+
* submitted. SessionManager therefore publishes fallback readiness after a
|
|
230
|
+
* non-blocking frame settles (or reaches its bounded liveness ceiling),
|
|
231
|
+
* while retaining the same check at request time.
|
|
187
232
|
*/
|
|
188
233
|
this.readyFallback = "immediate";
|
|
189
234
|
this.binary = options.binary ?? "codex";
|
|
@@ -223,7 +268,12 @@ export class CodexAdapter {
|
|
|
223
268
|
};
|
|
224
269
|
}
|
|
225
270
|
detectBlockingPrompt(scrollback) {
|
|
226
|
-
|
|
271
|
+
const rendered = stripAnsi(scrollback);
|
|
272
|
+
return BLOCKING_PROMPT_SIGNATURES.some((signature) => signature.every((pattern) => pattern.test(rendered)));
|
|
273
|
+
}
|
|
274
|
+
detectReadyPrompt(terminalOutput) {
|
|
275
|
+
const rendered = stripAnsi(terminalOutput);
|
|
276
|
+
return READY_PROMPT_PATTERNS.some((pattern) => pattern.test(rendered));
|
|
227
277
|
}
|
|
228
278
|
/**
|
|
229
279
|
* See `HarnessAdapter.canResume`. Reuses the same rollout walk +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/core/adapters/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAStC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C;;;;4BAI4B;AAC5B,MAAM,kBAAkB,GAAG,KAAM,CAAC;AAClC,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,uCAAuC;AAEjE
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/core/adapters/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -250,29 +250,63 @@ export declare class SessionManager {
|
|
|
250
250
|
* care that the session is active right now, not each individual chunk.
|
|
251
251
|
*/
|
|
252
252
|
private recordActivity;
|
|
253
|
+
/**
|
|
254
|
+
* Maintain a readiness-only view of terminal output. Codex's Ratatui loop
|
|
255
|
+
* emits a ~500-byte cursor/erase repaint every 80ms even when the visible
|
|
256
|
+
* screen is unchanged. Counting those chunks as startup progress both
|
|
257
|
+
* prevents the 700ms settle window from ever completing and pushes a real
|
|
258
|
+
* sign-in/trust prompt out of the raw 4KB tail. Synchronized-output markers
|
|
259
|
+
* give us an atomic repaint boundary: retain the latest repaint containing
|
|
260
|
+
* visible text, keep a bounded union for diff-rendered blocking prompts,
|
|
261
|
+
* and ignore control-only frames. Non-Ratatui adapters fall back to an
|
|
262
|
+
* ordinary rolling buffer.
|
|
263
|
+
*/
|
|
264
|
+
private recordReadinessOutput;
|
|
265
|
+
private hasVisibleReadinessContent;
|
|
266
|
+
private noteReadinessContent;
|
|
267
|
+
private commitReadinessOutput;
|
|
253
268
|
setAgentSessionId(id: string, agentSessionId: string): void;
|
|
254
269
|
/**
|
|
255
270
|
* Marks a session's TUI as genuinely interactive — see `HarnessSession.ready`.
|
|
256
|
-
* Called from the ingest pipeline when a SessionStart(-equivalent)
|
|
257
|
-
* is processed for this session (real hook for Claude Code, tailer-
|
|
258
|
-
* translated for Codex)
|
|
259
|
-
* ready is a silent no-op.
|
|
271
|
+
* Called either from the ingest pipeline when a SessionStart(-equivalent)
|
|
272
|
+
* event is processed for this session (real hook for Claude Code, tailer-
|
|
273
|
+
* translated for Codex), or from an adapter-declared readiness fallback.
|
|
274
|
+
* Idempotent; a session that's exited or already ready is a silent no-op.
|
|
260
275
|
*/
|
|
261
276
|
setReady(id: string): void;
|
|
262
277
|
/**
|
|
263
278
|
* Whether `id` should be treated as ready to receive programmatic input
|
|
264
|
-
* right now
|
|
265
|
-
*
|
|
266
|
-
*
|
|
267
|
-
*
|
|
268
|
-
*
|
|
269
|
-
*
|
|
270
|
-
*
|
|
271
|
-
*
|
|
272
|
-
* standalone, and a scrollback guess would just reopen the exact race
|
|
273
|
-
* this mechanism exists to close.
|
|
279
|
+
* right now. A real/fallback `session.ready` signal normally suffices; an
|
|
280
|
+
* immediate-fallback adapter gets one last recognized-blocker scan because
|
|
281
|
+
* readiness is latched while its TUI can still paint a late onboarding
|
|
282
|
+
* frame. Before readiness, immediate and legacy detect-only adapters require
|
|
283
|
+
* at least `READY_SETTLE_MS` of quiet output (or the bounded liveness
|
|
284
|
+
* ceiling) and a clean recent-screen view. Claude Code has no immediate
|
|
285
|
+
* shortcut — its SessionStart hook (or preserved 20-second hook-timeout
|
|
286
|
+
* path) controls readiness.
|
|
274
287
|
*/
|
|
275
288
|
private isReadyEnough;
|
|
289
|
+
private isImmediateFallbackSettled;
|
|
290
|
+
/** The best available current frame, excluding older diff repaint history.
|
|
291
|
+
* Used after readiness has latched so ordinary agent output that quotes old
|
|
292
|
+
* onboarding copy cannot permanently gate later writes. */
|
|
293
|
+
private currentReadinessOutput;
|
|
294
|
+
/** A bounded union of recent diff repaints, including an unfinished current
|
|
295
|
+
* repaint. This is intentionally only used before immediate readiness. */
|
|
296
|
+
private recentReadinessOutput;
|
|
297
|
+
/** Preserve a recognized blocker across Ratatui's partial row repaints. The
|
|
298
|
+
* latch is cleared only by a positive empty-composer match in a clean current
|
|
299
|
+
* frame; merely failing to re-render every phrase is not evidence that the
|
|
300
|
+
* screen was dismissed. */
|
|
301
|
+
private refreshImmediatePromptState;
|
|
302
|
+
private hasImmediateBlockingPrompt;
|
|
303
|
+
/** The original readiness-buffer check retained for Claude's hook-timeout
|
|
304
|
+
* and legacy detect-only adapters. Their fallback semantics must not change
|
|
305
|
+
* merely because Codex needs partial-frame reconstruction. */
|
|
306
|
+
private hasRetainedBlockingPrompt;
|
|
307
|
+
/** Scan only the best available current frame; dismissed full-screen prompts
|
|
308
|
+
* remain in older scrollback forever and must not block already-ready input. */
|
|
309
|
+
private hasCurrentBlockingPrompt;
|
|
276
310
|
/**
|
|
277
311
|
* Polls `isReadyEnough` until it's true, the session's pty goes away
|
|
278
312
|
* (killed/exited — it's never going to become ready now), or `timeoutMs`
|
|
@@ -293,28 +327,33 @@ export declare class SessionManager {
|
|
|
293
327
|
setBoundWorkflowPath(id: string, workflowPath: string | null): void;
|
|
294
328
|
private spawn;
|
|
295
329
|
/**
|
|
296
|
-
*
|
|
297
|
-
*
|
|
298
|
-
*
|
|
299
|
-
*
|
|
300
|
-
* Bash resolves no `.cmd`, so a machine whose only node is a .cmd shim runs
|
|
301
|
-
* zero hooks) the session looked fine in the terminal while every held
|
|
302
|
-
* prompt was silently dropped after the SPA's timeout.
|
|
330
|
+
* Publishes adapter-declared fallback readiness so the SPA's held first
|
|
331
|
+
* prompt can be released even when the harness's real lifecycle signal
|
|
332
|
+
* cannot arrive yet (Codex) or never arrived (Claude Code with a broken
|
|
333
|
+
* SessionStart hook).
|
|
303
334
|
*
|
|
304
|
-
*
|
|
305
|
-
* - fires no earlier than HOOK_READY_FALLBACK_MS after spawn — a healthy
|
|
306
|
-
* hook (1–3s) always wins the race, so behaviour only changes on
|
|
307
|
-
* machines where the hook is already broken;
|
|
335
|
+
* Both modes are conservative on purpose:
|
|
308
336
|
* - requires SOME output — a pty that hasn't drawn anything yet isn't an
|
|
309
|
-
* interactive TUI
|
|
310
|
-
* - keeps waiting while
|
|
311
|
-
*
|
|
312
|
-
* can never answer a dialog the user hasn't seen — once the user
|
|
313
|
-
* dismisses it, the next poll flips ready;
|
|
337
|
+
* interactive TUI, it's still starting;
|
|
338
|
+
* - keeps waiting while an adapter-recognized blocking prompt is on screen,
|
|
339
|
+
* so known trust/login/setup screens are not answered by injected input;
|
|
314
340
|
* - dies with the handle (exit clears the interval; a replaced handle is
|
|
315
341
|
* detected via the ptys map, same idempotency rule as markExited()).
|
|
342
|
+
*
|
|
343
|
+
* `"immediate"` (Codex) reuses the same quiet-window/ceiling and frame rule
|
|
344
|
+
* as `isReadyEnough()`, but proactively calls `setReady()` once output is
|
|
345
|
+
* stable or reaches the bounded liveness ceiling. That status event closes
|
|
346
|
+
* the first-prompt deadlock:
|
|
347
|
+
* Codex writes no rollout/session_meta before turn one, while the SPA waits
|
|
348
|
+
* for `ready` before submitting turn one. Only an EXPLICIT declaration arms
|
|
349
|
+
* this persistent state transition; detect-only legacy adapters retain their
|
|
350
|
+
* request-time `isReadyEnough()` compatibility path without being promoted.
|
|
351
|
+
*
|
|
352
|
+
* `"hook-timeout"` (Claude Code) retains its generous 20s delay: a healthy
|
|
353
|
+
* hook (1–3s) always wins the race, so behaviour only changes on machines
|
|
354
|
+
* where the hook is already broken.
|
|
316
355
|
*/
|
|
317
|
-
private
|
|
356
|
+
private armReadyFallback;
|
|
318
357
|
/**
|
|
319
358
|
* Transitions a session to "exited". Shared by node-pty's own `onExit`
|
|
320
359
|
* callback and `kill()`'s missed-event fallback (see `kill()`) — both are
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/core/session-manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,UAAU,EAEhB,MAAM,oBAAoB,CAAC;AAqB5B,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAKrB,KAAK,IAAI,GAAG,OAAO,UAAU,EAAE,IAAI,CAAC;AACpC,KAAK,cAAc,GAAG,OAAO,UAAU,EAAE,eAAe,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;AAKzF;;;;;;;;;;GAUG;AACH,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAcjE;
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/core/session-manager.ts"],"names":[],"mappings":"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"}
|