oh-my-codex 0.11.0 → 0.11.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/crates/omx-explore/src/main.rs +115 -9
- package/dist/cli/__tests__/ask.test.js +3 -3
- package/dist/cli/__tests__/ask.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-team.test.js +12 -2
- package/dist/cli/__tests__/doctor-team.test.js.map +1 -1
- package/dist/cli/__tests__/exec.test.js +4 -0
- package/dist/cli/__tests__/exec.test.js.map +1 -1
- package/dist/cli/__tests__/hooks.test.d.ts +2 -0
- package/dist/cli/__tests__/hooks.test.d.ts.map +1 -0
- package/dist/cli/__tests__/hooks.test.js +55 -0
- package/dist/cli/__tests__/hooks.test.js.map +1 -0
- package/dist/cli/__tests__/index.test.js +6 -2
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/package-bin-contract.test.js +3 -10
- package/dist/cli/__tests__/package-bin-contract.test.js.map +1 -1
- package/dist/cli/__tests__/sparkshell-packaging.test.js +1 -1
- package/dist/cli/__tests__/sparkshell-packaging.test.js.map +1 -1
- package/dist/cli/__tests__/team.test.js +4 -4
- package/dist/cli/__tests__/team.test.js.map +1 -1
- package/dist/cli/ask.js +1 -1
- package/dist/cli/ask.js.map +1 -1
- package/dist/cli/hooks.d.ts.map +1 -1
- package/dist/cli/hooks.js +2 -2
- package/dist/cli/hooks.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +26 -12
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/tmux-hook.d.ts.map +1 -1
- package/dist/cli/tmux-hook.js +5 -4
- package/dist/cli/tmux-hook.js.map +1 -1
- package/dist/hooks/__tests__/codebase-map.test.js +1 -1
- package/dist/hooks/__tests__/codebase-map.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js +46 -36
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-all-workers-idle.test.js +6 -0
- package/dist/hooks/__tests__/notify-hook-all-workers-idle.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-auto-nudge.test.js +24 -24
- package/dist/hooks/__tests__/notify-hook-auto-nudge.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-linked-sync.test.js +45 -1
- package/dist/hooks/__tests__/notify-hook-linked-sync.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-modules.test.js +1 -1
- package/dist/hooks/__tests__/notify-hook-modules.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-native-dispatch-contract.test.js +5 -5
- package/dist/hooks/__tests__/notify-hook-native-dispatch-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-regression-205.test.js +22 -1
- package/dist/hooks/__tests__/notify-hook-regression-205.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-dispatch.test.js +126 -1
- package/dist/hooks/__tests__/notify-hook-team-dispatch.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js +5 -4
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-tmux-heal.test.js +141 -3
- package/dist/hooks/__tests__/notify-hook-tmux-heal.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-tmux-scrollback.test.js +11 -8
- package/dist/hooks/__tests__/notify-hook-tmux-scrollback.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-visual-verdict.test.js +1 -1
- package/dist/hooks/__tests__/notify-hook-visual-verdict.test.js.map +1 -1
- package/dist/hooks/__tests__/tmux-hook-engine-types-sync.test.js +1 -1
- package/dist/hooks/__tests__/tmux-hook-engine-types-sync.test.js.map +1 -1
- package/dist/hooks/__tests__/tmux-hook-engine.test.js +65 -1
- package/dist/hooks/__tests__/tmux-hook-engine.test.js.map +1 -1
- package/dist/hooks/extensibility/__tests__/sdk-public-surface.test.d.ts +2 -0
- package/dist/hooks/extensibility/__tests__/sdk-public-surface.test.d.ts.map +1 -0
- package/dist/hooks/extensibility/__tests__/sdk-public-surface.test.js +32 -0
- package/dist/hooks/extensibility/__tests__/sdk-public-surface.test.js.map +1 -0
- package/dist/hooks/extensibility/__tests__/sdk.test.js +172 -0
- package/dist/hooks/extensibility/__tests__/sdk.test.js.map +1 -1
- package/dist/hooks/extensibility/sdk/logging.d.ts +6 -0
- package/dist/hooks/extensibility/sdk/logging.d.ts.map +1 -0
- package/dist/hooks/extensibility/sdk/logging.js +32 -0
- package/dist/hooks/extensibility/sdk/logging.js.map +1 -0
- package/dist/hooks/extensibility/sdk/paths.d.ts +7 -0
- package/dist/hooks/extensibility/sdk/paths.d.ts.map +1 -0
- package/dist/hooks/extensibility/sdk/paths.js +22 -0
- package/dist/hooks/extensibility/sdk/paths.js.map +1 -0
- package/dist/hooks/extensibility/sdk/plugin-state.d.ts +5 -0
- package/dist/hooks/extensibility/sdk/plugin-state.d.ts.map +1 -0
- package/dist/hooks/extensibility/sdk/plugin-state.js +66 -0
- package/dist/hooks/extensibility/sdk/plugin-state.js.map +1 -0
- package/dist/hooks/extensibility/sdk/runtime-state.d.ts +3 -0
- package/dist/hooks/extensibility/sdk/runtime-state.d.ts.map +1 -0
- package/dist/hooks/extensibility/sdk/runtime-state.js +41 -0
- package/dist/hooks/extensibility/sdk/runtime-state.js.map +1 -0
- package/dist/hooks/extensibility/sdk/tmux.d.ts +10 -0
- package/dist/hooks/extensibility/sdk/tmux.d.ts.map +1 -0
- package/dist/hooks/extensibility/sdk/tmux.js +178 -0
- package/dist/hooks/extensibility/sdk/tmux.js.map +1 -0
- package/dist/hooks/extensibility/sdk.d.ts.map +1 -1
- package/dist/hooks/extensibility/sdk.js +14 -246
- package/dist/hooks/extensibility/sdk.js.map +1 -1
- package/dist/hooks/extensibility/types.d.ts +52 -0
- package/dist/hooks/extensibility/types.d.ts.map +1 -1
- package/dist/hud/__tests__/authority.test.js +2 -2
- package/dist/hud/__tests__/authority.test.js.map +1 -1
- package/dist/hud/__tests__/index.test.js +9 -2
- package/dist/hud/__tests__/index.test.js.map +1 -1
- package/dist/mcp/__tests__/state-server-schema.test.js +10 -0
- package/dist/mcp/__tests__/state-server-schema.test.js.map +1 -1
- package/dist/mcp/__tests__/state-server.test.js +152 -1
- package/dist/mcp/__tests__/state-server.test.js.map +1 -1
- package/dist/mcp/state-server.d.ts +4 -4
- package/dist/mcp/state-server.d.ts.map +1 -1
- package/dist/mcp/state-server.js +1 -0
- package/dist/mcp/state-server.js.map +1 -1
- package/dist/modes/__tests__/base-autoresearch-contract.test.js +17 -0
- package/dist/modes/__tests__/base-autoresearch-contract.test.js.map +1 -1
- package/dist/modes/base.d.ts +2 -2
- package/dist/modes/base.d.ts.map +1 -1
- package/dist/modes/base.js +1 -1
- package/dist/notifications/__tests__/reply-listener.test.js +375 -8
- package/dist/notifications/__tests__/reply-listener.test.js.map +1 -1
- package/dist/notifications/reply-listener.d.ts +57 -0
- package/dist/notifications/reply-listener.d.ts.map +1 -1
- package/dist/notifications/reply-listener.js +85 -40
- package/dist/notifications/reply-listener.js.map +1 -1
- package/dist/scripts/__tests__/smoke-packed-install.test.js +8 -41
- package/dist/scripts/__tests__/smoke-packed-install.test.js.map +1 -1
- package/dist/scripts/__tests__/test-reply-listener-live.test.d.ts +2 -0
- package/dist/scripts/__tests__/test-reply-listener-live.test.d.ts.map +1 -0
- package/dist/scripts/__tests__/test-reply-listener-live.test.js +82 -0
- package/dist/scripts/__tests__/test-reply-listener-live.test.js.map +1 -0
- package/dist/scripts/notify-hook/team-dispatch.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.js +7 -3
- package/dist/scripts/notify-hook/team-dispatch.js.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.js +4 -3
- package/dist/scripts/notify-hook/team-leader-nudge.js.map +1 -1
- package/dist/scripts/notify-hook/team-worker.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-worker.js +27 -8
- package/dist/scripts/notify-hook/team-worker.js.map +1 -1
- package/dist/scripts/notify-hook/tmux-injection.d.ts +0 -1
- package/dist/scripts/notify-hook/tmux-injection.d.ts.map +1 -1
- package/dist/scripts/notify-hook/tmux-injection.js +123 -112
- package/dist/scripts/notify-hook/tmux-injection.js.map +1 -1
- package/dist/scripts/smoke-packed-install.d.ts +1 -3
- package/dist/scripts/smoke-packed-install.d.ts.map +1 -1
- package/dist/scripts/smoke-packed-install.js +14 -155
- package/dist/scripts/smoke-packed-install.js.map +1 -1
- package/dist/scripts/test-reply-listener-live.d.ts +24 -0
- package/dist/scripts/test-reply-listener-live.d.ts.map +1 -0
- package/dist/scripts/test-reply-listener-live.js +138 -0
- package/dist/scripts/test-reply-listener-live.js.map +1 -0
- package/dist/scripts/tmux-hook-engine.d.ts +3 -3
- package/dist/scripts/tmux-hook-engine.d.ts.map +1 -1
- package/dist/scripts/tmux-hook-engine.js +17 -16
- package/dist/scripts/tmux-hook-engine.js.map +1 -1
- package/dist/team/__tests__/hardening-e2e.test.js +11 -1
- package/dist/team/__tests__/hardening-e2e.test.js.map +1 -1
- package/dist/team/__tests__/mcp-comm.test.js +11 -1
- package/dist/team/__tests__/mcp-comm.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +11 -1
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/state.test.js +9 -1
- package/dist/team/__tests__/state.test.js.map +1 -1
- package/dist/team/__tests__/tmux-test-fixture.d.ts +9 -3
- package/dist/team/__tests__/tmux-test-fixture.d.ts.map +1 -1
- package/dist/team/__tests__/tmux-test-fixture.js +69 -24
- package/dist/team/__tests__/tmux-test-fixture.js.map +1 -1
- package/dist/team/__tests__/tmux-test-fixture.test.js +80 -3
- package/dist/team/__tests__/tmux-test-fixture.test.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +2 -7
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/verification/__tests__/ci-rust-gates.test.js +13 -0
- package/dist/verification/__tests__/ci-rust-gates.test.js.map +1 -1
- package/dist/verification/__tests__/explore-harness-release-workflow.test.js +15 -6
- package/dist/verification/__tests__/explore-harness-release-workflow.test.js.map +1 -1
- package/dist/verification/__tests__/native-release-manifest.test.js +1 -1
- package/dist/verification/__tests__/native-release-manifest.test.js.map +1 -1
- package/package.json +2 -1
- package/src/scripts/__tests__/smoke-packed-install.test.ts +9 -50
- package/src/scripts/__tests__/test-reply-listener-live.test.ts +101 -0
- package/src/scripts/notify-hook/team-dispatch.ts +8 -2
- package/src/scripts/notify-hook/team-leader-nudge.ts +4 -3
- package/src/scripts/notify-hook/team-worker.ts +26 -8
- package/src/scripts/notify-hook/tmux-injection.ts +118 -107
- package/src/scripts/smoke-packed-install.ts +17 -164
- package/src/scripts/test-reply-listener-live.ts +188 -0
- package/src/scripts/tmux-hook-engine.ts +18 -16
|
@@ -10,146 +10,158 @@ import { readJsonIfExists, normalizeTmuxState, pruneRecentKeys, getScopedStateDi
|
|
|
10
10
|
import { runProcess } from './process-runner.js';
|
|
11
11
|
import { logTmuxHookEvent } from './log.js';
|
|
12
12
|
import { evaluatePaneInjectionReadiness, mapPaneInjectionReadinessReason, sendPaneInput } from './team-tmux-guard.js';
|
|
13
|
-
import { normalizeTmuxHookConfig, pickActiveMode, evaluateInjectionGuards, buildSendKeysArgv, } from '../tmux-hook-engine.js';
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const lines = result.stdout
|
|
17
|
-
.split('\n')
|
|
18
|
-
.map((line) => line.trim())
|
|
19
|
-
.filter(Boolean);
|
|
20
|
-
if (lines.length === 0)
|
|
21
|
-
return null;
|
|
22
|
-
const active = lines.find((line) => line.endsWith(' 1')) || lines[0];
|
|
23
|
-
const paneId = active.split(' ')[0];
|
|
24
|
-
return paneId || null;
|
|
13
|
+
import { normalizeTmuxHookConfig, pickActiveMode, evaluateInjectionGuards, buildSendKeysArgv, resolveCodexPane, } from '../tmux-hook-engine.js';
|
|
14
|
+
function isHudPaneStartCommand(startCommand) {
|
|
15
|
+
return /\bomx\b.*\bhud\b.*--watch/i.test(safeString(startCommand));
|
|
25
16
|
}
|
|
26
|
-
|
|
17
|
+
async function resolvePaneCwdMismatch(paneId, expectedCwd) {
|
|
27
18
|
if (!expectedCwd)
|
|
28
19
|
return null;
|
|
29
|
-
|
|
30
|
-
|
|
20
|
+
try {
|
|
21
|
+
const paneCwdResult = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#{pane_current_path}']);
|
|
22
|
+
const paneCwd = safeString(paneCwdResult.stdout).trim();
|
|
23
|
+
if (paneCwd && resolvePath(paneCwd) !== resolvePath(expectedCwd)) {
|
|
24
|
+
return {
|
|
25
|
+
paneTarget: null,
|
|
26
|
+
reason: 'pane_cwd_mismatch',
|
|
27
|
+
pane_cwd: paneCwd,
|
|
28
|
+
expected_cwd: expectedCwd,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
// Best effort only — if tmux cannot report cwd, keep the explicit pane target.
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
async function finalizeResolvedPane(paneId, reason, expectedCwd) {
|
|
38
|
+
const cwdMismatch = await resolvePaneCwdMismatch(paneId, expectedCwd);
|
|
39
|
+
if (cwdMismatch)
|
|
40
|
+
return cwdMismatch;
|
|
41
|
+
let sessionName = '';
|
|
42
|
+
try {
|
|
43
|
+
const currentSession = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#S']);
|
|
44
|
+
sessionName = safeString(currentSession.stdout).trim();
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
sessionName = '';
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
paneTarget: paneId,
|
|
51
|
+
reason,
|
|
52
|
+
matched_session: sessionName || null,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
async function resolveCanonicalPaneFromPaneTarget(paneTarget, expectedCwd) {
|
|
56
|
+
const paneResult = await runProcess('tmux', ['display-message', '-p', '-t', paneTarget, '#{pane_id}']);
|
|
57
|
+
const paneId = safeString(paneResult.stdout).trim();
|
|
58
|
+
if (!paneId)
|
|
59
|
+
return { paneTarget: null, reason: 'target_not_found' };
|
|
60
|
+
let startCommand = '';
|
|
61
|
+
try {
|
|
62
|
+
const startResult = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#{pane_start_command}']);
|
|
63
|
+
startCommand = safeString(startResult.stdout).trim();
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
startCommand = '';
|
|
67
|
+
}
|
|
68
|
+
if (!startCommand || !isHudPaneStartCommand(startCommand)) {
|
|
69
|
+
return finalizeResolvedPane(paneId, 'ok', expectedCwd);
|
|
70
|
+
}
|
|
71
|
+
let sessionName = '';
|
|
72
|
+
try {
|
|
73
|
+
const sessionResult = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#S']);
|
|
74
|
+
sessionName = safeString(sessionResult.stdout).trim();
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
sessionName = '';
|
|
78
|
+
}
|
|
79
|
+
if (!sessionName)
|
|
80
|
+
return { paneTarget: null, reason: 'target_is_hud_pane' };
|
|
81
|
+
const healedPaneId = await resolveSessionToPane(sessionName);
|
|
82
|
+
if (!healedPaneId)
|
|
83
|
+
return { paneTarget: null, reason: 'target_is_hud_pane' };
|
|
84
|
+
return finalizeResolvedPane(healedPaneId, 'healed_hud_pane_target', expectedCwd);
|
|
85
|
+
}
|
|
86
|
+
export async function resolveSessionToPane(sessionName) {
|
|
87
|
+
const result = await runProcess('tmux', ['list-panes', '-t', sessionName, '-F', '#{pane_id}\t#{pane_active}\t#{pane_current_command}\t#{pane_start_command}']);
|
|
88
|
+
const rows = result.stdout
|
|
31
89
|
.split('\n')
|
|
32
90
|
.map((line) => line.trim())
|
|
33
|
-
.filter(Boolean)
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (candidates.length === 0)
|
|
91
|
+
.filter(Boolean)
|
|
92
|
+
.map((line) => {
|
|
93
|
+
const parts = line.includes('\t')
|
|
94
|
+
? line.split('\t')
|
|
95
|
+
: line.split(/\s+/, 4);
|
|
96
|
+
const [paneId = '', activeRaw = '0', currentCommand = '', startCommand = ''] = parts;
|
|
97
|
+
return {
|
|
98
|
+
paneId,
|
|
99
|
+
active: activeRaw === '1',
|
|
100
|
+
currentCommand: safeString(currentCommand).trim().toLowerCase(),
|
|
101
|
+
startCommand: safeString(startCommand).trim(),
|
|
102
|
+
};
|
|
103
|
+
})
|
|
104
|
+
.filter((row) => row.paneId.startsWith('%'));
|
|
105
|
+
if (rows.length === 0)
|
|
49
106
|
return null;
|
|
50
|
-
const
|
|
51
|
-
|
|
107
|
+
const nonHudRows = rows.filter((row) => !isHudPaneStartCommand(row.startCommand));
|
|
108
|
+
const canonicalRows = nonHudRows.filter((row) => /\bcodex\b/i.test(row.startCommand));
|
|
109
|
+
const activeCanonical = canonicalRows.find((row) => row.active);
|
|
110
|
+
if (activeCanonical)
|
|
111
|
+
return activeCanonical.paneId;
|
|
112
|
+
if (canonicalRows[0])
|
|
113
|
+
return canonicalRows[0].paneId;
|
|
114
|
+
const activeNonHud = nonHudRows.find((row) => row.active);
|
|
115
|
+
if (activeNonHud)
|
|
116
|
+
return activeNonHud.paneId;
|
|
117
|
+
return nonHudRows[0]?.paneId || null;
|
|
52
118
|
}
|
|
53
119
|
export async function resolvePaneTarget(target, fallbackPane, expectedCwd, modePane) {
|
|
120
|
+
const canonicalFallbackPane = safeString(fallbackPane).trim();
|
|
121
|
+
if (canonicalFallbackPane) {
|
|
122
|
+
try {
|
|
123
|
+
return await finalizeResolvedPane(canonicalFallbackPane, 'fallback_current_pane', expectedCwd);
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
// Fall through to mode/config probes
|
|
127
|
+
}
|
|
128
|
+
}
|
|
54
129
|
if (modePane) {
|
|
55
130
|
try {
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (!paneCwd || resolvePath(paneCwd) === resolvePath(expectedCwd)) {
|
|
63
|
-
const currentSession = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#S']);
|
|
64
|
-
const sessionName = safeString(currentSession.stdout).trim();
|
|
65
|
-
return {
|
|
66
|
-
paneTarget: paneId,
|
|
67
|
-
reason: 'fallback_mode_state_pane',
|
|
68
|
-
matched_session: sessionName || null,
|
|
69
|
-
};
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
const currentSession = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#S']);
|
|
74
|
-
const sessionName = safeString(currentSession.stdout).trim();
|
|
75
|
-
return {
|
|
76
|
-
paneTarget: paneId,
|
|
77
|
-
reason: 'fallback_mode_state_pane',
|
|
78
|
-
matched_session: sessionName || null,
|
|
79
|
-
};
|
|
80
|
-
}
|
|
131
|
+
const resolved = await resolveCanonicalPaneFromPaneTarget(modePane, expectedCwd);
|
|
132
|
+
if (resolved.paneTarget) {
|
|
133
|
+
return {
|
|
134
|
+
...resolved,
|
|
135
|
+
reason: resolved.reason === 'ok' ? 'fallback_mode_state_pane' : resolved.reason,
|
|
136
|
+
};
|
|
81
137
|
}
|
|
82
138
|
}
|
|
83
139
|
catch {
|
|
84
|
-
// Fall through to config
|
|
140
|
+
// Fall through to config probes
|
|
85
141
|
}
|
|
86
142
|
}
|
|
87
143
|
if (!target)
|
|
88
144
|
return { paneTarget: null, reason: 'invalid_target' };
|
|
89
145
|
if (target.type === 'pane') {
|
|
90
146
|
try {
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
return { paneTarget: paneId, reason: 'ok' };
|
|
147
|
+
const resolved = await resolveCanonicalPaneFromPaneTarget(target.value, expectedCwd);
|
|
148
|
+
if (resolved.paneTarget)
|
|
149
|
+
return resolved;
|
|
95
150
|
}
|
|
96
151
|
catch {
|
|
97
|
-
// Fall through
|
|
152
|
+
// Fall through
|
|
98
153
|
}
|
|
99
154
|
}
|
|
100
155
|
else {
|
|
101
156
|
try {
|
|
102
157
|
const paneId = await resolveSessionToPane(target.value);
|
|
103
158
|
if (paneId)
|
|
104
|
-
return
|
|
105
|
-
}
|
|
106
|
-
catch {
|
|
107
|
-
// Fall through to fallback probe
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
if (fallbackPane) {
|
|
111
|
-
try {
|
|
112
|
-
const currentPane = await runProcess('tmux', ['display-message', '-p', '-t', fallbackPane, '#{pane_id}']);
|
|
113
|
-
const paneId = safeString(currentPane.stdout).trim();
|
|
114
|
-
if (paneId) {
|
|
115
|
-
if (expectedCwd) {
|
|
116
|
-
const paneCwdResult = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#{pane_current_path}']);
|
|
117
|
-
const paneCwd = safeString(paneCwdResult.stdout).trim();
|
|
118
|
-
if (paneCwd && resolvePath(paneCwd) !== resolvePath(expectedCwd)) {
|
|
119
|
-
return {
|
|
120
|
-
paneTarget: null,
|
|
121
|
-
reason: 'pane_cwd_mismatch',
|
|
122
|
-
pane_cwd: paneCwd,
|
|
123
|
-
expected_cwd: expectedCwd,
|
|
124
|
-
};
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
const currentSession = await runProcess('tmux', ['display-message', '-p', '-t', paneId, '#S']);
|
|
128
|
-
const sessionName = safeString(currentSession.stdout).trim();
|
|
129
|
-
return {
|
|
130
|
-
paneTarget: paneId,
|
|
131
|
-
reason: 'fallback_current_pane',
|
|
132
|
-
matched_session: sessionName || null,
|
|
133
|
-
};
|
|
134
|
-
}
|
|
159
|
+
return await finalizeResolvedPane(paneId, 'ok', expectedCwd);
|
|
135
160
|
}
|
|
136
161
|
catch {
|
|
137
162
|
// Fall through
|
|
138
163
|
}
|
|
139
164
|
}
|
|
140
|
-
try {
|
|
141
|
-
const match = await resolvePaneByCwd(expectedCwd);
|
|
142
|
-
if (match && match.paneId) {
|
|
143
|
-
return {
|
|
144
|
-
paneTarget: match.paneId,
|
|
145
|
-
reason: 'fallback_pane_by_cwd',
|
|
146
|
-
matched_session: match.sessionName,
|
|
147
|
-
};
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
catch {
|
|
151
|
-
// Fall through
|
|
152
|
-
}
|
|
153
165
|
return { paneTarget: null, reason: 'target_not_found' };
|
|
154
166
|
}
|
|
155
167
|
export async function handleTmuxInjection({ payload, cwd, stateDir, logsDir, }) {
|
|
@@ -247,8 +259,7 @@ export async function handleTmuxInjection({ payload, cwd, stateDir, logsDir, })
|
|
|
247
259
|
turnId,
|
|
248
260
|
timestamp: nowIso,
|
|
249
261
|
}), sourceText);
|
|
250
|
-
const
|
|
251
|
-
const fallbackPane = resolveCodexPane() || safeString(process.env.TMUX_PANE || '');
|
|
262
|
+
const fallbackPane = resolveCodexPane();
|
|
252
263
|
const resolution = await resolvePaneTarget(config.target, fallbackPane, cwd, modePane);
|
|
253
264
|
if (!resolution.paneTarget) {
|
|
254
265
|
state.last_reason = resolution.reason;
|
|
@@ -284,8 +295,8 @@ export async function handleTmuxInjection({ payload, cwd, stateDir, logsDir, })
|
|
|
284
295
|
await logTmuxHookEvent(logsDir, { ...baseLog, event: 'injection_skipped', reason: guard.reason });
|
|
285
296
|
return;
|
|
286
297
|
}
|
|
287
|
-
// Pane-canonical healing: persist resolved pane target so routing stops depending on session names.
|
|
288
|
-
if (config.target && config.target.type !== 'pane') {
|
|
298
|
+
// Pane-canonical healing: persist resolved pane target so routing stops depending on session names or stale pane ids.
|
|
299
|
+
if (config.target && (config.target.type !== 'pane' || safeString(config.target.value).trim() !== paneTarget)) {
|
|
289
300
|
try {
|
|
290
301
|
const healed = {
|
|
291
302
|
...(rawConfig && typeof rawConfig === 'object' ? rawConfig : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmux-injection.js","sourceRoot":"","sources":["../../../src/scripts/notify-hook/tmux-injection.ts"],"names":[],"mappings":"AAAA,cAAc;AACd;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EACf,mCAAmC,EACnC,OAAO,GACR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtH,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAgB;IACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,2BAA2B,CAAC,CAAC,CAAC;IAC9G,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM;SACxB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAClC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,OAAO,MAAM,IAAI,IAAI,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,WAAgB;IACrD,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,mEAAmE,CAAC,CAAC,CAAC;IACzI,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM;SACxB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAClC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAC/B,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;QACxD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO;YAAE,SAAS;QAClC,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,QAAQ;YAAE,SAAS;QAChD,MAAM,MAAM,GAAG,SAAS,KAAK,GAAG,CAAC;QACjC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,IAAI,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAW,EAAE,YAAiB,EAAE,WAAgB,EAAE,QAAa;IACrG,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;YACzG,MAAM,MAAM,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACxD,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;oBAChH,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;oBACxD,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;wBAClE,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;wBAC/F,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;wBAC7D,OAAO;4BACL,UAAU,EAAE,MAAM;4BAClB,MAAM,EAAE,0BAA0B;4BAClC,eAAe,EAAE,WAAW,IAAI,IAAI;yBACrC,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC/F,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC7D,OAAO;wBACL,UAAU,EAAE,MAAM;wBAClB,MAAM,EAAE,0BAA0B;wBAClC,eAAe,EAAE,WAAW,IAAI,IAAI;qBACrC,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAEnE,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;YACrG,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,IAAI,MAAM;gBAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,iCAAiC;QACnC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACxD,IAAI,MAAM;gBAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,iCAAiC;QACnC,CAAC;IACH,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;YAC1G,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACrD,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;oBAChH,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;oBACxD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;wBACjE,OAAO;4BACL,UAAU,EAAE,IAAI;4BAChB,MAAM,EAAE,mBAAmB;4BAC3B,QAAQ,EAAE,OAAO;4BACjB,YAAY,EAAE,WAAW;yBAC1B,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC/F,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC7D,OAAO;oBACL,UAAU,EAAE,MAAM;oBAClB,MAAM,EAAE,uBAAuB;oBAC/B,eAAe,EAAE,WAAW,IAAI,IAAI;iBACrC,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO;gBACL,UAAU,EAAE,KAAK,CAAC,MAAM;gBACxB,MAAM,EAAE,sBAAsB;gBAC9B,eAAe,EAAE,KAAK,CAAC,WAAW;aACnC,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,OAAO,EACP,GAAG,EACH,QAAQ,EACR,OAAO,GACH;IACJ,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEvB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,QAAQ,IAAI,SAAS,CAAC;IACzC,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,OAAO,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;IAE/G,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9E,KAAK,CAAC,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAwB,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IACvF,MAAM,uBAAuB,GAAG,KAAK,EAAE,IAAc,EAAE,gBAAgB,GAAG,KAAK,EAAE,EAAE;QACjF,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7B,MAAM,iBAAiB,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC;gBAAE,SAAS;YACtD,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAExC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,KAAK,sBAAsB;oBAAE,SAAS;gBAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBACzD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBACjD,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3B,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACrD,gBAAgB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACtC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,mCAAmC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACzF,MAAM,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAE1C,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YACvG,MAAM,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,uBAAuB,CAAC;QACvC,MAAM;QACN,IAAI;QACJ,UAAU;QACV,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,UAAU;QACV,eAAe,EAAE,IAAI;QACrB,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,OAAO,GAAQ;QACnB,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,WAAW;QACjB,IAAI;QACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,KAAK;KACZ,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACnD,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,sBAAsB,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE;QACzE,IAAI,EAAE,IAAI,IAAI,SAAS;QACvB,QAAQ;QACR,MAAM;QACN,SAAS,EAAE,MAAM;KAClB,CAAC,EAAE,UAAU,CAAC,CAAC;IAChB,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;IACpE,MAAM,YAAY,GAAG,gBAAgB,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACnF,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACvF,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;QACtC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,mBAAmB;YAC1B,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,YAAY,EAAE,UAAU,CAAC,YAAY;SACtC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAEzC,oEAAoE;IACpE,MAAM,KAAK,GAAG,uBAAuB,CAAC;QACpC,MAAM;QACN,IAAI;QACJ,UAAU;QACV,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,OAAO,EAAE,UAAU;QACnB,UAAU;QACV,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;QACjC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAClG,OAAO;IACT,CAAC;IAED,oGAAoG;IACpG,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG;gBACb,GAAG,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE;aAC5C,CAAC;YACF,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACpE,MAAM,gBAAgB,CAAC,OAAO,EAAE;gBAC9B,GAAG,OAAO;gBACV,KAAK,EAAE,eAAe;gBACtB,MAAM,EAAE,yBAAyB;gBACjC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK;gBACpC,aAAa,EAAE,UAAU;aAC1B,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC7B,UAAU;QACV,MAAM;QACN,MAAM,EAAE,MAAM,CAAC,OAAO;KACvB,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,MAAc,EAAE,EAAE;QACjE,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;QAC9D,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;QAC3B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,CAAC,iBAAiB,GAAG,GAAG,CAAC;YAC9B,KAAK,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACrE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACnF,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;YAC/B,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC;IACH,CAAC,CAAC;IAEF,6EAA6E;IAC7E,uEAAuE;IACvE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,8BAA8B,CAAC,UAAU,EAAE;YACjE,eAAe,EAAE,MAAM,CAAC,iBAAiB;SAC1C,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,+BAA+B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACjE,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;YAC3B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;YAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;gBAC9B,GAAG,OAAO;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,MAAM;gBACN,WAAW,EAAE,UAAU;gBACvB,oBAAoB,EAAE,SAAS,CAAC,kBAAkB,IAAI,SAAS;gBAC/D,oBAAoB,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5F,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACxC,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,mBAAmB;YAC1B,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,UAAU;YACvB,IAAI;SACL,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC;YACrC,UAAU;YACV,MAAM;YACN,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;YACxC,aAAa,EAAE,EAAE;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QACzD,CAAC;QACD,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC9C,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,IAAI;YACV,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,qBAAqB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC5C,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE,aAAa;YACrB,WAAW,EAAE,UAAU;YACvB,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;SAC5D,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"tmux-injection.js","sourceRoot":"","sources":["../../../src/scripts/notify-hook/tmux-injection.ts"],"names":[],"mappings":"AAAA,cAAc;AACd;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EACf,mCAAmC,EACnC,OAAO,GACR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACtH,OAAO,EACL,uBAAuB,EACvB,cAAc,EACd,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,wBAAwB,CAAC;AAEhC,SAAS,qBAAqB,CAAC,YAAiB;IAC9C,OAAO,4BAA4B,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAAc,EAAE,WAAgB;IACpE,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAChH,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;YACjE,OAAO;gBACL,UAAU,EAAE,IAAI;gBAChB,MAAM,EAAE,mBAAmB;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,YAAY,EAAE,WAAW;aAC1B,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,+EAA+E;IACjF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,MAAc,EAAE,MAAc,EAAE,WAAgB;IAClF,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtE,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IACpC,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/F,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,EAAE,CAAC;IACnB,CAAC;IACD,OAAO;QACL,UAAU,EAAE,MAAM;QAClB,MAAM;QACN,eAAe,EAAE,WAAW,IAAI,IAAI;KACrC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,kCAAkC,CAAC,UAAe,EAAE,WAAgB;IACjF,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACvG,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACpD,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAErE,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC/G,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,YAAY,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,OAAO,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9F,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,EAAE,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAE5E,MAAM,YAAY,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC7E,OAAO,oBAAoB,CAAC,YAAY,EAAE,wBAAwB,EAAE,WAAW,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAgB;IACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,4EAA4E,CAAC,CAAC,CAAC;IAC/J,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM;SACvB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAClC,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAClB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,cAAc,GAAG,EAAE,EAAE,YAAY,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC;QACrF,OAAO;YACL,MAAM;YACN,MAAM,EAAE,SAAS,KAAK,GAAG;YACzB,cAAc,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;YAC/D,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE;SAC9C,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACvF,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3F,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrE,IAAI,eAAe;QAAE,OAAO,eAAe,CAAC,MAAM,CAAC;IACnD,IAAI,aAAa,CAAC,CAAC,CAAC;QAAE,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAErD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/D,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC,MAAM,CAAC;IAC7C,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAW,EAAE,YAAiB,EAAE,WAAgB,EAAE,QAAa;IACrG,MAAM,qBAAqB,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9D,IAAI,qBAAqB,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,OAAO,MAAM,oBAAoB,CAAC,qBAAqB,EAAE,uBAAuB,EAAE,WAAW,CAAC,CAAC;QACjG,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,kCAAkC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACjF,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACxB,OAAO;oBACL,GAAG,QAAQ;oBACX,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM;iBAChF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,gCAAgC;QAClC,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAEnE,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,kCAAkC,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACrF,IAAI,QAAQ,CAAC,UAAU;gBAAE,OAAO,QAAQ,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACxD,IAAI,MAAM;gBAAE,OAAO,MAAM,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3E,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,OAAO,EACP,GAAG,EACH,QAAQ,EACR,OAAO,GACH;IACJ,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEvB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAElD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,QAAQ,IAAI,SAAS,CAAC;IACzC,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,OAAO,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;IAE/G,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9E,KAAK,CAAC,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAwB,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IACvF,MAAM,uBAAuB,GAAG,KAAK,EAAE,IAAc,EAAE,gBAAgB,GAAG,KAAK,EAAE,EAAE;QACjF,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7B,MAAM,iBAAiB,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC;gBAAE,SAAS;YACtD,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAExC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,IAAI,KAAK,sBAAsB;oBAAE,SAAS;gBAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBACzD,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBACjD,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3B,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACrD,gBAAgB,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACtC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,mCAAmC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACzF,MAAM,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAE1C,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YACvG,MAAM,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,YAAY;IACd,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,uBAAuB,CAAC;QACvC,MAAM;QACN,IAAI;QACJ,UAAU;QACV,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,UAAU;QACV,eAAe,EAAE,IAAI;QACrB,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,OAAO,GAAQ;QACnB,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,WAAW;QACjB,IAAI;QACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,KAAK;KACZ,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;QACpC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YACnD,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,sBAAsB,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE;QACzE,IAAI,EAAE,IAAI,IAAI,SAAS;QACvB,QAAQ;QACR,MAAM;QACN,SAAS,EAAE,MAAM;KAClB,CAAC,EAAE,UAAU,CAAC,CAAC;IAChB,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACvF,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC;QACtC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,mBAAmB;YAC1B,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,YAAY,EAAE,UAAU,CAAC,YAAY;SACtC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IAEzC,oEAAoE;IACpE,MAAM,KAAK,GAAG,uBAAuB,CAAC;QACpC,MAAM;QACN,IAAI;QACJ,UAAU;QACV,gBAAgB;QAChB,QAAQ;QACR,MAAM;QACN,OAAO,EAAE,UAAU;QACnB,UAAU;QACV,GAAG;QACH,KAAK;KACN,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;QACjC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAClG,OAAO;IACT,CAAC;IAED,sHAAsH;IACtH,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,UAAU,CAAC,EAAE,CAAC;QAC9G,IAAI,CAAC;YACH,MAAM,MAAM,GAAG;gBACb,GAAG,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE;aAC5C,CAAC;YACF,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACpE,MAAM,gBAAgB,CAAC,OAAO,EAAE;gBAC9B,GAAG,OAAO;gBACV,KAAK,EAAE,eAAe;gBACtB,MAAM,EAAE,yBAAyB;gBACjC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK;gBACpC,aAAa,EAAE,UAAU;aAC1B,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC7B,UAAU;QACV,MAAM;QACN,MAAM,EAAE,MAAM,CAAC,OAAO;KACvB,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,MAAc,EAAE,EAAE;QACjE,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;QAC9D,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;QAC3B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;QAC7B,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,CAAC,iBAAiB,GAAG,GAAG,CAAC;YAC9B,KAAK,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACrE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YACxG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACnF,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;YAC/B,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC;IACH,CAAC,CAAC;IAEF,6EAA6E;IAC7E,uEAAuE;IACvE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,8BAA8B,CAAC,UAAU,EAAE;YACjE,eAAe,EAAE,MAAM,CAAC,iBAAiB;SAC1C,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,+BAA+B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACjE,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC;YAC3B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;YAC7B,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;gBAC9B,GAAG,OAAO;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,MAAM;gBACN,WAAW,EAAE,UAAU;gBACvB,oBAAoB,EAAE,SAAS,CAAC,kBAAkB,IAAI,SAAS;gBAC/D,oBAAoB,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;aAC5F,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACxC,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,mBAAmB;YAC1B,MAAM,EAAE,SAAS;YACjB,WAAW,EAAE,UAAU;YACvB,IAAI;SACL,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC;YACrC,UAAU;YACV,MAAM;YACN,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;YACxC,aAAa,EAAE,EAAE;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QACzD,CAAC;QACD,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC9C,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,IAAI;YACV,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,qBAAqB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC5C,MAAM,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC/E,MAAM,gBAAgB,CAAC,OAAO,EAAE;YAC9B,GAAG,OAAO;YACV,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE,aAAa;YACrB,WAAW,EAAE,UAAU;YACvB,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;SAC5D,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { rmSync, symlinkSync } from 'node:fs';
|
|
2
2
|
import { spawnSync } from 'node:child_process';
|
|
3
|
+
export declare const PACKED_INSTALL_SMOKE_CORE_COMMANDS: readonly [readonly ["--help"], readonly ["version"]];
|
|
3
4
|
export declare function hasUsableNodeModules(repoRoot: string): boolean;
|
|
4
5
|
export declare function resolveGitCommonDir(cwd: string, gitRunner?: typeof spawnSync): string | null;
|
|
5
6
|
interface EnsureRepoDepsOptions {
|
|
@@ -17,8 +18,5 @@ interface EnsureRepoDepsResult {
|
|
|
17
18
|
}
|
|
18
19
|
export declare function resolveReusableNodeModulesSource(repoRoot: string, gitRunner?: typeof spawnSync): string | null;
|
|
19
20
|
export declare function ensureRepoDependencies(repoRoot: string, options?: EnsureRepoDepsOptions): EnsureRepoDepsResult;
|
|
20
|
-
export declare function hasSparkShellFallbackBanner(stderr: string | undefined): boolean;
|
|
21
|
-
export declare function prepareLocalHydrationAssetDirectory(sourceDir: string, tempRoot: string): string;
|
|
22
|
-
export declare function rewriteManifestDownloadUrls(manifestPath: string, baseUrl: string): void;
|
|
23
21
|
export {};
|
|
24
22
|
//# sourceMappingURL=smoke-packed-install.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-packed-install.d.ts","sourceRoot":"","sources":["../../src/scripts/smoke-packed-install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"smoke-packed-install.d.ts","sourceRoot":"","sources":["../../src/scripts/smoke-packed-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,WAAW,EACZ,MAAM,SAAS,CAAC;AAIjB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAU/C,eAAO,MAAM,kCAAkC,sDAGrC,CAAC;AAoBX,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,mBAAY,GAAG,MAAM,GAAG,IAAI,CAarF;AAED,UAAU,qBAAqB;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,WAAW,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,mBAAY,GAAG,MAAM,GAAG,IAAI,CAgBvG;AAUD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,oBAAoB,CAgDlH"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { chmodSync, mkdirSync } from 'node:fs';
|
|
1
|
+
import { existsSync, lstatSync, mkdtempSync, rmSync, symlinkSync, } from 'node:fs';
|
|
2
|
+
import { mkdirSync } from 'node:fs';
|
|
4
3
|
import { tmpdir } from 'node:os';
|
|
5
4
|
import { basename, dirname, join, resolve } from 'node:path';
|
|
6
5
|
import { spawnSync } from 'node:child_process';
|
|
@@ -11,12 +10,16 @@ const REQUIRED_NODE_MODULE_MARKERS = [
|
|
|
11
10
|
join('@modelcontextprotocol', 'sdk', 'package.json'),
|
|
12
11
|
join('zod', 'package.json'),
|
|
13
12
|
];
|
|
13
|
+
export const PACKED_INSTALL_SMOKE_CORE_COMMANDS = [
|
|
14
|
+
['--help'],
|
|
15
|
+
['version'],
|
|
16
|
+
];
|
|
14
17
|
function usage() {
|
|
15
18
|
return [
|
|
16
|
-
'Usage: node scripts/smoke-packed-install.mjs
|
|
19
|
+
'Usage: node scripts/smoke-packed-install.mjs',
|
|
17
20
|
'',
|
|
18
21
|
'Creates an npm tarball, installs it into an isolated prefix, and smoke tests the installed omx CLI.',
|
|
19
|
-
'
|
|
22
|
+
'Release smoke stays intentionally minimal: install + boot + 1-2 core commands only.',
|
|
20
23
|
].join('\n');
|
|
21
24
|
}
|
|
22
25
|
function hasNodeModulesPath(nodeModulesPath) {
|
|
@@ -104,154 +107,35 @@ export function ensureRepoDependencies(repoRoot, options = {}) {
|
|
|
104
107
|
nodeModulesPath: targetNodeModules,
|
|
105
108
|
};
|
|
106
109
|
}
|
|
107
|
-
export function hasSparkShellFallbackBanner(stderr) {
|
|
108
|
-
return /GLIBC-incompatible native sidecar detected/i.test(String(stderr || ''));
|
|
109
|
-
}
|
|
110
110
|
function parseArgs(argv) {
|
|
111
|
-
|
|
112
|
-
let requireNoFallback = false;
|
|
113
|
-
for (let index = 0; index < argv.length; index += 1) {
|
|
114
|
-
const token = argv[index];
|
|
111
|
+
for (const token of argv) {
|
|
115
112
|
if (token === '--help' || token === '-h') {
|
|
116
113
|
console.log(usage());
|
|
117
114
|
process.exit(0);
|
|
118
115
|
}
|
|
119
|
-
if (token === '--release-assets-dir') {
|
|
120
|
-
const value = argv[index + 1];
|
|
121
|
-
if (!value)
|
|
122
|
-
throw new Error('Missing value after --release-assets-dir');
|
|
123
|
-
releaseAssetsDir = resolve(value);
|
|
124
|
-
index += 1;
|
|
125
|
-
continue;
|
|
126
|
-
}
|
|
127
|
-
if (token === '--require-no-fallback') {
|
|
128
|
-
requireNoFallback = true;
|
|
129
|
-
continue;
|
|
130
|
-
}
|
|
131
116
|
throw new Error(`Unknown argument: ${token}\n${usage()}`);
|
|
132
117
|
}
|
|
133
|
-
return { releaseAssetsDir, requireNoFallback };
|
|
134
118
|
}
|
|
135
119
|
function run(cmd, args, options = {}) {
|
|
136
|
-
const result = spawnSync(cmd, args, {
|
|
120
|
+
const result = spawnSync(cmd, [...args], {
|
|
137
121
|
encoding: 'utf-8',
|
|
138
122
|
stdio: 'pipe',
|
|
139
123
|
...options,
|
|
140
124
|
});
|
|
141
125
|
if (result.status !== 0) {
|
|
142
|
-
throw new Error(formatCommandFailure(cmd, args, result));
|
|
126
|
+
throw new Error(formatCommandFailure(cmd, [...args], result));
|
|
143
127
|
}
|
|
144
128
|
return result;
|
|
145
129
|
}
|
|
146
130
|
function npmBinName(name) {
|
|
147
131
|
return process.platform === 'win32' ? `${name}.cmd` : name;
|
|
148
132
|
}
|
|
149
|
-
function startStaticServer(root) {
|
|
150
|
-
return new Promise((resolveServer, reject) => {
|
|
151
|
-
const server = createServer((req, res) => {
|
|
152
|
-
try {
|
|
153
|
-
const url = new URL(req.url || '/', 'http://127.0.0.1');
|
|
154
|
-
const requested = resolve(root, url.pathname.replace(/^\//, ''));
|
|
155
|
-
if (!requested.startsWith(root) || !existsSync(requested)) {
|
|
156
|
-
res.writeHead(404);
|
|
157
|
-
res.end('missing');
|
|
158
|
-
return;
|
|
159
|
-
}
|
|
160
|
-
res.writeHead(200);
|
|
161
|
-
res.end(readFileSync(requested));
|
|
162
|
-
}
|
|
163
|
-
catch (error) {
|
|
164
|
-
res.writeHead(500);
|
|
165
|
-
res.end(String(error));
|
|
166
|
-
}
|
|
167
|
-
});
|
|
168
|
-
server.on('error', reject);
|
|
169
|
-
server.listen(0, '127.0.0.1', () => {
|
|
170
|
-
const address = server.address();
|
|
171
|
-
if (!address || typeof address === 'string') {
|
|
172
|
-
reject(new Error('Failed to bind local asset server'));
|
|
173
|
-
return;
|
|
174
|
-
}
|
|
175
|
-
resolveServer({
|
|
176
|
-
baseUrl: `http://127.0.0.1:${address.port}`,
|
|
177
|
-
close: () => new Promise((done, fail) => server.close((error) => error ? fail(error) : done())),
|
|
178
|
-
});
|
|
179
|
-
});
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
function writeCodexStub(binDir) {
|
|
183
|
-
const stubPath = join(binDir, process.platform === 'win32' ? 'codex.cmd' : 'codex');
|
|
184
|
-
if (process.platform === 'win32') {
|
|
185
|
-
writeFileSync(stubPath, [
|
|
186
|
-
'@echo off',
|
|
187
|
-
'setlocal enabledelayedexpansion',
|
|
188
|
-
'set output_path=',
|
|
189
|
-
':loop',
|
|
190
|
-
'if "%~1"=="" goto done',
|
|
191
|
-
'if "%~1"=="-o" (',
|
|
192
|
-
' set output_path=%~2',
|
|
193
|
-
' shift',
|
|
194
|
-
')',
|
|
195
|
-
'shift',
|
|
196
|
-
'goto loop',
|
|
197
|
-
':done',
|
|
198
|
-
'if "%output_path%"=="" exit /b 1',
|
|
199
|
-
'> "%output_path%" echo # Answer',
|
|
200
|
-
'>> "%output_path%" echo - packed install smoke harness',
|
|
201
|
-
'exit /b 0',
|
|
202
|
-
'',
|
|
203
|
-
].join('\r\n'));
|
|
204
|
-
}
|
|
205
|
-
else {
|
|
206
|
-
writeFileSync(stubPath, [
|
|
207
|
-
'#!/bin/sh',
|
|
208
|
-
'set -eu',
|
|
209
|
-
"output_path=''",
|
|
210
|
-
'while [ "$#" -gt 0 ]; do',
|
|
211
|
-
' if [ "$1" = "-o" ] && [ "$#" -ge 2 ]; then',
|
|
212
|
-
' output_path="$2"',
|
|
213
|
-
' shift 2',
|
|
214
|
-
' continue',
|
|
215
|
-
' fi',
|
|
216
|
-
' shift',
|
|
217
|
-
'done',
|
|
218
|
-
'if [ -z "$output_path" ]; then',
|
|
219
|
-
" printf 'missing -o output path\\n' >&2",
|
|
220
|
-
' exit 1',
|
|
221
|
-
'fi',
|
|
222
|
-
"printf '# Answer\\n- packed install smoke harness\\n' > \"$output_path\"",
|
|
223
|
-
'',
|
|
224
|
-
].join('\n'));
|
|
225
|
-
chmodSync(stubPath, 0o755);
|
|
226
|
-
}
|
|
227
|
-
return stubPath;
|
|
228
|
-
}
|
|
229
|
-
export function prepareLocalHydrationAssetDirectory(sourceDir, tempRoot) {
|
|
230
|
-
const localDir = join(tempRoot, 'hydration-assets');
|
|
231
|
-
cpSync(sourceDir, localDir, { recursive: true });
|
|
232
|
-
return localDir;
|
|
233
|
-
}
|
|
234
|
-
export function rewriteManifestDownloadUrls(manifestPath, baseUrl) {
|
|
235
|
-
const manifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
|
|
236
|
-
manifest.assets = Array.isArray(manifest.assets)
|
|
237
|
-
? manifest.assets.map((asset) => ({
|
|
238
|
-
...asset,
|
|
239
|
-
download_url: new URL(asset.archive, `${baseUrl}/`).toString(),
|
|
240
|
-
}))
|
|
241
|
-
: [];
|
|
242
|
-
writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
|
|
243
|
-
}
|
|
244
133
|
async function main() {
|
|
245
|
-
|
|
134
|
+
parseArgs(process.argv.slice(2));
|
|
246
135
|
const repoRoot = process.cwd();
|
|
247
136
|
const tempRoot = mkdtempSync(join(tmpdir(), 'omx-packed-install-'));
|
|
248
137
|
const prefixDir = join(tempRoot, 'prefix');
|
|
249
|
-
const cacheDir = join(tempRoot, 'cache');
|
|
250
|
-
const helperBinDir = join(tempRoot, 'bin');
|
|
251
138
|
mkdirSync(prefixDir, { recursive: true });
|
|
252
|
-
mkdirSync(cacheDir, { recursive: true });
|
|
253
|
-
mkdirSync(helperBinDir, { recursive: true });
|
|
254
|
-
let server;
|
|
255
139
|
let tarballPath;
|
|
256
140
|
try {
|
|
257
141
|
ensureRepoDependencies(repoRoot, {
|
|
@@ -265,39 +149,14 @@ async function main() {
|
|
|
265
149
|
tarballPath = join(repoRoot, tarballName);
|
|
266
150
|
run('npm', ['install', '-g', tarballPath, '--prefix', prefixDir], { cwd: repoRoot });
|
|
267
151
|
const omxPath = join(prefixDir, process.platform === 'win32' ? '' : 'bin', npmBinName('omx'));
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
if (releaseAssetsDir) {
|
|
271
|
-
const hydrationAssetsDir = prepareLocalHydrationAssetDirectory(releaseAssetsDir, tempRoot);
|
|
272
|
-
server = await startStaticServer(hydrationAssetsDir);
|
|
273
|
-
rewriteManifestDownloadUrls(join(hydrationAssetsDir, 'native-release-manifest.json'), server.baseUrl);
|
|
274
|
-
const codexStub = writeCodexStub(helperBinDir);
|
|
275
|
-
const env = {
|
|
276
|
-
...process.env,
|
|
277
|
-
PATH: `${helperBinDir}${process.platform === 'win32' ? ';' : ':'}${process.env.PATH || ''}`,
|
|
278
|
-
OMX_NATIVE_MANIFEST_URL: `${server.baseUrl}/native-release-manifest.json`,
|
|
279
|
-
OMX_NATIVE_CACHE_DIR: cacheDir,
|
|
280
|
-
OMX_EXPLORE_CODEX_BIN: codexStub,
|
|
281
|
-
};
|
|
282
|
-
const sparkshell = run(omxPath, ['sparkshell', 'node', '--version'], { cwd: repoRoot, env });
|
|
283
|
-
if (requireNoFallback && hasSparkShellFallbackBanner(sparkshell.stderr)) {
|
|
284
|
-
throw new Error(`Unexpected sparkshell fallback stderr:\n${sparkshell.stderr}`);
|
|
285
|
-
}
|
|
286
|
-
if (!/v\d+\./.test(sparkshell.stdout)) {
|
|
287
|
-
throw new Error(`Unexpected sparkshell stdout:\n${sparkshell.stdout}`);
|
|
288
|
-
}
|
|
289
|
-
const explore = run(omxPath, ['explore', '--prompt', 'where is buildExploreRoutingGuidance defined'], { cwd: repoRoot, env });
|
|
290
|
-
if (!explore.stdout.includes('# Answer') || !explore.stdout.includes('packed install smoke harness')) {
|
|
291
|
-
throw new Error(`Unexpected explore stdout:\n${explore.stdout}`);
|
|
292
|
-
}
|
|
152
|
+
for (const argv of PACKED_INSTALL_SMOKE_CORE_COMMANDS) {
|
|
153
|
+
run(omxPath, argv, { cwd: repoRoot });
|
|
293
154
|
}
|
|
294
155
|
console.log('packed install smoke: PASS');
|
|
295
156
|
}
|
|
296
157
|
finally {
|
|
297
158
|
if (tarballPath)
|
|
298
159
|
rmSync(tarballPath, { force: true });
|
|
299
|
-
if (server)
|
|
300
|
-
await server.close();
|
|
301
160
|
rmSync(tempRoot, { recursive: true, force: true });
|
|
302
161
|
}
|
|
303
162
|
}
|