@gkorepanov/ccodex 0.4.23 → 0.4.24
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/config/compatibility.json +1 -1
- package/dist/claude/service.d.ts +1 -1
- package/dist/claude/service.js +13 -4
- package/dist/claude/service.js.map +1 -1
- package/dist/claude/session/providerRuntimeFactory.js +15 -7
- package/dist/claude/session/providerRuntimeFactory.js.map +1 -1
- package/dist/claude/session/runtime.d.ts +10 -0
- package/dist/claude/session/runtime.js +44 -2
- package/dist/claude/session/runtime.js.map +1 -1
- package/dist/claude/session/session.js +30 -19
- package/dist/claude/session/session.js.map +1 -1
- package/dist/daemon/ownership.js +9 -1
- package/dist/daemon/ownership.js.map +1 -1
- package/dist/gateway/clientConnection.js +21 -12
- package/dist/gateway/clientConnection.js.map +1 -1
- package/dist/gateway/optimisticSideThreads.d.ts +11 -5
- package/dist/gateway/optimisticSideThreads.js +103 -47
- package/dist/gateway/optimisticSideThreads.js.map +1 -1
- package/dist/gateway/server.js +31 -1
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/stockSideThreads.d.ts +3 -6
- package/dist/gateway/stockSideThreads.js +38 -43
- package/dist/gateway/stockSideThreads.js.map +1 -1
- package/dist/gateway/threadList.d.ts +3 -3
- package/dist/gateway/threadList.js +15 -5
- package/dist/gateway/threadList.js.map +1 -1
- package/dist/handoff/service.js +1 -0
- package/dist/handoff/service.js.map +1 -1
- package/dist/handoff/store.d.ts +21 -0
- package/dist/handoff/store.js +15 -0
- package/dist/handoff/store.js.map +1 -1
- package/legal/THIRD_PARTY_NOTICES.md +0 -27
- package/package.json +4 -4
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export const OPTIMISTIC_SIDE_GRACE_MS = 60 * 60_000;
|
|
2
1
|
function deferred() {
|
|
3
2
|
let resolve;
|
|
4
3
|
let reject;
|
|
@@ -9,12 +8,13 @@ function deferred() {
|
|
|
9
8
|
return { promise, resolve, reject };
|
|
10
9
|
}
|
|
11
10
|
export class OptimisticSideThreads {
|
|
12
|
-
|
|
11
|
+
store;
|
|
13
12
|
states = new Map();
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
closed = false;
|
|
14
|
+
constructor(store) {
|
|
15
|
+
this.store = store;
|
|
16
16
|
}
|
|
17
|
-
open(connectionId, response, prepare, cleanup, failed) {
|
|
17
|
+
open(connectionId, response, prepare, cleanup, failed, preparation, restored) {
|
|
18
18
|
const ready = deferred();
|
|
19
19
|
const state = {
|
|
20
20
|
response,
|
|
@@ -25,34 +25,87 @@ export class OptimisticSideThreads {
|
|
|
25
25
|
reject: ready.reject,
|
|
26
26
|
tail: Promise.resolve(),
|
|
27
27
|
failureReported: false,
|
|
28
|
-
deleted: false,
|
|
28
|
+
deleted: restored?.deleted ?? false,
|
|
29
|
+
preparation,
|
|
30
|
+
injections: restored?.injections ?? [],
|
|
31
|
+
...(restored?.target ? { target: restored.target } : {}),
|
|
32
|
+
...(restored?.failure ? { failure: new Error(restored.failure) } : {}),
|
|
29
33
|
};
|
|
30
34
|
void state.ready.catch(() => undefined);
|
|
31
35
|
this.states.set(response.thread.id, state);
|
|
36
|
+
this.persist(state);
|
|
32
37
|
queueMicrotask(() => {
|
|
33
|
-
|
|
38
|
+
if (this.closed)
|
|
39
|
+
return;
|
|
40
|
+
const pending = state.target ? Promise.resolve(state.target)
|
|
41
|
+
: state.failure ? Promise.reject(state.failure) : prepare();
|
|
42
|
+
void pending.then(async (target) => {
|
|
43
|
+
if (this.closed)
|
|
44
|
+
return;
|
|
45
|
+
state.target = target;
|
|
46
|
+
this.persist(state);
|
|
34
47
|
if (state.deleted) {
|
|
35
|
-
await
|
|
36
|
-
this.states.delete(response.thread.id);
|
|
48
|
+
await this.delete(response.thread.id);
|
|
37
49
|
return;
|
|
38
50
|
}
|
|
39
|
-
state.target = target;
|
|
40
51
|
state.resolve(target);
|
|
41
52
|
}, (value) => {
|
|
53
|
+
if (this.closed)
|
|
54
|
+
return;
|
|
42
55
|
const error = value instanceof Error ? value : new Error(String(value));
|
|
43
56
|
state.failure = error;
|
|
57
|
+
this.persist(state);
|
|
44
58
|
state.reject(error);
|
|
45
59
|
if (state.deleted)
|
|
46
|
-
this.
|
|
60
|
+
this.forgetPromoted(response.thread.id);
|
|
47
61
|
else
|
|
48
62
|
failed(response.thread.id, error);
|
|
49
|
-
});
|
|
63
|
+
}).catch((error) => failed(response.thread.id, error instanceof Error ? error : new Error(String(error))));
|
|
50
64
|
});
|
|
51
65
|
return response;
|
|
52
66
|
}
|
|
67
|
+
recover(prepare, cleanup, restored, failed, inject) {
|
|
68
|
+
for (const record of this.store?.sideThreads() ?? []) {
|
|
69
|
+
const threadId = record.response.thread.id;
|
|
70
|
+
if (record.target)
|
|
71
|
+
restored(threadId, record.target, record.response);
|
|
72
|
+
this.open("", record.response, async () => {
|
|
73
|
+
const target = await prepare(record);
|
|
74
|
+
restored(threadId, target, record.response);
|
|
75
|
+
return target;
|
|
76
|
+
}, (target) => cleanup(threadId, target), failed, record.preparation, record);
|
|
77
|
+
if (!record.deleted && record.injections?.length) {
|
|
78
|
+
void this.run(threadId, (target) => this.flushInjections(this.states.get(threadId), target, inject))
|
|
79
|
+
.catch((error) => {
|
|
80
|
+
const failure = error instanceof Error ? error : new Error(String(error));
|
|
81
|
+
this.fail(threadId, failure);
|
|
82
|
+
failed(threadId, failure);
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
persist(state) {
|
|
88
|
+
if (this.closed)
|
|
89
|
+
return;
|
|
90
|
+
this.store?.saveSideThread({
|
|
91
|
+
response: state.response,
|
|
92
|
+
...(state.preparation ? { preparation: state.preparation } : {}),
|
|
93
|
+
...(state.target ? { target: state.target } : {}),
|
|
94
|
+
...(state.failure ? { failure: state.failure.message } : {}),
|
|
95
|
+
...(state.deleted ? { deleted: true } : {}),
|
|
96
|
+
...(state.injections.length ? { injections: state.injections } : {}),
|
|
97
|
+
});
|
|
98
|
+
}
|
|
53
99
|
owns(threadId) {
|
|
54
100
|
return this.states.has(threadId);
|
|
55
101
|
}
|
|
102
|
+
projectLoadedIds(ids) {
|
|
103
|
+
const backends = new Set([...this.states.values()].flatMap((state) => state.target?.backendThreadId ?? []));
|
|
104
|
+
return [...new Set([
|
|
105
|
+
...ids.filter((id) => !backends.has(id) && !this.states.get(id)?.deleted),
|
|
106
|
+
...[...this.states].filter(([, state]) => !state.deleted).map(([id]) => id),
|
|
107
|
+
])];
|
|
108
|
+
}
|
|
56
109
|
snapshot(threadId) {
|
|
57
110
|
return this.states.get(threadId)?.response;
|
|
58
111
|
}
|
|
@@ -74,23 +127,38 @@ export class OptimisticSideThreads {
|
|
|
74
127
|
const result = state.tail.then(async () => {
|
|
75
128
|
if (state.failure)
|
|
76
129
|
throw state.failure;
|
|
77
|
-
|
|
130
|
+
const target = await state.ready;
|
|
131
|
+
if (state.deleted || this.closed)
|
|
132
|
+
throw new Error(`Side thread '${threadId}' is no longer accepting operations.`);
|
|
133
|
+
return operation(target);
|
|
78
134
|
});
|
|
79
135
|
state.tail = result.then(() => undefined, () => undefined);
|
|
80
136
|
return result;
|
|
81
137
|
}
|
|
138
|
+
inject(threadId, items, apply) {
|
|
139
|
+
const state = this.states.get(threadId);
|
|
140
|
+
state.injections.push(items);
|
|
141
|
+
this.persist(state);
|
|
142
|
+
return this.run(threadId, (target) => this.flushInjections(state, target, apply));
|
|
143
|
+
}
|
|
144
|
+
async flushInjections(state, target, apply) {
|
|
145
|
+
while (state.injections.length) {
|
|
146
|
+
await apply(target, state.injections[0]);
|
|
147
|
+
state.injections.shift();
|
|
148
|
+
this.persist(state);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
82
151
|
fail(threadId, error) {
|
|
83
152
|
const state = this.states.get(threadId);
|
|
84
|
-
if (state && !state.failure)
|
|
153
|
+
if (state && !state.failure) {
|
|
85
154
|
state.failure = error;
|
|
155
|
+
this.persist(state);
|
|
156
|
+
}
|
|
86
157
|
}
|
|
87
158
|
attach(threadId, connectionId) {
|
|
88
159
|
const state = this.states.get(threadId);
|
|
89
160
|
if (!state)
|
|
90
161
|
return;
|
|
91
|
-
if (state.timer)
|
|
92
|
-
clearTimeout(state.timer);
|
|
93
|
-
delete state.timer;
|
|
94
162
|
state.connections.add(connectionId);
|
|
95
163
|
}
|
|
96
164
|
detach(threadId, connectionId) {
|
|
@@ -98,37 +166,38 @@ export class OptimisticSideThreads {
|
|
|
98
166
|
if (!state)
|
|
99
167
|
return;
|
|
100
168
|
state.connections.delete(connectionId);
|
|
101
|
-
if (state.connections.size === 0)
|
|
102
|
-
this.scheduleCleanup(threadId, state);
|
|
103
169
|
}
|
|
104
170
|
detachConnection(connectionId) {
|
|
105
|
-
for (const
|
|
106
|
-
|
|
107
|
-
continue;
|
|
108
|
-
this.scheduleCleanup(threadId, state);
|
|
171
|
+
for (const state of this.states.values()) {
|
|
172
|
+
state.connections.delete(connectionId);
|
|
109
173
|
}
|
|
110
174
|
}
|
|
111
175
|
async delete(threadId) {
|
|
112
176
|
const state = this.states.get(threadId);
|
|
113
|
-
if (!state
|
|
177
|
+
if (!state)
|
|
114
178
|
return;
|
|
179
|
+
if (state.deletion)
|
|
180
|
+
return state.deletion;
|
|
115
181
|
state.deleted = true;
|
|
116
|
-
|
|
117
|
-
clearTimeout(state.timer);
|
|
182
|
+
this.persist(state);
|
|
118
183
|
state.reject(new Error("Optimistic side thread was deleted before preparation completed."));
|
|
119
|
-
if (state.failure) {
|
|
120
|
-
this.
|
|
184
|
+
if (state.failure && !state.target) {
|
|
185
|
+
this.forgetPromoted(threadId);
|
|
121
186
|
return;
|
|
122
187
|
}
|
|
123
188
|
if (!state.target)
|
|
124
189
|
return;
|
|
125
|
-
|
|
126
|
-
|
|
190
|
+
state.deletion = state.cleanup(state.target).then(() => this.forgetPromoted(threadId));
|
|
191
|
+
try {
|
|
192
|
+
await state.deletion;
|
|
193
|
+
}
|
|
194
|
+
finally {
|
|
195
|
+
delete state.deletion;
|
|
196
|
+
}
|
|
127
197
|
}
|
|
128
198
|
forgetPromoted(threadId) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
clearTimeout(state.timer);
|
|
199
|
+
if (!this.closed)
|
|
200
|
+
this.store?.deleteSideThread(threadId);
|
|
132
201
|
this.states.delete(threadId);
|
|
133
202
|
}
|
|
134
203
|
claimFailure(threadId) {
|
|
@@ -139,20 +208,7 @@ export class OptimisticSideThreads {
|
|
|
139
208
|
return state.failure;
|
|
140
209
|
}
|
|
141
210
|
close() {
|
|
142
|
-
|
|
143
|
-
if (state.timer)
|
|
144
|
-
clearTimeout(state.timer);
|
|
145
|
-
}
|
|
146
|
-
scheduleCleanup(threadId, state) {
|
|
147
|
-
if (state.timer || state.deleted)
|
|
148
|
-
return;
|
|
149
|
-
state.timer = setTimeout(() => {
|
|
150
|
-
delete state.timer;
|
|
151
|
-
if (state.connections.size > 0)
|
|
152
|
-
return;
|
|
153
|
-
void this.delete(threadId);
|
|
154
|
-
}, this.graceMs);
|
|
155
|
-
state.timer.unref();
|
|
211
|
+
this.closed = true;
|
|
156
212
|
}
|
|
157
213
|
}
|
|
158
214
|
//# sourceMappingURL=optimisticSideThreads.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optimisticSideThreads.js","sourceRoot":"","sources":["../../src/gateway/optimisticSideThreads.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"optimisticSideThreads.js","sourceRoot":"","sources":["../../src/gateway/optimisticSideThreads.ts"],"names":[],"mappings":"AA0BA,SAAS,QAAQ;IAKf,IAAI,OAA4B,CAAC;IACjC,IAAI,MAA+B,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QAC5C,OAAO,GAAG,IAAI,CAAC;QACf,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,qBAAqB;IAII;IAHnB,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IAC3C,MAAM,GAAG,KAAK,CAAC;IAEvB,YAAoC,KAAiF;QAAjF,UAAK,GAAL,KAAK,CAA4E;IAAG,CAAC;IAElH,IAAI,CACT,YAAoB,EACpB,QAA4B,EAC5B,OAA4C,EAC5C,OAAwD,EACxD,MAAgD,EAChD,WAA6C,EAC7C,QAA2B;QAE3B,MAAM,KAAK,GAAG,QAAQ,EAAwB,CAAC;QAC/C,MAAM,KAAK,GAAU;YACnB,QAAQ;YACR,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;YACpC,OAAO;YACP,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE;YACvB,eAAe,EAAE,KAAK;YACtB,OAAO,EAAE,QAAQ,EAAE,OAAO,IAAI,KAAK;YACnC,WAAW;YACX,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,EAAE;YACtC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE,CAAC;QACF,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,cAAc,CAAC,GAAG,EAAE;YAClB,IAAI,IAAI,CAAC,MAAM;gBAAE,OAAO;YACxB,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC1D,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9D,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACjC,IAAI,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACxB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACpB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBAClB,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACtC,OAAO;gBACT,CAAC;gBACD,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC,EAAE,CAAC,KAAc,EAAE,EAAE;gBACpB,IAAI,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACxB,MAAM,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBACxE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACpB,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpB,IAAI,KAAK,CAAC,OAAO;oBAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;;oBACtD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACtH,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,OAAO,CACZ,OAAoE,EACpE,OAA0E,EAC1E,QAAgG,EAChG,MAAgD,EAChD,MAAiG;QAEjG,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,IAAI,MAAM,CAAC,MAAM;gBAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACxC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;gBACrC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5C,OAAO,MAAM,CAAC;YAChB,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;gBACjD,KAAK,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAE,EAAE,MAAM,EAAE,MAAO,CAAC,CAAC;qBACnG,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;oBACxB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC1E,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAC7B,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC;YACP,CAAC;QACH,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,KAAY;QAC1B,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC;YACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC,CAAC;IACL,CAAC;IAEM,IAAI,CAAC,QAAgB;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAEM,gBAAgB,CAAC,GAAsB;QAC5C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5G,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC;gBACjB,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC;gBACzE,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;aAC5E,CAAC,CAAC,CAAC;IACN,CAAC;IAEM,QAAQ,CAAC,QAAgB;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,QAAgB;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,IAAI,KAAK,CAAC,OAAO;YAAE,OAAO,QAAQ,CAAC;QACnC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IAC9C,CAAC;IAEM,MAAM,CAAC,QAAgB;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3C,CAAC;IAEM,GAAG,CACR,QAAgB,EAChB,SAAuD;QAEvD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,QAAQ,IAAI,CAAC,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACxC,IAAI,KAAK,CAAC,OAAO;gBAAE,MAAM,KAAK,CAAC,OAAO,CAAC;YACvC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;YACjC,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,QAAQ,sCAAsC,CAAC,CAAC;YAClH,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,MAAM,CACX,QAAgB,EAChB,KAAuC,EACvC,KAA+F;QAE/F,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;QACzC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,KAAY,EACZ,MAA4B,EAC5B,KAA+F;QAE/F,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC;YAC1C,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEM,IAAI,CAAC,QAAgB,EAAE,KAAY;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC5B,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,QAAgB,EAAE,YAAoB;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,QAAgB,EAAE,YAAoB;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAEM,gBAAgB,CAAC,YAAoB;QAC1C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAgB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,KAAK,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;QAC1C,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC,CAAC;QAC5F,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACnC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO;QAC1B,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,QAAQ,CAAC;QACvB,CAAC;gBAAS,CAAC;YACT,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;IACH,CAAC;IAEM,cAAc,CAAC,QAAgB;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,KAAK,CAAC,eAAe;YAAE,OAAO,SAAS,CAAC;QAC/D,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;CACF"}
|
package/dist/gateway/server.js
CHANGED
|
@@ -105,10 +105,40 @@ async function startGatewayOwner(config, socketPath, stockArgs, logger) {
|
|
|
105
105
|
handoffs.configureSubscriptions(subscriptions);
|
|
106
106
|
activeHandoffs = handoffs;
|
|
107
107
|
handoffs.configureDaemonStock(handoffStockRpc);
|
|
108
|
-
const optimisticSideThreads = new OptimisticSideThreads();
|
|
108
|
+
const optimisticSideThreads = new OptimisticSideThreads(persistence.operational);
|
|
109
109
|
await stockSideThreads.recover().catch((error) => {
|
|
110
110
|
logger.warn("stock.side.recovery-failed", { error: String(error) });
|
|
111
111
|
});
|
|
112
|
+
optimisticSideThreads.recover(async (record) => {
|
|
113
|
+
const { provider, params } = record.preparation;
|
|
114
|
+
const publicId = record.response.thread.id;
|
|
115
|
+
const publicParentId = record.response.thread.forkedFromId ?? params.threadId;
|
|
116
|
+
if (provider === "claude") {
|
|
117
|
+
const result = await claude.forkThread(params, publicParentId, publicId);
|
|
118
|
+
return { provider, backendThreadId: result.thread.id };
|
|
119
|
+
}
|
|
120
|
+
const result = await stockSideThreads.prepareOptimisticSide(params, publicParentId, publicId);
|
|
121
|
+
return { provider, backendThreadId: result.backendThreadId };
|
|
122
|
+
}, async (publicId, target) => {
|
|
123
|
+
if (target.provider === "claude") {
|
|
124
|
+
if (claude.ownsThread(target.backendThreadId))
|
|
125
|
+
await claude.deleteThread(target.backendThreadId);
|
|
126
|
+
subscriptions.unaliasThread(target.backendThreadId);
|
|
127
|
+
}
|
|
128
|
+
else
|
|
129
|
+
await stockSideThreads.discardOptimistic(publicId);
|
|
130
|
+
}, (publicId, target, response) => {
|
|
131
|
+
if (target.provider === "claude")
|
|
132
|
+
subscriptions.aliasThread(target.backendThreadId, publicId);
|
|
133
|
+
else
|
|
134
|
+
stockSideThreads.restoreOptimistic(publicId, target.backendThreadId, response.thread.forkedFromId);
|
|
135
|
+
}, (threadId, error) => logger.error("side.recovery-failed", { threadId, error: error.message }), async (target, items) => {
|
|
136
|
+
const params = { threadId: target.backendThreadId, items };
|
|
137
|
+
if (target.provider === "claude")
|
|
138
|
+
await claude.injectItems(params);
|
|
139
|
+
else
|
|
140
|
+
await stockSideThreads.request("thread/inject_items", params);
|
|
141
|
+
});
|
|
112
142
|
const threadCatalog = new ThreadCatalog(handoffStockRpc, claude, cursors, handoffs, stockSideThreads);
|
|
113
143
|
const webSockets = new WebSocketServer({ noServer: true, perMessageDeflate: false, maxPayload: 64 * 1024 * 1024 });
|
|
114
144
|
const connectionCleanups = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/gateway/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/gateway/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ import { type RpcMessage } from "../protocol/envelopes.js";
|
|
|
6
6
|
import type { StockRpc } from "./stockRpc.js";
|
|
7
7
|
import type { SubscriptionHub } from "./subscriptions.js";
|
|
8
8
|
export declare const STOCK_SIDE_THREAD_SOURCE = "ccodexSide";
|
|
9
|
-
export declare const STOCK_SIDE_DISCONNECT_GRACE_MS: number;
|
|
10
9
|
export type StockSideProjection = {
|
|
11
10
|
readonly kind: "drop";
|
|
12
11
|
} | {
|
|
@@ -22,20 +21,17 @@ export declare class StockSideThreads {
|
|
|
22
21
|
private readonly enabled;
|
|
23
22
|
private readonly cleanupStock;
|
|
24
23
|
private readonly logger;
|
|
25
|
-
private readonly graceMs;
|
|
26
24
|
private readonly hidden;
|
|
27
25
|
private readonly pending;
|
|
28
26
|
private readonly connectionsByThread;
|
|
29
27
|
private readonly threadsByConnection;
|
|
30
|
-
private readonly cleanupTimers;
|
|
31
28
|
private readonly publicParents;
|
|
32
29
|
private readonly publicSources;
|
|
33
30
|
private readonly publicIds;
|
|
34
31
|
private readonly optimisticBySource;
|
|
35
32
|
private readonly serverRequests;
|
|
36
33
|
private readonly serverRequestAliases;
|
|
37
|
-
|
|
38
|
-
constructor(enabled: boolean, cleanupStock: StockRpc, logger: Logger, graceMs?: number);
|
|
34
|
+
constructor(enabled: boolean, cleanupStock: StockRpc, logger: Logger);
|
|
39
35
|
recover(): Promise<void>;
|
|
40
36
|
prepareRequest(connectionId: string, message: RpcMessage, stock: StockRpc): Promise<RpcMessage>;
|
|
41
37
|
forkSide(connectionId: string, params: ThreadForkParams, publicSourceThreadId: string, stock: StockRpc): Promise<ThreadForkResponse>;
|
|
@@ -43,6 +39,7 @@ export declare class StockSideThreads {
|
|
|
43
39
|
response: ThreadForkResponse;
|
|
44
40
|
backendThreadId: string;
|
|
45
41
|
}>;
|
|
42
|
+
restoreOptimistic(publicThreadId: string, backendThreadId: string, publicParentId: string | null): void;
|
|
46
43
|
discardOptimistic(publicThreadId: string): Promise<void>;
|
|
47
44
|
request(method: string, params: unknown): Promise<unknown>;
|
|
48
45
|
captureDaemonMessage(message: RpcMessage, subscriptions: SubscriptionHub): boolean;
|
|
@@ -50,13 +47,13 @@ export declare class StockSideThreads {
|
|
|
50
47
|
projectMessage(connectionId: string, message: RpcMessage, trackConnection?: boolean): StockSideProjection;
|
|
51
48
|
filterThreads(threads: readonly Thread[]): Thread[];
|
|
52
49
|
hiddenIds(threads: readonly Thread[]): ReadonlySet<string>;
|
|
50
|
+
loadedSideIds(): string[];
|
|
53
51
|
detachConnection(connectionId: string): void;
|
|
54
52
|
close(): void;
|
|
55
53
|
private resultThread;
|
|
56
54
|
private discover;
|
|
57
55
|
private attach;
|
|
58
56
|
private detachThread;
|
|
59
|
-
private scheduleCleanup;
|
|
60
57
|
private forget;
|
|
61
58
|
private rememberPublicParent;
|
|
62
59
|
private projectThread;
|
|
@@ -5,7 +5,6 @@ import { v7 as uuidv7 } from "uuid";
|
|
|
5
5
|
import { projectRpcToPublicThread } from "./logicalThreadProjection.js";
|
|
6
6
|
import { isUserSideFork } from "./sideFork.js";
|
|
7
7
|
export const STOCK_SIDE_THREAD_SOURCE = "ccodexSide";
|
|
8
|
-
export const STOCK_SIDE_DISCONNECT_GRACE_MS = 60 * 60_000;
|
|
9
8
|
function requestKey(connectionId, id) {
|
|
10
9
|
return `${connectionId}:${typeof id}:${id}`;
|
|
11
10
|
}
|
|
@@ -13,7 +12,8 @@ function isThread(value) {
|
|
|
13
12
|
return Boolean(value && typeof value === "object" && typeof value.id === "string");
|
|
14
13
|
}
|
|
15
14
|
function isMarked(thread) {
|
|
16
|
-
return thread.threadSource === STOCK_SIDE_THREAD_SOURCE
|
|
15
|
+
return thread.threadSource === STOCK_SIDE_THREAD_SOURCE
|
|
16
|
+
|| thread.threadSource?.startsWith(`${STOCK_SIDE_THREAD_SOURCE}:`) === true;
|
|
17
17
|
}
|
|
18
18
|
async function hasPersistedMarker(thread) {
|
|
19
19
|
if (isMarked(thread))
|
|
@@ -25,8 +25,10 @@ async function hasPersistedMarker(thread) {
|
|
|
25
25
|
try {
|
|
26
26
|
for await (const line of lines) {
|
|
27
27
|
const record = JSON.parse(line);
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
if (record.type !== "session_meta" || typeof record.payload?.thread_source !== "string")
|
|
29
|
+
return false;
|
|
30
|
+
thread.threadSource = record.payload.thread_source;
|
|
31
|
+
return isMarked(thread);
|
|
30
32
|
}
|
|
31
33
|
return false;
|
|
32
34
|
}
|
|
@@ -47,24 +49,20 @@ export class StockSideThreads {
|
|
|
47
49
|
enabled;
|
|
48
50
|
cleanupStock;
|
|
49
51
|
logger;
|
|
50
|
-
graceMs;
|
|
51
52
|
hidden = new Set();
|
|
52
53
|
pending = new Map();
|
|
53
54
|
connectionsByThread = new Map();
|
|
54
55
|
threadsByConnection = new Map();
|
|
55
|
-
cleanupTimers = new Map();
|
|
56
56
|
publicParents = new Map();
|
|
57
57
|
publicSources = new Map();
|
|
58
58
|
publicIds = new Map();
|
|
59
59
|
optimisticBySource = new Map();
|
|
60
60
|
serverRequests = new Map();
|
|
61
61
|
serverRequestAliases = new Map();
|
|
62
|
-
|
|
63
|
-
constructor(enabled, cleanupStock, logger, graceMs = STOCK_SIDE_DISCONNECT_GRACE_MS) {
|
|
62
|
+
constructor(enabled, cleanupStock, logger) {
|
|
64
63
|
this.enabled = enabled;
|
|
65
64
|
this.cleanupStock = cleanupStock;
|
|
66
65
|
this.logger = logger;
|
|
67
|
-
this.graceMs = graceMs;
|
|
68
66
|
}
|
|
69
67
|
async recover() {
|
|
70
68
|
if (!this.enabled)
|
|
@@ -76,8 +74,9 @@ export class StockSideThreads {
|
|
|
76
74
|
if (!await hasPersistedMarker(thread))
|
|
77
75
|
continue;
|
|
78
76
|
this.hidden.add(thread.id);
|
|
79
|
-
const
|
|
80
|
-
|
|
77
|
+
const publicId = thread.threadSource?.slice(STOCK_SIDE_THREAD_SOURCE.length + 1);
|
|
78
|
+
if (publicId)
|
|
79
|
+
this.publicIds.set(thread.id, publicId);
|
|
81
80
|
}
|
|
82
81
|
cursor = result.nextCursor;
|
|
83
82
|
} while (cursor);
|
|
@@ -137,6 +136,12 @@ export class StockSideThreads {
|
|
|
137
136
|
}
|
|
138
137
|
async prepareOptimisticSide(params, publicSourceThreadId, publicSideThreadId) {
|
|
139
138
|
this.publicSources.set(params.threadId, publicSourceThreadId);
|
|
139
|
+
const recovered = [...this.publicIds].find(([, publicId]) => publicId === publicSideThreadId)?.[0];
|
|
140
|
+
if (recovered) {
|
|
141
|
+
this.publicParents.set(recovered, publicSourceThreadId);
|
|
142
|
+
const response = await this.cleanupStock.request("thread/resume", { threadId: recovered });
|
|
143
|
+
return { response: { ...response, thread: this.projectThread(response.thread) }, backendThreadId: recovered };
|
|
144
|
+
}
|
|
140
145
|
const pending = this.optimisticBySource.get(params.threadId) ?? [];
|
|
141
146
|
pending.push(publicSideThreadId);
|
|
142
147
|
this.optimisticBySource.set(params.threadId, pending);
|
|
@@ -144,7 +149,7 @@ export class StockSideThreads {
|
|
|
144
149
|
const response = await this.cleanupStock.request("thread/fork", {
|
|
145
150
|
...params,
|
|
146
151
|
ephemeral: false,
|
|
147
|
-
threadSource: STOCK_SIDE_THREAD_SOURCE
|
|
152
|
+
threadSource: `${STOCK_SIDE_THREAD_SOURCE}:${publicSideThreadId}`,
|
|
148
153
|
});
|
|
149
154
|
this.bindOptimistic(response.thread, publicSideThreadId);
|
|
150
155
|
return {
|
|
@@ -161,6 +166,12 @@ export class StockSideThreads {
|
|
|
161
166
|
this.optimisticBySource.delete(params.threadId);
|
|
162
167
|
}
|
|
163
168
|
}
|
|
169
|
+
restoreOptimistic(publicThreadId, backendThreadId, publicParentId) {
|
|
170
|
+
this.hidden.add(backendThreadId);
|
|
171
|
+
this.publicIds.set(backendThreadId, publicThreadId);
|
|
172
|
+
if (publicParentId)
|
|
173
|
+
this.publicParents.set(backendThreadId, publicParentId);
|
|
174
|
+
}
|
|
164
175
|
async discardOptimistic(publicThreadId) {
|
|
165
176
|
const backend = [...this.publicIds].find(([, publicId]) => publicId === publicThreadId)?.[0];
|
|
166
177
|
if (!backend)
|
|
@@ -232,6 +243,8 @@ export class StockSideThreads {
|
|
|
232
243
|
this.forget(pending.threadId);
|
|
233
244
|
if (pending?.kind === "promote" && "result" in message && pending.threadId) {
|
|
234
245
|
this.detachThread(pending.connectionId, pending.threadId);
|
|
246
|
+
const threadId = pending.threadId;
|
|
247
|
+
void this.cleanupStock.request("thread/delete", { threadId }).then(() => this.forget(threadId), (error) => this.logger.warn("stock.side.cleanup-failed", { threadId, error: String(error) }));
|
|
235
248
|
}
|
|
236
249
|
if (pending?.kind === "create" && "result" in message) {
|
|
237
250
|
const thread = this.resultThread(message.result);
|
|
@@ -264,9 +277,15 @@ export class StockSideThreads {
|
|
|
264
277
|
: undefined;
|
|
265
278
|
const backendThreadId = typeof params?.threadId === "string" ? params.threadId : undefined;
|
|
266
279
|
const publicThreadId = backendThreadId ? this.publicIds.get(backendThreadId) : undefined;
|
|
267
|
-
|
|
280
|
+
const projected = publicThreadId
|
|
268
281
|
? projectRpcToPublicThread(message, { backendThreadId: backendThreadId, publicThreadId })
|
|
269
|
-
: message
|
|
282
|
+
: message;
|
|
283
|
+
if (backendThreadId && this.hidden.has(backendThreadId)
|
|
284
|
+
&& "method" in projected && projected.method === "thread/status/changed"
|
|
285
|
+
&& projected.params.status.type === "notLoaded") {
|
|
286
|
+
return forward({ ...projected, params: { ...projected.params, status: { type: "idle" } } });
|
|
287
|
+
}
|
|
288
|
+
return forward(projected);
|
|
270
289
|
}
|
|
271
290
|
if (isMarked(thread)) {
|
|
272
291
|
if (trackConnection)
|
|
@@ -301,6 +320,9 @@ export class StockSideThreads {
|
|
|
301
320
|
this.filterThreads(threads);
|
|
302
321
|
return this.hidden;
|
|
303
322
|
}
|
|
323
|
+
loadedSideIds() {
|
|
324
|
+
return [...this.hidden].map((id) => this.publicIds.get(id) ?? id);
|
|
325
|
+
}
|
|
304
326
|
detachConnection(connectionId) {
|
|
305
327
|
for (const threadId of this.threadsByConnection.get(connectionId) ?? [])
|
|
306
328
|
this.detachThread(connectionId, threadId);
|
|
@@ -311,10 +333,6 @@ export class StockSideThreads {
|
|
|
311
333
|
}
|
|
312
334
|
}
|
|
313
335
|
close() {
|
|
314
|
-
this.closed = true;
|
|
315
|
-
for (const timer of this.cleanupTimers.values())
|
|
316
|
-
clearTimeout(timer);
|
|
317
|
-
this.cleanupTimers.clear();
|
|
318
336
|
this.pending.clear();
|
|
319
337
|
this.publicParents.clear();
|
|
320
338
|
this.publicSources.clear();
|
|
@@ -344,10 +362,6 @@ export class StockSideThreads {
|
|
|
344
362
|
}
|
|
345
363
|
attach(connectionId, threadId) {
|
|
346
364
|
this.hidden.add(threadId);
|
|
347
|
-
const timer = this.cleanupTimers.get(threadId);
|
|
348
|
-
if (timer)
|
|
349
|
-
clearTimeout(timer);
|
|
350
|
-
this.cleanupTimers.delete(threadId);
|
|
351
365
|
const connections = this.connectionsByThread.get(threadId) ?? new Set();
|
|
352
366
|
connections.add(connectionId);
|
|
353
367
|
this.connectionsByThread.set(threadId, connections);
|
|
@@ -364,29 +378,8 @@ export class StockSideThreads {
|
|
|
364
378
|
threads?.delete(threadId);
|
|
365
379
|
if (threads?.size === 0)
|
|
366
380
|
this.threadsByConnection.delete(connectionId);
|
|
367
|
-
if (!this.connectionsByThread.has(threadId))
|
|
368
|
-
this.scheduleCleanup(threadId, this.graceMs);
|
|
369
|
-
}
|
|
370
|
-
scheduleCleanup(threadId, delayMs) {
|
|
371
|
-
if (this.closed || this.cleanupTimers.has(threadId))
|
|
372
|
-
return;
|
|
373
|
-
const timer = setTimeout(() => {
|
|
374
|
-
this.cleanupTimers.delete(threadId);
|
|
375
|
-
if (this.connectionsByThread.has(threadId))
|
|
376
|
-
return;
|
|
377
|
-
void this.cleanupStock.request("thread/delete", { threadId }).then(() => this.forget(threadId), (error) => {
|
|
378
|
-
this.logger.warn("stock.side.cleanup-failed", { threadId, error: String(error) });
|
|
379
|
-
this.scheduleCleanup(threadId, Math.min(this.graceMs, 60_000));
|
|
380
|
-
});
|
|
381
|
-
}, delayMs);
|
|
382
|
-
timer.unref();
|
|
383
|
-
this.cleanupTimers.set(threadId, timer);
|
|
384
381
|
}
|
|
385
382
|
forget(threadId) {
|
|
386
|
-
const timer = this.cleanupTimers.get(threadId);
|
|
387
|
-
if (timer)
|
|
388
|
-
clearTimeout(timer);
|
|
389
|
-
this.cleanupTimers.delete(threadId);
|
|
390
383
|
this.hidden.delete(threadId);
|
|
391
384
|
this.publicParents.delete(threadId);
|
|
392
385
|
this.publicIds.delete(threadId);
|
|
@@ -409,9 +402,11 @@ export class StockSideThreads {
|
|
|
409
402
|
return {
|
|
410
403
|
...thread,
|
|
411
404
|
id: this.publicIds.get(thread.id) ?? thread.id,
|
|
405
|
+
sessionId: this.publicIds.get(thread.id) ?? thread.sessionId,
|
|
412
406
|
ephemeral: true,
|
|
413
407
|
path: null,
|
|
414
408
|
threadSource: "user",
|
|
409
|
+
status: thread.status.type === "notLoaded" ? { type: "idle" } : thread.status,
|
|
415
410
|
forkedFromId: this.publicParents.get(thread.id)
|
|
416
411
|
?? (thread.forkedFromId
|
|
417
412
|
? this.publicIds.get(thread.forkedFromId) ?? this.publicSources.get(thread.forkedFromId)
|