@zakstam/codex-local-component 0.1.3 → 0.2.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.
Files changed (82) hide show
  1. package/README.md +39 -42
  2. package/dist/app-server/client.d.ts +24 -0
  3. package/dist/app-server/client.d.ts.map +1 -0
  4. package/dist/app-server/client.js +44 -0
  5. package/dist/app-server/client.js.map +1 -0
  6. package/dist/app-server/index.d.ts +2 -0
  7. package/dist/app-server/index.d.ts.map +1 -0
  8. package/dist/app-server/index.js +2 -0
  9. package/dist/app-server/index.js.map +1 -0
  10. package/dist/client/index.d.ts +1 -1
  11. package/dist/client/index.d.ts.map +1 -1
  12. package/dist/client/index.js +1 -1
  13. package/dist/client/index.js.map +1 -1
  14. package/dist/client/sync.d.ts +4 -4
  15. package/dist/client/sync.d.ts.map +1 -1
  16. package/dist/client/sync.js +4 -4
  17. package/dist/client/sync.js.map +1 -1
  18. package/dist/client/types.d.ts +3 -3
  19. package/dist/client/types.d.ts.map +1 -1
  20. package/dist/component/_generated/component.d.ts +190 -5
  21. package/dist/component/_generated/component.d.ts.map +1 -1
  22. package/dist/component/approvals.d.ts.map +1 -1
  23. package/dist/component/approvals.js +33 -12
  24. package/dist/component/approvals.js.map +1 -1
  25. package/dist/component/messages.d.ts.map +1 -1
  26. package/dist/component/messages.js +12 -3
  27. package/dist/component/messages.js.map +1 -1
  28. package/dist/component/pagination.d.ts +5 -0
  29. package/dist/component/pagination.d.ts.map +1 -0
  30. package/dist/component/pagination.js +30 -0
  31. package/dist/component/pagination.js.map +1 -0
  32. package/dist/component/schema.d.ts +52 -6
  33. package/dist/component/schema.d.ts.map +1 -1
  34. package/dist/component/schema.js +32 -3
  35. package/dist/component/schema.js.map +1 -1
  36. package/dist/component/streams.d.ts +1 -1
  37. package/dist/component/streams.js +2 -2
  38. package/dist/component/streams.js.map +1 -1
  39. package/dist/component/sync.d.ts +94 -5
  40. package/dist/component/sync.d.ts.map +1 -1
  41. package/dist/component/sync.js +88 -11
  42. package/dist/component/sync.js.map +1 -1
  43. package/dist/component/syncIngest.d.ts +61 -4
  44. package/dist/component/syncIngest.d.ts.map +1 -1
  45. package/dist/component/syncIngest.js +346 -150
  46. package/dist/component/syncIngest.js.map +1 -1
  47. package/dist/component/syncReplay.d.ts +28 -7
  48. package/dist/component/syncReplay.d.ts.map +1 -1
  49. package/dist/component/syncReplay.js +122 -60
  50. package/dist/component/syncReplay.js.map +1 -1
  51. package/dist/component/threads.d.ts +38 -0
  52. package/dist/component/threads.d.ts.map +1 -1
  53. package/dist/component/threads.js +178 -32
  54. package/dist/component/threads.js.map +1 -1
  55. package/dist/component/utils.d.ts.map +1 -1
  56. package/dist/component/utils.js +4 -3
  57. package/dist/component/utils.js.map +1 -1
  58. package/dist/host/convex.d.ts +85 -0
  59. package/dist/host/convex.d.ts.map +1 -0
  60. package/dist/host/convex.js +50 -0
  61. package/dist/host/convex.js.map +1 -0
  62. package/dist/host/index.d.ts +3 -0
  63. package/dist/host/index.d.ts.map +1 -0
  64. package/dist/host/index.js +3 -0
  65. package/dist/host/index.js.map +1 -0
  66. package/dist/host/runtime.d.ts +116 -0
  67. package/dist/host/runtime.d.ts.map +1 -0
  68. package/dist/host/runtime.js +320 -0
  69. package/dist/host/runtime.js.map +1 -0
  70. package/dist/index.d.ts +1 -0
  71. package/dist/index.d.ts.map +1 -1
  72. package/dist/index.js +1 -0
  73. package/dist/index.js.map +1 -1
  74. package/dist/protocol/classifier.d.ts.map +1 -1
  75. package/dist/protocol/classifier.js +4 -7
  76. package/dist/protocol/classifier.js.map +1 -1
  77. package/dist/react/types.d.ts +10 -0
  78. package/dist/react/types.d.ts.map +1 -1
  79. package/dist/react/useCodexStreamOverlay.d.ts.map +1 -1
  80. package/dist/react/useCodexStreamOverlay.js +46 -8
  81. package/dist/react/useCodexStreamOverlay.js.map +1 -1
  82. package/package.json +10 -1
@@ -0,0 +1,320 @@
1
+ import { buildInitializeRequest, buildInitializedNotification, buildThreadStartRequest, buildTurnInterruptRequest, buildTurnStartTextRequest, isUuidLikeThreadId, } from "../app-server/client.js";
2
+ import { CodexLocalBridge } from "../local-adapter/bridge.js";
3
+ const MAX_BATCH_SIZE = 32;
4
+ function randomSessionId() {
5
+ if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
6
+ return crypto.randomUUID();
7
+ }
8
+ return `${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
9
+ }
10
+ function isServerNotification(message) {
11
+ return "method" in message;
12
+ }
13
+ function isResponse(message) {
14
+ return "id" in message && !isServerNotification(message);
15
+ }
16
+ function normalizeIngestKind(kind) {
17
+ if (kind === "codex/event/task_started") {
18
+ return "turn/started";
19
+ }
20
+ if (kind === "codex/event/task_complete") {
21
+ return "turn/completed";
22
+ }
23
+ return kind;
24
+ }
25
+ export function createCodexHostRuntime(args) {
26
+ let bridge = null;
27
+ let actor = null;
28
+ let sessionId = null;
29
+ let threadId = null;
30
+ let runtimeThreadId = null;
31
+ let externalThreadId = null;
32
+ let turnId = null;
33
+ let turnInFlight = false;
34
+ let turnSettled = false;
35
+ let interruptRequested = false;
36
+ let nextRequestId = 1;
37
+ let ingestQueue = [];
38
+ let flushTimer = null;
39
+ let flushTail = Promise.resolve();
40
+ let ingestFlushMs = 250;
41
+ const pendingRequests = new Map();
42
+ const emitState = (lastError = null) => {
43
+ args.handlers?.onState?.({
44
+ running: !!bridge,
45
+ threadId,
46
+ externalThreadId,
47
+ turnId,
48
+ turnInFlight,
49
+ lastError,
50
+ });
51
+ };
52
+ const clearFlushTimer = () => {
53
+ if (flushTimer) {
54
+ clearTimeout(flushTimer);
55
+ flushTimer = null;
56
+ }
57
+ };
58
+ const requestId = () => {
59
+ const id = nextRequestId;
60
+ nextRequestId += 1;
61
+ return id;
62
+ };
63
+ const sendMessage = (message, trackedMethod) => {
64
+ if (!bridge) {
65
+ throw new Error("Bridge not started");
66
+ }
67
+ bridge.send(message);
68
+ if ("id" in message && typeof message.id === "number" && trackedMethod) {
69
+ pendingRequests.set(message.id, { method: trackedMethod });
70
+ }
71
+ };
72
+ const flushQueue = async () => {
73
+ if (!actor || !sessionId || !threadId) {
74
+ return;
75
+ }
76
+ const activeActor = actor;
77
+ const activeSessionId = sessionId;
78
+ const activeThreadId = threadId;
79
+ const next = flushTail.then(async () => {
80
+ clearFlushTimer();
81
+ while (ingestQueue.length > 0) {
82
+ const batch = ingestQueue.splice(0, MAX_BATCH_SIZE);
83
+ const result = await args.persistence.ingestSafe({
84
+ actor: activeActor,
85
+ sessionId: activeSessionId,
86
+ threadId: activeThreadId,
87
+ deltas: batch,
88
+ });
89
+ if (result.status === "rejected") {
90
+ throw new Error(`ingestSafe rejected: ${result.errors.map((err) => err.code).join(",")}`);
91
+ }
92
+ }
93
+ });
94
+ flushTail = next.catch(() => undefined);
95
+ await next;
96
+ };
97
+ const enqueueIngestDelta = async (delta, forceFlush) => {
98
+ ingestQueue.push(delta);
99
+ if (forceFlush || ingestQueue.length >= MAX_BATCH_SIZE) {
100
+ await flushQueue();
101
+ return;
102
+ }
103
+ if (!flushTimer) {
104
+ flushTimer = setTimeout(() => {
105
+ flushTimer = null;
106
+ void flushQueue();
107
+ }, turnInFlight ? ingestFlushMs : 5000);
108
+ }
109
+ };
110
+ const start = async (startArgs) => {
111
+ if (bridge) {
112
+ emitState();
113
+ return;
114
+ }
115
+ actor = startArgs.actor;
116
+ sessionId = startArgs.sessionId ? `${startArgs.sessionId}-${randomSessionId()}` : randomSessionId();
117
+ externalThreadId = startArgs.externalThreadId ?? null;
118
+ ingestFlushMs = startArgs.ingestFlushMs ?? 250;
119
+ const bridgeConfig = {};
120
+ if (args.bridge?.codexBin !== undefined) {
121
+ bridgeConfig.codexBin = args.bridge.codexBin;
122
+ }
123
+ const resolvedCwd = startArgs.cwd ?? args.bridge?.cwd;
124
+ if (resolvedCwd !== undefined) {
125
+ bridgeConfig.cwd = resolvedCwd;
126
+ }
127
+ bridge = new CodexLocalBridge(bridgeConfig, {
128
+ onEvent: async (event) => {
129
+ if (!actor || !sessionId) {
130
+ return;
131
+ }
132
+ if (!runtimeThreadId ||
133
+ (!isUuidLikeThreadId(runtimeThreadId) && isUuidLikeThreadId(event.threadId))) {
134
+ runtimeThreadId = event.threadId;
135
+ }
136
+ if (!threadId) {
137
+ const binding = await args.persistence.ensureThread({
138
+ actor,
139
+ externalThreadId: externalThreadId ?? runtimeThreadId,
140
+ ...(startArgs.model !== undefined ? { model: startArgs.model } : {}),
141
+ ...(startArgs.cwd !== undefined ? { cwd: startArgs.cwd } : {}),
142
+ localThreadId: event.threadId,
143
+ });
144
+ threadId = binding.threadId;
145
+ externalThreadId = binding.externalThreadId ?? runtimeThreadId;
146
+ await args.persistence.ensureSession({
147
+ actor,
148
+ sessionId,
149
+ threadId,
150
+ lastEventCursor: 0,
151
+ });
152
+ emitState();
153
+ }
154
+ if (event.kind === "turn/started" && event.turnId) {
155
+ turnId = event.turnId;
156
+ turnInFlight = true;
157
+ turnSettled = false;
158
+ emitState();
159
+ if (interruptRequested) {
160
+ if (!runtimeThreadId) {
161
+ return;
162
+ }
163
+ sendMessage(buildTurnInterruptRequest(requestId(), {
164
+ threadId: runtimeThreadId,
165
+ turnId: event.turnId,
166
+ }), "turn/interrupt");
167
+ interruptRequested = false;
168
+ }
169
+ }
170
+ if (event.kind === "turn/completed" || event.kind === "codex/event/turn_aborted") {
171
+ turnId = null;
172
+ turnInFlight = false;
173
+ turnSettled = true;
174
+ emitState();
175
+ }
176
+ if (event.kind === "error") {
177
+ turnInFlight = false;
178
+ turnSettled = true;
179
+ if (!event.turnId || event.turnId === turnId) {
180
+ turnId = null;
181
+ }
182
+ emitState();
183
+ }
184
+ args.handlers?.onEvent?.(event);
185
+ const persistedThreadId = threadId;
186
+ if (!persistedThreadId) {
187
+ return;
188
+ }
189
+ const delta = event.streamId && event.turnId
190
+ ? {
191
+ type: "stream_delta",
192
+ eventId: event.eventId,
193
+ kind: normalizeIngestKind(event.kind),
194
+ payloadJson: event.payloadJson,
195
+ cursorStart: event.cursorStart,
196
+ cursorEnd: event.cursorEnd,
197
+ createdAt: event.createdAt,
198
+ threadId: persistedThreadId,
199
+ turnId: event.turnId,
200
+ streamId: event.streamId,
201
+ }
202
+ : {
203
+ type: "lifecycle_event",
204
+ eventId: event.eventId,
205
+ kind: normalizeIngestKind(event.kind),
206
+ payloadJson: event.payloadJson,
207
+ createdAt: event.createdAt,
208
+ threadId: persistedThreadId,
209
+ ...(event.turnId ? { turnId: event.turnId } : {}),
210
+ };
211
+ const forceFlush = event.kind === "turn/completed" ||
212
+ event.kind === "codex/event/turn_aborted" ||
213
+ event.kind === "error";
214
+ await enqueueIngestDelta(delta, forceFlush);
215
+ },
216
+ onGlobalMessage: async (message) => {
217
+ if (isResponse(message) && typeof message.id === "number") {
218
+ const pending = pendingRequests.get(message.id);
219
+ pendingRequests.delete(message.id);
220
+ if (pending?.method === "thread/start" &&
221
+ !message.error &&
222
+ message.result &&
223
+ typeof message.result === "object" &&
224
+ "thread" in message.result &&
225
+ typeof message.result.thread === "object" &&
226
+ message.result.thread !== null &&
227
+ "id" in message.result.thread &&
228
+ typeof message.result.thread.id === "string") {
229
+ runtimeThreadId = message.result.thread.id;
230
+ }
231
+ if (message.error && pending?.method === "turn/start") {
232
+ turnInFlight = false;
233
+ turnSettled = true;
234
+ turnId = null;
235
+ emitState();
236
+ }
237
+ }
238
+ args.handlers?.onGlobalMessage?.(message);
239
+ },
240
+ onProtocolError: async ({ line, error }) => {
241
+ const message = error instanceof Error ? error.message : String(error);
242
+ emitState(message);
243
+ args.handlers?.onProtocolError?.({ message, line });
244
+ },
245
+ onProcessExit: (code) => {
246
+ emitState(`codex exited with code ${String(code)}`);
247
+ },
248
+ });
249
+ bridge.start();
250
+ sendMessage(buildInitializeRequest(requestId(), {
251
+ name: "codex_local_host_runtime",
252
+ title: "Codex Local Host Runtime",
253
+ version: "0.1.0",
254
+ }), "initialize");
255
+ sendMessage(buildInitializedNotification());
256
+ sendMessage(buildThreadStartRequest(requestId(), {
257
+ ...(startArgs.model ? { model: startArgs.model } : {}),
258
+ ...(startArgs.cwd ? { cwd: startArgs.cwd } : {}),
259
+ }), "thread/start");
260
+ emitState();
261
+ };
262
+ const stop = async () => {
263
+ clearFlushTimer();
264
+ await flushQueue();
265
+ bridge?.stop();
266
+ bridge = null;
267
+ actor = null;
268
+ sessionId = null;
269
+ threadId = null;
270
+ runtimeThreadId = null;
271
+ externalThreadId = null;
272
+ turnId = null;
273
+ turnInFlight = false;
274
+ turnSettled = false;
275
+ interruptRequested = false;
276
+ pendingRequests.clear();
277
+ emitState();
278
+ };
279
+ const sendTurn = (text) => {
280
+ if (!bridge || !runtimeThreadId) {
281
+ throw new Error("Bridge/thread not ready. Start runtime first.");
282
+ }
283
+ if (turnInFlight && !turnSettled) {
284
+ throw new Error("A turn is already in flight.");
285
+ }
286
+ turnInFlight = true;
287
+ turnSettled = false;
288
+ emitState();
289
+ sendMessage(buildTurnStartTextRequest(requestId(), {
290
+ threadId: runtimeThreadId,
291
+ text,
292
+ }), "turn/start");
293
+ };
294
+ const interrupt = () => {
295
+ if (!bridge || !runtimeThreadId) {
296
+ return;
297
+ }
298
+ if (!turnId) {
299
+ interruptRequested = true;
300
+ return;
301
+ }
302
+ sendMessage(buildTurnInterruptRequest(requestId(), { threadId: runtimeThreadId, turnId }), "turn/interrupt");
303
+ };
304
+ const getState = () => ({
305
+ running: !!bridge,
306
+ threadId,
307
+ externalThreadId,
308
+ turnId,
309
+ turnInFlight,
310
+ lastError: null,
311
+ });
312
+ return {
313
+ start,
314
+ stop,
315
+ sendTurn,
316
+ interrupt,
317
+ getState,
318
+ };
319
+ }
320
+ //# sourceMappingURL=runtime.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/host/runtime.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  export * from "./client/index.js";
2
+ export * from "./host/index.js";
2
3
  export * from "./mapping.js";
3
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
package/dist/index.js CHANGED
@@ -1,3 +1,4 @@
1
1
  export * from "./client/index.js";
2
+ export * from "./host/index.js";
2
3
  export * from "./mapping.js";
3
4
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"classifier.d.ts","sourceRoot":"","sources":["../../src/protocol/classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GACzB;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAqDtC,wBAAgB,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,iBAAiB,CAahF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAyD/E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAElF"}
1
+ {"version":3,"file":"classifier.d.ts","sourceRoot":"","sources":["../../src/protocol/classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GACzB;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAiDtC,wBAAgB,eAAe,CAAC,OAAO,EAAE,oBAAoB,GAAG,iBAAiB,CAahF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAyD/E;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAElF"}
@@ -9,13 +9,6 @@ function extractThreadId(message) {
9
9
  if (!("method" in message)) {
10
10
  return undefined;
11
11
  }
12
- if ("conversationId" in message.params &&
13
- typeof message.params.conversationId === "string") {
14
- return message.params.conversationId;
15
- }
16
- if (message.method === "applyPatchApproval" || message.method === "execCommandApproval") {
17
- return message.params.conversationId;
18
- }
19
12
  if ("threadId" in message.params && typeof message.params.threadId === "string") {
20
13
  return message.params.threadId;
21
14
  }
@@ -26,6 +19,10 @@ function extractThreadId(message) {
26
19
  typeof message.params.thread.id === "string") {
27
20
  return message.params.thread.id;
28
21
  }
22
+ if ("conversationId" in message.params &&
23
+ typeof message.params.conversationId === "string") {
24
+ return message.params.conversationId;
25
+ }
29
26
  return undefined;
30
27
  }
31
28
  function isThreadScopedByKind(kind) {
@@ -1 +1 @@
1
- {"version":3,"file":"classifier.js","sourceRoot":"","sources":["../../src/protocol/classifier.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"classifier.js","sourceRoot":"","sources":["../../src/protocol/classifier.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,16 @@ export type CodexStreamsResult = {
19
19
  } | {
20
20
  kind: "deltas";
21
21
  deltas: CodexStreamDeltaLike[];
22
+ streamWindows: Array<{
23
+ streamId: string;
24
+ status: "ok" | "rebased" | "stale";
25
+ serverCursorStart: number;
26
+ serverCursorEnd: number;
27
+ }>;
28
+ nextCheckpoints: Array<{
29
+ streamId: string;
30
+ cursor: number;
31
+ }>;
22
32
  };
23
33
  export type CodexMessagesQuery<Args = Record<string, unknown>> = FunctionReference<"query", "public", {
24
34
  threadId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/react/types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1G,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAEnF,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,GACrE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAC;AAEvD,MAAM,MAAM,kBAAkB,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAChF,OAAO,EACP,QAAQ,EACR;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,iBAAiB,CAAC;IAClC,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,GAAG,IAAI,EACR,gBAAgB,CAAC,uBAAuB,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAAE,CAC7E,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,KAAK,SAAS,kBAAkB,CAAC,OAAO,CAAC,IAC1E,KAAK,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACrC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,YAAY,CAAC,GAC1D,KAAK,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/react/types.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC1G,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAEnF,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,GACrE;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,aAAa,EAAE,KAAK,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;QACnC,iBAAiB,EAAE,MAAM,CAAC;QAC1B,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;IACH,eAAe,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC9D,CAAC;AAEN,MAAM,MAAM,kBAAkB,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,iBAAiB,CAChF,OAAO,EACP,QAAQ,EACR;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,iBAAiB,CAAC;IAClC,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,GAAG,IAAI,EACR,gBAAgB,CAAC,uBAAuB,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,kBAAkB,CAAA;CAAE,CAC7E,CAAC;AAEF,MAAM,MAAM,sBAAsB,CAAC,KAAK,SAAS,kBAAkB,CAAC,OAAO,CAAC,IAC1E,KAAK,SAAS,kBAAkB,CAAC,OAAO,CAAC,GACrC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,gBAAgB,GAAG,YAAY,CAAC,GAC1D,KAAK,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"useCodexStreamOverlay.d.ts","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAsB,MAAM,YAAY,CAAC;AAuCjG,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,kBAAkB,CAAC,GAAG,CAAC,EACzE,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC,GAAG,MAAM,EAC5C,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC;IACD,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CA6DA"}
1
+ {"version":3,"file":"useCodexStreamOverlay.d.ts","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAsB,MAAM,YAAY,CAAC;AAyFjG,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,kBAAkB,CAAC,GAAG,CAAC,EACzE,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC,GAAG,MAAM,EAC5C,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC;IACD,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAmEA"}
@@ -1,24 +1,56 @@
1
1
  "use client";
2
2
  import { useQuery } from "convex/react";
3
3
  import { useEffect, useState } from "react";
4
- function applyDeltaBatch(state, deltas) {
4
+ function applyDeltaBatch(state, payload) {
5
+ const { deltas, streamWindows, nextCheckpoints } = payload;
5
6
  if (deltas.length === 0) {
6
- return state;
7
+ const nextOnly = { ...state.cursorsByStreamId };
8
+ const resetStreamIds = new Set(streamWindows
9
+ .filter((window) => window.status === "rebased" || window.status === "stale")
10
+ .map((window) => window.streamId));
11
+ const nextDeltas = state.deltas.filter((delta) => !resetStreamIds.has(delta.streamId));
12
+ for (const window of streamWindows) {
13
+ if (window.status !== "ok") {
14
+ nextOnly[window.streamId] = window.serverCursorStart;
15
+ }
16
+ }
17
+ for (const checkpoint of nextCheckpoints) {
18
+ nextOnly[checkpoint.streamId] = Math.max(nextOnly[checkpoint.streamId] ?? 0, checkpoint.cursor);
19
+ }
20
+ if (nextCheckpoints.length === 0 && resetStreamIds.size === 0) {
21
+ return state;
22
+ }
23
+ return { ...state, cursorsByStreamId: nextOnly, deltas: nextDeltas };
7
24
  }
8
25
  const nextCursors = { ...state.cursorsByStreamId };
9
- const nextDeltas = [...state.deltas];
26
+ const resetStreamIds = new Set(streamWindows
27
+ .filter((window) => window.status === "rebased" || window.status === "stale")
28
+ .map((window) => window.streamId));
29
+ let nextDeltas = state.deltas.filter((delta) => !resetStreamIds.has(delta.streamId));
30
+ for (const window of streamWindows) {
31
+ if (window.status !== "ok") {
32
+ nextCursors[window.streamId] = window.serverCursorStart;
33
+ }
34
+ }
10
35
  const sorted = [...deltas].sort((a, b) => a.cursorEnd - b.cursorEnd);
11
36
  for (const delta of sorted) {
12
37
  const currentCursor = nextCursors[delta.streamId] ?? 0;
13
38
  if (delta.cursorEnd <= currentCursor) {
14
39
  continue;
15
40
  }
16
- if (delta.cursorStart !== currentCursor) {
41
+ if (delta.cursorStart > currentCursor) {
42
+ nextDeltas = nextDeltas.filter((existing) => existing.streamId !== delta.streamId);
43
+ nextCursors[delta.streamId] = delta.cursorStart;
44
+ }
45
+ else if (delta.cursorStart < currentCursor) {
17
46
  continue;
18
47
  }
19
48
  nextDeltas.push(delta);
20
49
  nextCursors[delta.streamId] = delta.cursorEnd;
21
50
  }
51
+ for (const checkpoint of nextCheckpoints) {
52
+ nextCursors[checkpoint.streamId] = Math.max(nextCursors[checkpoint.streamId] ?? 0, checkpoint.cursor);
53
+ }
22
54
  return {
23
55
  threadId: state.threadId,
24
56
  cursorsByStreamId: nextCursors,
@@ -58,13 +90,19 @@ export function useCodexStreamOverlay(query, args, enabled, options) {
58
90
  })),
59
91
  },
60
92
  });
61
- const newDeltas = streamDeltaQuery?.streams?.kind === "deltas" ? streamDeltaQuery.streams.deltas : undefined;
93
+ const deltaPayload = streamDeltaQuery?.streams?.kind === "deltas"
94
+ ? {
95
+ deltas: streamDeltaQuery.streams.deltas,
96
+ streamWindows: streamDeltaQuery.streams.streamWindows,
97
+ nextCheckpoints: streamDeltaQuery.streams.nextCheckpoints,
98
+ }
99
+ : undefined;
62
100
  useEffect(() => {
63
- if (!newDeltas || newDeltas.length === 0) {
101
+ if (!deltaPayload) {
64
102
  return;
65
103
  }
66
- setOverlayState((current) => applyDeltaBatch(current, newDeltas));
67
- }, [newDeltas]);
104
+ setOverlayState((current) => applyDeltaBatch(current, deltaPayload));
105
+ }, [deltaPayload]);
68
106
  return {
69
107
  deltas: overlayState.deltas,
70
108
  streamIds,
@@ -1 +1 @@
1
- {"version":3,"file":"useCodexStreamOverlay.js","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useCodexStreamOverlay.js","sourceRoot":"","sources":["../../src/react/useCodexStreamOverlay.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zakstam/codex-local-component",
3
- "version": "0.1.3",
3
+ "version": "0.2.1",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -32,6 +32,14 @@
32
32
  "./protocol": {
33
33
  "types": "./dist/protocol/index.d.ts",
34
34
  "import": "./dist/protocol/index.js"
35
+ },
36
+ "./app-server": {
37
+ "types": "./dist/app-server/index.d.ts",
38
+ "import": "./dist/app-server/index.js"
39
+ },
40
+ "./host": {
41
+ "types": "./dist/host/index.d.ts",
42
+ "import": "./dist/host/index.js"
35
43
  }
36
44
  },
37
45
  "files": [
@@ -62,6 +70,7 @@
62
70
  "scripts": {
63
71
  "clean": "rm -rf dist",
64
72
  "build": "tsc -p tsconfig.build.json",
73
+ "build:watch": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
65
74
  "typecheck": "tsc --noEmit",
66
75
  "test": "pnpm run build && node --test test/*.test.mjs",
67
76
  "check:mount-imports": "node ./scripts/check-mount-imports.mjs",