oh-my-codex 0.11.12 → 0.11.13
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 +23 -0
- package/README.vi.md +144 -185
- package/crates/omx-runtime-core/src/engine.rs +122 -4
- package/crates/omx-runtime-core/src/lib.rs +17 -0
- package/dist/cli/__tests__/autoresearch.test.js +11 -0
- package/dist/cli/__tests__/autoresearch.test.js.map +1 -1
- package/dist/cli/__tests__/cleanup.test.js +117 -4
- package/dist/cli/__tests__/cleanup.test.js.map +1 -1
- package/dist/cli/__tests__/error-handling-warnings.test.js +13 -0
- package/dist/cli/__tests__/error-handling-warnings.test.js.map +1 -1
- package/dist/cli/__tests__/exec.test.js +6 -0
- package/dist/cli/__tests__/exec.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +94 -1
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/launch-fallback.test.js +3 -0
- package/dist/cli/__tests__/launch-fallback.test.js.map +1 -1
- package/dist/cli/__tests__/package-bin-contract.test.js +10 -0
- package/dist/cli/__tests__/package-bin-contract.test.js.map +1 -1
- package/dist/cli/__tests__/packaged-script-resolution.test.js +4 -3
- package/dist/cli/__tests__/packaged-script-resolution.test.js.map +1 -1
- package/dist/cli/__tests__/resume.test.js +6 -0
- package/dist/cli/__tests__/resume.test.js.map +1 -1
- package/dist/cli/__tests__/setup-refresh.test.js +29 -12
- package/dist/cli/__tests__/setup-refresh.test.js.map +1 -1
- package/dist/cli/__tests__/star-prompt.test.js +16 -0
- package/dist/cli/__tests__/star-prompt.test.js.map +1 -1
- package/dist/cli/__tests__/uninstall.test.js +112 -1
- package/dist/cli/__tests__/uninstall.test.js.map +1 -1
- package/dist/cli/__tests__/windows-popup-loop-contract.test.d.ts +2 -0
- package/dist/cli/__tests__/windows-popup-loop-contract.test.d.ts.map +1 -0
- package/dist/cli/__tests__/windows-popup-loop-contract.test.js +30 -0
- package/dist/cli/__tests__/windows-popup-loop-contract.test.js.map +1 -0
- package/dist/cli/cleanup.d.ts +2 -0
- package/dist/cli/cleanup.d.ts.map +1 -1
- package/dist/cli/cleanup.js +26 -1
- package/dist/cli/cleanup.js.map +1 -1
- package/dist/cli/index.d.ts +7 -0
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +161 -50
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +15 -14
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/star-prompt.d.ts.map +1 -1
- package/dist/cli/star-prompt.js +1 -0
- package/dist/cli/star-prompt.js.map +1 -1
- package/dist/cli/team.d.ts.map +1 -1
- package/dist/cli/team.js +5 -1
- package/dist/cli/team.js.map +1 -1
- package/dist/cli/uninstall.d.ts.map +1 -1
- package/dist/cli/uninstall.js +26 -0
- package/dist/cli/uninstall.js.map +1 -1
- package/dist/cli/update.d.ts.map +1 -1
- package/dist/cli/update.js +1 -0
- package/dist/cli/update.js.map +1 -1
- package/dist/config/__tests__/generator-idempotent.test.js +4 -4
- package/dist/config/__tests__/generator-idempotent.test.js.map +1 -1
- package/dist/config/__tests__/mcp-registry.test.js +13 -16
- package/dist/config/__tests__/mcp-registry.test.js.map +1 -1
- package/dist/config/mcp-registry.d.ts +1 -0
- package/dist/config/mcp-registry.d.ts.map +1 -1
- package/dist/config/mcp-registry.js +4 -4
- package/dist/config/mcp-registry.js.map +1 -1
- package/dist/config/models.d.ts +1 -0
- package/dist/config/models.d.ts.map +1 -1
- package/dist/config/models.js +39 -1
- package/dist/config/models.js.map +1 -1
- package/dist/hooks/__tests__/keyword-detector.test.js +12 -1
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js +499 -17
- package/dist/hooks/__tests__/notify-fallback-watcher.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-auto-nudge.test.js +140 -14
- package/dist/hooks/__tests__/notify-hook-auto-nudge.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-modules.test.js +5 -0
- package/dist/hooks/__tests__/notify-hook-modules.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-ralph-resume.test.d.ts +2 -0
- package/dist/hooks/__tests__/notify-hook-ralph-resume.test.d.ts.map +1 -0
- package/dist/hooks/__tests__/notify-hook-ralph-resume.test.js +597 -0
- package/dist/hooks/__tests__/notify-hook-ralph-resume.test.js.map +1 -0
- package/dist/hooks/__tests__/notify-hook-regression-205.test.js +15 -1
- package/dist/hooks/__tests__/notify-hook-regression-205.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-session-scope.test.js +73 -53
- package/dist/hooks/__tests__/notify-hook-session-scope.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-dispatch.test.js +193 -2
- package/dist/hooks/__tests__/notify-hook-team-dispatch.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js +183 -0
- package/dist/hooks/__tests__/notify-hook-team-leader-nudge.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-tmux-heal.test.js +255 -97
- package/dist/hooks/__tests__/notify-hook-tmux-heal.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-tmux-scrollback.test.js +0 -0
- package/dist/hooks/__tests__/notify-hook-tmux-scrollback.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-worker-idle.test.js +46 -0
- package/dist/hooks/__tests__/notify-hook-worker-idle.test.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts +1 -0
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +48 -0
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/hooks/session.d.ts.map +1 -1
- package/dist/hooks/session.js +1 -0
- package/dist/hooks/session.js.map +1 -1
- package/dist/hud/__tests__/state.test.js +70 -1
- package/dist/hud/__tests__/state.test.js.map +1 -1
- package/dist/hud/state.d.ts.map +1 -1
- package/dist/hud/state.js +10 -37
- package/dist/hud/state.js.map +1 -1
- package/dist/mcp/state-server.d.ts.map +1 -1
- package/dist/mcp/state-server.js +5 -0
- package/dist/mcp/state-server.js.map +1 -1
- package/dist/modes/__tests__/base-session-scope.test.js +46 -0
- package/dist/modes/__tests__/base-session-scope.test.js.map +1 -1
- package/dist/modes/base.d.ts.map +1 -1
- package/dist/modes/base.js +4 -0
- package/dist/modes/base.js.map +1 -1
- package/dist/notifications/__tests__/custom-alias-enablement.test.d.ts +2 -0
- package/dist/notifications/__tests__/custom-alias-enablement.test.d.ts.map +1 -0
- package/dist/notifications/__tests__/custom-alias-enablement.test.js +84 -0
- package/dist/notifications/__tests__/custom-alias-enablement.test.js.map +1 -0
- package/dist/notifications/__tests__/idle-cooldown.test.js +55 -0
- package/dist/notifications/__tests__/idle-cooldown.test.js.map +1 -1
- package/dist/notifications/idle-cooldown.d.ts +8 -6
- package/dist/notifications/idle-cooldown.d.ts.map +1 -1
- package/dist/notifications/idle-cooldown.js +53 -22
- package/dist/notifications/idle-cooldown.js.map +1 -1
- package/dist/notifications/notifier.js +1 -1
- package/dist/notifications/notifier.js.map +1 -1
- package/dist/notifications/reply-listener.d.ts.map +1 -1
- package/dist/notifications/reply-listener.js +1 -0
- package/dist/notifications/reply-listener.js.map +1 -1
- package/dist/openclaw/config.js +2 -2
- package/dist/openclaw/config.js.map +1 -1
- package/dist/runtime/bridge.d.ts +1 -0
- package/dist/runtime/bridge.d.ts.map +1 -1
- package/dist/runtime/bridge.js +2 -6
- package/dist/runtime/bridge.js.map +1 -1
- package/dist/scripts/notify-fallback-watcher.js +97 -59
- package/dist/scripts/notify-fallback-watcher.js.map +1 -1
- package/dist/scripts/notify-hook/auto-nudge.d.ts +2 -1
- package/dist/scripts/notify-hook/auto-nudge.d.ts.map +1 -1
- package/dist/scripts/notify-hook/auto-nudge.js +72 -238
- package/dist/scripts/notify-hook/auto-nudge.js.map +1 -1
- package/dist/scripts/notify-hook/managed-tmux.d.ts +19 -0
- package/dist/scripts/notify-hook/managed-tmux.d.ts.map +1 -0
- package/dist/scripts/notify-hook/managed-tmux.js +320 -0
- package/dist/scripts/notify-hook/managed-tmux.js.map +1 -0
- package/dist/scripts/notify-hook/ralph-session-resume.d.ts +22 -0
- package/dist/scripts/notify-hook/ralph-session-resume.d.ts.map +1 -0
- package/dist/scripts/notify-hook/ralph-session-resume.js +277 -0
- package/dist/scripts/notify-hook/ralph-session-resume.js.map +1 -0
- package/dist/scripts/notify-hook/state-io.d.ts +1 -1
- package/dist/scripts/notify-hook/state-io.d.ts.map +1 -1
- package/dist/scripts/notify-hook/state-io.js +2 -10
- package/dist/scripts/notify-hook/state-io.js.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.js +60 -59
- package/dist/scripts/notify-hook/team-dispatch.js.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.d.ts +2 -1
- package/dist/scripts/notify-hook/team-leader-nudge.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-leader-nudge.js +13 -5
- package/dist/scripts/notify-hook/team-leader-nudge.js.map +1 -1
- package/dist/scripts/notify-hook/team-tmux-guard.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-tmux-guard.js +1 -19
- package/dist/scripts/notify-hook/team-tmux-guard.js.map +1 -1
- package/dist/scripts/notify-hook/team-worker.js +4 -4
- package/dist/scripts/notify-hook/team-worker.js.map +1 -1
- package/dist/scripts/notify-hook/tmux-injection.d.ts +1 -1
- package/dist/scripts/notify-hook/tmux-injection.d.ts.map +1 -1
- package/dist/scripts/notify-hook/tmux-injection.js +102 -35
- package/dist/scripts/notify-hook/tmux-injection.js.map +1 -1
- package/dist/scripts/notify-hook.js +144 -20
- package/dist/scripts/notify-hook.js.map +1 -1
- package/dist/scripts/tmux-hook-engine.d.ts +1 -0
- package/dist/scripts/tmux-hook-engine.d.ts.map +1 -1
- package/dist/scripts/tmux-hook-engine.js +3 -0
- package/dist/scripts/tmux-hook-engine.js.map +1 -1
- package/dist/team/__tests__/api-interop.test.js +96 -4
- package/dist/team/__tests__/api-interop.test.js.map +1 -1
- package/dist/team/__tests__/leader-activity.test.js +107 -2
- package/dist/team/__tests__/leader-activity.test.js.map +1 -1
- package/dist/team/__tests__/runtime-cli.test.js +32 -0
- package/dist/team/__tests__/runtime-cli.test.js.map +1 -1
- package/dist/team/__tests__/runtime.test.js +148 -0
- package/dist/team/__tests__/runtime.test.js.map +1 -1
- package/dist/team/__tests__/shutdown-fallback.test.js +13 -0
- package/dist/team/__tests__/shutdown-fallback.test.js.map +1 -1
- package/dist/team/__tests__/state-root.test.js +11 -1
- package/dist/team/__tests__/state-root.test.js.map +1 -1
- package/dist/team/__tests__/state.test.js +16 -5
- package/dist/team/__tests__/state.test.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +460 -2
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/api-interop.d.ts.map +1 -1
- package/dist/team/api-interop.js +34 -7
- package/dist/team/api-interop.js.map +1 -1
- package/dist/team/commit-hygiene.d.ts +60 -0
- package/dist/team/commit-hygiene.d.ts.map +1 -0
- package/dist/team/commit-hygiene.js +232 -0
- package/dist/team/commit-hygiene.js.map +1 -0
- package/dist/team/leader-activity.d.ts.map +1 -1
- package/dist/team/leader-activity.js +17 -35
- package/dist/team/leader-activity.js.map +1 -1
- package/dist/team/runtime-cli.d.ts +9 -1
- package/dist/team/runtime-cli.d.ts.map +1 -1
- package/dist/team/runtime-cli.js +15 -6
- package/dist/team/runtime-cli.js.map +1 -1
- package/dist/team/runtime.d.ts +7 -2
- package/dist/team/runtime.d.ts.map +1 -1
- package/dist/team/runtime.js +391 -63
- package/dist/team/runtime.js.map +1 -1
- package/dist/team/state/dispatch.js +1 -1
- package/dist/team/state/dispatch.js.map +1 -1
- package/dist/team/state/mailbox.d.ts +1 -0
- package/dist/team/state/mailbox.d.ts.map +1 -1
- package/dist/team/state/mailbox.js +54 -8
- package/dist/team/state/mailbox.js.map +1 -1
- package/dist/team/state-root.d.ts +1 -1
- package/dist/team/state-root.d.ts.map +1 -1
- package/dist/team/state-root.js +8 -3
- package/dist/team/state-root.js.map +1 -1
- package/dist/team/state.d.ts.map +1 -1
- package/dist/team/state.js +66 -3
- package/dist/team/state.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +69 -27
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/utils/__tests__/platform-command.test.js +101 -2
- package/dist/utils/__tests__/platform-command.test.js.map +1 -1
- package/dist/utils/git-layout.d.ts +8 -0
- package/dist/utils/git-layout.d.ts.map +1 -0
- package/dist/utils/git-layout.js +58 -0
- package/dist/utils/git-layout.js.map +1 -0
- package/dist/utils/platform-command.d.ts.map +1 -1
- package/dist/utils/platform-command.js +32 -1
- package/dist/utils/platform-command.js.map +1 -1
- package/package.json +6 -6
- package/src/scripts/notify-fallback-watcher.ts +96 -58
- package/src/scripts/notify-hook/auto-nudge.ts +75 -230
- package/src/scripts/notify-hook/managed-tmux.ts +324 -0
- package/src/scripts/notify-hook/ralph-session-resume.ts +337 -0
- package/src/scripts/notify-hook/state-io.ts +2 -10
- package/src/scripts/notify-hook/team-dispatch.ts +70 -54
- package/src/scripts/notify-hook/team-leader-nudge.ts +19 -5
- package/src/scripts/notify-hook/team-tmux-guard.ts +0 -20
- package/src/scripts/notify-hook/team-worker.ts +4 -4
- package/src/scripts/notify-hook/tmux-injection.ts +103 -33
- package/src/scripts/notify-hook.ts +150 -21
- package/src/scripts/tmux-hook-engine.ts +4 -0
|
@@ -0,0 +1,320 @@
|
|
|
1
|
+
import { execFileSync } from 'child_process';
|
|
2
|
+
import { readFileSync } from 'fs';
|
|
3
|
+
import { basename, dirname, resolve as resolvePath } from 'path';
|
|
4
|
+
import { readSessionState, isSessionStale } from '../../hooks/session.js';
|
|
5
|
+
import { runProcess } from './process-runner.js';
|
|
6
|
+
import { safeString } from './utils.js';
|
|
7
|
+
function sanitizeTmuxToken(value) {
|
|
8
|
+
const cleaned = safeString(value)
|
|
9
|
+
.toLowerCase()
|
|
10
|
+
.replace(/[^a-z0-9]+/g, '-')
|
|
11
|
+
.replace(/^-+|-+$/g, '');
|
|
12
|
+
return cleaned || 'unknown';
|
|
13
|
+
}
|
|
14
|
+
export function buildExpectedManagedTmuxSessionName(cwd, sessionId) {
|
|
15
|
+
const parentPath = dirname(cwd);
|
|
16
|
+
const parentDir = basename(parentPath);
|
|
17
|
+
const dirName = basename(cwd);
|
|
18
|
+
const grandparentPath = dirname(parentPath);
|
|
19
|
+
const grandparentDir = basename(grandparentPath);
|
|
20
|
+
const repoDir = parentDir.endsWith('.omx-worktrees')
|
|
21
|
+
? parentDir.slice(0, -'.omx-worktrees'.length)
|
|
22
|
+
: parentDir === 'worktrees' && grandparentDir === '.omx'
|
|
23
|
+
? basename(dirname(grandparentPath))
|
|
24
|
+
: null;
|
|
25
|
+
const dirToken = repoDir
|
|
26
|
+
? sanitizeTmuxToken(`${repoDir}-${dirName}`)
|
|
27
|
+
: sanitizeTmuxToken(dirName);
|
|
28
|
+
let branchToken = 'detached';
|
|
29
|
+
try {
|
|
30
|
+
const branch = execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
|
|
31
|
+
cwd,
|
|
32
|
+
encoding: 'utf-8',
|
|
33
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
34
|
+
timeout: 2000,
|
|
35
|
+
windowsHide: true,
|
|
36
|
+
}).trim();
|
|
37
|
+
if (branch)
|
|
38
|
+
branchToken = sanitizeTmuxToken(branch);
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
// best effort only
|
|
42
|
+
}
|
|
43
|
+
const sessionToken = sanitizeTmuxToken(sessionId.replace(/^omx-/, ''));
|
|
44
|
+
const name = `omx-${dirToken}-${branchToken}-${sessionToken}`;
|
|
45
|
+
return name.length > 120 ? name.slice(0, 120) : name;
|
|
46
|
+
}
|
|
47
|
+
export function resolveInvocationSessionId(payload) {
|
|
48
|
+
return safeString(payload?.session_id
|
|
49
|
+
|| payload?.['session-id']
|
|
50
|
+
|| process.env.OMX_SESSION_ID
|
|
51
|
+
|| process.env.CODEX_SESSION_ID
|
|
52
|
+
|| process.env.SESSION_ID
|
|
53
|
+
|| '').trim();
|
|
54
|
+
}
|
|
55
|
+
function readCurrentTmuxSessionName() {
|
|
56
|
+
if (!process.env.TMUX)
|
|
57
|
+
return '';
|
|
58
|
+
try {
|
|
59
|
+
return execFileSync('tmux', ['display-message', '-p', '#S'], {
|
|
60
|
+
encoding: 'utf-8',
|
|
61
|
+
stdio: ['ignore', 'pipe', 'ignore'],
|
|
62
|
+
timeout: 2000,
|
|
63
|
+
}).trim();
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
return '';
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
function readParentPid(pid) {
|
|
70
|
+
if (!Number.isInteger(pid) || pid <= 1)
|
|
71
|
+
return null;
|
|
72
|
+
try {
|
|
73
|
+
if (process.platform === 'linux') {
|
|
74
|
+
const stat = readFileSync(`/proc/${pid}/stat`, 'utf-8');
|
|
75
|
+
const commandEnd = stat.lastIndexOf(')');
|
|
76
|
+
if (commandEnd === -1)
|
|
77
|
+
return null;
|
|
78
|
+
const remainder = stat.slice(commandEnd + 1).trim();
|
|
79
|
+
const fields = remainder.split(/\s+/);
|
|
80
|
+
if (fields.length === 0)
|
|
81
|
+
return null;
|
|
82
|
+
const ppid = Number(fields[1]);
|
|
83
|
+
return Number.isFinite(ppid) && ppid > 0 ? ppid : null;
|
|
84
|
+
}
|
|
85
|
+
const raw = execFileSync('ps', ['-o', 'ppid=', '-p', String(pid)], {
|
|
86
|
+
encoding: 'utf-8',
|
|
87
|
+
timeout: 2000,
|
|
88
|
+
}).trim();
|
|
89
|
+
const ppid = Number(raw);
|
|
90
|
+
return Number.isFinite(ppid) && ppid > 0 ? ppid : null;
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
function processHasAncestorPid(targetPid, currentPid = process.pid) {
|
|
97
|
+
if (!Number.isInteger(targetPid) || targetPid <= 1)
|
|
98
|
+
return false;
|
|
99
|
+
let pid = Number.isInteger(currentPid) && currentPid > 1 ? currentPid : process.pid;
|
|
100
|
+
for (let depth = 0; depth < 64 && pid > 1; depth += 1) {
|
|
101
|
+
if (pid === targetPid)
|
|
102
|
+
return true;
|
|
103
|
+
const parent = readParentPid(pid);
|
|
104
|
+
if (!parent || parent === pid)
|
|
105
|
+
break;
|
|
106
|
+
pid = parent;
|
|
107
|
+
}
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
export async function resolveManagedSessionContext(cwd, payload, { allowTeamWorker = true } = {}) {
|
|
111
|
+
if (allowTeamWorker && safeString(process.env.OMX_TEAM_WORKER || '').trim() !== '') {
|
|
112
|
+
return {
|
|
113
|
+
managed: true,
|
|
114
|
+
reason: 'team_worker',
|
|
115
|
+
invocationSessionId: '',
|
|
116
|
+
sessionState: null,
|
|
117
|
+
expectedTmuxSessionName: '',
|
|
118
|
+
currentTmuxSessionName: '',
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
const invocationSessionId = resolveInvocationSessionId(payload);
|
|
122
|
+
if (!invocationSessionId) {
|
|
123
|
+
return {
|
|
124
|
+
managed: false,
|
|
125
|
+
reason: 'missing_session_id',
|
|
126
|
+
invocationSessionId: '',
|
|
127
|
+
sessionState: null,
|
|
128
|
+
expectedTmuxSessionName: '',
|
|
129
|
+
currentTmuxSessionName: '',
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
try {
|
|
133
|
+
const sessionState = await readSessionState(cwd);
|
|
134
|
+
if (!sessionState) {
|
|
135
|
+
return { managed: false, reason: 'missing_session_state', invocationSessionId, sessionState: null, expectedTmuxSessionName: '', currentTmuxSessionName: '' };
|
|
136
|
+
}
|
|
137
|
+
if (resolvePath(safeString(sessionState.cwd || cwd)) !== resolvePath(cwd)) {
|
|
138
|
+
return { managed: false, reason: 'cwd_mismatch', invocationSessionId, sessionState, expectedTmuxSessionName: '', currentTmuxSessionName: '' };
|
|
139
|
+
}
|
|
140
|
+
if (safeString(sessionState.session_id).trim() !== invocationSessionId) {
|
|
141
|
+
return { managed: false, reason: 'session_id_mismatch', invocationSessionId, sessionState, expectedTmuxSessionName: '', currentTmuxSessionName: '' };
|
|
142
|
+
}
|
|
143
|
+
if (isSessionStale(sessionState)) {
|
|
144
|
+
return { managed: false, reason: 'stale_session', invocationSessionId, sessionState, expectedTmuxSessionName: '', currentTmuxSessionName: '' };
|
|
145
|
+
}
|
|
146
|
+
const expectedTmuxSessionName = buildExpectedManagedTmuxSessionName(cwd, invocationSessionId);
|
|
147
|
+
const currentTmuxSessionName = readCurrentTmuxSessionName();
|
|
148
|
+
if (currentTmuxSessionName && currentTmuxSessionName === expectedTmuxSessionName) {
|
|
149
|
+
return {
|
|
150
|
+
managed: true,
|
|
151
|
+
reason: 'tmux_session_match',
|
|
152
|
+
invocationSessionId,
|
|
153
|
+
sessionState,
|
|
154
|
+
expectedTmuxSessionName,
|
|
155
|
+
currentTmuxSessionName,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
if (processHasAncestorPid(sessionState.pid)) {
|
|
159
|
+
return {
|
|
160
|
+
managed: true,
|
|
161
|
+
reason: currentTmuxSessionName ? 'pid_ancestry_match_tmux_mismatch' : 'pid_ancestry_match',
|
|
162
|
+
invocationSessionId,
|
|
163
|
+
sessionState,
|
|
164
|
+
expectedTmuxSessionName,
|
|
165
|
+
currentTmuxSessionName: '',
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
return {
|
|
169
|
+
managed: false,
|
|
170
|
+
reason: currentTmuxSessionName ? 'tmux_session_mismatch' : 'pid_ancestry_mismatch',
|
|
171
|
+
invocationSessionId,
|
|
172
|
+
sessionState,
|
|
173
|
+
expectedTmuxSessionName,
|
|
174
|
+
currentTmuxSessionName,
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
catch {
|
|
178
|
+
return {
|
|
179
|
+
managed: false,
|
|
180
|
+
reason: 'session_check_failed',
|
|
181
|
+
invocationSessionId,
|
|
182
|
+
sessionState: null,
|
|
183
|
+
expectedTmuxSessionName: '',
|
|
184
|
+
currentTmuxSessionName: '',
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
export async function isManagedOmxSession(cwd, payload, options = {}) {
|
|
189
|
+
const context = await resolveManagedSessionContext(cwd, payload, options);
|
|
190
|
+
return context.managed === true;
|
|
191
|
+
}
|
|
192
|
+
export async function verifyManagedPaneTarget(paneId, cwd, payload, { allowTeamWorker = true } = {}) {
|
|
193
|
+
const paneTarget = safeString(paneId).trim();
|
|
194
|
+
if (!paneTarget) {
|
|
195
|
+
return { ok: false, reason: 'missing_pane_target', paneTarget: '' };
|
|
196
|
+
}
|
|
197
|
+
const managedContext = await resolveManagedSessionContext(cwd, payload, { allowTeamWorker });
|
|
198
|
+
if (!managedContext.managed) {
|
|
199
|
+
return { ok: false, reason: managedContext.reason || 'unmanaged_session', paneTarget, managedContext };
|
|
200
|
+
}
|
|
201
|
+
if (managedContext.reason === 'team_worker') {
|
|
202
|
+
return { ok: true, reason: 'ok', paneTarget, managedContext };
|
|
203
|
+
}
|
|
204
|
+
const expectedSession = safeString(managedContext.expectedTmuxSessionName).trim();
|
|
205
|
+
if (!expectedSession) {
|
|
206
|
+
return { ok: false, reason: 'missing_expected_tmux_session', paneTarget, managedContext };
|
|
207
|
+
}
|
|
208
|
+
try {
|
|
209
|
+
const sessionResult = await runProcess('tmux', ['display-message', '-p', '-t', paneTarget, '#S'], 2000);
|
|
210
|
+
const paneSessionName = safeString(sessionResult.stdout).trim();
|
|
211
|
+
if (!paneSessionName) {
|
|
212
|
+
return { ok: false, reason: 'pane_session_missing', paneTarget, managedContext };
|
|
213
|
+
}
|
|
214
|
+
if (paneSessionName !== expectedSession) {
|
|
215
|
+
return { ok: false, reason: 'pane_not_managed_session', paneTarget, paneSessionName, managedContext };
|
|
216
|
+
}
|
|
217
|
+
return { ok: true, reason: 'ok', paneTarget, paneSessionName, managedContext };
|
|
218
|
+
}
|
|
219
|
+
catch {
|
|
220
|
+
return { ok: false, reason: 'pane_session_lookup_failed', paneTarget, managedContext };
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
async function readManagedPaneCommandState(paneTarget) {
|
|
224
|
+
try {
|
|
225
|
+
const [currentResult, startResult] = await Promise.all([
|
|
226
|
+
runProcess('tmux', ['display-message', '-p', '-t', paneTarget, '#{pane_current_command}'], 2000),
|
|
227
|
+
runProcess('tmux', ['display-message', '-p', '-t', paneTarget, '#{pane_start_command}'], 2000),
|
|
228
|
+
]);
|
|
229
|
+
return {
|
|
230
|
+
currentCommand: safeString(currentResult.stdout).trim().toLowerCase(),
|
|
231
|
+
startCommand: safeString(startResult.stdout).trim().toLowerCase(),
|
|
232
|
+
};
|
|
233
|
+
}
|
|
234
|
+
catch {
|
|
235
|
+
return { currentCommand: '', startCommand: '' };
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
function paneLooksLikeManagedAgent({ currentCommand, startCommand }) {
|
|
239
|
+
if (/\bomx\b.*\bhud\b.*--watch/i.test(startCommand))
|
|
240
|
+
return false;
|
|
241
|
+
if (startCommand.includes('codex'))
|
|
242
|
+
return true;
|
|
243
|
+
return currentCommand === 'codex' || currentCommand === 'node' || currentCommand === 'npx';
|
|
244
|
+
}
|
|
245
|
+
export async function resolveManagedCurrentPane(cwd, payload, { allowTeamWorker = false } = {}) {
|
|
246
|
+
const paneTarget = safeString(process.env.TMUX_PANE || '').trim();
|
|
247
|
+
if (!paneTarget)
|
|
248
|
+
return '';
|
|
249
|
+
const verdict = await verifyManagedPaneTarget(paneTarget, cwd, payload, { allowTeamWorker });
|
|
250
|
+
if (!verdict.ok)
|
|
251
|
+
return '';
|
|
252
|
+
const commandState = await readManagedPaneCommandState(paneTarget);
|
|
253
|
+
return paneLooksLikeManagedAgent(commandState) ? paneTarget : '';
|
|
254
|
+
}
|
|
255
|
+
export async function resolveManagedSessionPane(cwd, payload) {
|
|
256
|
+
const managedContext = await resolveManagedSessionContext(cwd, payload, { allowTeamWorker: false });
|
|
257
|
+
if (!managedContext.managed)
|
|
258
|
+
return '';
|
|
259
|
+
const expectedSession = safeString(managedContext.expectedTmuxSessionName).trim();
|
|
260
|
+
if (!expectedSession)
|
|
261
|
+
return '';
|
|
262
|
+
try {
|
|
263
|
+
const panesResult = await runProcess('tmux', ['list-panes', '-s', '-t', expectedSession, '-F', '#{pane_id}\t#{pane_current_command}\t#{pane_start_command}'], 2000);
|
|
264
|
+
const panes = safeString(panesResult.stdout)
|
|
265
|
+
.trim()
|
|
266
|
+
.split('\n')
|
|
267
|
+
.filter(Boolean);
|
|
268
|
+
for (const line of panes) {
|
|
269
|
+
const [candidatePaneId, rawCurrentCommand = '', rawStartCommand = ''] = line.split('\t');
|
|
270
|
+
const startCommand = safeString(rawStartCommand).toLowerCase();
|
|
271
|
+
const currentCommand = safeString(rawCurrentCommand).trim().toLowerCase();
|
|
272
|
+
if (!candidatePaneId)
|
|
273
|
+
continue;
|
|
274
|
+
if (/\bomx\b.*\bhud\b.*--watch/i.test(startCommand))
|
|
275
|
+
continue;
|
|
276
|
+
if (startCommand.includes('codex'))
|
|
277
|
+
return candidatePaneId;
|
|
278
|
+
if (currentCommand === 'codex')
|
|
279
|
+
return candidatePaneId;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
catch {
|
|
283
|
+
// best effort only
|
|
284
|
+
}
|
|
285
|
+
return '';
|
|
286
|
+
}
|
|
287
|
+
export async function resolveManagedPaneFromAnchor(anchorPane, cwd, payload, { allowTeamWorker = false } = {}) {
|
|
288
|
+
const paneTarget = safeString(anchorPane).trim();
|
|
289
|
+
if (!paneTarget)
|
|
290
|
+
return '';
|
|
291
|
+
const verdict = await verifyManagedPaneTarget(paneTarget, cwd, payload, { allowTeamWorker });
|
|
292
|
+
if (!verdict.ok)
|
|
293
|
+
return '';
|
|
294
|
+
try {
|
|
295
|
+
const sessionResult = await runProcess('tmux', ['display-message', '-p', '-t', paneTarget, '#S'], 2000);
|
|
296
|
+
const sessionName = safeString(sessionResult.stdout).trim();
|
|
297
|
+
if (!sessionName)
|
|
298
|
+
return paneTarget;
|
|
299
|
+
const panesResult = await runProcess('tmux', ['list-panes', '-s', '-t', sessionName, '-F', '#{pane_id}\t#{pane_current_command}\t#{pane_start_command}'], 2000);
|
|
300
|
+
const panes = safeString(panesResult.stdout).trim().split('\n').filter(Boolean);
|
|
301
|
+
for (const line of panes) {
|
|
302
|
+
const [candidatePaneId, rawCurrentCommand = '', rawStartCommand = ''] = line.split('\t');
|
|
303
|
+
const startCommand = safeString(rawStartCommand).toLowerCase();
|
|
304
|
+
const currentCommand = safeString(rawCurrentCommand).trim().toLowerCase();
|
|
305
|
+
if (!candidatePaneId)
|
|
306
|
+
continue;
|
|
307
|
+
if (/\bomx\b.*\bhud\b.*--watch/i.test(startCommand))
|
|
308
|
+
continue;
|
|
309
|
+
if (startCommand.includes('codex'))
|
|
310
|
+
return candidatePaneId;
|
|
311
|
+
if (currentCommand === 'codex')
|
|
312
|
+
return candidatePaneId;
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
catch {
|
|
316
|
+
// best effort only
|
|
317
|
+
}
|
|
318
|
+
return paneTarget;
|
|
319
|
+
}
|
|
320
|
+
//# sourceMappingURL=managed-tmux.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"managed-tmux.js","sourceRoot":"","sources":["../../../src/scripts/notify-hook/managed-tmux.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC;SAC9B,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC3B,OAAO,OAAO,IAAI,SAAS,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,GAAW,EAAE,SAAiB;IAChF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClD,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAC9C,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,cAAc,KAAK,MAAM;YACtD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACpC,CAAC,CAAC,IAAI,CAAC;IACX,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,iBAAiB,CAAC,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC;QAC5C,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,WAAW,GAAG,UAAU,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE;YACxE,GAAG;YACH,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,MAAM;YAAE,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,mBAAmB;IACrB,CAAC;IACD,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,OAAO,QAAQ,IAAI,WAAW,IAAI,YAAY,EAAE,CAAC;IAC9D,OAAO,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,OAAY;IACrD,OAAO,UAAU,CACf,OAAO,EAAE,UAAU;WAChB,OAAO,EAAE,CAAC,YAAY,CAAC;WACvB,OAAO,CAAC,GAAG,CAAC,cAAc;WAC1B,OAAO,CAAC,GAAG,CAAC,gBAAgB;WAC5B,OAAO,CAAC,GAAG,CAAC,UAAU;WACtB,EAAE,CACN,CAAC,IAAI,EAAE,CAAC;AACX,CAAC;AAED,SAAS,0BAA0B;IACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;YAC3D,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACpD,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,UAAU,KAAK,CAAC,CAAC;gBAAE,OAAO,IAAI,CAAC;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YACrC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACzD,CAAC;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;YACjE,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiB,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG;IACxE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACpF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,IAAI,GAAG,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,GAAG;YAAE,MAAM;QACrC,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,GAAW,EAAE,OAAY,EAAE,EAAE,eAAe,GAAG,IAAI,EAAE,GAAG,EAAE;IAC3G,IAAI,eAAe,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACnF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,aAAa;YACrB,mBAAmB,EAAE,EAAE;YACvB,YAAY,EAAE,IAAI;YAClB,uBAAuB,EAAE,EAAE;YAC3B,sBAAsB,EAAE,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,oBAAoB;YAC5B,mBAAmB,EAAE,EAAE;YACvB,YAAY,EAAE,IAAI;YAClB,uBAAuB,EAAE,EAAE;YAC3B,sBAAsB,EAAE,EAAE;SAC3B,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,YAAY,EAAE,IAAI,EAAE,uBAAuB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAAC;QAC/J,CAAC;QACD,IAAI,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,uBAAuB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAAC;QAChJ,CAAC;QACD,IAAI,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,KAAK,mBAAmB,EAAE,CAAC;YACvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,YAAY,EAAE,uBAAuB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAAC;QACvJ,CAAC;QACD,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,YAAY,EAAE,uBAAuB,EAAE,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,CAAC;QACjJ,CAAC;QAED,MAAM,uBAAuB,GAAG,mCAAmC,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QAC9F,MAAM,sBAAsB,GAAG,0BAA0B,EAAE,CAAC;QAC5D,IAAI,sBAAsB,IAAI,sBAAsB,KAAK,uBAAuB,EAAE,CAAC;YACjF,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,oBAAoB;gBAC5B,mBAAmB;gBACnB,YAAY;gBACZ,uBAAuB;gBACvB,sBAAsB;aACvB,CAAC;QACJ,CAAC;QAED,IAAI,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5C,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,oBAAoB;gBAC1F,mBAAmB;gBACnB,YAAY;gBACZ,uBAAuB;gBACvB,sBAAsB,EAAE,EAAE;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,uBAAuB;YAClF,mBAAmB;YACnB,YAAY;YACZ,uBAAuB;YACvB,sBAAsB;SACvB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,sBAAsB;YAC9B,mBAAmB;YACnB,YAAY,EAAE,IAAI;YAClB,uBAAuB,EAAE,EAAE;YAC3B,sBAAsB,EAAE,EAAE;SAC3B,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,OAAY,EAAE,UAAyC,EAAE;IAC9G,MAAM,OAAO,GAAG,MAAM,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1E,OAAO,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,MAAc,EAAE,GAAW,EAAE,OAAY,EAAE,EAAE,eAAe,GAAG,IAAI,EAAE,GAAG,EAAE;IACtH,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IACtE,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,IAAI,mBAAmB,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IACzG,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QAC5C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,+BAA+B,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IAC5F,CAAC;IAED,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QACxG,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;QACnF,CAAC;QACD,IAAI,eAAe,KAAK,eAAe,EAAE,CAAC;YACxC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,0BAA0B,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;QACxG,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;IACzF,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,2BAA2B,CAAC,UAAkB;IAC3D,IAAI,CAAC;QACH,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,yBAAyB,CAAC,EAAE,IAAI,CAAC;YAChG,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,uBAAuB,CAAC,EAAE,IAAI,CAAC;SAC/F,CAAC,CAAC;QACH,OAAO;YACL,cAAc,EAAE,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;YACrE,YAAY,EAAE,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;SAClE,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,EAAE,cAAc,EAAE,YAAY,EAAoD;IACnH,IAAI,4BAA4B,CAAC,IAAI,CAAC,YAAY,CAAC;QAAE,OAAO,KAAK,CAAC;IAClE,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,OAAO,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,IAAI,cAAc,KAAK,KAAK,CAAC;AAC7F,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,GAAW,EAAE,OAAY,EAAE,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,EAAE;IACzG,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClE,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,YAAY,GAAG,MAAM,2BAA2B,CAAC,UAAU,CAAC,CAAC;IACnE,OAAO,yBAAyB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,GAAW,EAAE,OAAY;IACvE,MAAM,cAAc,GAAG,MAAM,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACpG,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,IAAI,CAAC,eAAe;QAAE,OAAO,EAAE,CAAC;IAEhC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAClC,MAAM,EACN,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,4DAA4D,CAAC,EAC/G,IAAI,CACL,CAAC;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC;aACzC,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,OAAO,CAAC,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzF,MAAM,YAAY,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/D,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC1E,IAAI,CAAC,eAAe;gBAAE,SAAS;YAC/B,IAAI,4BAA4B,CAAC,IAAI,CAAC,YAAY,CAAC;gBAAE,SAAS;YAC9D,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,OAAO,eAAe,CAAC;YAC3D,IAAI,cAAc,KAAK,OAAO;gBAAE,OAAO,eAAe,CAAC;QACzD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mBAAmB;IACrB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,UAAkB,EAAE,GAAW,EAAE,OAAY,EAAE,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,EAAE;IAChI,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QACxG,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,IAAI,CAAC,WAAW;YAAE,OAAO,UAAU,CAAC;QAEpC,MAAM,WAAW,GAAG,MAAM,UAAU,CAClC,MAAM,EACN,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,4DAA4D,CAAC,EAC3G,IAAI,CACL,CAAC;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,EAAE,EAAE,eAAe,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzF,MAAM,YAAY,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/D,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC1E,IAAI,CAAC,eAAe;gBAAE,SAAS;YAC/B,IAAI,4BAA4B,CAAC,IAAI,CAAC,YAAY,CAAC;gBAAE,SAAS;YAC9D,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,OAAO,eAAe,CAAC;YAC3D,IAAI,cAAc,KAAK,OAAO;gBAAE,OAAO,eAAe,CAAC;QACzD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mBAAmB;IACrB,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
interface RalphSessionResumeHooks {
|
|
2
|
+
afterLockAcquired?: () => Promise<void> | void;
|
|
3
|
+
afterTargetWrite?: () => Promise<void> | void;
|
|
4
|
+
}
|
|
5
|
+
interface RalphSessionResumeParams {
|
|
6
|
+
stateDir: string;
|
|
7
|
+
payloadSessionId: string;
|
|
8
|
+
payloadThreadId?: string;
|
|
9
|
+
env?: NodeJS.ProcessEnv;
|
|
10
|
+
hooks?: RalphSessionResumeHooks;
|
|
11
|
+
}
|
|
12
|
+
export interface RalphSessionResumeResult {
|
|
13
|
+
currentOmxSessionId: string;
|
|
14
|
+
resumed: boolean;
|
|
15
|
+
updatedCurrentOwner: boolean;
|
|
16
|
+
reason: string;
|
|
17
|
+
sourcePath?: string;
|
|
18
|
+
targetPath?: string;
|
|
19
|
+
}
|
|
20
|
+
export declare function reconcileRalphSessionResume({ stateDir, payloadSessionId, payloadThreadId, env, hooks, }: RalphSessionResumeParams): Promise<RalphSessionResumeResult>;
|
|
21
|
+
export {};
|
|
22
|
+
//# sourceMappingURL=ralph-session-resume.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ralph-session-resume.d.ts","sourceRoot":"","sources":["../../../src/scripts/notify-hook/ralph-session-resume.ts"],"names":[],"mappings":"AAaA,UAAU,uBAAuB;IAC/B,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/C,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC/C;AAED,UAAU,wBAAwB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,uBAAuB,CAAC;CACjC;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAwJD,wBAAsB,2BAA2B,CAAC,EAChD,QAAQ,EACR,gBAAgB,EAChB,eAAoB,EACpB,GAAiB,EACjB,KAAK,GACN,EAAE,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAiJ9D"}
|
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { existsSync } from 'fs';
|
|
2
|
+
import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'fs/promises';
|
|
3
|
+
import { dirname, join } from 'path';
|
|
4
|
+
import { captureTmuxPaneFromEnv } from '../../state/mode-state-context.js';
|
|
5
|
+
import { resolveCodexPane } from '../tmux-hook-engine.js';
|
|
6
|
+
import { safeString } from './utils.js';
|
|
7
|
+
const SESSION_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
|
|
8
|
+
const RALPH_TERMINAL_PHASES = new Set(['complete', 'failed', 'cancelled']);
|
|
9
|
+
const RALPH_RESUME_LOCK_STALE_MS = 10_000;
|
|
10
|
+
const RALPH_RESUME_LOCK_TIMEOUT_MS = 5_000;
|
|
11
|
+
const RALPH_RESUME_LOCK_RETRY_MS = 25;
|
|
12
|
+
function lockOwnerToken() {
|
|
13
|
+
return `${process.pid}.${Date.now()}.${Math.random().toString(16).slice(2)}`;
|
|
14
|
+
}
|
|
15
|
+
async function sleep(ms) {
|
|
16
|
+
await new Promise((resolve) => setTimeout(resolve, ms));
|
|
17
|
+
}
|
|
18
|
+
async function maybeRecoverStaleLock(lockDir) {
|
|
19
|
+
try {
|
|
20
|
+
const info = await stat(lockDir);
|
|
21
|
+
if (Date.now() - info.mtimeMs <= RALPH_RESUME_LOCK_STALE_MS) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
await rm(lockDir, { recursive: true, force: true });
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
async function withRalphResumeLock(stateDir, fn) {
|
|
32
|
+
const lockDir = join(stateDir, '.lock.ralph-session-resume');
|
|
33
|
+
const ownerPath = join(lockDir, 'owner');
|
|
34
|
+
const ownerToken = lockOwnerToken();
|
|
35
|
+
const deadline = Date.now() + RALPH_RESUME_LOCK_TIMEOUT_MS;
|
|
36
|
+
await mkdir(dirname(lockDir), { recursive: true }).catch(() => { });
|
|
37
|
+
while (true) {
|
|
38
|
+
try {
|
|
39
|
+
await mkdir(lockDir, { recursive: false });
|
|
40
|
+
try {
|
|
41
|
+
await writeFile(ownerPath, ownerToken, 'utf8');
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
await rm(lockDir, { recursive: true, force: true }).catch(() => { });
|
|
45
|
+
throw error;
|
|
46
|
+
}
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
const err = error;
|
|
51
|
+
if (err.code !== 'EEXIST')
|
|
52
|
+
throw error;
|
|
53
|
+
if (await maybeRecoverStaleLock(lockDir))
|
|
54
|
+
continue;
|
|
55
|
+
if (Date.now() > deadline)
|
|
56
|
+
return null;
|
|
57
|
+
await sleep(RALPH_RESUME_LOCK_RETRY_MS);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
return await fn();
|
|
62
|
+
}
|
|
63
|
+
finally {
|
|
64
|
+
try {
|
|
65
|
+
const currentOwner = await readFile(ownerPath, 'utf8');
|
|
66
|
+
if (currentOwner.trim() === ownerToken) {
|
|
67
|
+
await rm(lockDir, { recursive: true, force: true });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
// Lock may already be gone after stale recovery or process interruption.
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
async function readJson(path) {
|
|
76
|
+
try {
|
|
77
|
+
return JSON.parse(await readFile(path, 'utf-8'));
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
async function writeJsonAtomic(path, value) {
|
|
84
|
+
await mkdir(dirname(path), { recursive: true }).catch(() => { });
|
|
85
|
+
const tempPath = `${path}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
86
|
+
await writeFile(tempPath, JSON.stringify(value, null, 2));
|
|
87
|
+
await rename(tempPath, path);
|
|
88
|
+
}
|
|
89
|
+
function isTerminalRalphPhase(value) {
|
|
90
|
+
return RALPH_TERMINAL_PHASES.has(safeString(value).trim().toLowerCase());
|
|
91
|
+
}
|
|
92
|
+
function isActiveRalphCandidate(state) {
|
|
93
|
+
if (!state || typeof state !== 'object')
|
|
94
|
+
return false;
|
|
95
|
+
return state.active === true && !isTerminalRalphPhase(state.current_phase);
|
|
96
|
+
}
|
|
97
|
+
async function readCurrentOmxSessionId(stateDir) {
|
|
98
|
+
const session = await readJson(join(stateDir, 'session.json'));
|
|
99
|
+
const sessionId = safeString(session?.session_id).trim();
|
|
100
|
+
return SESSION_ID_PATTERN.test(sessionId) ? sessionId : '';
|
|
101
|
+
}
|
|
102
|
+
function resolveResumePane(env = process.env) {
|
|
103
|
+
const injectedPane = captureTmuxPaneFromEnv(env);
|
|
104
|
+
if (env !== process.env && injectedPane)
|
|
105
|
+
return injectedPane;
|
|
106
|
+
return resolveCodexPane() || injectedPane || '';
|
|
107
|
+
}
|
|
108
|
+
function bindCurrentPane(state, nowIso, env = process.env) {
|
|
109
|
+
const paneId = resolveResumePane(env);
|
|
110
|
+
if (!paneId)
|
|
111
|
+
return state;
|
|
112
|
+
return {
|
|
113
|
+
...state,
|
|
114
|
+
tmux_pane_id: paneId,
|
|
115
|
+
tmux_pane_set_at: nowIso,
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
async function scanMatchingRalphCandidates(stateDir, currentOmxSessionId, payloadSessionId, payloadThreadId) {
|
|
119
|
+
const sessionsRoot = join(stateDir, 'sessions');
|
|
120
|
+
if (!existsSync(sessionsRoot))
|
|
121
|
+
return [];
|
|
122
|
+
const entries = await readdir(sessionsRoot, { withFileTypes: true }).catch(() => []);
|
|
123
|
+
const matches = [];
|
|
124
|
+
for (const entry of entries) {
|
|
125
|
+
if (!entry.isDirectory() || !SESSION_ID_PATTERN.test(entry.name) || entry.name === currentOmxSessionId)
|
|
126
|
+
continue;
|
|
127
|
+
const path = join(sessionsRoot, entry.name, 'ralph-state.json');
|
|
128
|
+
if (!existsSync(path))
|
|
129
|
+
continue;
|
|
130
|
+
const state = await readJson(path);
|
|
131
|
+
if (!isActiveRalphCandidate(state))
|
|
132
|
+
continue;
|
|
133
|
+
const ownerSessionId = safeString(state.owner_codex_session_id).trim();
|
|
134
|
+
const ownerThreadId = safeString(state.owner_codex_thread_id).trim();
|
|
135
|
+
if (ownerSessionId) {
|
|
136
|
+
if (!payloadSessionId || ownerSessionId !== payloadSessionId)
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
139
|
+
else if (!payloadThreadId || !ownerThreadId || ownerThreadId !== payloadThreadId) {
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
142
|
+
matches.push({
|
|
143
|
+
sessionId: entry.name,
|
|
144
|
+
path,
|
|
145
|
+
state,
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
return matches;
|
|
149
|
+
}
|
|
150
|
+
export async function reconcileRalphSessionResume({ stateDir, payloadSessionId, payloadThreadId = '', env = process.env, hooks, }) {
|
|
151
|
+
const lockedResult = await withRalphResumeLock(stateDir, async () => {
|
|
152
|
+
await hooks?.afterLockAcquired?.();
|
|
153
|
+
const currentOmxSessionId = await readCurrentOmxSessionId(stateDir);
|
|
154
|
+
if (!currentOmxSessionId) {
|
|
155
|
+
return {
|
|
156
|
+
currentOmxSessionId: '',
|
|
157
|
+
resumed: false,
|
|
158
|
+
updatedCurrentOwner: false,
|
|
159
|
+
reason: 'current_omx_session_missing',
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
const currentSessionDir = join(stateDir, 'sessions', currentOmxSessionId);
|
|
163
|
+
const currentRalphPath = join(currentSessionDir, 'ralph-state.json');
|
|
164
|
+
const currentRalphExists = existsSync(currentRalphPath);
|
|
165
|
+
const currentRalphState = currentRalphExists
|
|
166
|
+
? await readJson(currentRalphPath)
|
|
167
|
+
: null;
|
|
168
|
+
const nowIso = new Date().toISOString();
|
|
169
|
+
if (currentRalphState && currentRalphState.active === true) {
|
|
170
|
+
let changed = false;
|
|
171
|
+
const updated = { ...currentRalphState };
|
|
172
|
+
if (safeString(updated.owner_omx_session_id).trim() !== currentOmxSessionId) {
|
|
173
|
+
updated.owner_omx_session_id = currentOmxSessionId;
|
|
174
|
+
changed = true;
|
|
175
|
+
}
|
|
176
|
+
if (payloadSessionId && !safeString(updated.owner_codex_session_id).trim()) {
|
|
177
|
+
updated.owner_codex_session_id = payloadSessionId;
|
|
178
|
+
changed = true;
|
|
179
|
+
}
|
|
180
|
+
if (typeof updated.owner_codex_thread_id === 'string'
|
|
181
|
+
&& safeString(updated.owner_codex_session_id).trim()) {
|
|
182
|
+
delete updated.owner_codex_thread_id;
|
|
183
|
+
changed = true;
|
|
184
|
+
}
|
|
185
|
+
const currentPaneId = resolveResumePane(env);
|
|
186
|
+
const currentStatePaneId = safeString(updated.tmux_pane_id).trim();
|
|
187
|
+
if (currentPaneId && currentPaneId !== currentStatePaneId) {
|
|
188
|
+
Object.assign(updated, bindCurrentPane(updated, nowIso, env));
|
|
189
|
+
changed = true;
|
|
190
|
+
}
|
|
191
|
+
if (changed) {
|
|
192
|
+
await writeJsonAtomic(currentRalphPath, updated);
|
|
193
|
+
}
|
|
194
|
+
return {
|
|
195
|
+
currentOmxSessionId,
|
|
196
|
+
resumed: false,
|
|
197
|
+
updatedCurrentOwner: changed,
|
|
198
|
+
reason: 'current_ralph_active',
|
|
199
|
+
targetPath: currentRalphPath,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
if (currentRalphExists) {
|
|
203
|
+
return {
|
|
204
|
+
currentOmxSessionId,
|
|
205
|
+
resumed: false,
|
|
206
|
+
updatedCurrentOwner: false,
|
|
207
|
+
reason: currentRalphState ? 'current_ralph_present' : 'current_ralph_unreadable',
|
|
208
|
+
targetPath: currentRalphPath,
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
const normalizedPayloadSessionId = safeString(payloadSessionId).trim();
|
|
212
|
+
const normalizedPayloadThreadId = safeString(payloadThreadId).trim();
|
|
213
|
+
if (!normalizedPayloadSessionId && !normalizedPayloadThreadId) {
|
|
214
|
+
return {
|
|
215
|
+
currentOmxSessionId,
|
|
216
|
+
resumed: false,
|
|
217
|
+
updatedCurrentOwner: false,
|
|
218
|
+
reason: 'payload_codex_identity_missing',
|
|
219
|
+
};
|
|
220
|
+
}
|
|
221
|
+
const candidates = await scanMatchingRalphCandidates(stateDir, currentOmxSessionId, normalizedPayloadSessionId, normalizedPayloadThreadId);
|
|
222
|
+
if (candidates.length !== 1) {
|
|
223
|
+
return {
|
|
224
|
+
currentOmxSessionId,
|
|
225
|
+
resumed: false,
|
|
226
|
+
updatedCurrentOwner: false,
|
|
227
|
+
reason: candidates.length === 0 ? 'no_matching_prior_ralph' : 'multiple_matching_prior_ralphs',
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
const source = candidates[0];
|
|
231
|
+
await mkdir(currentSessionDir, { recursive: true });
|
|
232
|
+
const nextState = bindCurrentPane({
|
|
233
|
+
...source.state,
|
|
234
|
+
owner_omx_session_id: currentOmxSessionId,
|
|
235
|
+
...(normalizedPayloadSessionId ? { owner_codex_session_id: normalizedPayloadSessionId } : {}),
|
|
236
|
+
}, nowIso, env);
|
|
237
|
+
if (safeString(nextState.owner_codex_session_id).trim()) {
|
|
238
|
+
delete nextState.owner_codex_thread_id;
|
|
239
|
+
}
|
|
240
|
+
delete nextState.completed_at;
|
|
241
|
+
delete nextState.stop_reason;
|
|
242
|
+
const previousState = {
|
|
243
|
+
...source.state,
|
|
244
|
+
active: false,
|
|
245
|
+
current_phase: 'cancelled',
|
|
246
|
+
completed_at: nowIso,
|
|
247
|
+
stop_reason: 'ownership_transferred',
|
|
248
|
+
};
|
|
249
|
+
await writeJsonAtomic(currentRalphPath, nextState);
|
|
250
|
+
try {
|
|
251
|
+
await hooks?.afterTargetWrite?.();
|
|
252
|
+
await writeJsonAtomic(source.path, previousState);
|
|
253
|
+
}
|
|
254
|
+
catch (error) {
|
|
255
|
+
await rm(currentRalphPath, { force: true }).catch(() => { });
|
|
256
|
+
throw error;
|
|
257
|
+
}
|
|
258
|
+
return {
|
|
259
|
+
currentOmxSessionId,
|
|
260
|
+
resumed: true,
|
|
261
|
+
updatedCurrentOwner: false,
|
|
262
|
+
reason: 'resumed_same_codex_session',
|
|
263
|
+
sourcePath: source.path,
|
|
264
|
+
targetPath: currentRalphPath,
|
|
265
|
+
};
|
|
266
|
+
});
|
|
267
|
+
if (lockedResult) {
|
|
268
|
+
return lockedResult;
|
|
269
|
+
}
|
|
270
|
+
return {
|
|
271
|
+
currentOmxSessionId: '',
|
|
272
|
+
resumed: false,
|
|
273
|
+
updatedCurrentOwner: false,
|
|
274
|
+
reason: 'resume_lock_timeout',
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
//# sourceMappingURL=ralph-session-resume.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ralph-session-resume.js","sourceRoot":"","sources":["../../../src/scripts/notify-hook/ralph-session-resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AAC3E,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAC1C,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAC3C,MAAM,0BAA0B,GAAG,EAAE,CAAC;AA8BtC,SAAS,cAAc;IACrB,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,EAAU;IAC7B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAAe;IAClD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,0BAA0B,EAAE,CAAC;YAC5D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,QAAgB,EAChB,EAAoB;IAEpB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,4BAA4B,CAAC;IAC3D,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEnE,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACpE,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAA8B,CAAC;YAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;YACvC,IAAI,MAAM,qBAAqB,CAAC,OAAO,CAAC;gBAAE,SAAS;YACnD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;gBAAE,OAAO,IAAI,CAAC;YACvC,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvD,IAAI,YAAY,CAAC,IAAI,EAAE,KAAK,UAAU,EAAE,CAAC;gBACvC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;QAC3E,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAA4B,CAAC;IAC9E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,KAAc;IACzD,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,GAAG,IAAI,QAAQ,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACnG,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,OAAO,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAqC;IACnE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,OAAO,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;AAC7E,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,QAAgB;IACrD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,OAAO,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC7D,MAAM,YAAY,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAC7D,OAAO,gBAAgB,EAAE,IAAI,YAAY,IAAI,EAAE,CAAC;AAClD,CAAC;AAED,SAAS,eAAe,CAAC,KAA8B,EAAE,MAAc,EAAE,MAAyB,OAAO,CAAC,GAAG;IAC3G,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,OAAO;QACL,GAAG,KAAK;QACR,YAAY,EAAE,MAAM;QACpB,gBAAgB,EAAE,MAAM;KACzB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,QAAgB,EAChB,mBAA2B,EAC3B,gBAAwB,EACxB,eAAuB;IAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,CAAC;IAEzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACrF,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAAE,SAAS;QACjH,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QAChC,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;YAAE,SAAS;QAC7C,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,gBAAgB,IAAI,cAAc,KAAK,gBAAgB;gBAAE,SAAS;QACzE,CAAC;aAAM,IAAI,CAAC,eAAe,IAAI,CAAC,aAAa,IAAI,aAAa,KAAK,eAAe,EAAE,CAAC;YACnF,SAAS;QACX,CAAC;QACD,OAAO,CAAC,IAAI,CAAC;YACX,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAChD,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAAG,EAAE,EACpB,GAAG,GAAG,OAAO,CAAC,GAAG,EACjB,KAAK,GACoB;IACzB,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,KAAK,EAAE,iBAAiB,EAAE,EAAE,CAAC;QAEnC,MAAM,mBAAmB,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,OAAO;gBACL,mBAAmB,EAAE,EAAE;gBACvB,OAAO,EAAE,KAAK;gBACd,mBAAmB,EAAE,KAAK;gBAC1B,MAAM,EAAE,6BAA6B;aACtC,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAC1E,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;QACrE,MAAM,kBAAkB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,iBAAiB,GAAG,kBAAkB;YAC1C,CAAC,CAAC,MAAM,QAAQ,CAAC,gBAAgB,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAExC,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAC3D,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,MAAM,OAAO,GAA4B,EAAE,GAAG,iBAAiB,EAAE,CAAC;YAClE,IAAI,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,KAAK,mBAAmB,EAAE,CAAC;gBAC5E,OAAO,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;gBACnD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,gBAAgB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC3E,OAAO,CAAC,sBAAsB,GAAG,gBAAgB,CAAC;gBAClD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IACE,OAAO,OAAO,CAAC,qBAAqB,KAAK,QAAQ;mBAC9C,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,EACpD,CAAC;gBACD,OAAO,OAAO,CAAC,qBAAqB,CAAC;gBACrC,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;YACnE,IAAI,aAAa,IAAI,aAAa,KAAK,kBAAkB,EAAE,CAAC;gBAC1D,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC9D,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,eAAe,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;YACD,OAAO;gBACL,mBAAmB;gBACnB,OAAO,EAAE,KAAK;gBACd,mBAAmB,EAAE,OAAO;gBAC5B,MAAM,EAAE,sBAAsB;gBAC9B,UAAU,EAAE,gBAAgB;aAC7B,CAAC;QACJ,CAAC;QAED,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO;gBACL,mBAAmB;gBACnB,OAAO,EAAE,KAAK;gBACd,mBAAmB,EAAE,KAAK;gBAC1B,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,0BAA0B;gBAChF,UAAU,EAAE,gBAAgB;aAC7B,CAAC;QACJ,CAAC;QAED,MAAM,0BAA0B,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,yBAAyB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,IAAI,CAAC,0BAA0B,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC9D,OAAO;gBACL,mBAAmB;gBACnB,OAAO,EAAE,KAAK;gBACd,mBAAmB,EAAE,KAAK;gBAC1B,MAAM,EAAE,gCAAgC;aACzC,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAClD,QAAQ,EACR,mBAAmB,EACnB,0BAA0B,EAC1B,yBAAyB,CAC1B,CAAC;QACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO;gBACL,mBAAmB;gBACnB,OAAO,EAAE,KAAK;gBACd,mBAAmB,EAAE,KAAK;gBAC1B,MAAM,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,gCAAgC;aAC/F,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,KAAK,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpD,MAAM,SAAS,GAAG,eAAe,CAAC;YAChC,GAAG,MAAM,CAAC,KAAK;YACf,oBAAoB,EAAE,mBAAmB;YACzC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9F,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAChB,IAAI,UAAU,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACxD,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,CAAC;QACD,OAAO,SAAS,CAAC,YAAY,CAAC;QAC9B,OAAO,SAAS,CAAC,WAAW,CAAC;QAE7B,MAAM,aAAa,GAA4B;YAC7C,GAAG,MAAM,CAAC,KAAK;YACf,MAAM,EAAE,KAAK;YACb,aAAa,EAAE,WAAW;YAC1B,YAAY,EAAE,MAAM;YACpB,WAAW,EAAE,uBAAuB;SACrC,CAAC;QAEF,MAAM,eAAe,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,KAAK,EAAE,gBAAgB,EAAE,EAAE,CAAC;YAClC,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,EAAE,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC5D,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO;YACL,mBAAmB;YACnB,OAAO,EAAE,IAAI;YACb,mBAAmB,EAAE,KAAK;YAC1B,MAAM,EAAE,4BAA4B;YACpC,UAAU,EAAE,MAAM,CAAC,IAAI;YACvB,UAAU,EAAE,gBAAgB;SAC7B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,OAAO;QACL,mBAAmB,EAAE,EAAE;QACvB,OAAO,EAAE,KAAK;QACd,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,qBAAqB;KAC9B,CAAC;AACJ,CAAC"}
|