oh-my-codex 0.14.0 → 0.14.2
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/Cargo.lock +5 -5
- package/Cargo.toml +1 -1
- package/README.md +14 -8
- package/crates/omx-explore/src/main.rs +94 -1
- package/crates/omx-sparkshell/src/codex_bridge.rs +59 -12
- package/crates/omx-sparkshell/tests/execution.rs +48 -0
- package/dist/cli/__tests__/explore.test.js +33 -1
- package/dist/cli/__tests__/explore.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +11 -2
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/package-bin-contract.test.js +5 -0
- package/dist/cli/__tests__/package-bin-contract.test.js.map +1 -1
- package/dist/cli/__tests__/question.test.js +139 -25
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/__tests__/session-scoped-runtime.test.js +30 -0
- package/dist/cli/__tests__/session-scoped-runtime.test.js.map +1 -1
- package/dist/cli/__tests__/setup-agents-overwrite.test.js +32 -7
- package/dist/cli/__tests__/setup-agents-overwrite.test.js.map +1 -1
- package/dist/cli/__tests__/setup-refresh.test.js +8 -6
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/sparkshell-cli.test.js +23 -0
- package/dist/cli/__tests__/sparkshell-cli.test.js.map +1 -1
- package/dist/cli/__tests__/uninstall.test.js +65 -5
- package/dist/cli/__tests__/uninstall.test.js.map +1 -1
- package/dist/cli/__tests__/update.test.js +360 -26
- package/dist/cli/__tests__/update.test.js.map +1 -1
- package/dist/cli/explore.d.ts.map +1 -1
- package/dist/cli/explore.js +18 -3
- package/dist/cli/explore.js.map +1 -1
- package/dist/cli/index.d.ts +2 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +7 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +25 -3
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/sparkshell.d.ts.map +1 -1
- package/dist/cli/sparkshell.js +11 -1
- package/dist/cli/sparkshell.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +159 -394
- package/dist/cli/team.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +3 -1
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/update.d.ts +37 -9
- package/dist/cli/update.d.ts.map +1 -1
- package/dist/cli/update.js +204 -26
- package/dist/cli/update.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +51 -14
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/__tests__/generator-notify.test.js +35 -10
- package/dist/config/__tests__/generator-notify.test.js.map +1 -1
- package/dist/config/generator.d.ts +1 -0
- package/dist/config/generator.d.ts.map +1 -1
- package/dist/config/generator.js +61 -7
- package/dist/config/generator.js.map +1 -1
- package/dist/hooks/__tests__/code-review-skill-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.js +56 -0
- package/dist/hooks/__tests__/code-review-skill-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/deep-interview-contract.test.js +31 -0
- package/dist/hooks/__tests__/deep-interview-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.js +43 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-docs-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.d.ts +2 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.js +38 -0
- package/dist/hooks/__tests__/explicit-terminal-stop-model-docs-contract.test.js.map +1 -0
- package/dist/hooks/__tests__/keyword-detector.test.js +108 -0
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.d.ts.map +1 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.js +16 -1
- package/dist/hooks/__tests__/prompt-guidance-test-helpers.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +34 -8
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/mcp/__tests__/bootstrap.test.js +7 -25
- package/dist/mcp/__tests__/bootstrap.test.js.map +1 -1
- package/dist/mcp/__tests__/server-lifecycle.test.js +60 -0
- package/dist/mcp/__tests__/server-lifecycle.test.js.map +1 -1
- package/dist/mcp/__tests__/state-server.test.js +177 -0
- package/dist/mcp/__tests__/state-server.test.js.map +1 -1
- package/dist/mcp/bootstrap.d.ts.map +1 -1
- package/dist/mcp/bootstrap.js +36 -18
- package/dist/mcp/bootstrap.js.map +1 -1
- package/dist/mcp/state-server.d.ts +17 -0
- package/dist/mcp/state-server.d.ts.map +1 -1
- package/dist/mcp/state-server.js +55 -1
- package/dist/mcp/state-server.js.map +1 -1
- package/dist/notifications/__tests__/index.test.js +0 -3
- package/dist/notifications/__tests__/index.test.js.map +1 -1
- package/dist/notifications/__tests__/session-status.test.js +90 -0
- package/dist/notifications/__tests__/session-status.test.js.map +1 -1
- package/dist/notifications/session-status.d.ts +2 -0
- package/dist/notifications/session-status.d.ts.map +1 -1
- package/dist/notifications/session-status.js +19 -4
- package/dist/notifications/session-status.js.map +1 -1
- package/dist/question/__tests__/deep-interview.test.js +44 -0
- package/dist/question/__tests__/deep-interview.test.js.map +1 -1
- package/dist/question/__tests__/renderer.test.js +192 -12
- package/dist/question/__tests__/renderer.test.js.map +1 -1
- package/dist/question/__tests__/state.test.js +21 -1
- package/dist/question/__tests__/state.test.js.map +1 -1
- package/dist/question/deep-interview.d.ts +3 -0
- package/dist/question/deep-interview.d.ts.map +1 -1
- package/dist/question/deep-interview.js +18 -1
- package/dist/question/deep-interview.js.map +1 -1
- package/dist/question/renderer.d.ts +4 -2
- package/dist/question/renderer.d.ts.map +1 -1
- package/dist/question/renderer.js +87 -18
- package/dist/question/renderer.js.map +1 -1
- package/dist/runtime/__tests__/run-outcome.test.js +38 -0
- package/dist/runtime/__tests__/run-outcome.test.js.map +1 -1
- package/dist/runtime/__tests__/run-state.test.d.ts +2 -0
- package/dist/runtime/__tests__/run-state.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/run-state.test.js +37 -0
- package/dist/runtime/__tests__/run-state.test.js.map +1 -0
- package/dist/runtime/run-loop.d.ts +5 -1
- package/dist/runtime/run-loop.d.ts.map +1 -1
- package/dist/runtime/run-loop.js +8 -3
- package/dist/runtime/run-loop.js.map +1 -1
- package/dist/runtime/run-outcome.d.ts +18 -0
- package/dist/runtime/run-outcome.d.ts.map +1 -1
- package/dist/runtime/run-outcome.js +156 -7
- package/dist/runtime/run-outcome.js.map +1 -1
- package/dist/runtime/run-state.d.ts +5 -1
- package/dist/runtime/run-state.d.ts.map +1 -1
- package/dist/runtime/run-state.js +13 -3
- package/dist/runtime/run-state.js.map +1 -1
- package/dist/runtime/terminal-lifecycle.d.ts +11 -0
- package/dist/runtime/terminal-lifecycle.d.ts.map +1 -0
- package/dist/runtime/terminal-lifecycle.js +52 -0
- package/dist/runtime/terminal-lifecycle.js.map +1 -0
- package/dist/scripts/__tests__/codex-native-hook.test.js +370 -56
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/postinstall.test.d.ts +2 -0
- package/dist/scripts/__tests__/postinstall.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/postinstall.test.js +178 -0
- package/dist/scripts/__tests__/postinstall.test.js.map +1 -0
- package/dist/scripts/codex-native-hook.d.ts +1 -0
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +115 -56
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/postinstall.d.ts +22 -0
- package/dist/scripts/postinstall.d.ts.map +1 -0
- package/dist/scripts/postinstall.js +105 -0
- package/dist/scripts/postinstall.js.map +1 -0
- package/dist/state/__tests__/operations.test.js +60 -0
- package/dist/state/__tests__/operations.test.js.map +1 -1
- package/dist/state/operations.d.ts.map +1 -1
- package/dist/state/operations.js +18 -1
- package/dist/state/operations.js.map +1 -1
- package/dist/team/__tests__/role-router.test.js +6 -0
- package/dist/team/__tests__/role-router.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +108 -2
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +18 -4
- package/dist/team/runtime.js.map +1 -1
- package/dist/utils/__tests__/dep-versions.test.js +25 -8
- package/dist/utils/__tests__/dep-versions.test.js.map +1 -1
- package/dist/utils/__tests__/paths.test.js +45 -0
- package/dist/utils/__tests__/paths.test.js.map +1 -1
- package/dist/utils/paths.d.ts +2 -0
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +22 -7
- package/dist/utils/paths.js.map +1 -1
- package/dist/verification/__tests__/ci-rust-gates.test.js +1 -1
- package/dist/verification/__tests__/ci-rust-gates.test.js.map +1 -1
- package/package.json +3 -2
- package/prompts/architect.md +4 -0
- package/prompts/code-reviewer.md +3 -0
- package/skills/code-review/SKILL.md +94 -28
- package/skills/deep-interview/SKILL.md +91 -0
- package/src/scripts/__tests__/codex-native-hook.test.ts +468 -64
- package/src/scripts/__tests__/postinstall.test.ts +210 -0
- package/src/scripts/codex-native-hook.ts +136 -53
- package/src/scripts/postinstall-bootstrap.js +23 -0
- package/src/scripts/postinstall.ts +161 -0
- package/templates/AGENTS.md +1 -1
- package/templates/model-instructions/explore-lightweight-AGENTS.md +11 -0
- package/templates/model-instructions/sparkshell-lightweight-AGENTS.md +10 -0
|
@@ -1,18 +1,52 @@
|
|
|
1
1
|
import assert from 'node:assert/strict';
|
|
2
2
|
import { describe, it } from 'node:test';
|
|
3
3
|
import { formatQuestionAnswerForInjection, injectQuestionAnswerToPane, launchQuestionRenderer, resolveQuestionRendererStrategy, } from '../renderer.js';
|
|
4
|
+
import { buildSendPaneArgvs } from '../../notifications/tmux-detector.js';
|
|
4
5
|
describe('resolveQuestionRendererStrategy', () => {
|
|
5
6
|
it('prefers inside-tmux when TMUX is present', () => {
|
|
6
7
|
assert.equal(resolveQuestionRendererStrategy({ TMUX: '/tmp/tmux-demo' }, '/usr/bin/tmux'), 'inside-tmux');
|
|
7
8
|
});
|
|
8
|
-
it('
|
|
9
|
-
assert.equal(resolveQuestionRendererStrategy({}, '/usr/bin/tmux'), '
|
|
9
|
+
it('fails closed when tmux exists but TMUX is absent', () => {
|
|
10
|
+
assert.equal(resolveQuestionRendererStrategy({}, '/usr/bin/tmux'), 'unsupported');
|
|
10
11
|
});
|
|
11
12
|
it('uses noop test renderer override when requested', () => {
|
|
12
13
|
assert.equal(resolveQuestionRendererStrategy({ OMX_QUESTION_TEST_RENDERER: 'noop' }, '/usr/bin/tmux'), 'test-noop');
|
|
13
14
|
});
|
|
15
|
+
it('fails closed when neither attached tmux nor tmux binary exists', () => {
|
|
16
|
+
assert.equal(resolveQuestionRendererStrategy({}, undefined), 'unsupported');
|
|
17
|
+
});
|
|
14
18
|
});
|
|
15
19
|
describe('launchQuestionRenderer', () => {
|
|
20
|
+
it('fails before building UI argv or invoking tmux when no visible renderer is available', () => {
|
|
21
|
+
const calls = [];
|
|
22
|
+
const originalArgv1 = process.argv[1];
|
|
23
|
+
process.argv[1] = '';
|
|
24
|
+
try {
|
|
25
|
+
assert.throws(() => launchQuestionRenderer({
|
|
26
|
+
cwd: '/repo',
|
|
27
|
+
recordPath: '/repo/.omx/state/sessions/s1/questions/question-1.json',
|
|
28
|
+
env: {},
|
|
29
|
+
}, {
|
|
30
|
+
strategy: 'unsupported',
|
|
31
|
+
execTmux: (args) => {
|
|
32
|
+
calls.push(args);
|
|
33
|
+
return '';
|
|
34
|
+
},
|
|
35
|
+
sleepSync: () => { },
|
|
36
|
+
}), (error) => {
|
|
37
|
+
assert.ok(error instanceof Error);
|
|
38
|
+
assert.match(error.message, /visible renderer/i);
|
|
39
|
+
assert.match(error.message, /attached tmux pane/i);
|
|
40
|
+
assert.match(error.message, /Run omx question from inside tmux/i);
|
|
41
|
+
assert.doesNotMatch(error.message, /tmux is unavailable/i);
|
|
42
|
+
return true;
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
process.argv[1] = originalArgv1;
|
|
47
|
+
}
|
|
48
|
+
assert.deepEqual(calls, []);
|
|
49
|
+
});
|
|
16
50
|
it('opens an interactive foreground split when already inside tmux', () => {
|
|
17
51
|
const calls = [];
|
|
18
52
|
const result = launchQuestionRenderer({
|
|
@@ -25,16 +59,93 @@ describe('launchQuestionRenderer', () => {
|
|
|
25
59
|
strategy: 'inside-tmux',
|
|
26
60
|
execTmux: (args) => {
|
|
27
61
|
calls.push(args);
|
|
28
|
-
|
|
62
|
+
if (args[0] === 'split-window')
|
|
63
|
+
return '%42\n';
|
|
64
|
+
if (args[0] === 'list-panes')
|
|
65
|
+
return '0\t%42\n';
|
|
66
|
+
return '';
|
|
29
67
|
},
|
|
68
|
+
sleepSync: () => { },
|
|
30
69
|
});
|
|
31
70
|
assert.equal(result.renderer, 'tmux-pane');
|
|
32
71
|
assert.equal(result.target, '%42');
|
|
33
72
|
assert.equal(result.return_target, '%11');
|
|
34
73
|
assert.equal(result.return_transport, 'tmux-send-keys');
|
|
35
|
-
assert.equal(calls.length,
|
|
74
|
+
assert.equal(calls.length, 2);
|
|
36
75
|
assert.equal(calls[0]?.[0], 'split-window');
|
|
37
76
|
assert.ok(!calls[0]?.includes('-d'));
|
|
77
|
+
assert.equal(calls[0]?.[calls[0].length - 6], process.execPath);
|
|
78
|
+
assert.equal(calls[0]?.[calls[0].length - 5]?.endsWith('/dist/cli/omx.js'), true);
|
|
79
|
+
assert.deepEqual(calls[0]?.slice(-4), [
|
|
80
|
+
'question',
|
|
81
|
+
'--ui',
|
|
82
|
+
'--state-path',
|
|
83
|
+
'/repo/.omx/state/sessions/s1/questions/question-1.json',
|
|
84
|
+
]);
|
|
85
|
+
assert.ok(calls[0]?.includes('-e'));
|
|
86
|
+
assert.ok(calls[0]?.includes('OMX_SESSION_ID=s1'));
|
|
87
|
+
assert.deepEqual(calls[1], ['list-panes', '-t', '%42', '-F', '#{pane_dead}\t#{pane_id}']);
|
|
88
|
+
});
|
|
89
|
+
it('fails before prompting state when a reported split pane is already gone', () => {
|
|
90
|
+
const calls = [];
|
|
91
|
+
assert.throws(() => launchQuestionRenderer({
|
|
92
|
+
cwd: '/repo',
|
|
93
|
+
recordPath: '/repo/.omx/state/sessions/s1/questions/question-1.json',
|
|
94
|
+
sessionId: 's1',
|
|
95
|
+
nowIso: '2026-04-19T00:00:00.000Z',
|
|
96
|
+
env: { TMUX: '/tmp/tmux-demo', TMUX_PANE: '%11' },
|
|
97
|
+
}, {
|
|
98
|
+
strategy: 'inside-tmux',
|
|
99
|
+
execTmux: (args) => {
|
|
100
|
+
calls.push(args);
|
|
101
|
+
if (args[0] === 'split-window')
|
|
102
|
+
return '%42\n';
|
|
103
|
+
throw new Error("can't find pane: %42");
|
|
104
|
+
},
|
|
105
|
+
sleepSync: () => { },
|
|
106
|
+
}), /Question UI pane %42 disappeared immediately after launch/);
|
|
107
|
+
assert.equal(calls.length, 2);
|
|
108
|
+
assert.equal(calls[0]?.[0], 'split-window');
|
|
109
|
+
assert.equal(calls[0]?.[calls[0].length - 6], process.execPath);
|
|
110
|
+
assert.equal(calls[0]?.[calls[0].length - 5]?.endsWith('/dist/cli/omx.js'), true);
|
|
111
|
+
assert.deepEqual(calls[0]?.slice(-4), [
|
|
112
|
+
'question',
|
|
113
|
+
'--ui',
|
|
114
|
+
'--state-path',
|
|
115
|
+
'/repo/.omx/state/sessions/s1/questions/question-1.json',
|
|
116
|
+
]);
|
|
117
|
+
assert.deepEqual(calls[1], ['list-panes', '-t', '%42', '-F', '#{pane_dead}\t#{pane_id}']);
|
|
118
|
+
});
|
|
119
|
+
it('passes direct tmux argv so non-POSIX default shells do not parse a shell string', () => {
|
|
120
|
+
const calls = [];
|
|
121
|
+
launchQuestionRenderer({
|
|
122
|
+
cwd: '/repo',
|
|
123
|
+
recordPath: '/repo/question with spaces.json',
|
|
124
|
+
sessionId: 'sess-123',
|
|
125
|
+
env: { TMUX: '/tmp/tmux-demo' },
|
|
126
|
+
}, {
|
|
127
|
+
strategy: 'inside-tmux',
|
|
128
|
+
execTmux: (args) => {
|
|
129
|
+
calls.push(args);
|
|
130
|
+
if (args[0] === 'split-window')
|
|
131
|
+
return '%77\n';
|
|
132
|
+
if (args[0] === 'list-panes')
|
|
133
|
+
return '0\t%77\n';
|
|
134
|
+
return '';
|
|
135
|
+
},
|
|
136
|
+
sleepSync: () => { },
|
|
137
|
+
});
|
|
138
|
+
assert.equal(calls.length, 2);
|
|
139
|
+
assert.equal(calls[0]?.some((part) => /question --ui --state-path/.test(part)), false);
|
|
140
|
+
assert.equal(calls[0]?.some((part) => /^'.*'$/.test(part)), false);
|
|
141
|
+
assert.equal(calls[0]?.[calls[0].length - 6], process.execPath);
|
|
142
|
+
assert.equal(calls[0]?.[calls[0].length - 5]?.endsWith('/dist/cli/omx.js'), true);
|
|
143
|
+
assert.deepEqual(calls[0]?.slice(-4), [
|
|
144
|
+
'question',
|
|
145
|
+
'--ui',
|
|
146
|
+
'--state-path',
|
|
147
|
+
'/repo/question with spaces.json',
|
|
148
|
+
]);
|
|
38
149
|
});
|
|
39
150
|
it('uses detached sessions outside tmux', () => {
|
|
40
151
|
const calls = [];
|
|
@@ -42,17 +153,86 @@ describe('launchQuestionRenderer', () => {
|
|
|
42
153
|
cwd: '/repo',
|
|
43
154
|
recordPath: '/repo/.omx/state/sessions/s1/questions/question-2.json',
|
|
44
155
|
nowIso: '2026-04-19T00:00:00.000Z',
|
|
156
|
+
env: {},
|
|
45
157
|
}, {
|
|
46
158
|
strategy: 'detached-tmux',
|
|
47
159
|
execTmux: (args) => {
|
|
48
160
|
calls.push(args);
|
|
161
|
+
if (args[0] === 'has-session')
|
|
162
|
+
return '';
|
|
49
163
|
return 'omx-question-question-2\n';
|
|
50
164
|
},
|
|
165
|
+
sleepSync: () => { },
|
|
51
166
|
});
|
|
52
167
|
assert.equal(result.renderer, 'tmux-session');
|
|
53
|
-
assert.equal(calls.length,
|
|
168
|
+
assert.equal(calls.length, 2);
|
|
54
169
|
assert.equal(calls[0]?.[0], 'new-session');
|
|
55
170
|
assert.ok(calls[0]?.includes('-d'));
|
|
171
|
+
assert.equal(calls[0]?.[calls[0].length - 6], process.execPath);
|
|
172
|
+
assert.equal(calls[0]?.[calls[0].length - 5]?.endsWith('/dist/cli/omx.js'), true);
|
|
173
|
+
assert.deepEqual(calls[0]?.slice(-4), [
|
|
174
|
+
'question',
|
|
175
|
+
'--ui',
|
|
176
|
+
'--state-path',
|
|
177
|
+
'/repo/.omx/state/sessions/s1/questions/question-2.json',
|
|
178
|
+
]);
|
|
179
|
+
assert.deepEqual(calls[1], ['has-session', '-t', 'omx-question-question-2']);
|
|
180
|
+
});
|
|
181
|
+
it('fails when a detached tmux session disappears immediately after launch', () => {
|
|
182
|
+
const calls = [];
|
|
183
|
+
assert.throws(() => launchQuestionRenderer({
|
|
184
|
+
cwd: '/repo',
|
|
185
|
+
recordPath: '/repo/.omx/state/sessions/s1/questions/question-2.json',
|
|
186
|
+
nowIso: '2026-04-19T00:00:00.000Z',
|
|
187
|
+
env: {},
|
|
188
|
+
}, {
|
|
189
|
+
strategy: 'detached-tmux',
|
|
190
|
+
execTmux: (args) => {
|
|
191
|
+
calls.push(args);
|
|
192
|
+
if (args[0] === 'new-session')
|
|
193
|
+
return 'omx-question-question-2\n';
|
|
194
|
+
throw new Error('can\'t find session: omx-question-question-2');
|
|
195
|
+
},
|
|
196
|
+
sleepSync: () => { },
|
|
197
|
+
}), /Question UI session omx-question-question-2 disappeared immediately after launch/);
|
|
198
|
+
assert.equal(calls.length, 2);
|
|
199
|
+
assert.equal(calls[0]?.[0], 'new-session');
|
|
200
|
+
assert.deepEqual(calls[1], ['has-session', '-t', 'omx-question-question-2']);
|
|
201
|
+
});
|
|
202
|
+
it('prefers the current launcher path over a stale ambient OMX_ENTRY_PATH when spawning the UI', () => {
|
|
203
|
+
const calls = [];
|
|
204
|
+
const originalArgv1 = process.argv[1];
|
|
205
|
+
process.argv[1] = '/repo/dist/cli/omx.js';
|
|
206
|
+
try {
|
|
207
|
+
const result = launchQuestionRenderer({
|
|
208
|
+
cwd: '/repo',
|
|
209
|
+
recordPath: '/repo/.omx/state/sessions/s1/questions/question-3.json',
|
|
210
|
+
sessionId: 's1',
|
|
211
|
+
nowIso: '2026-04-19T00:00:00.000Z',
|
|
212
|
+
env: {
|
|
213
|
+
TMUX: '/tmp/tmux-demo',
|
|
214
|
+
TMUX_PANE: '%11',
|
|
215
|
+
OMX_ENTRY_PATH: '/stale/global/dist/cli/omx.js',
|
|
216
|
+
},
|
|
217
|
+
}, {
|
|
218
|
+
strategy: 'inside-tmux',
|
|
219
|
+
execTmux: (args) => {
|
|
220
|
+
calls.push(args);
|
|
221
|
+
if (args[0] === 'split-window')
|
|
222
|
+
return '%42\n';
|
|
223
|
+
if (args[0] === 'list-panes')
|
|
224
|
+
return '0\t%42\n';
|
|
225
|
+
return '';
|
|
226
|
+
},
|
|
227
|
+
sleepSync: () => { },
|
|
228
|
+
});
|
|
229
|
+
assert.equal(result.target, '%42');
|
|
230
|
+
assert.equal(calls[0]?.includes('/repo/dist/cli/omx.js'), true);
|
|
231
|
+
assert.equal(calls[0]?.includes('/stale/global/dist/cli/omx.js'), false);
|
|
232
|
+
}
|
|
233
|
+
finally {
|
|
234
|
+
process.argv[1] = originalArgv1;
|
|
235
|
+
}
|
|
56
236
|
});
|
|
57
237
|
});
|
|
58
238
|
describe('question answer injection', () => {
|
|
@@ -65,8 +245,9 @@ describe('question answer injection', () => {
|
|
|
65
245
|
other_text: 'hello\nworld',
|
|
66
246
|
}), '[omx question answered] hello world');
|
|
67
247
|
});
|
|
68
|
-
it('injects the answered text back into the requester pane and submits
|
|
248
|
+
it('injects the answered text back into the requester pane and submits with isolated double C-m', () => {
|
|
69
249
|
const calls = [];
|
|
250
|
+
const sleeps = [];
|
|
70
251
|
const ok = injectQuestionAnswerToPane('%11', {
|
|
71
252
|
kind: 'option',
|
|
72
253
|
value: 'proceed',
|
|
@@ -75,14 +256,13 @@ describe('question answer injection', () => {
|
|
|
75
256
|
}, (args) => {
|
|
76
257
|
calls.push(args);
|
|
77
258
|
return '';
|
|
259
|
+
}, (ms) => {
|
|
260
|
+
sleeps.push(ms);
|
|
78
261
|
});
|
|
79
262
|
assert.equal(ok, true);
|
|
80
|
-
assert.deepEqual(calls, [
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
['send-keys', '-t', '%11', 'Enter'],
|
|
84
|
-
['send-keys', '-t', '%11', 'Enter'],
|
|
85
|
-
]);
|
|
263
|
+
assert.deepEqual(calls, buildSendPaneArgvs('%11', '[omx question answered] proceed', true));
|
|
264
|
+
assert.deepEqual(sleeps, [120, 100]);
|
|
265
|
+
assert.equal(calls.some((argv) => argv.includes('Enter')), false);
|
|
86
266
|
});
|
|
87
267
|
});
|
|
88
268
|
//# sourceMappingURL=renderer.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.test.js","sourceRoot":"","sources":["../../../src/question/__tests__/renderer.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderer.test.js","sourceRoot":"","sources":["../../../src/question/__tests__/renderer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { mkdtemp, rm } from 'node:fs/promises';
|
|
|
3
3
|
import { tmpdir } from 'node:os';
|
|
4
4
|
import { join } from 'node:path';
|
|
5
5
|
import { afterEach, describe, it } from 'node:test';
|
|
6
|
-
import { createQuestionRecord, getQuestionRecordPath, markQuestionAnswered, readQuestionRecord, waitForQuestionTerminalState, } from '../state.js';
|
|
6
|
+
import { createQuestionRecord, getQuestionRecordPath, markQuestionAnswered, markQuestionPrompting, markQuestionTerminalError, readQuestionRecord, waitForQuestionTerminalState, } from '../state.js';
|
|
7
7
|
const tempDirs = [];
|
|
8
8
|
async function makeRepo() {
|
|
9
9
|
const cwd = await mkdtemp(join(tmpdir(), 'omx-question-state-'));
|
|
@@ -51,5 +51,25 @@ describe('question state', () => {
|
|
|
51
51
|
assert.equal(finalRecord.answer?.value, 'custom text');
|
|
52
52
|
assert.equal(finalRecord.status, 'answered');
|
|
53
53
|
});
|
|
54
|
+
it('persists explicit terminal errors after prompting begins', async () => {
|
|
55
|
+
const cwd = await makeRepo();
|
|
56
|
+
const { recordPath } = await createQuestionRecord(cwd, {
|
|
57
|
+
question: 'Pick one',
|
|
58
|
+
options: [{ label: 'A', value: 'a' }],
|
|
59
|
+
allow_other: true,
|
|
60
|
+
other_label: 'Other',
|
|
61
|
+
multi_select: false,
|
|
62
|
+
}, 'sess-3');
|
|
63
|
+
await markQuestionPrompting(recordPath, {
|
|
64
|
+
renderer: 'tmux-pane',
|
|
65
|
+
target: '%42',
|
|
66
|
+
launched_at: new Date().toISOString(),
|
|
67
|
+
});
|
|
68
|
+
await markQuestionTerminalError(recordPath, 'error', 'question_runtime_failed', 'Question UI pane %42 disappeared immediately after launch.');
|
|
69
|
+
const loaded = await readQuestionRecord(recordPath);
|
|
70
|
+
assert.equal(loaded?.status, 'error');
|
|
71
|
+
assert.equal(loaded?.error?.code, 'question_runtime_failed');
|
|
72
|
+
assert.match(loaded?.error?.message || '', /pane %42 disappeared immediately after launch/);
|
|
73
|
+
});
|
|
54
74
|
});
|
|
55
75
|
//# sourceMappingURL=state.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.test.js","sourceRoot":"","sources":["../../../src/question/__tests__/state.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"state.test.js","sourceRoot":"","sources":["../../../src/question/__tests__/state.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,aAAa,CAAC;AAErB,MAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,KAAK,UAAU,QAAQ;IACrB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACjE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAChG,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE;YAC7D,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACrC,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,KAAK;SACpB,EAAE,QAAQ,CAAC,CAAC;QAEb,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE;YACrD,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACrC,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,KAAK;SACpB,EAAE,QAAQ,CAAC,CAAC;QAEb,MAAM,MAAM,GAAG,4BAA4B,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjG,UAAU,CAAC,GAAG,EAAE;YACd,KAAK,oBAAoB,CAAC,UAAU,EAAE;gBACpC,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,aAAa;gBACpB,eAAe,EAAE,CAAC,OAAO,CAAC;gBAC1B,eAAe,EAAE,CAAC,aAAa,CAAC;gBAChC,UAAU,EAAE,aAAa;aAC1B,CAAC,CAAC;QACL,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE;YACrD,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACrC,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,KAAK;SACpB,EAAE,QAAQ,CAAC,CAAC;QAEb,MAAM,qBAAqB,CAAC,UAAU,EAAE;YACtC,QAAQ,EAAE,WAAW;YACrB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,yBAAyB,CAC7B,UAAU,EACV,OAAO,EACP,yBAAyB,EACzB,4DAA4D,CAC7D,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,yBAAyB,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE,EAAE,+CAA+C,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { type OmxQuestionClientOptions, type OmxQuestionSuccessPayload } from './client.js';
|
|
2
|
+
import type { TerminalLifecycleOutcome } from '../runtime/terminal-lifecycle.js';
|
|
2
3
|
import type { QuestionInput } from './types.js';
|
|
3
4
|
export interface DeepInterviewQuestionEnforcementState {
|
|
4
5
|
obligation_id: string;
|
|
5
6
|
source: 'omx-question';
|
|
6
7
|
status: 'pending' | 'satisfied' | 'cleared';
|
|
8
|
+
lifecycle_outcome: 'askuserQuestion';
|
|
7
9
|
requested_at: string;
|
|
8
10
|
question_id?: string;
|
|
9
11
|
satisfied_at?: string;
|
|
@@ -12,6 +14,7 @@ export interface DeepInterviewQuestionEnforcementState {
|
|
|
12
14
|
}
|
|
13
15
|
interface DeepInterviewStateRecord {
|
|
14
16
|
updated_at?: string;
|
|
17
|
+
lifecycle_outcome?: TerminalLifecycleOutcome;
|
|
15
18
|
question_enforcement?: DeepInterviewQuestionEnforcementState;
|
|
16
19
|
[key: string]: unknown;
|
|
17
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep-interview.d.ts","sourceRoot":"","sources":["../../src/question/deep-interview.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC/B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAIhD,MAAM,WAAW,qCAAqC;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;CAC9C;AAED,UAAU,wBAAwB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,qCAAqC,CAAC;IAC7D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgCD,wBAAgB,qCAAqC,CACnD,GAAG,OAAa,GACf,qCAAqC,
|
|
1
|
+
{"version":3,"file":"deep-interview.d.ts","sourceRoot":"","sources":["../../src/question/deep-interview.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC/B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAIhD,MAAM,WAAW,qCAAqC;IACpD,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;IAC5C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;CAC9C;AAED,UAAU,wBAAwB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,oBAAoB,CAAC,EAAE,qCAAqC,CAAC;IAC7D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAgCD,wBAAgB,qCAAqC,CACnD,GAAG,OAAa,GACf,qCAAqC,CAQvC;AAED,wBAAgB,yCAAyC,CACvD,WAAW,EAAE,OAAO,CAAC,qCAAqC,CAAC,GAAG,IAAI,GAAG,SAAS,GAC7E,WAAW,IAAI,qCAAqC,CAGtD;AAED,wBAAgB,sCAAsC,CACpD,WAAW,EAAE,qCAAqC,EAClD,UAAU,EAAE,MAAM,EAClB,GAAG,OAAa,GACf,qCAAqC,CASvC;AAED,wBAAgB,oCAAoC,CAClD,WAAW,EAAE,qCAAqC,GAAG,SAAS,EAC9D,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,EACrC,GAAG,OAAa,GACf,qCAAqC,GAAG,SAAS,CASnD;AAED,wBAAsB,sCAAsC,CAC1D,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,EAAE,CACP,OAAO,EAAE,qCAAqC,GAAG,SAAS,KACvD,qCAAqC,GAAG,SAAS,GACrD,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC,CAiC1C;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EACpD,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,yBAAyB,CAAC,CA4CpC"}
|
|
@@ -28,6 +28,7 @@ export function createDeepInterviewQuestionObligation(now = new Date()) {
|
|
|
28
28
|
obligation_id: buildObligationId(now),
|
|
29
29
|
source: 'omx-question',
|
|
30
30
|
status: 'pending',
|
|
31
|
+
lifecycle_outcome: 'askuserQuestion',
|
|
31
32
|
requested_at: now.toISOString(),
|
|
32
33
|
};
|
|
33
34
|
}
|
|
@@ -67,11 +68,27 @@ export async function updateDeepInterviewQuestionEnforcement(cwd, sessionId, upd
|
|
|
67
68
|
const nextState = {
|
|
68
69
|
...state,
|
|
69
70
|
updated_at: new Date().toISOString(),
|
|
70
|
-
...(nextEnforcement
|
|
71
|
+
...(nextEnforcement
|
|
72
|
+
? {
|
|
73
|
+
question_enforcement: nextEnforcement,
|
|
74
|
+
...(nextEnforcement.status === 'pending'
|
|
75
|
+
? {
|
|
76
|
+
lifecycle_outcome: 'askuserQuestion',
|
|
77
|
+
run_outcome: 'blocked_on_user',
|
|
78
|
+
active: false,
|
|
79
|
+
completed_at: safeString(state.completed_at) || new Date().toISOString(),
|
|
80
|
+
}
|
|
81
|
+
: {}),
|
|
82
|
+
}
|
|
83
|
+
: {}),
|
|
71
84
|
};
|
|
72
85
|
if (!nextEnforcement) {
|
|
73
86
|
delete nextState.question_enforcement;
|
|
74
87
|
}
|
|
88
|
+
if (nextEnforcement?.status !== 'pending') {
|
|
89
|
+
delete nextState.lifecycle_outcome;
|
|
90
|
+
delete nextState.run_outcome;
|
|
91
|
+
}
|
|
75
92
|
await writeDeepInterviewState(cwd, nextState, sessionId);
|
|
76
93
|
return nextState;
|
|
77
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep-interview.js","sourceRoot":"","sources":["../../src/question/deep-interview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EACL,cAAc,GAGf,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"deep-interview.js","sourceRoot":"","sources":["../../src/question/deep-interview.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,13 @@ export interface LaunchQuestionRendererOptions {
|
|
|
8
8
|
nowIso?: string;
|
|
9
9
|
}
|
|
10
10
|
export type ExecTmuxSync = (args: string[]) => string;
|
|
11
|
-
export
|
|
11
|
+
export type SleepSync = (ms: number) => void;
|
|
12
|
+
export declare function resolveQuestionRendererStrategy(env?: NodeJS.ProcessEnv, _tmuxBinary?: string | null): QuestionRendererStrategy;
|
|
12
13
|
export declare function formatQuestionAnswerForInjection(answer: QuestionAnswer): string;
|
|
13
|
-
export declare function injectQuestionAnswerToPane(paneId: string, answer: QuestionAnswer, execTmux?: ExecTmuxSync): boolean;
|
|
14
|
+
export declare function injectQuestionAnswerToPane(paneId: string, answer: QuestionAnswer, execTmux?: ExecTmuxSync, sleepImpl?: SleepSync): boolean;
|
|
14
15
|
export declare function launchQuestionRenderer(options: LaunchQuestionRendererOptions, deps?: {
|
|
15
16
|
strategy?: QuestionRendererStrategy;
|
|
16
17
|
execTmux?: ExecTmuxSync;
|
|
18
|
+
sleepSync?: SleepSync;
|
|
17
19
|
}): QuestionRendererState;
|
|
18
20
|
//# sourceMappingURL=renderer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/question/renderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/question/renderer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAExE,MAAM,MAAM,wBAAwB,GAAG,aAAa,GAAG,eAAe,GAAG,WAAW,GAAG,aAAa,CAAC;AAErG,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;AACtD,MAAM,MAAM,SAAS,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;AAe7C,wBAAgB,+BAA+B,CAC7C,GAAG,GAAE,MAAM,CAAC,UAAwB,EAGpC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAC1B,wBAAwB,CAI1B;AA4ED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAU/E;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,EACtB,QAAQ,GAAE,YAA8B,EACxC,SAAS,GAAE,SAAqB,GAC/B,OAAO,CAaT;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,6BAA6B,EACtC,IAAI,GAAE;IACJ,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;CAClB,GACL,qBAAqB,CAmFvB"}
|
|
@@ -1,31 +1,49 @@
|
|
|
1
1
|
import { execFileSync } from 'node:child_process';
|
|
2
2
|
import { basename } from 'node:path';
|
|
3
|
-
import { parsePaneIdFromTmuxOutput
|
|
3
|
+
import { parsePaneIdFromTmuxOutput } from '../hud/tmux.js';
|
|
4
|
+
import { buildSendPaneArgvs } from '../notifications/tmux-detector.js';
|
|
5
|
+
import { sleepSync } from '../utils/sleep.js';
|
|
4
6
|
import { sanitizeReplyInput } from '../notifications/reply-listener.js';
|
|
5
7
|
import { getCurrentTmuxPaneId } from '../notifications/tmux.js';
|
|
6
8
|
import { resolveTmuxBinaryForPlatform } from '../utils/platform-command.js';
|
|
7
9
|
import { resolveOmxCliEntryPath } from '../utils/paths.js';
|
|
10
|
+
const QUESTION_TEXT_SETTLE_MS = 120;
|
|
11
|
+
const QUESTION_SUBMIT_REPEAT_DELAY_MS = 100;
|
|
12
|
+
const QUESTION_RENDERER_PANE_SETTLE_MS = 120;
|
|
13
|
+
const QUESTION_RENDERER_SESSION_SETTLE_MS = 120;
|
|
8
14
|
function safeString(value) {
|
|
9
15
|
return typeof value === 'string' ? value : '';
|
|
10
16
|
}
|
|
11
17
|
function isPaneId(value) {
|
|
12
18
|
return typeof value === 'string' && /^%\d+$/.test(value.trim());
|
|
13
19
|
}
|
|
14
|
-
export function resolveQuestionRendererStrategy(env = process.env,
|
|
20
|
+
export function resolveQuestionRendererStrategy(env = process.env,
|
|
21
|
+
// Kept for callers/tests that used to pass detected tmux availability; default
|
|
22
|
+
// strategy selection now depends only on renderer visibility signals.
|
|
23
|
+
_tmuxBinary) {
|
|
15
24
|
if (safeString(env.OMX_QUESTION_TEST_RENDERER).trim() === 'noop')
|
|
16
25
|
return 'test-noop';
|
|
17
26
|
if (safeString(env.TMUX).trim() !== '')
|
|
18
27
|
return 'inside-tmux';
|
|
19
|
-
if (tmuxBinary)
|
|
20
|
-
return 'detached-tmux';
|
|
21
28
|
return 'unsupported';
|
|
22
29
|
}
|
|
23
|
-
function
|
|
24
|
-
const omxBin = resolveOmxCliEntryPath(
|
|
30
|
+
function buildQuestionUiTmuxArgs(recordPath, options) {
|
|
31
|
+
const omxBin = resolveOmxCliEntryPath({
|
|
32
|
+
argv1: process.argv[1],
|
|
33
|
+
cwd: options.cwd,
|
|
34
|
+
env: options.env,
|
|
35
|
+
}) || process.argv[1];
|
|
25
36
|
if (!omxBin)
|
|
26
37
|
throw new Error('Unable to resolve OMX CLI entry path for question UI launch.');
|
|
27
|
-
|
|
28
|
-
|
|
38
|
+
return [
|
|
39
|
+
...(options.sessionId ? ['-e', `OMX_SESSION_ID=${options.sessionId}`] : []),
|
|
40
|
+
process.execPath,
|
|
41
|
+
omxBin,
|
|
42
|
+
'question',
|
|
43
|
+
'--ui',
|
|
44
|
+
'--state-path',
|
|
45
|
+
recordPath,
|
|
46
|
+
];
|
|
29
47
|
}
|
|
30
48
|
function defaultExecTmux(args) {
|
|
31
49
|
const tmux = resolveTmuxBinaryForPlatform();
|
|
@@ -43,6 +61,35 @@ function resolveReturnTarget(env = process.env) {
|
|
|
43
61
|
const detectedPane = getCurrentTmuxPaneId();
|
|
44
62
|
return isPaneId(detectedPane) ? detectedPane : undefined;
|
|
45
63
|
}
|
|
64
|
+
function isLaunchedQuestionPaneAlive(paneId, execTmux) {
|
|
65
|
+
if (!isPaneId(paneId))
|
|
66
|
+
return false;
|
|
67
|
+
try {
|
|
68
|
+
const status = execTmux(['list-panes', '-t', paneId, '-F', '#{pane_dead}\t#{pane_id}']);
|
|
69
|
+
return status
|
|
70
|
+
.split('\n')
|
|
71
|
+
.map((line) => line.trim())
|
|
72
|
+
.filter(Boolean)
|
|
73
|
+
.some((line) => {
|
|
74
|
+
const [paneDead = '', resolvedPaneId = ''] = line.split('\t');
|
|
75
|
+
return resolvedPaneId === paneId && paneDead !== '1';
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
function isLaunchedQuestionSessionAlive(sessionName, execTmux) {
|
|
83
|
+
if (!safeString(sessionName).trim())
|
|
84
|
+
return false;
|
|
85
|
+
try {
|
|
86
|
+
execTmux(['has-session', '-t', sessionName]);
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
46
93
|
export function formatQuestionAnswerForInjection(answer) {
|
|
47
94
|
const prefix = '[omx question answered]';
|
|
48
95
|
if (answer.kind === 'other') {
|
|
@@ -54,23 +101,35 @@ export function formatQuestionAnswerForInjection(answer) {
|
|
|
54
101
|
}
|
|
55
102
|
return sanitizeReplyInput(`${prefix} ${String(answer.value)}`);
|
|
56
103
|
}
|
|
57
|
-
export function injectQuestionAnswerToPane(paneId, answer, execTmux = defaultExecTmux) {
|
|
104
|
+
export function injectQuestionAnswerToPane(paneId, answer, execTmux = defaultExecTmux, sleepImpl = sleepSync) {
|
|
58
105
|
if (!isPaneId(paneId))
|
|
59
106
|
return false;
|
|
60
107
|
const text = formatQuestionAnswerForInjection(answer);
|
|
61
108
|
if (!text)
|
|
62
109
|
return false;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
110
|
+
const argvs = buildSendPaneArgvs(paneId, text, true);
|
|
111
|
+
for (const [index, argv] of argvs.entries()) {
|
|
112
|
+
execTmux(argv);
|
|
113
|
+
const hasNextArgv = index < argvs.length - 1;
|
|
114
|
+
if (!hasNextArgv)
|
|
115
|
+
continue;
|
|
116
|
+
sleepImpl(index === 0 ? QUESTION_TEXT_SETTLE_MS : QUESTION_SUBMIT_REPEAT_DELAY_MS);
|
|
117
|
+
}
|
|
67
118
|
return true;
|
|
68
119
|
}
|
|
69
120
|
export function launchQuestionRenderer(options, deps = {}) {
|
|
70
121
|
const strategy = deps.strategy ?? resolveQuestionRendererStrategy(options.env ?? process.env);
|
|
71
122
|
const execTmux = deps.execTmux ?? defaultExecTmux;
|
|
123
|
+
const sleepImpl = deps.sleepSync ?? sleepSync;
|
|
72
124
|
const launchedAt = options.nowIso ?? new Date().toISOString();
|
|
73
|
-
|
|
125
|
+
if (strategy === 'unsupported') {
|
|
126
|
+
throw new Error('omx question cannot open a visible renderer because this process is not running inside an attached tmux pane. Run omx question from inside tmux.');
|
|
127
|
+
}
|
|
128
|
+
const commandArgs = buildQuestionUiTmuxArgs(options.recordPath, {
|
|
129
|
+
cwd: options.cwd,
|
|
130
|
+
env: options.env,
|
|
131
|
+
sessionId: options.sessionId,
|
|
132
|
+
});
|
|
74
133
|
if (strategy === 'inside-tmux') {
|
|
75
134
|
const rawPane = execTmux([
|
|
76
135
|
'split-window',
|
|
@@ -82,11 +141,15 @@ export function launchQuestionRenderer(options, deps = {}) {
|
|
|
82
141
|
'#{pane_id}',
|
|
83
142
|
'-c',
|
|
84
143
|
options.cwd,
|
|
85
|
-
|
|
144
|
+
...commandArgs,
|
|
86
145
|
]);
|
|
87
146
|
const paneId = parsePaneIdFromTmuxOutput(rawPane);
|
|
88
147
|
if (!paneId)
|
|
89
148
|
throw new Error('Failed to create tmux split pane for omx question UI.');
|
|
149
|
+
sleepImpl(QUESTION_RENDERER_PANE_SETTLE_MS);
|
|
150
|
+
if (!isLaunchedQuestionPaneAlive(paneId, execTmux)) {
|
|
151
|
+
throw new Error(`Question UI pane ${paneId} disappeared immediately after launch.`);
|
|
152
|
+
}
|
|
90
153
|
const returnTarget = resolveReturnTarget(options.env ?? process.env);
|
|
91
154
|
return {
|
|
92
155
|
renderer: 'tmux-pane',
|
|
@@ -108,11 +171,16 @@ export function launchQuestionRenderer(options, deps = {}) {
|
|
|
108
171
|
sessionName,
|
|
109
172
|
'-c',
|
|
110
173
|
options.cwd,
|
|
111
|
-
|
|
174
|
+
...commandArgs,
|
|
112
175
|
]).trim();
|
|
176
|
+
const target = output || sessionName;
|
|
177
|
+
sleepImpl(QUESTION_RENDERER_SESSION_SETTLE_MS);
|
|
178
|
+
if (!isLaunchedQuestionSessionAlive(target, execTmux)) {
|
|
179
|
+
throw new Error(`Question UI session ${target} disappeared immediately after launch.`);
|
|
180
|
+
}
|
|
113
181
|
return {
|
|
114
182
|
renderer: 'tmux-session',
|
|
115
|
-
target
|
|
183
|
+
target,
|
|
116
184
|
launched_at: launchedAt,
|
|
117
185
|
};
|
|
118
186
|
}
|
|
@@ -123,6 +191,7 @@ export function launchQuestionRenderer(options, deps = {}) {
|
|
|
123
191
|
launched_at: launchedAt,
|
|
124
192
|
};
|
|
125
193
|
}
|
|
126
|
-
|
|
194
|
+
const exhaustiveStrategy = strategy;
|
|
195
|
+
throw new Error(`Unsupported omx question renderer strategy: ${exhaustiveStrategy}`);
|
|
127
196
|
}
|
|
128
197
|
//# sourceMappingURL=renderer.js.map
|