@gkorepanov/ccodex 0.3.0 → 0.4.1
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/README.md +139 -63
- package/assets/ccodex/goals/continuation.md +1 -0
- package/{compatibility.json → config/compatibility.json} +5 -6
- package/dist/claude/asyncQueue.d.ts +3 -0
- package/dist/claude/asyncQueue.js +13 -2
- package/dist/claude/asyncQueue.js.map +1 -1
- package/dist/claude/commandActions.d.ts +6 -0
- package/dist/claude/commandActions.js +57 -0
- package/dist/claude/commandActions.js.map +1 -0
- package/dist/claude/compactCommand.d.ts +2 -0
- package/dist/claude/compactCommand.js +7 -0
- package/dist/claude/compactCommand.js.map +1 -0
- package/dist/claude/goalTools.d.ts +15 -0
- package/dist/claude/goalTools.js +128 -0
- package/dist/claude/goalTools.js.map +1 -0
- package/dist/claude/hookMapper.d.ts +17 -4
- package/dist/claude/hookMapper.js +7 -5
- package/dist/claude/hookMapper.js.map +1 -1
- package/dist/claude/inputMapper.d.ts +1 -0
- package/dist/claude/inputMapper.js +1 -0
- package/dist/claude/inputMapper.js.map +1 -1
- package/dist/claude/rateLimits.d.ts +72 -0
- package/dist/claude/rateLimits.js +330 -0
- package/dist/claude/rateLimits.js.map +1 -0
- package/dist/claude/responseItemValidation.d.ts +2 -0
- package/dist/claude/responseItemValidation.js +40 -0
- package/dist/claude/responseItemValidation.js.map +1 -0
- package/dist/claude/resultClassifier.d.ts +8 -2
- package/dist/claude/resultClassifier.js +9 -1
- package/dist/claude/resultClassifier.js.map +1 -1
- package/dist/claude/service.d.ts +116 -29
- package/dist/claude/service.js +1337 -680
- package/dist/claude/service.js.map +1 -1
- package/dist/claude/session/backgroundOutput.d.ts +2 -0
- package/dist/claude/session/backgroundOutput.js +29 -0
- package/dist/claude/session/backgroundOutput.js.map +1 -0
- package/dist/claude/session/commands.d.ts +862 -0
- package/dist/claude/session/commands.js +2 -0
- package/dist/claude/session/commands.js.map +1 -0
- package/dist/claude/session/goalState.d.ts +49 -0
- package/dist/claude/session/goalState.js +407 -0
- package/dist/claude/session/goalState.js.map +1 -0
- package/dist/claude/session/mailbox.d.ts +52 -0
- package/dist/claude/session/mailbox.js +190 -0
- package/dist/claude/session/mailbox.js.map +1 -0
- package/dist/claude/session/outputAdapter.d.ts +11 -0
- package/dist/claude/session/outputAdapter.js +31 -0
- package/dist/claude/session/outputAdapter.js.map +1 -0
- package/dist/claude/session/permissionUpdates.d.ts +4 -0
- package/dist/claude/session/permissionUpdates.js +17 -0
- package/dist/claude/session/permissionUpdates.js.map +1 -0
- package/dist/claude/session/providerFacts.d.ts +47 -0
- package/dist/claude/session/providerFacts.js +84 -0
- package/dist/claude/session/providerFacts.js.map +1 -0
- package/dist/claude/session/providerRuntime.d.ts +1 -0
- package/dist/claude/session/providerRuntime.js +2 -0
- package/dist/claude/session/providerRuntime.js.map +1 -0
- package/dist/claude/session/providerRuntimeFactory.d.ts +49 -0
- package/dist/claude/session/providerRuntimeFactory.js +122 -0
- package/dist/claude/session/providerRuntimeFactory.js.map +1 -0
- package/dist/claude/session/repository.d.ts +57 -0
- package/dist/claude/session/repository.js +161 -0
- package/dist/claude/session/repository.js.map +1 -0
- package/dist/claude/session/runtime.d.ts +46 -0
- package/dist/claude/session/runtime.js +140 -0
- package/dist/claude/session/runtime.js.map +1 -0
- package/dist/claude/session/scopeState.d.ts +61 -0
- package/dist/claude/session/scopeState.js +74 -0
- package/dist/claude/session/scopeState.js.map +1 -0
- package/dist/claude/session/session.d.ts +285 -0
- package/dist/claude/session/session.js +6778 -0
- package/dist/claude/session/session.js.map +1 -0
- package/dist/claude/session/shellRunner.d.ts +13 -0
- package/dist/claude/session/shellRunner.js +103 -0
- package/dist/claude/session/shellRunner.js.map +1 -0
- package/dist/claude/session/usage.d.ts +2 -0
- package/dist/claude/session/usage.js +10 -0
- package/dist/claude/session/usage.js.map +1 -0
- package/dist/claude/sessionRegistry.d.ts +26 -0
- package/dist/claude/sessionRegistry.js +118 -0
- package/dist/claude/sessionRegistry.js.map +1 -0
- package/dist/claude/shellSupervisor.d.ts +1 -0
- package/dist/claude/shellSupervisor.js +69 -0
- package/dist/claude/shellSupervisor.js.map +1 -0
- package/dist/claude/statusCommand.d.ts +21 -0
- package/dist/claude/statusCommand.js +97 -0
- package/dist/claude/statusCommand.js.map +1 -0
- package/dist/claude/toolMapper.d.ts +9 -1
- package/dist/claude/toolMapper.js +98 -18
- package/dist/claude/toolMapper.js.map +1 -1
- package/dist/claude/transcriptBrancher.d.ts +37 -0
- package/dist/claude/transcriptBrancher.js +103 -0
- package/dist/claude/transcriptBrancher.js.map +1 -0
- package/dist/cli/delegate.js +23 -1
- package/dist/cli/delegate.js.map +1 -1
- package/dist/cli/main.js +28 -12
- package/dist/cli/main.js.map +1 -1
- package/dist/codex/generated/ResponseItemRuntimeSchema.d.ts +8 -0
- package/dist/codex/generated/ResponseItemRuntimeSchema.js +7 -0
- package/dist/codex/generated/ResponseItemRuntimeSchema.js.map +1 -0
- package/dist/compatibility/probe.js +12 -7
- package/dist/compatibility/probe.js.map +1 -1
- package/dist/config/config.d.ts +12 -0
- package/dist/config/config.js +103 -11
- package/dist/config/config.js.map +1 -1
- package/dist/daemon/daemon.js +91 -43
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/ownership.d.ts +15 -0
- package/dist/daemon/ownership.js +185 -0
- package/dist/daemon/ownership.js.map +1 -0
- package/dist/daemon/probe.js +1 -1
- package/dist/daemon/supervisor.d.ts +3 -0
- package/dist/daemon/supervisor.js +37 -1
- package/dist/daemon/supervisor.js.map +1 -1
- package/dist/gateway/clientConnection.d.ts +7 -1
- package/dist/gateway/clientConnection.js +656 -60
- package/dist/gateway/clientConnection.js.map +1 -1
- package/dist/gateway/logicalThreadProjection.d.ts +8 -0
- package/dist/gateway/logicalThreadProjection.js +59 -0
- package/dist/gateway/logicalThreadProjection.js.map +1 -0
- package/dist/gateway/remoteRelay.js +0 -1
- package/dist/gateway/remoteRelay.js.map +1 -1
- package/dist/gateway/server.d.ts +1 -1
- package/dist/gateway/server.js +69 -11
- package/dist/gateway/server.js.map +1 -1
- package/dist/gateway/stockRpc.d.ts +5 -2
- package/dist/gateway/stockRpc.js +52 -6
- package/dist/gateway/stockRpc.js.map +1 -1
- package/dist/gateway/subscriptions.d.ts +19 -3
- package/dist/gateway/subscriptions.js +152 -13
- package/dist/gateway/subscriptions.js.map +1 -1
- package/dist/gateway/threadList.d.ts +7 -2
- package/dist/gateway/threadList.js +8 -4
- package/dist/gateway/threadList.js.map +1 -1
- package/dist/gateway/transientNotice.d.ts +15 -0
- package/dist/gateway/transientNotice.js +96 -1
- package/dist/gateway/transientNotice.js.map +1 -1
- package/dist/handoff/providerEpochs.d.ts +18 -0
- package/dist/handoff/providerEpochs.js +77 -0
- package/dist/handoff/providerEpochs.js.map +1 -0
- package/dist/handoff/service.d.ts +86 -6
- package/dist/handoff/service.js +1276 -168
- package/dist/handoff/service.js.map +1 -1
- package/dist/handoff/store.d.ts +189 -2
- package/dist/handoff/store.js +618 -7
- package/dist/handoff/store.js.map +1 -1
- package/dist/handoff/titleGeneration.d.ts +28 -0
- package/dist/handoff/titleGeneration.js +138 -0
- package/dist/handoff/titleGeneration.js.map +1 -0
- package/dist/management/doctor.d.ts +1 -1
- package/dist/management/doctor.js +32 -23
- package/dist/management/doctor.js.map +1 -1
- package/dist/management/lifecycle.js +14 -2
- package/dist/management/lifecycle.js.map +1 -1
- package/dist/management/remoteShim.d.ts +10 -0
- package/dist/management/remoteShim.js +65 -0
- package/dist/management/remoteShim.js.map +1 -0
- package/dist/management/setup.d.ts +5 -0
- package/dist/management/setup.js +122 -41
- package/dist/management/setup.js.map +1 -1
- package/dist/management/shimSelect.d.ts +3 -0
- package/dist/management/shimSelect.js +49 -0
- package/dist/management/shimSelect.js.map +1 -0
- package/dist/management/shims.d.ts +5 -0
- package/dist/management/shims.js +59 -0
- package/dist/management/shims.js.map +1 -0
- package/dist/observability/metrics.d.ts +2 -0
- package/dist/observability/metrics.js +6 -0
- package/dist/observability/metrics.js.map +1 -1
- package/dist/protocol/errors.d.ts +1 -0
- package/dist/protocol/errors.js +4 -1
- package/dist/protocol/errors.js.map +1 -1
- package/dist/runtime/dependencies.js +3 -3
- package/dist/runtime/dependencies.js.map +1 -1
- package/dist/runtime/providerAvailability.d.ts +24 -0
- package/dist/runtime/providerAvailability.js +107 -0
- package/dist/runtime/providerAvailability.js.map +1 -0
- package/dist/state/stateCommand.d.ts +21 -0
- package/dist/state/stateCommand.js +198 -0
- package/dist/state/stateCommand.js.map +1 -0
- package/dist/state/stockStateTracker.d.ts +16 -0
- package/dist/state/stockStateTracker.js +137 -0
- package/dist/state/stockStateTracker.js.map +1 -0
- package/dist/store/HybridStore.d.ts +118 -2
- package/dist/store/HybridStore.js +23 -1
- package/dist/store/HybridStore.js.map +1 -1
- package/dist/store/memoryStore.d.ts +57 -7
- package/dist/store/memoryStore.js +337 -5
- package/dist/store/memoryStore.js.map +1 -1
- package/dist/store/sqliteStore.d.ts +30 -4
- package/dist/store/sqliteStore.js +395 -42
- package/dist/store/sqliteStore.js.map +1 -1
- package/examples/config.toml +35 -0
- package/{LICENSES.md → legal/LICENSES.md} +2 -2
- package/{THIRD_PARTY_NOTICES.md → legal/THIRD_PARTY_NOTICES.md} +177 -148
- package/package.json +36 -24
- package/{install.sh → scripts/install.sh} +2 -2
- package/scripts/postinstall.mjs +10 -0
- package/vendor/codex/continuation.md +51 -0
- package/BUILD_BENCHMARKS.md +0 -27
- package/RELEASING.md +0 -98
- package/SSH_VERIFY.md +0 -69
- package/config.example.toml +0 -20
- package/dist/claude/interactions.d.ts +0 -23
- package/dist/claude/interactions.js +0 -77
- package/dist/claude/interactions.js.map +0 -1
- package/dist/claude/sessionRuntime.d.ts +0 -102
- package/dist/claude/sessionRuntime.js +0 -1361
- package/dist/claude/sessionRuntime.js.map +0 -1
- /package/{uninstall.sh → scripts/uninstall.sh} +0 -0
|
@@ -1,7 +1,12 @@
|
|
|
1
|
+
import { projectRpcToPublicThread } from "./logicalThreadProjection.js";
|
|
1
2
|
export class SubscriptionHub {
|
|
2
3
|
subscriptions = new Map();
|
|
3
4
|
connections = new Map();
|
|
4
5
|
suppressedThreads = new Set();
|
|
6
|
+
mutedByConnection = new Map();
|
|
7
|
+
requestRecipients = new Map();
|
|
8
|
+
threadAliases = new Map();
|
|
9
|
+
hiddenUserMessageTurns = new Map();
|
|
5
10
|
static globalThreadNotifications = new Set([
|
|
6
11
|
"thread/started",
|
|
7
12
|
"thread/status/changed",
|
|
@@ -11,13 +16,14 @@ export class SubscriptionHub {
|
|
|
11
16
|
"thread/deleted",
|
|
12
17
|
"thread/closed",
|
|
13
18
|
]);
|
|
14
|
-
attach(connectionId, sink) {
|
|
15
|
-
this.connections.set(connectionId, sink);
|
|
19
|
+
attach(connectionId, sink, requestSink) {
|
|
20
|
+
this.connections.set(connectionId, { connectionId, sink, ...(requestSink ? { requestSink } : {}) });
|
|
16
21
|
}
|
|
17
22
|
subscribe(threadId, connectionId, sink, requestSink) {
|
|
18
23
|
const threadSubscriptions = this.subscriptions.get(threadId) ?? new Map();
|
|
19
24
|
threadSubscriptions.set(connectionId, { connectionId, sink, ...(requestSink ? { requestSink } : {}) });
|
|
20
25
|
this.subscriptions.set(threadId, threadSubscriptions);
|
|
26
|
+
return true;
|
|
21
27
|
}
|
|
22
28
|
unsubscribe(threadId, connectionId) {
|
|
23
29
|
const threadSubscriptions = this.subscriptions.get(threadId);
|
|
@@ -25,8 +31,14 @@ export class SubscriptionHub {
|
|
|
25
31
|
if (threadSubscriptions?.size === 0)
|
|
26
32
|
this.subscriptions.delete(threadId);
|
|
27
33
|
}
|
|
34
|
+
hasSubscribers(threadId) {
|
|
35
|
+
return (this.subscriptions.get(this.publicThreadId(threadId))?.size ?? 0) > 0;
|
|
36
|
+
}
|
|
28
37
|
detach(connectionId) {
|
|
29
38
|
this.connections.delete(connectionId);
|
|
39
|
+
this.mutedByConnection.delete(connectionId);
|
|
40
|
+
for (const recipients of this.requestRecipients.values())
|
|
41
|
+
recipients.delete(connectionId);
|
|
30
42
|
for (const [threadId, threadSubscriptions] of this.subscriptions) {
|
|
31
43
|
threadSubscriptions.delete(connectionId);
|
|
32
44
|
if (threadSubscriptions.size === 0)
|
|
@@ -36,28 +48,155 @@ export class SubscriptionHub {
|
|
|
36
48
|
emit(threadId, method, params) {
|
|
37
49
|
if (this.suppressedThreads.has(threadId))
|
|
38
50
|
return;
|
|
51
|
+
this.emitVisible(threadId, method, params, false);
|
|
52
|
+
}
|
|
53
|
+
emitPublic(publicThreadId, method, params) {
|
|
54
|
+
this.emitVisible(publicThreadId, method, params, true);
|
|
55
|
+
}
|
|
56
|
+
emitVisible(threadId, method, params, alreadyPublic) {
|
|
57
|
+
const visibleParams = this.withoutHiddenUserMessage(threadId, method, params);
|
|
58
|
+
if (visibleParams === undefined)
|
|
59
|
+
return;
|
|
60
|
+
const publicThreadId = alreadyPublic ? threadId : this.publicThreadId(threadId);
|
|
61
|
+
const projectedParams = publicThreadId === threadId ? visibleParams : projectRpcToPublicThread({ params: visibleParams }, { publicThreadId, backendThreadId: threadId }).params;
|
|
62
|
+
if (method === "serverRequest/resolved") {
|
|
63
|
+
const requestId = projectedParams && typeof projectedParams === "object" && "requestId" in projectedParams
|
|
64
|
+
? projectedParams.requestId
|
|
65
|
+
: undefined;
|
|
66
|
+
if (typeof requestId !== "string")
|
|
67
|
+
return;
|
|
68
|
+
const recipients = this.requestRecipients.get(requestId) ?? new Set();
|
|
69
|
+
for (const connectionId of recipients) {
|
|
70
|
+
const connection = this.connections.get(connectionId);
|
|
71
|
+
if (connection)
|
|
72
|
+
connection.sink(method, projectedParams);
|
|
73
|
+
else
|
|
74
|
+
this.subscriptions.get(publicThreadId)?.get(connectionId)?.sink(method, projectedParams);
|
|
75
|
+
}
|
|
76
|
+
this.requestRecipients.delete(requestId);
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
39
79
|
if (SubscriptionHub.globalThreadNotifications.has(method)) {
|
|
40
|
-
for (const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
80
|
+
for (const connection of this.connections.values()) {
|
|
81
|
+
if (!this.isMuted(publicThreadId, connection.connectionId))
|
|
82
|
+
connection.sink(method, projectedParams);
|
|
83
|
+
}
|
|
84
|
+
for (const subscription of this.subscriptions.get(publicThreadId)?.values() ?? []) {
|
|
85
|
+
if (!this.connections.has(subscription.connectionId) && !this.isMuted(publicThreadId, subscription.connectionId)) {
|
|
86
|
+
subscription.sink(method, projectedParams);
|
|
87
|
+
}
|
|
45
88
|
}
|
|
46
89
|
return;
|
|
47
90
|
}
|
|
48
|
-
for (const subscription of this.subscriptions.get(
|
|
49
|
-
|
|
91
|
+
for (const subscription of this.subscriptions.get(publicThreadId)?.values() ?? []) {
|
|
92
|
+
if (!this.isMuted(publicThreadId, subscription.connectionId))
|
|
93
|
+
subscription.sink(method, projectedParams);
|
|
50
94
|
}
|
|
51
95
|
}
|
|
52
|
-
request(threadId, id, method, params) {
|
|
96
|
+
request(threadId, id, method, params, connectionId) {
|
|
53
97
|
if (this.suppressedThreads.has(threadId))
|
|
54
|
-
return;
|
|
55
|
-
|
|
56
|
-
|
|
98
|
+
return false;
|
|
99
|
+
const publicThreadId = this.publicThreadId(threadId);
|
|
100
|
+
const projectedParams = publicThreadId === threadId ? params : projectRpcToPublicThread({ params }, { publicThreadId, backendThreadId: threadId }).params;
|
|
101
|
+
if (connectionId) {
|
|
102
|
+
const target = this.subscriptions.get(publicThreadId)?.get(connectionId) ?? this.connections.get(connectionId);
|
|
103
|
+
if (!target?.requestSink)
|
|
104
|
+
return false;
|
|
105
|
+
target.requestSink(id, method, projectedParams);
|
|
106
|
+
const recipients = this.requestRecipients.get(id) ?? new Set();
|
|
107
|
+
recipients.add(connectionId);
|
|
108
|
+
this.requestRecipients.set(id, recipients);
|
|
109
|
+
return true;
|
|
110
|
+
}
|
|
111
|
+
let delivered = false;
|
|
112
|
+
const recipients = this.requestRecipients.get(id) ?? new Set();
|
|
113
|
+
for (const subscription of this.subscriptions.get(publicThreadId)?.values() ?? []) {
|
|
114
|
+
if (!subscription.requestSink)
|
|
115
|
+
continue;
|
|
116
|
+
subscription.requestSink(id, method, projectedParams);
|
|
117
|
+
recipients.add(subscription.connectionId);
|
|
118
|
+
delivered = true;
|
|
119
|
+
}
|
|
120
|
+
if (delivered) {
|
|
121
|
+
this.requestRecipients.set(id, recipients);
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
// Subagent threads are projections and the App commonly subscribes only to
|
|
125
|
+
// their parent. An approval still has to reach every attached App surface;
|
|
126
|
+
// the request params retain the canonical child thread/turn/item identity.
|
|
127
|
+
for (const connection of this.connections.values()) {
|
|
128
|
+
if (!connection.requestSink)
|
|
129
|
+
continue;
|
|
130
|
+
connection.requestSink(id, method, projectedParams);
|
|
131
|
+
recipients.add(connection.connectionId);
|
|
57
132
|
}
|
|
133
|
+
if (recipients.size > 0)
|
|
134
|
+
this.requestRecipients.set(id, recipients);
|
|
135
|
+
return recipients.size > 0;
|
|
58
136
|
}
|
|
59
137
|
suppress(threadId) { this.suppressedThreads.add(threadId); }
|
|
60
138
|
unsuppress(threadId) { this.suppressedThreads.delete(threadId); }
|
|
61
139
|
isSuppressed(threadId) { return this.suppressedThreads.has(threadId); }
|
|
140
|
+
threadDeleted(threadId) {
|
|
141
|
+
this.emit(threadId, "thread/deleted", { threadId });
|
|
142
|
+
this.hiddenUserMessageTurns.delete(threadId);
|
|
143
|
+
}
|
|
144
|
+
hideUserMessages(threadId, turnId) {
|
|
145
|
+
const turns = this.hiddenUserMessageTurns.get(threadId) ?? new Set();
|
|
146
|
+
turns.add(turnId);
|
|
147
|
+
this.hiddenUserMessageTurns.set(threadId, turns);
|
|
148
|
+
}
|
|
149
|
+
aliasThread(backendThreadId, publicThreadId) {
|
|
150
|
+
if (backendThreadId === publicThreadId)
|
|
151
|
+
return;
|
|
152
|
+
this.threadAliases.set(backendThreadId, publicThreadId);
|
|
153
|
+
}
|
|
154
|
+
unaliasThread(backendThreadId) { this.threadAliases.delete(backendThreadId); }
|
|
155
|
+
mute(threadId, connectionId) {
|
|
156
|
+
const threads = this.mutedByConnection.get(connectionId) ?? new Set();
|
|
157
|
+
threads.add(threadId);
|
|
158
|
+
this.mutedByConnection.set(connectionId, threads);
|
|
159
|
+
}
|
|
160
|
+
unmute(threadId, connectionId) {
|
|
161
|
+
const threads = this.mutedByConnection.get(connectionId);
|
|
162
|
+
threads?.delete(threadId);
|
|
163
|
+
if (threads?.size === 0)
|
|
164
|
+
this.mutedByConnection.delete(connectionId);
|
|
165
|
+
}
|
|
166
|
+
isMuted(threadId, connectionId) {
|
|
167
|
+
return this.mutedByConnection.get(connectionId)?.has(threadId) ?? false;
|
|
168
|
+
}
|
|
169
|
+
publicThreadId(threadId) {
|
|
170
|
+
return this.threadAliases.get(threadId) ?? threadId;
|
|
171
|
+
}
|
|
172
|
+
withoutHiddenUserMessage(threadId, method, params) {
|
|
173
|
+
if (!params || typeof params !== "object")
|
|
174
|
+
return params;
|
|
175
|
+
const record = params;
|
|
176
|
+
const turn = record.turn && typeof record.turn === "object"
|
|
177
|
+
? record.turn
|
|
178
|
+
: undefined;
|
|
179
|
+
const turnId = typeof record.turnId === "string"
|
|
180
|
+
? record.turnId
|
|
181
|
+
: typeof turn?.id === "string" ? turn.id : undefined;
|
|
182
|
+
if (!turnId || !this.hiddenUserMessageTurns.get(threadId)?.has(turnId))
|
|
183
|
+
return params;
|
|
184
|
+
const item = record.item && typeof record.item === "object"
|
|
185
|
+
? record.item
|
|
186
|
+
: undefined;
|
|
187
|
+
if ((method === "item/started" || method === "item/completed") && item?.type === "userMessage") {
|
|
188
|
+
return undefined;
|
|
189
|
+
}
|
|
190
|
+
const visible = Array.isArray(turn?.items) && turn.items.some((candidate) => candidate && typeof candidate === "object" && candidate.type === "userMessage")
|
|
191
|
+
? { ...record, turn: { ...turn, items: turn.items.filter((candidate) => !candidate || typeof candidate !== "object" || candidate.type !== "userMessage") } }
|
|
192
|
+
: params;
|
|
193
|
+
if (method === "turn/completed") {
|
|
194
|
+
const turns = this.hiddenUserMessageTurns.get(threadId);
|
|
195
|
+
turns.delete(turnId);
|
|
196
|
+
if (turns.size === 0)
|
|
197
|
+
this.hiddenUserMessageTurns.delete(threadId);
|
|
198
|
+
}
|
|
199
|
+
return visible;
|
|
200
|
+
}
|
|
62
201
|
}
|
|
63
202
|
//# sourceMappingURL=subscriptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/gateway/subscriptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/gateway/subscriptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Thread } from "../codex/generated/v2/Thread.js";
|
|
1
2
|
import type { ThreadListParams } from "../codex/generated/v2/ThreadListParams.js";
|
|
2
3
|
import type { ThreadListResponse } from "../codex/generated/v2/ThreadListResponse.js";
|
|
3
4
|
import type { ThreadLoadedListParams } from "../codex/generated/v2/ThreadLoadedListParams.js";
|
|
@@ -5,5 +6,9 @@ import type { ThreadLoadedListResponse } from "../codex/generated/v2/ThreadLoade
|
|
|
5
6
|
import type { ClaudeService } from "../claude/service.js";
|
|
6
7
|
import type { StockRpc } from "./stockRpc.js";
|
|
7
8
|
import { CursorCodec } from "../protocol/cursor.js";
|
|
8
|
-
export declare function mergedThreadList(params: ThreadListParams, stock: StockRpc, claude: ClaudeService, cursors: CursorCodec
|
|
9
|
-
|
|
9
|
+
export declare function mergedThreadList(params: ThreadListParams, stock: StockRpc, claude: ClaudeService, cursors: CursorCodec, logical?: {
|
|
10
|
+
projectThreadCatalog(stock: Thread[], claude: Thread[]): Thread[];
|
|
11
|
+
}): Promise<ThreadListResponse>;
|
|
12
|
+
export declare function mergedLoadedList(params: ThreadLoadedListParams, stock: StockRpc, claude: ClaudeService, cursors: CursorCodec, logical?: {
|
|
13
|
+
projectLoadedThreadIds(stock: string[], claude: string[]): string[];
|
|
14
|
+
}): Promise<ThreadLoadedListResponse>;
|
|
@@ -26,7 +26,7 @@ async function allStockThreads(stock, params) {
|
|
|
26
26
|
} while (cursor);
|
|
27
27
|
return threads;
|
|
28
28
|
}
|
|
29
|
-
export async function mergedThreadList(params, stock, claude, cursors) {
|
|
29
|
+
export async function mergedThreadList(params, stock, claude, cursors, logical) {
|
|
30
30
|
const [stockThreads, claudeThreads] = await Promise.all([
|
|
31
31
|
allStockThreads(stock, { ...params, cursor: null }),
|
|
32
32
|
Promise.resolve(claude.listThreads({ ...params, cursor: null })),
|
|
@@ -39,7 +39,7 @@ export async function mergedThreadList(params, stock, claude, cursors) {
|
|
|
39
39
|
throw invalidParams("Thread pagination query changed; restart pagination.");
|
|
40
40
|
}
|
|
41
41
|
const anchor = cursor ? { [key]: cursor.value, id: cursor.id } : undefined;
|
|
42
|
-
const catalog = [...stockThreads, ...claudeThreads]
|
|
42
|
+
const catalog = (logical ? logical.projectThreadCatalog(stockThreads, claudeThreads) : [...stockThreads, ...claudeThreads])
|
|
43
43
|
.sort((left, right) => compareThreads(left, right, key, direction))
|
|
44
44
|
.filter((thread) => !anchor || compareThreads(thread, anchor, key, direction) > 0);
|
|
45
45
|
const limit = Math.max(1, Math.min(params.limit ?? 50, 100));
|
|
@@ -63,8 +63,12 @@ async function allStockLoaded(stock) {
|
|
|
63
63
|
} while (cursor);
|
|
64
64
|
return ids;
|
|
65
65
|
}
|
|
66
|
-
export async function mergedLoadedList(params, stock, claude, cursors) {
|
|
67
|
-
const
|
|
66
|
+
export async function mergedLoadedList(params, stock, claude, cursors, logical) {
|
|
67
|
+
const stockIds = await allStockLoaded(stock);
|
|
68
|
+
const claudeIds = claude.loadedThreadIds();
|
|
69
|
+
const data = logical
|
|
70
|
+
? logical.projectLoadedThreadIds(stockIds, claudeIds)
|
|
71
|
+
: [...new Set([...stockIds, ...claudeIds])];
|
|
68
72
|
const version = createHash("sha256").update(data.join("\0")).digest("hex").slice(0, 16);
|
|
69
73
|
const query = queryFingerprint({});
|
|
70
74
|
const cursor = cursors.decode("loaded", params.cursor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"threadList.js","sourceRoot":"","sources":["../../src/gateway/threadList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAQzC,OAAO,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAgBtD,SAAS,SAAS,CAAC,MAAwB;IACzC,OAAO,MAAM,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;AACrH,CAAC;AAED,SAAS,WAAW,CAAC,MAAwB;IAC3C,OAAO,gBAAgB,CAAC;QACtB,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,IAAI;QACtF,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,IAAI;QACpG,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,IAAI;QACrF,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,IAAI;KACjG,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,KAAa,EAAE,GAAwB,EAAE,SAAoC;IACjH,MAAM,IAAI,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;AAC9F,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,KAAe,EAAE,MAAwB;IACtE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,GAAG,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAuB,CAAC;QAC3G,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC;IAC7B,CAAC,QAAQ,MAAM,EAAE;IACjB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAwB,EACxB,KAAe,EACf,MAAqB,EACrB,OAAoB;
|
|
1
|
+
{"version":3,"file":"threadList.js","sourceRoot":"","sources":["../../src/gateway/threadList.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Turn } from "../codex/generated/v2/Turn.js";
|
|
2
|
+
import type { UserInput } from "../codex/generated/v2/UserInput.js";
|
|
2
3
|
export interface TransientNotice {
|
|
3
4
|
readonly response: {
|
|
4
5
|
turn: Turn;
|
|
@@ -8,7 +9,21 @@ export interface TransientNotice {
|
|
|
8
9
|
params: unknown;
|
|
9
10
|
}>;
|
|
10
11
|
}
|
|
12
|
+
export interface ProviderMigrationNotice extends TransientNotice {
|
|
13
|
+
readonly turnId: string;
|
|
14
|
+
readonly compactionItemId: string;
|
|
15
|
+
}
|
|
11
16
|
export type SystemNoticeKind = "info" | "error";
|
|
12
17
|
export declare function systemNoticeText(text: string, kind?: SystemNoticeKind): string;
|
|
13
18
|
export declare function transientAgentNotice(threadId: string, text: string, nowMs?: number): TransientNotice;
|
|
14
19
|
export declare function transientSystemNotice(threadId: string, text: string, kind?: SystemNoticeKind, nowMs?: number): TransientNotice;
|
|
20
|
+
export declare function transientCommandNotice(threadId: string, content: UserInput[], text: string, clientId?: string | null, nowMs?: number): TransientNotice;
|
|
21
|
+
export declare function providerMigrationNotice(threadId: string, nowMs?: number): ProviderMigrationNotice;
|
|
22
|
+
export declare function providerMigrationFailed(threadId: string, migration: ProviderMigrationNotice, message: string, nowMs?: number): Array<{
|
|
23
|
+
method: string;
|
|
24
|
+
params: unknown;
|
|
25
|
+
}>;
|
|
26
|
+
export declare function providerMigrationCompleted(threadId: string, migration: ProviderMigrationNotice, nowMs?: number): Array<{
|
|
27
|
+
method: string;
|
|
28
|
+
params: unknown;
|
|
29
|
+
}>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { v7 as uuidv7 } from "uuid";
|
|
2
2
|
export function systemNoticeText(text, kind = "info") {
|
|
3
|
-
return kind === "error" ?
|
|
3
|
+
return kind === "error" ? `◆ **CCodex** │ ⚠️ ${text}` : `◆ **CCodex** │ ${text}`;
|
|
4
4
|
}
|
|
5
5
|
export function transientAgentNotice(threadId, text, nowMs = Date.now()) {
|
|
6
6
|
const turnId = uuidv7({ msecs: nowMs });
|
|
@@ -46,4 +46,99 @@ export function transientAgentNotice(threadId, text, nowMs = Date.now()) {
|
|
|
46
46
|
export function transientSystemNotice(threadId, text, kind = "info", nowMs = Date.now()) {
|
|
47
47
|
return transientAgentNotice(threadId, systemNoticeText(text, kind), nowMs);
|
|
48
48
|
}
|
|
49
|
+
export function transientCommandNotice(threadId, content, text, clientId = null, nowMs = Date.now()) {
|
|
50
|
+
const turnId = uuidv7({ msecs: nowMs });
|
|
51
|
+
const user = {
|
|
52
|
+
type: "userMessage", id: uuidv7({ msecs: nowMs }), clientId, content,
|
|
53
|
+
};
|
|
54
|
+
const agentId = uuidv7({ msecs: nowMs });
|
|
55
|
+
const emptyAgent = {
|
|
56
|
+
type: "agentMessage", id: agentId, text: "", phase: null, memoryCitation: null,
|
|
57
|
+
};
|
|
58
|
+
const agent = { ...emptyAgent, text, phase: "final_answer" };
|
|
59
|
+
const startedAt = Math.floor(nowMs / 1_000);
|
|
60
|
+
const started = {
|
|
61
|
+
id: turnId,
|
|
62
|
+
items: [user],
|
|
63
|
+
itemsView: "full",
|
|
64
|
+
status: "inProgress",
|
|
65
|
+
error: null,
|
|
66
|
+
startedAt,
|
|
67
|
+
completedAt: null,
|
|
68
|
+
durationMs: null,
|
|
69
|
+
};
|
|
70
|
+
const completed = {
|
|
71
|
+
...started,
|
|
72
|
+
items: [user, agent],
|
|
73
|
+
status: "completed",
|
|
74
|
+
completedAt: startedAt,
|
|
75
|
+
durationMs: 0,
|
|
76
|
+
};
|
|
77
|
+
return {
|
|
78
|
+
response: { turn: started },
|
|
79
|
+
notifications: [
|
|
80
|
+
{ method: "turn/started", params: { threadId, turn: started } },
|
|
81
|
+
{ method: "item/started", params: { item: user, threadId, turnId, startedAtMs: nowMs } },
|
|
82
|
+
{ method: "item/completed", params: { item: user, threadId, turnId, completedAtMs: nowMs } },
|
|
83
|
+
{ method: "item/started", params: { item: emptyAgent, threadId, turnId, startedAtMs: nowMs } },
|
|
84
|
+
{ method: "item/agentMessage/delta", params: { threadId, turnId, itemId: agentId, delta: text } },
|
|
85
|
+
{ method: "item/completed", params: { item: agent, threadId, turnId, completedAtMs: nowMs } },
|
|
86
|
+
{ method: "turn/completed", params: { threadId, turn: completed } },
|
|
87
|
+
],
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
export function providerMigrationNotice(threadId, nowMs = Date.now()) {
|
|
91
|
+
const turnId = uuidv7({ msecs: nowMs });
|
|
92
|
+
const compaction = { type: "contextCompaction", id: uuidv7({ msecs: nowMs }) };
|
|
93
|
+
const startedAt = Math.floor(nowMs / 1_000);
|
|
94
|
+
const turn = {
|
|
95
|
+
id: turnId,
|
|
96
|
+
items: [compaction],
|
|
97
|
+
itemsView: "full",
|
|
98
|
+
status: "inProgress",
|
|
99
|
+
error: null,
|
|
100
|
+
startedAt,
|
|
101
|
+
completedAt: null,
|
|
102
|
+
durationMs: null,
|
|
103
|
+
};
|
|
104
|
+
return {
|
|
105
|
+
turnId,
|
|
106
|
+
compactionItemId: compaction.id,
|
|
107
|
+
response: { turn },
|
|
108
|
+
notifications: [
|
|
109
|
+
{ method: "turn/started", params: { threadId, turn } },
|
|
110
|
+
{ method: "item/started", params: { item: compaction, threadId, turnId, startedAtMs: nowMs } },
|
|
111
|
+
],
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
export function providerMigrationFailed(threadId, migration, message, nowMs = Date.now()) {
|
|
115
|
+
const started = migration.response.turn;
|
|
116
|
+
const compaction = started.items.find((item) => item.id === migration.compactionItemId);
|
|
117
|
+
const turn = {
|
|
118
|
+
...started,
|
|
119
|
+
status: "failed",
|
|
120
|
+
error: { message, codexErrorInfo: "badRequest", additionalDetails: null },
|
|
121
|
+
completedAt: Math.floor(nowMs / 1_000),
|
|
122
|
+
durationMs: Math.max(0, nowMs - (started.startedAt ?? Math.floor(nowMs / 1_000)) * 1_000),
|
|
123
|
+
};
|
|
124
|
+
return [
|
|
125
|
+
{ method: "item/completed", params: { item: compaction, threadId, turnId: turn.id, completedAtMs: nowMs } },
|
|
126
|
+
{ method: "turn/completed", params: { threadId, turn } },
|
|
127
|
+
];
|
|
128
|
+
}
|
|
129
|
+
export function providerMigrationCompleted(threadId, migration, nowMs = Date.now()) {
|
|
130
|
+
const started = migration.response.turn;
|
|
131
|
+
const compaction = started.items.find((item) => item.id === migration.compactionItemId);
|
|
132
|
+
const turn = {
|
|
133
|
+
...started,
|
|
134
|
+
status: "completed",
|
|
135
|
+
completedAt: Math.floor(nowMs / 1_000),
|
|
136
|
+
durationMs: Math.max(0, nowMs - (started.startedAt ?? Math.floor(nowMs / 1_000)) * 1_000),
|
|
137
|
+
};
|
|
138
|
+
return [
|
|
139
|
+
{ method: "item/completed", params: { item: compaction, threadId, turnId: turn.id, completedAtMs: nowMs } },
|
|
140
|
+
{ method: "thread/compacted", params: { threadId, turnId: turn.id } },
|
|
141
|
+
{ method: "turn/completed", params: { threadId, turn } },
|
|
142
|
+
];
|
|
143
|
+
}
|
|
49
144
|
//# sourceMappingURL=transientNotice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transientNotice.js","sourceRoot":"","sources":["../../src/gateway/transientNotice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"transientNotice.js","sourceRoot":"","sources":["../../src/gateway/transientNotice.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { Thread } from "../codex/generated/v2/Thread.js";
|
|
2
|
+
import type { Turn } from "../codex/generated/v2/Turn.js";
|
|
3
|
+
import { HandoffStore, type LogicalThread, type NewLogicalTurn, type ProviderEpoch, type ProviderKind } from "./store.js";
|
|
4
|
+
export interface ResolvedProviderEpoch {
|
|
5
|
+
readonly logical: LogicalThread;
|
|
6
|
+
readonly epoch: ProviderEpoch;
|
|
7
|
+
}
|
|
8
|
+
export declare class ProviderEpochs {
|
|
9
|
+
private readonly store;
|
|
10
|
+
constructor(store: HandoffStore);
|
|
11
|
+
resolve(publicThreadId: string): ResolvedProviderEpoch | undefined;
|
|
12
|
+
publicId(provider: ProviderKind, backendThreadId: string): string | undefined;
|
|
13
|
+
hiddenBackendIds(provider?: ProviderKind): Set<string>;
|
|
14
|
+
seed(thread: Thread, provider: ProviderKind, model: string, settings: Record<string, unknown>): ResolvedProviderEpoch;
|
|
15
|
+
visibleTurns(publicThreadId: string, currentBackendTurns: readonly Turn[]): Turn[];
|
|
16
|
+
snapshotTurns(publicThreadId: string, currentBackendTurns: readonly Turn[]): NewLogicalTurn[];
|
|
17
|
+
projectThread(publicThreadId: string, backend: Thread, includeTurns: boolean): Thread;
|
|
18
|
+
}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { v7 as uuidv7 } from "uuid";
|
|
2
|
+
function providerTurns(epochId, turns) {
|
|
3
|
+
return turns.map((turn) => ({
|
|
4
|
+
publicTurnId: turn.id,
|
|
5
|
+
epochId,
|
|
6
|
+
providerTurnId: turn.id,
|
|
7
|
+
turn,
|
|
8
|
+
kind: "provider",
|
|
9
|
+
}));
|
|
10
|
+
}
|
|
11
|
+
export class ProviderEpochs {
|
|
12
|
+
store;
|
|
13
|
+
constructor(store) {
|
|
14
|
+
this.store = store;
|
|
15
|
+
}
|
|
16
|
+
resolve(publicThreadId) {
|
|
17
|
+
const logical = this.store.getLogicalThread(publicThreadId);
|
|
18
|
+
const epoch = logical && this.store.getEpoch(logical.currentEpochId);
|
|
19
|
+
return logical && epoch ? { logical, epoch } : undefined;
|
|
20
|
+
}
|
|
21
|
+
publicId(provider, backendThreadId) {
|
|
22
|
+
const epoch = this.store.findEpochByBackend(provider, backendThreadId);
|
|
23
|
+
return epoch?.state === "current" ? epoch.publicThreadId : undefined;
|
|
24
|
+
}
|
|
25
|
+
hiddenBackendIds(provider) {
|
|
26
|
+
return new Set(this.store.listBackendMappings()
|
|
27
|
+
.filter((mapping) => provider === undefined || mapping.provider === provider)
|
|
28
|
+
.map((mapping) => mapping.backendThreadId));
|
|
29
|
+
}
|
|
30
|
+
seed(thread, provider, model, settings) {
|
|
31
|
+
const existing = this.resolve(thread.id);
|
|
32
|
+
if (existing)
|
|
33
|
+
return existing;
|
|
34
|
+
const epochId = uuidv7();
|
|
35
|
+
const logical = this.store.createLogicalThread({
|
|
36
|
+
thread,
|
|
37
|
+
epoch: { id: epochId, provider, backendThreadId: thread.id, model, settings },
|
|
38
|
+
});
|
|
39
|
+
return this.resolve(thread.id);
|
|
40
|
+
}
|
|
41
|
+
visibleTurns(publicThreadId, currentBackendTurns) {
|
|
42
|
+
return [
|
|
43
|
+
...this.store.listLogicalTurns(publicThreadId).map((turn) => turn.turn),
|
|
44
|
+
...currentBackendTurns,
|
|
45
|
+
];
|
|
46
|
+
}
|
|
47
|
+
snapshotTurns(publicThreadId, currentBackendTurns) {
|
|
48
|
+
const resolved = this.resolve(publicThreadId);
|
|
49
|
+
if (!resolved)
|
|
50
|
+
throw new Error(`Unknown logical thread '${publicThreadId}'.`);
|
|
51
|
+
return [
|
|
52
|
+
...this.store.listLogicalTurns(publicThreadId).map((turn) => ({
|
|
53
|
+
publicTurnId: turn.publicTurnId,
|
|
54
|
+
...(turn.epochId ? { epochId: turn.epochId } : {}),
|
|
55
|
+
...(turn.providerTurnId ? { providerTurnId: turn.providerTurnId } : {}),
|
|
56
|
+
turn: turn.turn,
|
|
57
|
+
kind: turn.kind,
|
|
58
|
+
})),
|
|
59
|
+
...providerTurns(resolved.epoch.id, currentBackendTurns),
|
|
60
|
+
];
|
|
61
|
+
}
|
|
62
|
+
projectThread(publicThreadId, backend, includeTurns) {
|
|
63
|
+
const resolved = this.resolve(publicThreadId);
|
|
64
|
+
if (!resolved)
|
|
65
|
+
throw new Error(`Unknown logical thread '${publicThreadId}'.`);
|
|
66
|
+
const base = resolved.logical.thread;
|
|
67
|
+
return {
|
|
68
|
+
...backend,
|
|
69
|
+
id: publicThreadId,
|
|
70
|
+
forkedFromId: base.forkedFromId,
|
|
71
|
+
name: base.name ?? backend.name,
|
|
72
|
+
createdAt: base.createdAt,
|
|
73
|
+
turns: includeTurns ? this.visibleTurns(publicThreadId, backend.turns) : [],
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=providerEpochs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providerEpochs.js","sourceRoot":"","sources":["../../src/handoff/providerEpochs.ts"],"names":[],"mappings":"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"}
|