@jsonstudio/rcc 0.90.429 → 0.90.701
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build-info.js +2 -2
- package/dist/cli/commands/heartbeat.js +138 -0
- package/dist/cli/commands/heartbeat.js.map +1 -1
- package/dist/cli/commands/launcher/types.d.ts +1 -0
- package/dist/cli/commands/launcher/utils.js +28 -2
- package/dist/cli/commands/launcher/utils.js.map +1 -1
- package/dist/cli/commands/launcher-kernel.js +61 -9
- package/dist/cli/commands/launcher-kernel.js.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/config/system-prompts/codex-cli.txt +1 -1
- package/dist/config/user-data-paths.d.ts +1 -0
- package/dist/config/user-data-paths.js +29 -0
- package/dist/config/user-data-paths.js.map +1 -1
- package/dist/manager/modules/quota/antigravity-quota-persistence.js +18 -10
- package/dist/manager/modules/quota/antigravity-quota-persistence.js.map +1 -1
- package/dist/manager/quota/provider-quota-store.js +17 -9
- package/dist/manager/quota/provider-quota-store.js.map +1 -1
- package/dist/modules/llmswitch/bridge/index.d.ts +2 -2
- package/dist/modules/llmswitch/bridge/index.js +2 -2
- package/dist/modules/llmswitch/bridge/index.js.map +1 -1
- package/dist/modules/llmswitch/bridge/snapshot-recorder.d.ts +1 -0
- package/dist/modules/llmswitch/bridge/snapshot-recorder.js +223 -23
- package/dist/modules/llmswitch/bridge/snapshot-recorder.js.map +1 -1
- package/dist/modules/llmswitch/bridge/state-integrations.d.ts +18 -0
- package/dist/modules/llmswitch/bridge/state-integrations.js +34 -1
- package/dist/modules/llmswitch/bridge/state-integrations.js.map +1 -1
- package/dist/modules/llmswitch/bridge.d.ts +2 -2
- package/dist/modules/llmswitch/bridge.js +2 -2
- package/dist/modules/llmswitch/bridge.js.map +1 -1
- package/dist/providers/auth/apikey-auth.d.ts +1 -0
- package/dist/providers/auth/apikey-auth.js +7 -2
- package/dist/providers/auth/apikey-auth.js.map +1 -1
- package/dist/providers/core/runtime/provider-factory-helpers.js +25 -3
- package/dist/providers/core/runtime/provider-factory-helpers.js.map +1 -1
- package/dist/providers/core/runtime/transport/request-header-builder.d.ts +8 -0
- package/dist/providers/core/runtime/transport/request-header-builder.js +129 -9
- package/dist/providers/core/runtime/transport/request-header-builder.js.map +1 -1
- package/dist/providers/core/runtime/vercel-ai-sdk/openai-sdk-transport.d.ts +2 -1
- package/dist/providers/core/runtime/vercel-ai-sdk/openai-sdk-transport.js +28 -2
- package/dist/providers/core/runtime/vercel-ai-sdk/openai-sdk-transport.js.map +1 -1
- package/dist/providers/core/utils/snapshot-writer.js +10 -11
- package/dist/providers/core/utils/snapshot-writer.js.map +1 -1
- package/dist/providers/mock/mock-provider-runtime.js +1 -1
- package/dist/providers/mock/mock-provider-runtime.js.map +1 -1
- package/dist/server/handlers/handler-response-utils.js +134 -10
- package/dist/server/handlers/handler-response-utils.js.map +1 -1
- package/dist/server/handlers/handler-utils.js +2 -2
- package/dist/server/handlers/handler-utils.js.map +1 -1
- package/dist/server/handlers/types.d.ts +4 -0
- package/dist/server/runtime/http-server/clock-runtime-hooks.js +134 -35
- package/dist/server/runtime/http-server/clock-runtime-hooks.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-response-converter.js +34 -8
- package/dist/server/runtime/http-server/executor/provider-response-converter.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-runtime-resolver.js +11 -1
- package/dist/server/runtime/http-server/executor/provider-runtime-resolver.js.map +1 -1
- package/dist/server/runtime/http-server/executor-metadata.js +31 -1
- package/dist/server/runtime/http-server/executor-metadata.js.map +1 -1
- package/dist/server/runtime/http-server/executor-pipeline.js +24 -1
- package/dist/server/runtime/http-server/executor-pipeline.js.map +1 -1
- package/dist/server/runtime/http-server/executor-provider.js +1 -1
- package/dist/server/runtime/http-server/executor-provider.js.map +1 -1
- package/dist/server/runtime/http-server/heartbeat-runtime-hooks.js +128 -20
- package/dist/server/runtime/http-server/heartbeat-runtime-hooks.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-legacy-pipeline.js +6 -2
- package/dist/server/runtime/http-server/http-server-legacy-pipeline.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-lifecycle.js +16 -0
- package/dist/server/runtime/http-server/http-server-lifecycle.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-runtime-providers.js +14 -0
- package/dist/server/runtime/http-server/http-server-runtime-providers.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-session-daemon.js +14 -7
- package/dist/server/runtime/http-server/http-server-session-daemon.js.map +1 -1
- package/dist/server/runtime/http-server/index.js +18 -1
- package/dist/server/runtime/http-server/index.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.js +27 -1
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/dist/server/runtime/http-server/session-client-registry.js +6 -1
- package/dist/server/runtime/http-server/session-client-registry.js.map +1 -1
- package/dist/server/runtime/http-server/session-client-routes.js +83 -5
- package/dist/server/runtime/http-server/session-client-routes.js.map +1 -1
- package/dist/server/runtime/http-server/session-execution-state.d.ts +47 -0
- package/dist/server/runtime/http-server/session-execution-state.js +328 -0
- package/dist/server/runtime/http-server/session-execution-state.js.map +1 -0
- package/dist/server/runtime/http-server/session-scope-resolution.d.ts +2 -0
- package/dist/server/runtime/http-server/session-scope-resolution.js +98 -4
- package/dist/server/runtime/http-server/session-scope-resolution.js.map +1 -1
- package/dist/server/runtime/http-server/session-storage-cleanup.d.ts +2 -0
- package/dist/server/runtime/http-server/session-storage-cleanup.js +74 -0
- package/dist/server/runtime/http-server/session-storage-cleanup.js.map +1 -1
- package/dist/server/runtime/http-server/tmux-injection-history.d.ts +12 -0
- package/dist/server/runtime/http-server/tmux-injection-history.js +94 -0
- package/dist/server/runtime/http-server/tmux-injection-history.js.map +1 -0
- package/dist/server/runtime/http-server/tmux-injection-runtime-config.d.ts +42 -0
- package/dist/server/runtime/http-server/tmux-injection-runtime-config.js +245 -0
- package/dist/server/runtime/http-server/tmux-injection-runtime-config.js.map +1 -0
- package/dist/server/runtime/http-server/tmux-session-probe.d.ts +1 -0
- package/dist/server/runtime/http-server/tmux-session-probe.js +89 -2
- package/dist/server/runtime/http-server/tmux-session-probe.js.map +1 -1
- package/dist/server/utils/request-id-manager.d.ts +8 -0
- package/dist/server/utils/request-id-manager.js +116 -27
- package/dist/server/utils/request-id-manager.js.map +1 -1
- package/dist/server/utils/request-log-color.d.ts +1 -0
- package/dist/server/utils/request-log-color.js +12 -1
- package/dist/server/utils/request-log-color.js.map +1 -1
- package/dist/server/utils/stage-logger.js +37 -3
- package/dist/server/utils/stage-logger.js.map +1 -1
- package/dist/utils/errorsamples.js +181 -1
- package/dist/utils/errorsamples.js.map +1 -1
- package/dist/utils/snapshot-writer.js +2 -6
- package/dist/utils/snapshot-writer.js.map +1 -1
- package/docs/ARCHITECTURE.md +8 -0
- package/docs/design/heartbeat-session-execution-state.md +227 -0
- package/docs/reports/apply-patch-errorsamples-classification.md +144 -0
- package/package.json +3 -2
- package/scripts/ci/repo-sanity.mjs +3 -1
- package/scripts/install-global.sh +17 -40
- package/scripts/install-release.sh +16 -0
- package/scripts/link-global-llms-local.mjs +108 -0
|
@@ -0,0 +1,328 @@
|
|
|
1
|
+
import { resolveEffectiveRequestId } from '../../utils/request-id-manager.js';
|
|
2
|
+
function readString(value) {
|
|
3
|
+
if (typeof value !== 'string') {
|
|
4
|
+
return undefined;
|
|
5
|
+
}
|
|
6
|
+
const trimmed = value.trim();
|
|
7
|
+
return trimmed || undefined;
|
|
8
|
+
}
|
|
9
|
+
function normalizeRequestId(value) {
|
|
10
|
+
const normalized = readString(resolveEffectiveRequestId(typeof value === 'string' ? value : undefined));
|
|
11
|
+
if (normalized && normalized !== 'unknown' && !normalized.includes('-unknown-')) {
|
|
12
|
+
return normalized;
|
|
13
|
+
}
|
|
14
|
+
return readString(typeof value === 'string' ? value : undefined);
|
|
15
|
+
}
|
|
16
|
+
function normalizeTmuxSessionId(metadata) {
|
|
17
|
+
return (readString(metadata?.tmuxSessionId)
|
|
18
|
+
|| readString(metadata?.clientTmuxSessionId)
|
|
19
|
+
|| readString(metadata?.tmux_session_id)
|
|
20
|
+
|| readString(metadata?.client_tmux_session_id));
|
|
21
|
+
}
|
|
22
|
+
const DEFAULT_WAITING_TIMEOUT_MS = 5 * 60 * 1000;
|
|
23
|
+
const DEFAULT_POST_RESPONSE_GRACE_MS = 60 * 1000;
|
|
24
|
+
const TMUX_RECORD_TTL_MS = 6 * 60 * 60 * 1000;
|
|
25
|
+
const REQUEST_RECORD_TTL_MS = 60 * 60 * 1000;
|
|
26
|
+
export class SessionExecutionStateTracker {
|
|
27
|
+
byRequestId = new Map();
|
|
28
|
+
byTmuxSessionId = new Map();
|
|
29
|
+
sequence = 0;
|
|
30
|
+
nextSeq() {
|
|
31
|
+
this.sequence += 1;
|
|
32
|
+
return this.sequence;
|
|
33
|
+
}
|
|
34
|
+
ensureTmuxRecord(tmuxSessionId, nowMs) {
|
|
35
|
+
let record = this.byTmuxSessionId.get(tmuxSessionId);
|
|
36
|
+
if (!record) {
|
|
37
|
+
record = {
|
|
38
|
+
tmuxSessionId,
|
|
39
|
+
openSseRequestIds: new Set(),
|
|
40
|
+
lastUpdatedAtMs: nowMs
|
|
41
|
+
};
|
|
42
|
+
this.byTmuxSessionId.set(tmuxSessionId, record);
|
|
43
|
+
return record;
|
|
44
|
+
}
|
|
45
|
+
record.lastUpdatedAtMs = nowMs;
|
|
46
|
+
return record;
|
|
47
|
+
}
|
|
48
|
+
maybeDeleteRequest(requestId) {
|
|
49
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
50
|
+
if (!normalizedRequestId) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const requestRecord = this.byRequestId.get(normalizedRequestId);
|
|
54
|
+
if (!requestRecord) {
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
if (requestRecord.sseOpen) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
this.byRequestId.delete(normalizedRequestId);
|
|
61
|
+
}
|
|
62
|
+
closeOpenSse(requestRecord, tmuxRecord, nowMs) {
|
|
63
|
+
if (!requestRecord.sseOpen) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
requestRecord.sseOpen = false;
|
|
67
|
+
tmuxRecord.openSseRequestIds.delete(requestRecord.requestId);
|
|
68
|
+
tmuxRecord.lastSseCloseAtMs = nowMs;
|
|
69
|
+
}
|
|
70
|
+
prune(nowMs) {
|
|
71
|
+
for (const [requestId, record] of this.byRequestId.entries()) {
|
|
72
|
+
if (record.sseOpen) {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
75
|
+
if (nowMs - record.startedAtMs >= REQUEST_RECORD_TTL_MS) {
|
|
76
|
+
this.byRequestId.delete(requestId);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
for (const [tmuxSessionId, record] of this.byTmuxSessionId.entries()) {
|
|
80
|
+
if (record.openSseRequestIds.size > 0) {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
if (nowMs - record.lastUpdatedAtMs >= TMUX_RECORD_TTL_MS) {
|
|
84
|
+
this.byTmuxSessionId.delete(tmuxSessionId);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
recordRequestStart(requestId, metadata) {
|
|
89
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
90
|
+
const tmuxSessionId = normalizeTmuxSessionId(metadata);
|
|
91
|
+
if (!normalizedRequestId || !tmuxSessionId) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const nowMs = Date.now();
|
|
95
|
+
this.prune(nowMs);
|
|
96
|
+
const existing = this.byRequestId.get(normalizedRequestId);
|
|
97
|
+
if (existing) {
|
|
98
|
+
const previousTmux = this.byTmuxSessionId.get(existing.tmuxSessionId);
|
|
99
|
+
if (previousTmux) {
|
|
100
|
+
this.closeOpenSse(existing, previousTmux, nowMs);
|
|
101
|
+
}
|
|
102
|
+
this.byRequestId.delete(normalizedRequestId);
|
|
103
|
+
}
|
|
104
|
+
const tmuxRecord = this.ensureTmuxRecord(tmuxSessionId, nowMs);
|
|
105
|
+
tmuxRecord.lastRequestId = normalizedRequestId;
|
|
106
|
+
tmuxRecord.lastRequestAtMs = nowMs;
|
|
107
|
+
tmuxRecord.lastRequestSeq = this.nextSeq();
|
|
108
|
+
tmuxRecord.lastRequestWasStream = metadata?.stream === true;
|
|
109
|
+
this.byRequestId.set(normalizedRequestId, {
|
|
110
|
+
requestId: normalizedRequestId,
|
|
111
|
+
tmuxSessionId,
|
|
112
|
+
startedAtMs: nowMs,
|
|
113
|
+
stream: metadata?.stream === true,
|
|
114
|
+
sseOpen: false
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
recordJsonResponseComplete(requestId, finishReason) {
|
|
118
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
119
|
+
if (!normalizedRequestId) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const requestRecord = this.byRequestId.get(normalizedRequestId);
|
|
123
|
+
if (!requestRecord) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const nowMs = Date.now();
|
|
127
|
+
this.prune(nowMs);
|
|
128
|
+
const tmuxRecord = this.ensureTmuxRecord(requestRecord.tmuxSessionId, nowMs);
|
|
129
|
+
tmuxRecord.lastResponseRequestId = normalizedRequestId;
|
|
130
|
+
tmuxRecord.lastResponseAtMs = nowMs;
|
|
131
|
+
tmuxRecord.lastResponseSeq = this.nextSeq();
|
|
132
|
+
tmuxRecord.lastFinishReason = readString(finishReason);
|
|
133
|
+
tmuxRecord.lastTerminalAtMs = nowMs;
|
|
134
|
+
this.closeOpenSse(requestRecord, tmuxRecord, nowMs);
|
|
135
|
+
this.byRequestId.delete(normalizedRequestId);
|
|
136
|
+
}
|
|
137
|
+
recordSseStreamStart(requestId) {
|
|
138
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
139
|
+
if (!normalizedRequestId) {
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
const requestRecord = this.byRequestId.get(normalizedRequestId);
|
|
143
|
+
if (!requestRecord || requestRecord.sseOpen) {
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
const nowMs = Date.now();
|
|
147
|
+
this.prune(nowMs);
|
|
148
|
+
const tmuxRecord = this.ensureTmuxRecord(requestRecord.tmuxSessionId, nowMs);
|
|
149
|
+
requestRecord.sseOpen = true;
|
|
150
|
+
tmuxRecord.openSseRequestIds.add(normalizedRequestId);
|
|
151
|
+
tmuxRecord.lastSseOpenAtMs = nowMs;
|
|
152
|
+
}
|
|
153
|
+
recordSseStreamEnd(requestId, options) {
|
|
154
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
155
|
+
if (!normalizedRequestId) {
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
const requestRecord = this.byRequestId.get(normalizedRequestId);
|
|
159
|
+
if (!requestRecord) {
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
const nowMs = Date.now();
|
|
163
|
+
this.prune(nowMs);
|
|
164
|
+
const tmuxRecord = this.ensureTmuxRecord(requestRecord.tmuxSessionId, nowMs);
|
|
165
|
+
tmuxRecord.lastResponseRequestId = normalizedRequestId;
|
|
166
|
+
tmuxRecord.lastResponseAtMs = nowMs;
|
|
167
|
+
tmuxRecord.lastResponseSeq = this.nextSeq();
|
|
168
|
+
tmuxRecord.lastFinishReason = readString(options?.finishReason);
|
|
169
|
+
if (options?.terminal !== false) {
|
|
170
|
+
tmuxRecord.lastTerminalAtMs = nowMs;
|
|
171
|
+
}
|
|
172
|
+
this.closeOpenSse(requestRecord, tmuxRecord, nowMs);
|
|
173
|
+
this.byRequestId.delete(normalizedRequestId);
|
|
174
|
+
}
|
|
175
|
+
recordSseClientClose(requestId, options) {
|
|
176
|
+
const normalizedRequestId = normalizeRequestId(requestId);
|
|
177
|
+
if (!normalizedRequestId) {
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
const requestRecord = this.byRequestId.get(normalizedRequestId);
|
|
181
|
+
if (!requestRecord) {
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
const nowMs = Date.now();
|
|
185
|
+
this.prune(nowMs);
|
|
186
|
+
const tmuxRecord = this.ensureTmuxRecord(requestRecord.tmuxSessionId, nowMs);
|
|
187
|
+
if (readString(options?.finishReason)) {
|
|
188
|
+
tmuxRecord.lastFinishReason = readString(options?.finishReason);
|
|
189
|
+
}
|
|
190
|
+
if (options?.terminal === true) {
|
|
191
|
+
tmuxRecord.lastTerminalAtMs = nowMs;
|
|
192
|
+
}
|
|
193
|
+
if (options?.closeBeforeStreamEnd === true) {
|
|
194
|
+
tmuxRecord.lastClientCloseBeforeTerminalAtMs = nowMs;
|
|
195
|
+
tmuxRecord.lastClientCloseSeq = this.nextSeq();
|
|
196
|
+
}
|
|
197
|
+
this.closeOpenSse(requestRecord, tmuxRecord, nowMs);
|
|
198
|
+
this.byRequestId.delete(normalizedRequestId);
|
|
199
|
+
}
|
|
200
|
+
getStateSnapshot(tmuxSessionId, options) {
|
|
201
|
+
const normalizedTmuxSessionId = readString(tmuxSessionId);
|
|
202
|
+
if (!normalizedTmuxSessionId) {
|
|
203
|
+
return {
|
|
204
|
+
tmuxSessionId: '',
|
|
205
|
+
state: 'UNKNOWN',
|
|
206
|
+
shouldSkipHeartbeat: false,
|
|
207
|
+
reason: 'no_state',
|
|
208
|
+
openSseCount: 0
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
const nowMs = options?.nowMs ?? Date.now();
|
|
212
|
+
this.prune(nowMs);
|
|
213
|
+
const tmuxRecord = this.byTmuxSessionId.get(normalizedTmuxSessionId);
|
|
214
|
+
if (!tmuxRecord) {
|
|
215
|
+
return {
|
|
216
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
217
|
+
state: 'UNKNOWN',
|
|
218
|
+
shouldSkipHeartbeat: false,
|
|
219
|
+
reason: 'no_state',
|
|
220
|
+
openSseCount: 0
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
const waitingTimeoutMs = options?.waitingTimeoutMs ?? DEFAULT_WAITING_TIMEOUT_MS;
|
|
224
|
+
const postResponseGraceMs = options?.postResponseGraceMs ?? DEFAULT_POST_RESPONSE_GRACE_MS;
|
|
225
|
+
const openSseCount = tmuxRecord.openSseRequestIds.size;
|
|
226
|
+
if (openSseCount > 0) {
|
|
227
|
+
return {
|
|
228
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
229
|
+
state: 'STREAMING_OPEN',
|
|
230
|
+
shouldSkipHeartbeat: true,
|
|
231
|
+
reason: 'sse_open',
|
|
232
|
+
lastRequestId: tmuxRecord.lastRequestId,
|
|
233
|
+
lastRequestAtMs: tmuxRecord.lastRequestAtMs,
|
|
234
|
+
lastRequestWasStream: tmuxRecord.lastRequestWasStream,
|
|
235
|
+
lastResponseRequestId: tmuxRecord.lastResponseRequestId,
|
|
236
|
+
lastResponseAtMs: tmuxRecord.lastResponseAtMs,
|
|
237
|
+
lastFinishReason: tmuxRecord.lastFinishReason,
|
|
238
|
+
openSseCount,
|
|
239
|
+
lastSseOpenAtMs: tmuxRecord.lastSseOpenAtMs,
|
|
240
|
+
lastSseCloseAtMs: tmuxRecord.lastSseCloseAtMs,
|
|
241
|
+
lastClientCloseBeforeTerminalAtMs: tmuxRecord.lastClientCloseBeforeTerminalAtMs
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
const requestSeq = tmuxRecord.lastRequestSeq ?? 0;
|
|
245
|
+
const responseSeq = tmuxRecord.lastResponseSeq ?? 0;
|
|
246
|
+
const clientCloseSeq = tmuxRecord.lastClientCloseSeq ?? 0;
|
|
247
|
+
if (requestSeq === 0 && responseSeq === 0 && clientCloseSeq === 0) {
|
|
248
|
+
return {
|
|
249
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
250
|
+
state: 'UNKNOWN',
|
|
251
|
+
shouldSkipHeartbeat: false,
|
|
252
|
+
reason: 'no_state',
|
|
253
|
+
lastRequestId: tmuxRecord.lastRequestId,
|
|
254
|
+
lastRequestAtMs: tmuxRecord.lastRequestAtMs,
|
|
255
|
+
lastRequestWasStream: tmuxRecord.lastRequestWasStream,
|
|
256
|
+
lastResponseRequestId: tmuxRecord.lastResponseRequestId,
|
|
257
|
+
lastResponseAtMs: tmuxRecord.lastResponseAtMs,
|
|
258
|
+
lastFinishReason: tmuxRecord.lastFinishReason,
|
|
259
|
+
openSseCount,
|
|
260
|
+
lastSseOpenAtMs: tmuxRecord.lastSseOpenAtMs,
|
|
261
|
+
lastSseCloseAtMs: tmuxRecord.lastSseCloseAtMs,
|
|
262
|
+
lastClientCloseBeforeTerminalAtMs: tmuxRecord.lastClientCloseBeforeTerminalAtMs
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
if (requestSeq > responseSeq && requestSeq > clientCloseSeq) {
|
|
266
|
+
const lastRequestAtMs = tmuxRecord.lastRequestAtMs ?? nowMs;
|
|
267
|
+
const timedOut = nowMs - lastRequestAtMs > waitingTimeoutMs;
|
|
268
|
+
return {
|
|
269
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
270
|
+
state: timedOut ? 'STALED' : 'WAITING_RESPONSE',
|
|
271
|
+
shouldSkipHeartbeat: !timedOut,
|
|
272
|
+
reason: timedOut ? 'request_timed_out' : 'waiting_response',
|
|
273
|
+
lastRequestId: tmuxRecord.lastRequestId,
|
|
274
|
+
lastRequestAtMs: tmuxRecord.lastRequestAtMs,
|
|
275
|
+
lastRequestWasStream: tmuxRecord.lastRequestWasStream,
|
|
276
|
+
lastResponseRequestId: tmuxRecord.lastResponseRequestId,
|
|
277
|
+
lastResponseAtMs: tmuxRecord.lastResponseAtMs,
|
|
278
|
+
lastFinishReason: tmuxRecord.lastFinishReason,
|
|
279
|
+
openSseCount,
|
|
280
|
+
lastSseOpenAtMs: tmuxRecord.lastSseOpenAtMs,
|
|
281
|
+
lastSseCloseAtMs: tmuxRecord.lastSseCloseAtMs,
|
|
282
|
+
lastClientCloseBeforeTerminalAtMs: tmuxRecord.lastClientCloseBeforeTerminalAtMs
|
|
283
|
+
};
|
|
284
|
+
}
|
|
285
|
+
if (clientCloseSeq > responseSeq && clientCloseSeq > requestSeq) {
|
|
286
|
+
return {
|
|
287
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
288
|
+
state: 'STALED',
|
|
289
|
+
shouldSkipHeartbeat: false,
|
|
290
|
+
reason: 'client_closed_before_terminal',
|
|
291
|
+
lastRequestId: tmuxRecord.lastRequestId,
|
|
292
|
+
lastRequestAtMs: tmuxRecord.lastRequestAtMs,
|
|
293
|
+
lastRequestWasStream: tmuxRecord.lastRequestWasStream,
|
|
294
|
+
lastResponseRequestId: tmuxRecord.lastResponseRequestId,
|
|
295
|
+
lastResponseAtMs: tmuxRecord.lastResponseAtMs,
|
|
296
|
+
lastFinishReason: tmuxRecord.lastFinishReason,
|
|
297
|
+
openSseCount,
|
|
298
|
+
lastSseOpenAtMs: tmuxRecord.lastSseOpenAtMs,
|
|
299
|
+
lastSseCloseAtMs: tmuxRecord.lastSseCloseAtMs,
|
|
300
|
+
lastClientCloseBeforeTerminalAtMs: tmuxRecord.lastClientCloseBeforeTerminalAtMs
|
|
301
|
+
};
|
|
302
|
+
}
|
|
303
|
+
const lastResponseAtMs = tmuxRecord.lastResponseAtMs ?? nowMs;
|
|
304
|
+
const finishReason = readString(tmuxRecord.lastFinishReason);
|
|
305
|
+
const recentNonterminal = nowMs - lastResponseAtMs <= postResponseGraceMs && finishReason !== 'stop';
|
|
306
|
+
return {
|
|
307
|
+
tmuxSessionId: normalizedTmuxSessionId,
|
|
308
|
+
state: recentNonterminal ? 'POST_RESPONSE_GRACE' : 'IDLE',
|
|
309
|
+
shouldSkipHeartbeat: recentNonterminal,
|
|
310
|
+
reason: recentNonterminal ? 'recent_nonterminal_response' : 'latest_response_stop',
|
|
311
|
+
lastRequestId: tmuxRecord.lastRequestId,
|
|
312
|
+
lastRequestAtMs: tmuxRecord.lastRequestAtMs,
|
|
313
|
+
lastRequestWasStream: tmuxRecord.lastRequestWasStream,
|
|
314
|
+
lastResponseRequestId: tmuxRecord.lastResponseRequestId,
|
|
315
|
+
lastResponseAtMs: tmuxRecord.lastResponseAtMs,
|
|
316
|
+
lastFinishReason: tmuxRecord.lastFinishReason,
|
|
317
|
+
openSseCount,
|
|
318
|
+
lastSseOpenAtMs: tmuxRecord.lastSseOpenAtMs,
|
|
319
|
+
lastSseCloseAtMs: tmuxRecord.lastSseCloseAtMs,
|
|
320
|
+
lastClientCloseBeforeTerminalAtMs: tmuxRecord.lastClientCloseBeforeTerminalAtMs
|
|
321
|
+
};
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
const singleton = new SessionExecutionStateTracker();
|
|
325
|
+
export function getSessionExecutionStateTracker() {
|
|
326
|
+
return singleton;
|
|
327
|
+
}
|
|
328
|
+
//# sourceMappingURL=session-execution-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-execution-state.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/session-execution-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ type SessionScopeResolutionArgs = {
|
|
|
5
5
|
clientHeaders?: Record<string, string>;
|
|
6
6
|
daemonId?: string;
|
|
7
7
|
resolveTmuxSessionIdFromDaemon?: (daemonId: string | undefined) => string | undefined;
|
|
8
|
+
resolveTmuxSessionIdFromBinding?: (sessionScopeId: string) => string | undefined;
|
|
9
|
+
isTmuxSessionAlive?: (tmuxSessionId: string) => boolean;
|
|
8
10
|
};
|
|
9
11
|
export type TmuxSessionResolution = {
|
|
10
12
|
tmuxSessionId?: string;
|
|
@@ -189,20 +189,114 @@ function readTmuxFromHeaderSource(source) {
|
|
|
189
189
|
}
|
|
190
190
|
return undefined;
|
|
191
191
|
}
|
|
192
|
+
function readSessionScopeFromHeaderSource(source) {
|
|
193
|
+
if (!source) {
|
|
194
|
+
return undefined;
|
|
195
|
+
}
|
|
196
|
+
const fromApiKeyHeader = extractHeaderValue(source, 'x-routecodex-api-key')
|
|
197
|
+
|| extractHeaderValue(source, 'x-api-key')
|
|
198
|
+
|| extractHeaderValue(source, 'x-routecodex-apikey')
|
|
199
|
+
|| extractHeaderValue(source, 'api-key')
|
|
200
|
+
|| extractHeaderValue(source, 'apikey');
|
|
201
|
+
const fromApiKey = extractSessionClientScopeIdFromApiKey(fromApiKeyHeader);
|
|
202
|
+
if (fromApiKey) {
|
|
203
|
+
return fromApiKey;
|
|
204
|
+
}
|
|
205
|
+
const authorization = extractHeaderValue(source, 'authorization');
|
|
206
|
+
if (authorization) {
|
|
207
|
+
const match = authorization.match(/^(?:Bearer|ApiKey)\s+(.+)$/i);
|
|
208
|
+
const fromAuth = extractSessionClientScopeIdFromApiKey(match ? String(match[1]) : authorization);
|
|
209
|
+
if (fromAuth) {
|
|
210
|
+
return fromAuth;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return undefined;
|
|
214
|
+
}
|
|
215
|
+
function collectBindingSessionScopeCandidates(args) {
|
|
216
|
+
const candidates = [];
|
|
217
|
+
const push = (value) => {
|
|
218
|
+
const token = readToken(value);
|
|
219
|
+
if (!token) {
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
if (!candidates.includes(token)) {
|
|
223
|
+
candidates.push(token);
|
|
224
|
+
}
|
|
225
|
+
};
|
|
226
|
+
const headerSources = [
|
|
227
|
+
args.headers,
|
|
228
|
+
args.clientHeaders
|
|
229
|
+
];
|
|
230
|
+
for (const source of headerSources) {
|
|
231
|
+
push(extractHeaderValue(source, 'session_id'));
|
|
232
|
+
push(extractHeaderValue(source, 'session-id'));
|
|
233
|
+
push(extractHeaderValue(source, 'x-session-id'));
|
|
234
|
+
push(extractHeaderValue(source, 'x-routecodex-session-id'));
|
|
235
|
+
push(extractHeaderValue(source, 'x-rcc-session-id'));
|
|
236
|
+
push(extractHeaderValue(source, 'conversation_id'));
|
|
237
|
+
push(extractHeaderValue(source, 'conversation-id'));
|
|
238
|
+
push(extractHeaderValue(source, 'x-conversation-id'));
|
|
239
|
+
push(extractHeaderValue(source, 'x-routecodex-conversation-id'));
|
|
240
|
+
push(readSessionScopeFromHeaderSource(source));
|
|
241
|
+
}
|
|
242
|
+
push(args.userMeta.sessionId);
|
|
243
|
+
push(args.userMeta.session_id);
|
|
244
|
+
push(args.userMeta.conversationId);
|
|
245
|
+
push(args.userMeta.conversation_id);
|
|
246
|
+
push(args.bodyMeta.sessionId);
|
|
247
|
+
push(args.bodyMeta.session_id);
|
|
248
|
+
push(args.bodyMeta.conversationId);
|
|
249
|
+
push(args.bodyMeta.conversation_id);
|
|
250
|
+
if (args.daemonId && readToken(args.daemonId)) {
|
|
251
|
+
push(`sessiond.${readToken(args.daemonId)}`);
|
|
252
|
+
}
|
|
253
|
+
return candidates;
|
|
254
|
+
}
|
|
255
|
+
function isTmuxCandidateAlive(args, tmuxSessionId) {
|
|
256
|
+
if (typeof args.isTmuxSessionAlive !== 'function') {
|
|
257
|
+
return true;
|
|
258
|
+
}
|
|
259
|
+
try {
|
|
260
|
+
return args.isTmuxSessionAlive(tmuxSessionId);
|
|
261
|
+
}
|
|
262
|
+
catch {
|
|
263
|
+
return false;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
function resolveIfAlive(args, candidate) {
|
|
267
|
+
const token = readToken(candidate);
|
|
268
|
+
if (!token) {
|
|
269
|
+
return undefined;
|
|
270
|
+
}
|
|
271
|
+
return isTmuxCandidateAlive(args, token) ? token : undefined;
|
|
272
|
+
}
|
|
192
273
|
export function resolveTmuxSessionIdAndSource(args) {
|
|
193
|
-
const tmuxFromHeaders = readTmuxFromHeaderSource(args.headers)
|
|
194
|
-
|| readTmuxFromHeaderSource(args.clientHeaders);
|
|
274
|
+
const tmuxFromHeaders = resolveIfAlive(args, readTmuxFromHeaderSource(args.headers)
|
|
275
|
+
|| readTmuxFromHeaderSource(args.clientHeaders));
|
|
195
276
|
if (tmuxFromHeaders) {
|
|
196
277
|
return { tmuxSessionId: tmuxFromHeaders, source: 'headers_or_api_key' };
|
|
197
278
|
}
|
|
198
|
-
const tmuxFromMeta = readToken(args.userMeta.tmuxSessionId) || readToken(args.userMeta.tmux_session_id);
|
|
279
|
+
const tmuxFromMeta = resolveIfAlive(args, readToken(args.userMeta.tmuxSessionId) || readToken(args.userMeta.tmux_session_id));
|
|
199
280
|
if (tmuxFromMeta) {
|
|
200
281
|
return { tmuxSessionId: tmuxFromMeta, source: 'metadata' };
|
|
201
282
|
}
|
|
202
|
-
const tmuxFromBody = readToken(args.bodyMeta.tmuxSessionId) || readToken(args.bodyMeta.tmux_session_id);
|
|
283
|
+
const tmuxFromBody = resolveIfAlive(args, readToken(args.bodyMeta.tmuxSessionId) || readToken(args.bodyMeta.tmux_session_id));
|
|
203
284
|
if (tmuxFromBody) {
|
|
204
285
|
return { tmuxSessionId: tmuxFromBody, source: 'body_metadata' };
|
|
205
286
|
}
|
|
287
|
+
const tmuxFromDaemon = resolveIfAlive(args, readToken(args.resolveTmuxSessionIdFromDaemon?.(args.daemonId)));
|
|
288
|
+
if (tmuxFromDaemon) {
|
|
289
|
+
return { tmuxSessionId: tmuxFromDaemon, source: 'registry_by_daemon' };
|
|
290
|
+
}
|
|
291
|
+
if (typeof args.resolveTmuxSessionIdFromBinding === 'function') {
|
|
292
|
+
const bindingCandidates = collectBindingSessionScopeCandidates(args);
|
|
293
|
+
for (const scope of bindingCandidates) {
|
|
294
|
+
const tmuxFromBinding = resolveIfAlive(args, readToken(args.resolveTmuxSessionIdFromBinding(scope)));
|
|
295
|
+
if (tmuxFromBinding) {
|
|
296
|
+
return { tmuxSessionId: tmuxFromBinding, source: 'registry_by_binding' };
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
}
|
|
206
300
|
return { source: 'none' };
|
|
207
301
|
}
|
|
208
302
|
//# sourceMappingURL=session-scope-resolution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-scope-resolution.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/session-scope-resolution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-scope-resolution.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/session-scope-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,wCAAwC,CAAC;AAkB/F,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED,SAAS,kBAAkB,CACzB,OAA4C,EAC5C,IAAY;IAEZ,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;YACjC,SAAS;QACX,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;QAC9C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oCAAoC,CAAC,QAA4B;IACxE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAsB,EAAE;QAChE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,IAAa,EAAsB,EAAE;QAC5D,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,KAAK,GAAc,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,IAAI,OAAO,CAAC,GAAG,CAAC,OAAiB,CAAC,EAAE,CAAC;gBACnC,SAAS;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,OAAiB,CAAC,CAAC;YAE/B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACvC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACpB,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,OAAkC,CAAC;YAClD,MAAM,UAAU,GACd,kBAAkB,CAAC,MAAM,CAAC,aAAa,CAAC;mBACrC,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC;mBAC1C,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC;mBACtC,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC;mBACvC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC;mBAC3C,kBAAkB,CAAC,MAAM,CAAC,mBAAmB,CAAC;mBAC9C,kBAAkB,CAAC,MAAM,CAAC,mBAAmB,CAAC;mBAC9C,kBAAkB,CAAC,MAAM,CAAC,sBAAsB,CAAC;mBACjD,kBAAkB,CAAC,MAAM,CAAC,6BAA6B,CAAC;mBACxD,kBAAkB,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;YACnE,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC;YACpB,CAAC;YAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACvC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAClB,SAAS;gBACX,CAAC;gBACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,SAAS;gBACX,CAAC;gBACD,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBAC/C,IACE,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC;uBAC3B,aAAa,KAAK,oCAAoC;uBACtD,aAAa,KAAK,+BAA+B,EACpD,CAAC;oBACD,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;oBACxC,IAAI,KAAK,EAAE,CAAC;wBACV,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,6BAA6B;IAC/B,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YACtE,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACtE,IAAI,OAAO,EAAE,CAAC;gBACZ,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,gCAAgC;QAClC,CAAC;IACH,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACrC,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,UAAU,GACd,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;mBAC5C,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;mBACjD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;mBAC7C,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;mBAC9C,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;mBAClD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;mBACrD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;mBACrD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;mBACxD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC,CAAC;YAC1E,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,kCAAkC;QACpC,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,wBAAwB,CAAC,MAA2C;IAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,YAAY,GAAG,oCAAoC,CAAC,kBAAkB,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC/G,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,MAAM,UAAU,GACd,kBAAkB,CAAC,MAAM,EAAE,qCAAqC,CAAC;WAC9D,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,CAAC;WAC1D,kBAAkB,CAAC,MAAM,EAAE,oCAAoC,CAAC;WAChE,kBAAkB,CAAC,MAAM,EAAE,6BAA6B,CAAC;WACzD,kBAAkB,CAAC,MAAM,EAAE,kCAAkC,CAAC;WAC9D,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,CAAC;WAC1D,kBAAkB,CAAC,MAAM,EAAE,uBAAuB,CAAC;WACnD,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrD,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,gBAAgB,GACpB,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,CAAC;WAC/C,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;WACvC,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,CAAC;WACjD,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC;WACrC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,qCAAqC,CAAC,gBAAgB,CAAC,CAAC;IAC3E,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClE,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,qCAAqC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACjG,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gCAAgC,CAAC,MAA2C;IACnF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,gBAAgB,GACpB,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,CAAC;WAC/C,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;WACvC,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,CAAC;WACjD,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC;WACrC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,qCAAqC,CAAC,gBAAgB,CAAC,CAAC;IAC3E,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClE,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,qCAAqC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACjG,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oCAAoC,CAAC,IAAgC;IAC5E,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,CAAC,KAAc,EAAQ,EAAE;QACpC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,aAAa,GAA+C;QAChE,IAAI,CAAC,OAAO;QACZ,IAAI,CAAC,aAA+D;KACrE,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACpC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEpC,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,YAAY,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAgC,EAAE,aAAqB;IACnF,IAAI,OAAO,IAAI,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAgC,EAAE,SAA6B;IACrF,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,IAAgC;IAC5E,MAAM,eAAe,GAAG,cAAc,CACpC,IAAI,EACJ,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC;WACjC,wBAAwB,CAAC,IAAI,CAAC,aAA+D,CAAC,CACpG,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC1E,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9H,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9H,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IAClE,CAAC;IAED,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7G,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IACzE,CAAC;IAED,IAAI,OAAO,IAAI,CAAC,+BAA+B,KAAK,UAAU,EAAE,CAAC;QAC/D,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,IAAI,CAAC,CAAC;QACrE,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACtC,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrG,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;YAC3E,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC"}
|
|
@@ -2,6 +2,7 @@ type CleanupSummary = {
|
|
|
2
2
|
removedLegacyScopeFiles: number;
|
|
3
3
|
removedDeadTmuxStateFiles: number;
|
|
4
4
|
removedHeartbeatStateFiles: number;
|
|
5
|
+
removedClockStateFiles: number;
|
|
5
6
|
prunedRegistryDirs: number;
|
|
6
7
|
removedRegistryDirs: number;
|
|
7
8
|
removedRegistryRecords: number;
|
|
@@ -14,4 +15,5 @@ export declare function cleanupSessionStorageOnStartup(options?: {
|
|
|
14
15
|
staleAfterMs?: number;
|
|
15
16
|
isTmuxSessionAlive?: (tmuxSessionId: string) => boolean;
|
|
16
17
|
}): CleanupSummary;
|
|
18
|
+
export declare function cleanupSessionStorageOnShutdown(options?: Parameters<typeof cleanupSessionStorageOnStartup>[0]): CleanupSummary;
|
|
17
19
|
export {};
|
|
@@ -47,6 +47,62 @@ function removeDirIfEmpty(dirpath) {
|
|
|
47
47
|
return false;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
+
function readClockStateTmuxSessionId(filePath, fallbackName) {
|
|
51
|
+
const payload = parseJsonFile(filePath);
|
|
52
|
+
if (payload) {
|
|
53
|
+
const tmuxSessionId = normalizeString(payload.tmuxSessionId);
|
|
54
|
+
if (tmuxSessionId) {
|
|
55
|
+
return tmuxSessionId;
|
|
56
|
+
}
|
|
57
|
+
const sessionId = normalizeString(payload.sessionId);
|
|
58
|
+
if (sessionId?.startsWith('tmux:')) {
|
|
59
|
+
const rawTmux = normalizeString(sessionId.slice('tmux:'.length));
|
|
60
|
+
if (rawTmux) {
|
|
61
|
+
return rawTmux;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const fallback = normalizeString(fallbackName.replace(/\.json$/i, ''));
|
|
66
|
+
if (fallback?.startsWith('tmux:')) {
|
|
67
|
+
const rawTmux = normalizeString(fallback.slice('tmux:'.length));
|
|
68
|
+
if (rawTmux) {
|
|
69
|
+
return rawTmux;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
function sanitizeClockStateDir(args) {
|
|
75
|
+
let removedClockStateFiles = 0;
|
|
76
|
+
let entries = [];
|
|
77
|
+
try {
|
|
78
|
+
entries = fs.readdirSync(args.dirpath, { withFileTypes: true });
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
return removedClockStateFiles;
|
|
82
|
+
}
|
|
83
|
+
for (const entry of entries) {
|
|
84
|
+
if (!entry.isFile() || !entry.name.endsWith('.json') || entry.name === 'ntp-state.json') {
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
const filePath = path.join(args.dirpath, entry.name);
|
|
88
|
+
const tmuxSessionId = readClockStateTmuxSessionId(filePath, entry.name);
|
|
89
|
+
if (!tmuxSessionId) {
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
let alive = true;
|
|
93
|
+
try {
|
|
94
|
+
alive = args.isTmuxSessionAlive(tmuxSessionId);
|
|
95
|
+
}
|
|
96
|
+
catch {
|
|
97
|
+
alive = true;
|
|
98
|
+
}
|
|
99
|
+
if (!alive && removeFileIfExists(filePath)) {
|
|
100
|
+
removedClockStateFiles += 1;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
removeDirIfEmpty(args.dirpath);
|
|
104
|
+
return removedClockStateFiles;
|
|
105
|
+
}
|
|
50
106
|
function sanitizeSessionBindingsDir(args) {
|
|
51
107
|
const bindingsFile = path.join(args.dirpath, 'session-bindings.json');
|
|
52
108
|
const toolStateFile = path.join(args.dirpath, 'tmux-tools-state.json');
|
|
@@ -168,6 +224,7 @@ export function cleanupSessionStorageOnStartup(options) {
|
|
|
168
224
|
removedLegacyScopeFiles: 0,
|
|
169
225
|
removedDeadTmuxStateFiles: 0,
|
|
170
226
|
removedHeartbeatStateFiles: 0,
|
|
227
|
+
removedClockStateFiles: 0,
|
|
171
228
|
prunedRegistryDirs: 0,
|
|
172
229
|
removedRegistryDirs: 0,
|
|
173
230
|
removedRegistryRecords: 0,
|
|
@@ -230,6 +287,20 @@ export function cleanupSessionStorageOnStartup(options) {
|
|
|
230
287
|
removeDirIfEmpty(fullpath);
|
|
231
288
|
continue;
|
|
232
289
|
}
|
|
290
|
+
if (entry.name === 'clock') {
|
|
291
|
+
summary.removedClockStateFiles += sanitizeClockStateDir({
|
|
292
|
+
dirpath: fullpath,
|
|
293
|
+
isTmuxSessionAlive
|
|
294
|
+
});
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
const nestedClockDir = path.join(fullpath, 'clock');
|
|
298
|
+
if (fs.existsSync(nestedClockDir)) {
|
|
299
|
+
summary.removedClockStateFiles += sanitizeClockStateDir({
|
|
300
|
+
dirpath: nestedClockDir,
|
|
301
|
+
isTmuxSessionAlive
|
|
302
|
+
});
|
|
303
|
+
}
|
|
233
304
|
const dirSummary = sanitizeSessionBindingsDir({
|
|
234
305
|
dirpath: fullpath,
|
|
235
306
|
nowMs,
|
|
@@ -248,4 +319,7 @@ export function cleanupSessionStorageOnStartup(options) {
|
|
|
248
319
|
}
|
|
249
320
|
return summary;
|
|
250
321
|
}
|
|
322
|
+
export function cleanupSessionStorageOnShutdown(options) {
|
|
323
|
+
return cleanupSessionStorageOnStartup(options);
|
|
324
|
+
}
|
|
251
325
|
//# sourceMappingURL=session-storage-cleanup.js.map
|