poly-weaver 0.11.5 → 0.12.1
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/dump/hotkey.d.ts +13 -2
- package/dist/dump/hotkey.d.ts.map +1 -1
- package/dist/dump/hotkey.js +22 -3
- package/dist/dump/hotkey.js.map +1 -1
- package/dist/flow/executor.d.ts.map +1 -1
- package/dist/flow/executor.js +49 -38
- package/dist/flow/executor.js.map +1 -1
- package/dist/flow/types.d.ts +2 -0
- package/dist/flow/types.d.ts.map +1 -1
- package/dist/flow/types.js.map +1 -1
- package/dist/flow-editor/tui.d.ts.map +1 -1
- package/dist/flow-editor/tui.js +35 -0
- package/dist/flow-editor/tui.js.map +1 -1
- package/dist/offscreen/agent-viewer.d.ts +28 -0
- package/dist/offscreen/agent-viewer.d.ts.map +1 -0
- package/dist/offscreen/agent-viewer.js +168 -0
- package/dist/offscreen/agent-viewer.js.map +1 -0
- package/dist/offscreen/controller.d.ts +38 -1
- package/dist/offscreen/controller.d.ts.map +1 -1
- package/dist/offscreen/controller.js +382 -12
- package/dist/offscreen/controller.js.map +1 -1
- package/dist/offscreen/fork-busy.d.ts +28 -0
- package/dist/offscreen/fork-busy.d.ts.map +1 -0
- package/dist/offscreen/fork-busy.js +86 -0
- package/dist/offscreen/fork-busy.js.map +1 -0
- package/dist/offscreen/fork-launch.d.ts +3 -0
- package/dist/offscreen/fork-launch.d.ts.map +1 -1
- package/dist/offscreen/fork-launch.js +1 -0
- package/dist/offscreen/fork-launch.js.map +1 -1
- package/dist/offscreen/fork.d.ts +2 -0
- package/dist/offscreen/fork.d.ts.map +1 -1
- package/dist/offscreen/fork.js +6 -2
- package/dist/offscreen/fork.js.map +1 -1
- package/dist/offscreen/inquiry-sender.d.ts +19 -0
- package/dist/offscreen/inquiry-sender.d.ts.map +1 -0
- package/dist/offscreen/inquiry-sender.js +60 -0
- package/dist/offscreen/inquiry-sender.js.map +1 -0
- package/dist/offscreen/keys.d.ts +4 -0
- package/dist/offscreen/keys.d.ts.map +1 -1
- package/dist/offscreen/keys.js +45 -0
- package/dist/offscreen/keys.js.map +1 -1
- package/dist/offscreen/resolve.d.ts.map +1 -1
- package/dist/offscreen/resolve.js +8 -0
- package/dist/offscreen/resolve.js.map +1 -1
- package/dist/offscreen/split-inquiry.d.ts +6 -0
- package/dist/offscreen/split-inquiry.d.ts.map +1 -1
- package/dist/offscreen/split-inquiry.js +21 -0
- package/dist/offscreen/split-inquiry.js.map +1 -1
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +6 -0
- package/dist/orchestrator.js.map +1 -1
- package/dist/preview-panel.d.ts.map +1 -1
- package/dist/preview-panel.js +22 -0
- package/dist/preview-panel.js.map +1 -1
- package/dist/providers/claude/completion.d.ts +4 -1
- package/dist/providers/claude/completion.d.ts.map +1 -1
- package/dist/providers/claude/completion.js +28 -9
- package/dist/providers/claude/completion.js.map +1 -1
- package/dist/providers/claude/session.d.ts +6 -0
- package/dist/providers/claude/session.d.ts.map +1 -1
- package/dist/providers/claude/session.js +41 -1
- package/dist/providers/claude/session.js.map +1 -1
- package/dist/providers/codex/completion.d.ts +6 -1
- package/dist/providers/codex/completion.d.ts.map +1 -1
- package/dist/providers/codex/completion.js +17 -1
- package/dist/providers/codex/completion.js.map +1 -1
- package/dist/providers/codex/plan-mode-activator.d.ts +4 -0
- package/dist/providers/codex/plan-mode-activator.d.ts.map +1 -1
- package/dist/providers/codex/plan-mode-activator.js +33 -18
- package/dist/providers/codex/plan-mode-activator.js.map +1 -1
- package/dist/providers/codex/session.d.ts +9 -0
- package/dist/providers/codex/session.d.ts.map +1 -1
- package/dist/providers/codex/session.js +34 -1
- package/dist/providers/codex/session.js.map +1 -1
- package/dist/providers/copilot/completion.d.ts +4 -2
- package/dist/providers/copilot/completion.d.ts.map +1 -1
- package/dist/providers/copilot/completion.js +25 -15
- package/dist/providers/copilot/completion.js.map +1 -1
- package/dist/providers/option-catalog.d.ts.map +1 -1
- package/dist/providers/option-catalog.js +7 -4
- package/dist/providers/option-catalog.js.map +1 -1
- package/dist/session/reader.d.ts +4 -0
- package/dist/session/reader.d.ts.map +1 -1
- package/dist/session/reader.js +15 -0
- package/dist/session/reader.js.map +1 -1
- package/dist/startup-tui.d.ts.map +1 -1
- package/dist/startup-tui.js +42 -5
- package/dist/startup-tui.js.map +1 -1
- package/dist/status-bar.d.ts +2 -0
- package/dist/status-bar.d.ts.map +1 -1
- package/dist/status-bar.js +28 -2
- package/dist/status-bar.js.map +1 -1
- package/dist/terminal/host.d.ts +26 -0
- package/dist/terminal/host.d.ts.map +1 -1
- package/dist/terminal/host.js +186 -19
- package/dist/terminal/host.js.map +1 -1
- package/dist/terminal/input-router.d.ts +16 -2
- package/dist/terminal/input-router.d.ts.map +1 -1
- package/dist/terminal/input-router.js +59 -3
- package/dist/terminal/input-router.js.map +1 -1
- package/dist/terminal/paste-submit.d.ts +42 -0
- package/dist/terminal/paste-submit.d.ts.map +1 -0
- package/dist/terminal/paste-submit.js +146 -0
- package/dist/terminal/paste-submit.js.map +1 -0
- package/dist/terminal-input.d.ts.map +1 -1
- package/dist/terminal-input.js +6 -0
- package/dist/terminal-input.js.map +1 -1
- package/dist/text-editing/emacs-input.d.ts +3 -0
- package/dist/text-editing/emacs-input.d.ts.map +1 -1
- package/dist/text-editing/emacs-input.js +57 -3
- package/dist/text-editing/emacs-input.js.map +1 -1
- package/dist/text-editing/kill-ring.d.ts +7 -0
- package/dist/text-editing/kill-ring.d.ts.map +1 -0
- package/dist/text-editing/kill-ring.js +30 -0
- package/dist/text-editing/kill-ring.js.map +1 -0
- package/dist/user/host-curate-prompt.d.ts +7 -2
- package/dist/user/host-curate-prompt.d.ts.map +1 -1
- package/dist/user/host-curate-prompt.js +52 -46
- package/dist/user/host-curate-prompt.js.map +1 -1
- package/dist/user/host-prompt.d.ts +22 -3
- package/dist/user/host-prompt.d.ts.map +1 -1
- package/dist/user/host-prompt.js +32 -7
- package/dist/user/host-prompt.js.map +1 -1
- package/dist/user/issue-inquiry.d.ts +6 -0
- package/dist/user/issue-inquiry.d.ts.map +1 -0
- package/dist/user/issue-inquiry.js +7 -0
- package/dist/user/issue-inquiry.js.map +1 -0
- package/dist/user/issues-pane.d.ts +4 -0
- package/dist/user/issues-pane.d.ts.map +1 -0
- package/dist/user/issues-pane.js +38 -0
- package/dist/user/issues-pane.js.map +1 -0
- package/dist/user/split-surface.d.ts +12 -0
- package/dist/user/split-surface.d.ts.map +1 -1
- package/dist/user/split-surface.js +35 -0
- package/dist/user/split-surface.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { ANSI_RE,
|
|
2
|
-
import { abortableSleep } from "../../session/locator.js";
|
|
1
|
+
import { ANSI_RE, SHIFT_TAB } from "../../ansi.js";
|
|
2
|
+
import { abortableSleep, throwIfAborted } from "../../session/locator.js";
|
|
3
|
+
import { captureSignature, DEFAULT_DETECT_SETTLE_MS, DEFAULT_DETECT_TIMEOUT_MS, pasteDetectSubmit, } from "../../terminal/paste-submit.js";
|
|
3
4
|
import { VirtualTerminal } from "../../terminal/virtual-terminal.js";
|
|
4
5
|
/**
|
|
5
6
|
* Codex 0.130 renders the active mode as a compact status-line suffix
|
|
@@ -49,13 +50,17 @@ export class CodexPlanModeActivator {
|
|
|
49
50
|
pollMs;
|
|
50
51
|
submitDelayMs;
|
|
51
52
|
timeoutMs;
|
|
53
|
+
detectTimeoutMs;
|
|
54
|
+
detectSettleMs;
|
|
52
55
|
constructor(opts) {
|
|
53
56
|
this.pollMs = opts?.pollMs ?? DEFAULT_POLL_MS;
|
|
54
57
|
this.submitDelayMs = opts?.submitDelayMs ?? DEFAULT_SUBMIT_DELAY_MS;
|
|
55
58
|
this.timeoutMs = opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
59
|
+
this.detectTimeoutMs = opts?.detectTimeoutMs ?? DEFAULT_DETECT_TIMEOUT_MS;
|
|
60
|
+
this.detectSettleMs = opts?.detectSettleMs ?? DEFAULT_DETECT_SETTLE_MS;
|
|
56
61
|
}
|
|
57
62
|
attach(handle) {
|
|
58
|
-
return new CodexAttachedActivator(handle, this.pollMs, this.submitDelayMs, this.timeoutMs);
|
|
63
|
+
return new CodexAttachedActivator(handle, this.pollMs, this.submitDelayMs, this.timeoutMs, this.detectTimeoutMs, this.detectSettleMs);
|
|
59
64
|
}
|
|
60
65
|
}
|
|
61
66
|
class CodexAttachedActivator {
|
|
@@ -63,6 +68,8 @@ class CodexAttachedActivator {
|
|
|
63
68
|
pollMs;
|
|
64
69
|
submitDelayMs;
|
|
65
70
|
timeoutMs;
|
|
71
|
+
detectTimeoutMs;
|
|
72
|
+
detectSettleMs;
|
|
66
73
|
vt = new VirtualTerminal(VT_COLS, VT_ROWS);
|
|
67
74
|
buffer = "";
|
|
68
75
|
detected = false;
|
|
@@ -71,23 +78,25 @@ class CodexAttachedActivator {
|
|
|
71
78
|
readyCallbackError;
|
|
72
79
|
readyCallback;
|
|
73
80
|
active = true;
|
|
74
|
-
constructor(handle, pollMs, submitDelayMs, timeoutMs) {
|
|
81
|
+
constructor(handle, pollMs, submitDelayMs, timeoutMs, detectTimeoutMs, detectSettleMs) {
|
|
75
82
|
this.handle = handle;
|
|
76
83
|
this.pollMs = pollMs;
|
|
77
84
|
this.submitDelayMs = submitDelayMs;
|
|
78
85
|
this.timeoutMs = timeoutMs;
|
|
86
|
+
this.detectTimeoutMs = detectTimeoutMs;
|
|
87
|
+
this.detectSettleMs = detectSettleMs;
|
|
79
88
|
handle.onData((data) => {
|
|
80
89
|
if (!this.active)
|
|
81
90
|
return;
|
|
82
|
-
if (this.detected
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
+
if (!this.detected || !this.codexStarted) {
|
|
92
|
+
// Strip ANSI SGR codes for the raw-text fast path. The rendered VT
|
|
93
|
+
// path below handles cursor-addressed repaints where the visible
|
|
94
|
+
// status text never appears contiguously in the byte stream.
|
|
95
|
+
const stripped = data.replace(ANSI_RE, "");
|
|
96
|
+
const next = this.buffer + stripped;
|
|
97
|
+
this.buffer = next.length > BUFFER_CAPACITY ? next.slice(-BUFFER_CAPACITY) : next;
|
|
98
|
+
this.updateStateFromText(this.buffer);
|
|
99
|
+
}
|
|
91
100
|
this.vt.write(data, () => {
|
|
92
101
|
if (!this.active)
|
|
93
102
|
return;
|
|
@@ -130,11 +139,17 @@ class CodexAttachedActivator {
|
|
|
130
139
|
this.handle.write(SHIFT_TAB);
|
|
131
140
|
}
|
|
132
141
|
this.throwReadyCallbackError();
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
this.
|
|
142
|
+
throwIfAborted(opts.signal);
|
|
143
|
+
if (this.vt.cursorVisible !== true) {
|
|
144
|
+
throw new Error("Codex plan mode activation could not find a visible composer cursor");
|
|
145
|
+
}
|
|
146
|
+
const home = captureSignature(this.vt);
|
|
147
|
+
await pasteDetectSubmit({ vt: this.vt, pty: this.handle }, prompt, home, {
|
|
148
|
+
signal: opts.signal,
|
|
149
|
+
submitDelayMs: this.submitDelayMs,
|
|
150
|
+
detectTimeoutMs: this.detectTimeoutMs,
|
|
151
|
+
detectSettleMs: this.detectSettleMs,
|
|
152
|
+
});
|
|
138
153
|
}
|
|
139
154
|
finally {
|
|
140
155
|
this.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-mode-activator.js","sourceRoot":"","sources":["../../../src/providers/codex/plan-mode-activator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"plan-mode-activator.js","sourceRoot":"","sources":["../../../src/providers/codex/plan-mode-activator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE;;;;GAIG;AACH,MAAM,YAAY,GAAG,gBAAgB,CAAC;AACtC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAC9C,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AACnD,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AACrD,MAAM,oBAAoB,GACxB,uGAAuG,CAAC;AAC1G,MAAM,oBAAoB,GACxB,4EAA4E,CAAC;AAE/E,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC;AACjC,MAAM,OAAO,GAAG,GAAG,CAAC;AACpB,MAAM,OAAO,GAAG,EAAE,CAAC;AAEnB,SAAS,oBAAoB,CAAC,IAAY;IACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY;IAC1C,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,cAAc,CAAC,KAAe;IACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,OAAO,sBAAsB;IAChB,MAAM,CAAS;IACf,aAAa,CAAS;IACtB,SAAS,CAAS;IAClB,eAAe,CAAS;IACxB,cAAc,CAAS;IAExC,YAAY,IAMX;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,eAAe,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,EAAE,aAAa,IAAI,uBAAuB,CAAC;QACpE,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,kBAAkB,CAAC;QACvD,IAAI,CAAC,eAAe,GAAG,IAAI,EAAE,eAAe,IAAI,yBAAyB,CAAC;QAC1E,IAAI,CAAC,cAAc,GAAG,IAAI,EAAE,cAAc,IAAI,wBAAwB,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,MAAiB;QACtB,OAAO,IAAI,sBAAsB,CAC/B,MAAM,EACN,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,sBAAsB;IAWP;IACA;IACA;IACA;IACA;IACA;IAfF,EAAE,GAAG,IAAI,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,GAAG,EAAE,CAAC;IACZ,QAAQ,GAAG,KAAK,CAAC;IACjB,YAAY,GAAG,KAAK,CAAC;IACrB,kBAAkB,GAAG,KAAK,CAAC;IAC3B,kBAAkB,CAAU;IAC5B,aAAa,CAAc;IAC3B,MAAM,GAAG,IAAI,CAAC;IAEtB,YACmB,MAAiB,EACjB,MAAc,EACd,aAAqB,EACrB,SAAiB,EACjB,eAAuB,EACvB,cAAsB;QALtB,WAAM,GAAN,MAAM,CAAW;QACjB,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAQ;QACrB,cAAS,GAAT,SAAS,CAAQ;QACjB,oBAAe,GAAf,eAAe,CAAQ;QACvB,mBAAc,GAAd,cAAc,CAAQ;QAEvC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,MAAM;gBAAE,OAAO;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACzC,mEAAmE;gBACnE,iEAAiE;gBACjE,6DAA6D;gBAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;gBACpC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAClF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE;gBACvB,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACzB,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CACT,MAAc,EACd,IAAiE;QAEjE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC/C,mEAAmE;QACnE,2DAA2D;QAC3D,gEAAgE;QAChE,qDAAqD;QACrD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YAE7C,kEAAkE;YAClE,oEAAoE;YACpE,mEAAmE;YACnE,6BAA6B;YAC7B,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACnD,CAAC;YACD,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAE/B,iEAAiE;YACjE,iEAAiE;YACjE,kEAAkE;YAClE,mEAAmE;YACnE,8DAA8D;YAC9D,aAAa;YACb,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtB,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACjD,IAAI,IAAI,CAAC,QAAQ;oBAAE,MAAM;gBACzB,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAE/B,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,IAAI,IAAI,CAAC,EAAE,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;YACzF,CAAC;YACD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACvE,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO;QACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IAEO,mBAAmB,CAAC,IAAY;QACtC,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO;QAC/C,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;QAClC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;YAC5D,IAAI,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IAEO,wBAAwB;QAC9B,IAAI,IAAI,CAAC,kBAAkB;YAAE,OAAO;QACpC,qEAAqE;QACrE,qEAAqE;QACrE,qEAAqE;QACrE,iEAAiE;QACjE,IAAI,CAAC,IAAI,CAAC,aAAa;YAAE,OAAO;QAChC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,uBAAuB;QAC7B,IAAI,IAAI,CAAC,kBAAkB,YAAY,KAAK;YAAE,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAC5E,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,QAAgB,EAChB,MAA+B;QAE/B,MAAM,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1C,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,8CAA8C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CACnF,CAAC;QACJ,CAAC;QACD,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;CACF"}
|
|
@@ -50,5 +50,14 @@ export declare class CodexSessionHandler implements SessionHandler {
|
|
|
50
50
|
extractSessionId(sessionFilePath: string): Promise<string>;
|
|
51
51
|
extractPlanFilePath(sessionFilePath: string, lineOffset: number): Promise<string | undefined>;
|
|
52
52
|
}
|
|
53
|
+
export declare function findCodexForkSessionFile(sourceSessionId: string, opts?: {
|
|
54
|
+
signal?: AbortSignal;
|
|
55
|
+
timeoutMs?: number;
|
|
56
|
+
pollMs?: number;
|
|
57
|
+
sessionsRoot?: string;
|
|
58
|
+
exclude?: Set<string>;
|
|
59
|
+
}): Promise<string>;
|
|
60
|
+
export declare function snapshotCodexSessionFiles(sessionsRoot?: string): Promise<Set<string>>;
|
|
61
|
+
export declare function listRecentCodexSessionFiles(root: string, limit: number): Promise<string[]>;
|
|
53
62
|
export declare function extractCodexResponse(lines: SessionLine[]): string;
|
|
54
63
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/session.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAU5E;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAqBD;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAgBzB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,OAAO,SAAI,EACX,OAAO,SAAM,GACZ,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;;;;GAMG;AACH;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,cAAc;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,GAAE,MAAM,MAA6B;IAE3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAanF,eAAe,CACnB,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjG,OAAO,CAAC,MAAM,CAAC;IAwCZ,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CA4B/B;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/providers/codex/session.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAU5E;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAqBD;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAgBzB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,OAAO,SAAI,EACX,OAAO,SAAM,GACZ,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;;;;GAMG;AACH;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,cAAc;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAAf,eAAe,GAAE,MAAM,MAA6B;IAE3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAMpD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAanF,eAAe,CACnB,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,mBAAmB,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjG,OAAO,CAAC,MAAM,CAAC;IAwCZ,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CA4B/B;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,IAAI,GAAE;IACJ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClB,GACL,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAsB,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAE3F;AAED,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA2ChG;AAaD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CAmCjE"}
|
|
@@ -177,7 +177,29 @@ export class CodexSessionHandler {
|
|
|
177
177
|
return targetPath;
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
|
-
async function
|
|
180
|
+
export async function findCodexForkSessionFile(sourceSessionId, opts = {}) {
|
|
181
|
+
const signal = opts.signal;
|
|
182
|
+
return pollUntil(async () => {
|
|
183
|
+
const candidates = await listRecentCodexSessionFiles(opts.sessionsRoot ?? getCodexSessionsRoot(), 1000);
|
|
184
|
+
for (const file of candidates) {
|
|
185
|
+
throwIfAborted(signal);
|
|
186
|
+
if (opts.exclude?.has(file))
|
|
187
|
+
continue;
|
|
188
|
+
if (await isCodexForkOf(file, sourceSessionId))
|
|
189
|
+
return file;
|
|
190
|
+
}
|
|
191
|
+
return undefined;
|
|
192
|
+
}, {
|
|
193
|
+
timeoutMs: opts.timeoutMs ?? SESSION_FILE_WAIT_DEFAULT_MS,
|
|
194
|
+
pollMs: opts.pollMs ?? 500,
|
|
195
|
+
signal,
|
|
196
|
+
timeoutMessage: `Timed out waiting for Codex fork of session ${sourceSessionId}`,
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
export async function snapshotCodexSessionFiles(sessionsRoot) {
|
|
200
|
+
return new Set(await listRecentCodexSessionFiles(sessionsRoot ?? getCodexSessionsRoot(), 1000));
|
|
201
|
+
}
|
|
202
|
+
export async function listRecentCodexSessionFiles(root, limit) {
|
|
181
203
|
const files = [];
|
|
182
204
|
async function walk(dir) {
|
|
183
205
|
if (files.length >= limit * 2)
|
|
@@ -221,6 +243,17 @@ async function listRecentCodexSessionFiles(root, limit) {
|
|
|
221
243
|
.slice(0, limit)
|
|
222
244
|
.map((file) => file.path);
|
|
223
245
|
}
|
|
246
|
+
async function isCodexForkOf(file, sourceSessionId) {
|
|
247
|
+
try {
|
|
248
|
+
const lines = await readSessionFile(file);
|
|
249
|
+
const meta = lines.find((line) => line.type === "session_meta");
|
|
250
|
+
const payload = meta?.payload;
|
|
251
|
+
return payload?.forked_from_id === sourceSessionId;
|
|
252
|
+
}
|
|
253
|
+
catch {
|
|
254
|
+
return false;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
224
257
|
export function extractCodexResponse(lines) {
|
|
225
258
|
// Prefer task_complete event (nested inside event_msg in real Codex sessions)
|
|
226
259
|
for (let i = lines.length - 1; i >= 0; i--) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/providers/codex/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/providers/codex/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type SessionLine } from "../../session/reader.js";
|
|
2
2
|
import { AbstractCompletionDetector } from "../base-completion.js";
|
|
3
|
+
export declare function isCopilotTurnComplete(lines: SessionLine[]): boolean;
|
|
4
|
+
export declare function latestCopilotSubmitIndex(lines: SessionLine[]): number;
|
|
5
|
+
export declare function countCopilotSubmits(lines: SessionLine[]): number;
|
|
3
6
|
/**
|
|
4
7
|
* Copilot completion detection.
|
|
5
8
|
*
|
|
@@ -17,6 +20,5 @@ export declare class CopilotCompletionDetector extends AbstractCompletionDetecto
|
|
|
17
20
|
protected extractResponse(lines: SessionLine[]): string;
|
|
18
21
|
protected shouldShortCircuit(_lines: SessionLine[]): boolean;
|
|
19
22
|
protected shouldSuppressPtyTimerReset(): boolean;
|
|
20
|
-
private isLatestTurnComplete;
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=completion.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/providers/copilot/completion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"completion.d.ts","sourceRoot":"","sources":["../../../src/providers/copilot/completion.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAExF,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAcnE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CAErE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,CAEhE;AAED;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,0BAA0B;IAOrE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IANhC,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,cAAc,CAAS;gBAG7B,MAAM,SAAM,EACZ,OAAO,SAAM,EACI,YAAY,CAAC,EAAE,MAAM,YAAA,EACtC,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,IAAI;IAK3B,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI;IAwBlD,SAAS,CAAC,oBAAoB,IAAI,OAAO;IAIzC,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM;cAIpC,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO;cAIlD,2BAA2B,IAAI,OAAO;CAG1D"}
|
|
@@ -1,5 +1,26 @@
|
|
|
1
|
+
import { countLines, latestLineIndex } from "../../session/reader.js";
|
|
1
2
|
import { extractCopilotResponse } from "./session.js";
|
|
2
3
|
import { AbstractCompletionDetector } from "../base-completion.js";
|
|
4
|
+
export function isCopilotTurnComplete(lines) {
|
|
5
|
+
let lastTurnStart = -1;
|
|
6
|
+
let lastTurnEnd = -1;
|
|
7
|
+
for (let i = 0; i < lines.length; i++) {
|
|
8
|
+
const line = lines[i];
|
|
9
|
+
if (line.type === "assistant.turn_start") {
|
|
10
|
+
lastTurnStart = i;
|
|
11
|
+
}
|
|
12
|
+
else if (line.type === "assistant.turn_end") {
|
|
13
|
+
lastTurnEnd = i;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return lastTurnStart !== -1 && lastTurnEnd > lastTurnStart;
|
|
17
|
+
}
|
|
18
|
+
export function latestCopilotSubmitIndex(lines) {
|
|
19
|
+
return latestLineIndex(lines, isCopilotTurnInitiatingUserLine);
|
|
20
|
+
}
|
|
21
|
+
export function countCopilotSubmits(lines) {
|
|
22
|
+
return countLines(lines, isCopilotTurnInitiatingUserLine);
|
|
23
|
+
}
|
|
3
24
|
/**
|
|
4
25
|
* Copilot completion detection.
|
|
5
26
|
*
|
|
@@ -16,7 +37,7 @@ export class CopilotCompletionDetector extends AbstractCompletionDetector {
|
|
|
16
37
|
this.exitToolName = exitToolName;
|
|
17
38
|
}
|
|
18
39
|
analyzeLines(lines) {
|
|
19
|
-
this.latestTurnComplete =
|
|
40
|
+
this.latestTurnComplete = isCopilotTurnComplete(lines);
|
|
20
41
|
this.exitToolCalled = false;
|
|
21
42
|
if (this.exitToolName) {
|
|
22
43
|
for (const line of lines) {
|
|
@@ -47,19 +68,8 @@ export class CopilotCompletionDetector extends AbstractCompletionDetector {
|
|
|
47
68
|
shouldSuppressPtyTimerReset() {
|
|
48
69
|
return this.latestTurnComplete || this.exitToolCalled;
|
|
49
70
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
for (let i = 0; i < lines.length; i++) {
|
|
54
|
-
const line = lines[i];
|
|
55
|
-
if (line.type === "assistant.turn_start") {
|
|
56
|
-
lastTurnStart = i;
|
|
57
|
-
}
|
|
58
|
-
else if (line.type === "assistant.turn_end") {
|
|
59
|
-
lastTurnEnd = i;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
return lastTurnStart !== -1 && lastTurnEnd > lastTurnStart;
|
|
63
|
-
}
|
|
71
|
+
}
|
|
72
|
+
function isCopilotTurnInitiatingUserLine(line) {
|
|
73
|
+
return line.type === "user.message";
|
|
64
74
|
}
|
|
65
75
|
//# sourceMappingURL=completion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/providers/copilot/completion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/providers/copilot/completion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-catalog.d.ts","sourceRoot":"","sources":["../../src/providers/option-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"option-catalog.d.ts","sourceRoot":"","sources":["../../src/providers/option-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAqGnD,wBAAgB,cAAc,CAAC,CAAC,EAAE,UAAU,GAAG,SAAS,MAAM,EAAE,CAI/D;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAOlD;AAED,wBAAgB,eAAe,CAC7B,CAAC,EAAE,UAAU,EACb,KAAK,CAAC,EAAE,MAAM,GACb,SAAS,MAAM,EAAE,CAOnB;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAEnD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAI9D;AAED,wBAAgB,aAAa,CAC3B,CAAC,EAAE,UAAU,EACb,CAAC,EAAE,MAAM,EACT,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAET"}
|
|
@@ -28,16 +28,19 @@ const CATALOG = {
|
|
|
28
28
|
claude: {
|
|
29
29
|
// Claude models are derived dynamically from the detected CLI version.
|
|
30
30
|
models: [],
|
|
31
|
-
efforts: ["high", "xhigh", "max"],
|
|
31
|
+
efforts: ["medium", "high", "xhigh", "max"],
|
|
32
|
+
defaultEffort: "high",
|
|
32
33
|
},
|
|
33
34
|
codex: {
|
|
34
35
|
models: ["gpt-5.5"],
|
|
35
|
-
efforts: ["high", "xhigh"],
|
|
36
|
+
efforts: ["medium", "high", "xhigh"],
|
|
37
|
+
defaultEffort: "high",
|
|
36
38
|
},
|
|
37
39
|
copilot: {
|
|
38
40
|
// Copilot models are derived dynamically from the detected CLI version.
|
|
39
41
|
models: COPILOT_MODELS_LEGACY,
|
|
40
|
-
efforts: ["high", "xhigh"],
|
|
42
|
+
efforts: ["medium", "high", "xhigh"],
|
|
43
|
+
defaultEffort: "high",
|
|
41
44
|
},
|
|
42
45
|
};
|
|
43
46
|
function claudeCliVersion() {
|
|
@@ -102,7 +105,7 @@ export function providerEfforts(p, model) {
|
|
|
102
105
|
return modelAllowsMax ? base : base.filter((effort) => effort !== "max");
|
|
103
106
|
}
|
|
104
107
|
export function defaultEffort(p) {
|
|
105
|
-
return CATALOG[p]?.
|
|
108
|
+
return CATALOG[p]?.defaultEffort ?? "";
|
|
106
109
|
}
|
|
107
110
|
export function isKnownModel(p, m) {
|
|
108
111
|
if (p === "claude")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-catalog.js","sourceRoot":"","sources":["../../src/providers/option-catalog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"option-catalog.js","sourceRoot":"","sources":["../../src/providers/option-catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/session/reader.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
/** A single parsed line from a JSONL session file. */
|
|
2
2
|
export type SessionLine = Record<string, unknown>;
|
|
3
|
+
/** Index of the last line matching `pred`, scanning from the end; -1 if none. */
|
|
4
|
+
export declare function latestLineIndex(lines: SessionLine[], pred: (line: SessionLine) => boolean): number;
|
|
5
|
+
/** Count of lines matching `pred`. */
|
|
6
|
+
export declare function countLines(lines: SessionLine[], pred: (line: SessionLine) => boolean): number;
|
|
3
7
|
/** Parse a JSONL file into an array of JSON objects. Skips blank/malformed lines. */
|
|
4
8
|
export declare function parseJsonl(raw: string): SessionLine[];
|
|
5
9
|
/** Read and parse a JSONL session file. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reader.d.ts","sourceRoot":"","sources":["../../src/session/reader.ts"],"names":[],"mappings":"AAEA,sDAAsD;AACtD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,qFAAqF;AACrF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CAYrD;AAED,2CAA2C;AAC3C,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAG1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU5D"}
|
|
1
|
+
{"version":3,"file":"reader.d.ts","sourceRoot":"","sources":["../../src/session/reader.ts"],"names":[],"mappings":"AAEA,sDAAsD;AACtD,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,iFAAiF;AACjF,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,EAAE,EACpB,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,GACnC,MAAM,CAGR;AAED,sCAAsC;AACtC,wBAAgB,UAAU,CACxB,KAAK,EAAE,WAAW,EAAE,EACpB,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,GACnC,MAAM,CAIR;AAED,qFAAqF;AACrF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CAYrD;AAED,2CAA2C;AAC3C,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAG1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAU5D"}
|
package/dist/session/reader.js
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
1
|
import { readFile } from "node:fs/promises";
|
|
2
|
+
/** Index of the last line matching `pred`, scanning from the end; -1 if none. */
|
|
3
|
+
export function latestLineIndex(lines, pred) {
|
|
4
|
+
for (let i = lines.length - 1; i >= 0; i--)
|
|
5
|
+
if (pred(lines[i]))
|
|
6
|
+
return i;
|
|
7
|
+
return -1;
|
|
8
|
+
}
|
|
9
|
+
/** Count of lines matching `pred`. */
|
|
10
|
+
export function countLines(lines, pred) {
|
|
11
|
+
let n = 0;
|
|
12
|
+
for (const line of lines)
|
|
13
|
+
if (pred(line))
|
|
14
|
+
n++;
|
|
15
|
+
return n;
|
|
16
|
+
}
|
|
2
17
|
/** Parse a JSONL file into an array of JSON objects. Skips blank/malformed lines. */
|
|
3
18
|
export function parseJsonl(raw) {
|
|
4
19
|
const lines = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reader.js","sourceRoot":"","sources":["../../src/session/reader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reader.js","sourceRoot":"","sources":["../../src/session/reader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup-tui.d.ts","sourceRoot":"","sources":["../src/startup-tui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAc,YAAY,EAAmB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjG,OAAO,EAAwB,KAAK,cAAc,EAAmB,MAAM,gCAAgC,CAAC;AAC5G,OAAO,EAEL,gBAAgB,EAEhB,KAAK,QAAQ,EACd,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"startup-tui.d.ts","sourceRoot":"","sources":["../src/startup-tui.ts"],"names":[],"mappings":"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"}
|
package/dist/startup-tui.js
CHANGED
|
@@ -5,6 +5,7 @@ import { flowReadsTask } from "./flow/inspect.js";
|
|
|
5
5
|
import { resolveFlowParams } from "./flow/params.js";
|
|
6
6
|
import { createKeyEventSource } from "./terminal/key-event-source.js";
|
|
7
7
|
import { aliasSelectionNavEvent, EmacsInputParser, splitPasteToEvents, } from "./text-editing/emacs-input.js";
|
|
8
|
+
import { noteFocus } from "./text-editing/kill-ring.js";
|
|
8
9
|
import { cursorToVisual, softWrapLine } from "./text-editing/soft-wrap.js";
|
|
9
10
|
import { padToWidth, bold, dim, reset, cyan, red, yellow, HIDE_CURSOR, ALT_SCREEN_ON, ALT_SCREEN_OFF, CSI, } from "./ansi.js";
|
|
10
11
|
import { getGitInfo } from "./git-info.js";
|
|
@@ -248,17 +249,32 @@ export function render(state, out) {
|
|
|
248
249
|
: "";
|
|
249
250
|
const imagePasteHint = renderShortcutToken(ALT_V_PASTE_IMAGE_HINT);
|
|
250
251
|
const workflowHint = flowTemplates.length > 1 ? ` ${dim}Shift+Tab${reset} Workflow` : "";
|
|
251
|
-
const
|
|
252
|
-
|
|
252
|
+
const somethingExpanded = state.fields.some((f) => (f.kind === "group" && f.groupExpanded) || (f.kind === "select" && f.expanded));
|
|
253
|
+
const closeHint = somethingExpanded ? ` · ${dim}Esc${reset} Close` : "";
|
|
254
|
+
const typeHint = state.fields[state.configIndex]?.kind === "number"
|
|
255
|
+
? ` · ${dim}0-9${reset} Type`
|
|
253
256
|
: "";
|
|
257
|
+
const focusedField = state.fields[state.configIndex];
|
|
258
|
+
const enterExpands = (focusedField?.kind === "select" && !focusedField.expanded) ||
|
|
259
|
+
(focusedField?.kind === "group" && !focusedField.groupExpanded) ||
|
|
260
|
+
(focusedField?.kind === "group" &&
|
|
261
|
+
focusedField.groupExpanded &&
|
|
262
|
+
!focusedField.children[focusedField.focusedChild]?.expanded);
|
|
263
|
+
const expandHint = enterExpands ? ` · ${dim}Enter${reset} Expand` : "";
|
|
264
|
+
const collapsedGroupFocused = focusedField?.kind === "group" && !focusedField.groupExpanded;
|
|
265
|
+
const chordHint = collapsedGroupFocused
|
|
266
|
+
? ` · ${dim}Ctrl+←→${reset} Model · ${dim}Ctrl+↑↓${reset} Effort`
|
|
267
|
+
: "";
|
|
268
|
+
const workflowSeg = workflowHint ? ` · ${workflowHint.trimStart()}` : "";
|
|
254
269
|
if (!state.taskRequired) {
|
|
255
|
-
footer = ` ${dim}↑↓${reset} Navigate · ${dim}← →${reset} Adjust
|
|
270
|
+
footer = ` ${dim}↑↓${reset} Navigate · ${dim}← →${reset} Adjust${typeHint}${expandHint}${chordHint}${closeHint}${workflowSeg} · ${dim}Ctrl+D${reset} Start · ${dim}Ctrl+C${reset} Quit${transientHint}`;
|
|
256
271
|
}
|
|
257
272
|
else if (state.zone === "editor") {
|
|
258
|
-
footer = ` ${dim}Tab${reset} Config${
|
|
273
|
+
footer = ` ${dim}Tab${reset} Config${workflowSeg} · ${dim}Ctrl+J${reset} Newline · ${dim}Ctrl+D${reset} Start · ${dim}Ctrl+C${reset} Quit · ${imagePasteHint}${transientHint}`;
|
|
259
274
|
}
|
|
260
275
|
else {
|
|
261
|
-
|
|
276
|
+
const taskSwitchPrefix = somethingExpanded ? "" : `${dim}Tab/Esc${reset} Task · `;
|
|
277
|
+
footer = ` ${taskSwitchPrefix}${dim}↑↓${reset} Navigate · ${dim}← →${reset} Adjust${typeHint}${expandHint}${chordHint}${closeHint}${workflowSeg} · ${dim}Ctrl+D${reset} Start · ${dim}Ctrl+C${reset} Quit${transientHint}`;
|
|
262
278
|
}
|
|
263
279
|
lines.push(pad(footer));
|
|
264
280
|
// Build output
|
|
@@ -296,7 +312,27 @@ function advanceConfigIndex(state, direction) {
|
|
|
296
312
|
state.configIndex = next;
|
|
297
313
|
return true;
|
|
298
314
|
}
|
|
315
|
+
function configFocusKey(state) {
|
|
316
|
+
const field = state.fields[state.configIndex];
|
|
317
|
+
if (!field)
|
|
318
|
+
return `cfg:${state.configIndex}:none`;
|
|
319
|
+
if (field.kind === "number") {
|
|
320
|
+
return `cfg:${state.configIndex}:number:${field.editing ? "edit" : "nav"}`;
|
|
321
|
+
}
|
|
322
|
+
if (field.kind === "group" && field.groupExpanded) {
|
|
323
|
+
const child = field.children[field.focusedChild];
|
|
324
|
+
return `cfg:${state.configIndex}:group:${field.focusedChild}:${child?.expanded ? "expanded" : "nav"}`;
|
|
325
|
+
}
|
|
326
|
+
if (field.kind === "select") {
|
|
327
|
+
return `cfg:${state.configIndex}:select:${field.expanded ? "expanded" : "nav"}`;
|
|
328
|
+
}
|
|
329
|
+
return `cfg:${state.configIndex}:${field.kind}`;
|
|
330
|
+
}
|
|
331
|
+
function focusKeyFor(state) {
|
|
332
|
+
return state.zone === "editor" ? state.editor : configFocusKey(state);
|
|
333
|
+
}
|
|
299
334
|
export function handleEvent(state, event) {
|
|
335
|
+
noteFocus(focusKeyFor(state));
|
|
300
336
|
if (state.transientHint)
|
|
301
337
|
state.transientHint = null;
|
|
302
338
|
if (event.type === "paste" || event.type === "image-paste") {
|
|
@@ -501,6 +537,7 @@ export async function inputLoop(state, opts = {}) {
|
|
|
501
537
|
};
|
|
502
538
|
const unsubscribe = source.onEvents((keys) => {
|
|
503
539
|
for (const event of parser.mapKeys(keys)) {
|
|
540
|
+
noteFocus(focusKeyFor(state));
|
|
504
541
|
if (event.type === "paste") {
|
|
505
542
|
if (state.taskRequired && state.zone === "editor") {
|
|
506
543
|
if (state.transientHint)
|