@claudexor/daemon 5.0.1 → 5.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client.d.ts +56 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/command-store.d.ts +2 -0
- package/dist/command-store.d.ts.map +1 -1
- package/dist/command-store.js.map +1 -1
- package/dist/deferred-message-owner.d.ts +14 -1
- package/dist/deferred-message-owner.d.ts.map +1 -1
- package/dist/deferred-messages.d.ts +22 -1
- package/dist/deferred-messages.d.ts.map +1 -1
- package/dist/deferred-messages.js +60 -18
- package/dist/deferred-messages.js.map +1 -1
- package/dist/enqueue-command.d.ts +19 -4
- package/dist/enqueue-command.d.ts.map +1 -1
- package/dist/enqueue-command.js +72 -8
- package/dist/enqueue-command.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interactions.d.ts.map +1 -1
- package/dist/interactions.js +29 -7
- package/dist/interactions.js.map +1 -1
- package/dist/job-record.d.ts.map +1 -1
- package/dist/job-record.js +4 -3
- package/dist/job-record.js.map +1 -1
- package/dist/job-settlement.d.ts +3 -1
- package/dist/job-settlement.d.ts.map +1 -1
- package/dist/job-settlement.js +13 -0
- package/dist/job-settlement.js.map +1 -1
- package/dist/model-operation-execution.d.ts +10 -0
- package/dist/model-operation-execution.d.ts.map +1 -1
- package/dist/model-operation-execution.js +12 -5
- package/dist/model-operation-execution.js.map +1 -1
- package/dist/model-operations.d.ts +1 -0
- package/dist/model-operations.d.ts.map +1 -1
- package/dist/model-operations.js +20 -10
- package/dist/model-operations.js.map +1 -1
- package/dist/quota-registry-support.d.ts.map +1 -1
- package/dist/quota-registry-support.js +14 -9
- package/dist/quota-registry-support.js.map +1 -1
- package/dist/server.d.ts +2 -3
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +12 -38
- package/dist/server.js.map +1 -1
- package/dist/store/blob-files.d.ts +17 -6
- package/dist/store/blob-files.d.ts.map +1 -1
- package/dist/store/blob-files.js +29 -5
- package/dist/store/blob-files.js.map +1 -1
- package/dist/store/command-prune.d.ts.map +1 -1
- package/dist/store/command-prune.js +4 -0
- package/dist/store/command-prune.js.map +1 -1
- package/dist/store/commands.d.ts +29 -2
- package/dist/store/commands.d.ts.map +1 -1
- package/dist/store/commands.js +136 -26
- package/dist/store/commands.js.map +1 -1
- package/dist/store/deferred-message-rows.d.ts +10 -0
- package/dist/store/deferred-message-rows.d.ts.map +1 -1
- package/dist/store/deferred-message-rows.js +28 -1
- package/dist/store/deferred-message-rows.js.map +1 -1
- package/dist/store/deferred-messages.d.ts +19 -5
- package/dist/store/deferred-messages.d.ts.map +1 -1
- package/dist/store/deferred-messages.js +93 -30
- package/dist/store/deferred-messages.js.map +1 -1
- package/dist/store/event-store.d.ts +2 -0
- package/dist/store/event-store.d.ts.map +1 -1
- package/dist/store/event-store.js +3 -1
- package/dist/store/event-store.js.map +1 -1
- package/dist/store/external-files.d.ts +57 -2
- package/dist/store/external-files.d.ts.map +1 -1
- package/dist/store/external-files.js +178 -3
- package/dist/store/external-files.js.map +1 -1
- package/dist/store/idempotency.d.ts +1 -1
- package/dist/store/idempotency.d.ts.map +1 -1
- package/dist/store/idempotency.js +2 -1
- package/dist/store/idempotency.js.map +1 -1
- package/dist/store/import-context.js +1 -1
- package/dist/store/import-context.js.map +1 -1
- package/dist/store/libuv-pool.d.ts +25 -0
- package/dist/store/libuv-pool.d.ts.map +1 -0
- package/dist/store/libuv-pool.js +96 -0
- package/dist/store/libuv-pool.js.map +1 -0
- package/dist/store/maintenance-worker.d.ts.map +1 -1
- package/dist/store/maintenance-worker.js +45 -0
- package/dist/store/maintenance-worker.js.map +1 -1
- package/dist/store/maintenance.d.ts +28 -2
- package/dist/store/maintenance.d.ts.map +1 -1
- package/dist/store/maintenance.js +36 -6
- package/dist/store/maintenance.js.map +1 -1
- package/dist/store/project-router.d.ts +108 -1
- package/dist/store/project-router.d.ts.map +1 -1
- package/dist/store/project-router.js +38 -0
- package/dist/store/project-router.js.map +1 -1
- package/dist/store/publish-blob.d.ts.map +1 -1
- package/dist/store/publish-blob.js +36 -14
- package/dist/store/publish-blob.js.map +1 -1
- package/dist/store/purge-files.d.ts +11 -2
- package/dist/store/purge-files.d.ts.map +1 -1
- package/dist/store/purge-files.js +34 -7
- package/dist/store/purge-files.js.map +1 -1
- package/dist/store/resource-release.d.ts +15 -0
- package/dist/store/resource-release.d.ts.map +1 -0
- package/dist/store/resource-release.js +56 -0
- package/dist/store/resource-release.js.map +1 -0
- package/dist/store/resource-rows.d.ts +2 -0
- package/dist/store/resource-rows.d.ts.map +1 -1
- package/dist/store/resource-rows.js.map +1 -1
- package/dist/store/resource-uses.d.ts +84 -0
- package/dist/store/resource-uses.d.ts.map +1 -0
- package/dist/store/resource-uses.js +129 -0
- package/dist/store/resource-uses.js.map +1 -0
- package/dist/store/resources.d.ts +16 -2
- package/dist/store/resources.d.ts.map +1 -1
- package/dist/store/resources.js +42 -3
- package/dist/store/resources.js.map +1 -1
- package/dist/store/retention-changes.d.ts +8 -2
- package/dist/store/retention-changes.d.ts.map +1 -1
- package/dist/store/retention-changes.js +24 -11
- package/dist/store/retention-changes.js.map +1 -1
- package/dist/store/retention-generations.d.ts +7 -2
- package/dist/store/retention-generations.d.ts.map +1 -1
- package/dist/store/retention-generations.js +71 -26
- package/dist/store/retention-generations.js.map +1 -1
- package/dist/store/retention-reference-reader.d.ts +26 -1
- package/dist/store/retention-reference-reader.d.ts.map +1 -1
- package/dist/store/retention-reference-reader.js +31 -7
- package/dist/store/retention-reference-reader.js.map +1 -1
- package/dist/store/retention-references.d.ts +5 -0
- package/dist/store/retention-references.d.ts.map +1 -1
- package/dist/store/retention-references.js +35 -6
- package/dist/store/retention-references.js.map +1 -1
- package/dist/store/schema.d.ts +2 -2
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +17 -2
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sql-command-router.d.ts +12 -1
- package/dist/store/sql-command-router.d.ts.map +1 -1
- package/dist/store/sql-command-router.js +19 -1
- package/dist/store/sql-command-router.js.map +1 -1
- package/dist/store/sql-daemon-services.d.ts.map +1 -1
- package/dist/store/sql-daemon-services.js +9 -8
- package/dist/store/sql-daemon-services.js.map +1 -1
- package/dist/store/sql-validation.d.ts.map +1 -1
- package/dist/store/sql-validation.js +1 -0
- package/dist/store/sql-validation.js.map +1 -1
- package/dist/store/store.d.ts +9 -0
- package/dist/store/store.d.ts.map +1 -1
- package/dist/store/store.js +19 -0
- package/dist/store/store.js.map +1 -1
- package/dist/store/terminal-files.d.ts +24 -2
- package/dist/store/terminal-files.d.ts.map +1 -1
- package/dist/store/terminal-files.js +153 -31
- package/dist/store/terminal-files.js.map +1 -1
- package/dist/store/thread-closure.d.ts +62 -0
- package/dist/store/thread-closure.d.ts.map +1 -0
- package/dist/store/thread-closure.js +290 -0
- package/dist/store/thread-closure.js.map +1 -0
- package/dist/store/thread-retirement.d.ts +29 -0
- package/dist/store/thread-retirement.d.ts.map +1 -0
- package/dist/store/thread-retirement.js +123 -0
- package/dist/store/thread-retirement.js.map +1 -0
- package/dist/store/threads.d.ts +2 -0
- package/dist/store/threads.d.ts.map +1 -1
- package/dist/store/threads.js +10 -1
- package/dist/store/threads.js.map +1 -1
- package/dist/store/upload-imports.d.ts.map +1 -1
- package/dist/store/upload-imports.js +16 -3
- package/dist/store/upload-imports.js.map +1 -1
- package/dist/store/uploads.d.ts +13 -2
- package/dist/store/uploads.d.ts.map +1 -1
- package/dist/store/uploads.js +76 -30
- package/dist/store/uploads.js.map +1 -1
- package/dist/store-contracts.d.ts +32 -2
- package/dist/store-contracts.d.ts.map +1 -1
- package/dist/terminal-authority.d.ts +9 -1
- package/dist/terminal-authority.d.ts.map +1 -1
- package/dist/terminal-authority.js +32 -0
- package/dist/terminal-authority.js.map +1 -1
- package/dist/thread-lifecycle.d.ts +3 -1
- package/dist/thread-lifecycle.d.ts.map +1 -1
- package/dist/thread-lifecycle.js +2 -2
- package/dist/thread-lifecycle.js.map +1 -1
- package/dist/writer-lease.d.ts.map +1 -1
- package/dist/writer-lease.js +6 -3
- package/dist/writer-lease.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenance.d.ts","sourceRoot":"","sources":["../../src/store/maintenance.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAA2B,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"maintenance.d.ts","sourceRoot":"","sources":["../../src/store/maintenance.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,9 @@ import "./maintenance-worker.js";
|
|
|
14
14
|
* The worker owns a separate read-only connection, never shares a thread or
|
|
15
15
|
* connection with the flusher, never writes a row, and only ENUMERATES sweep
|
|
16
16
|
* candidates older than the process start; every removal is decided on the
|
|
17
|
-
* main thread through the one owner-generation unlink rule (C10).
|
|
17
|
+
* main thread through the one owner-generation unlink rule (C10). Its snapshot
|
|
18
|
+
* also answers a thread's closure for an export's observation; every decision
|
|
19
|
+
* reads the closure again on the writer, inside the deciding transaction.
|
|
18
20
|
*/
|
|
19
21
|
export class MaintenanceController {
|
|
20
22
|
store;
|
|
@@ -46,6 +48,16 @@ export class MaintenanceController {
|
|
|
46
48
|
exportTo(target) {
|
|
47
49
|
return this.run({ id: 0, kind: "vacuum_into", target });
|
|
48
50
|
}
|
|
51
|
+
/**
|
|
52
|
+
* The thread's closure as one read-only snapshot holds it, read on the worker so
|
|
53
|
+
* the writer's thread stays free. An observation only: retirement reads it again
|
|
54
|
+
* inside its own transaction. `signal` ends the caller's wait alone. A read the
|
|
55
|
+
* worker has not taken leaves the queue; one it has taken keeps the worker until
|
|
56
|
+
* it ends, and its answer is dropped.
|
|
57
|
+
*/
|
|
58
|
+
threadClosure(threadId, signal) {
|
|
59
|
+
return this.run({ id: 0, kind: "thread_closure", threadId, storeId: this.store.storeId ?? null }, signal);
|
|
60
|
+
}
|
|
49
61
|
/** The worker's candidate list for files older than the process start (test seam). */
|
|
50
62
|
sweepCandidates() {
|
|
51
63
|
return this.run({
|
|
@@ -113,16 +125,33 @@ export class MaintenanceController {
|
|
|
113
125
|
if (worker)
|
|
114
126
|
await worker.terminate();
|
|
115
127
|
}
|
|
116
|
-
run(request) {
|
|
128
|
+
run(request, signal) {
|
|
117
129
|
if (this.closing) {
|
|
118
130
|
return Promise.reject(new StoreError("store_closed", 503, false, "engine store is closing"));
|
|
119
131
|
}
|
|
132
|
+
if (signal?.aborted)
|
|
133
|
+
return Promise.reject(signal.reason);
|
|
120
134
|
return new Promise((resolve, reject) => {
|
|
121
|
-
|
|
135
|
+
const leave = () => {
|
|
136
|
+
const queued = this.queue.indexOf(pending);
|
|
137
|
+
if (queued >= 0)
|
|
138
|
+
this.queue.splice(queued, 1);
|
|
139
|
+
reject(signal.reason);
|
|
140
|
+
};
|
|
141
|
+
const settled = () => signal?.removeEventListener("abort", leave);
|
|
142
|
+
const pending = {
|
|
122
143
|
request: { ...request, id: this.nextId++ },
|
|
123
|
-
resolve:
|
|
124
|
-
|
|
125
|
-
|
|
144
|
+
resolve: (value) => {
|
|
145
|
+
settled();
|
|
146
|
+
resolve(value);
|
|
147
|
+
},
|
|
148
|
+
reject: (error) => {
|
|
149
|
+
settled();
|
|
150
|
+
reject(error);
|
|
151
|
+
},
|
|
152
|
+
};
|
|
153
|
+
signal?.addEventListener("abort", leave, { once: true });
|
|
154
|
+
this.queue.push(pending);
|
|
126
155
|
this.pump();
|
|
127
156
|
});
|
|
128
157
|
}
|
|
@@ -139,6 +168,7 @@ export class MaintenanceController {
|
|
|
139
168
|
const data = {
|
|
140
169
|
[STORE_WORKER_DATA_KEY]: "maintenance",
|
|
141
170
|
dbPath: this.store.paths.database,
|
|
171
|
+
...(this.options.hooks ? { hooks: this.options.hooks } : {}),
|
|
142
172
|
};
|
|
143
173
|
const worker = new Worker(this.entry, {
|
|
144
174
|
workerData: data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenance.js","sourceRoot":"","sources":["../../src/store/maintenance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"maintenance.js","sourceRoot":"","sources":["../../src/store/maintenance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { type ControlProjectListingProblem, type Thread, type ThreadTurn } from "@claudexor/schema";
|
|
1
|
+
import { type ControlProjectListingProblem, type Thread, type ThreadExportDigestEntry, type ThreadRetireRequest, type ThreadTurn } from "@claudexor/schema";
|
|
2
2
|
import type { CreateThreadInput, CreateTurnInput, UpdateThreadInput } from "../threads.js";
|
|
3
3
|
import { type PartitionGeneration } from "./partitions.js";
|
|
4
4
|
import { SqlProjectStore } from "./projects.js";
|
|
5
|
+
import { type RetirementRefusal } from "./thread-retirement.js";
|
|
5
6
|
import { SqlThreadStore } from "./threads.js";
|
|
6
7
|
/** SQL routing returns one generation, never an array of recovered stores.
|
|
7
8
|
* Command/interaction/decision owners use these same addressed routes. */
|
|
@@ -105,6 +106,7 @@ export declare class SqlProjectRouter {
|
|
|
105
106
|
} | null;
|
|
106
107
|
created_at: string;
|
|
107
108
|
};
|
|
109
|
+
stageTurnPrompt(id: string, prompt: string): Promise<void>;
|
|
108
110
|
findTurnByIdempotency(id: string, input: NonNullable<CreateTurnInput["idempotency"]>): {
|
|
109
111
|
id: string;
|
|
110
112
|
thread_id: string;
|
|
@@ -174,6 +176,14 @@ export declare class SqlProjectRouter {
|
|
|
174
176
|
trashed_at: string | null;
|
|
175
177
|
purge_after: string | null;
|
|
176
178
|
pre_trash_state: "active" | "closed" | null;
|
|
179
|
+
retirement?: {
|
|
180
|
+
operationId: string;
|
|
181
|
+
exportId: string;
|
|
182
|
+
closureDigest: string;
|
|
183
|
+
contentDigest: string;
|
|
184
|
+
laneDigest: string;
|
|
185
|
+
acceptedAt: string;
|
|
186
|
+
} | undefined;
|
|
177
187
|
};
|
|
178
188
|
trashThread(id: string): {
|
|
179
189
|
schema_version: 2;
|
|
@@ -205,6 +215,14 @@ export declare class SqlProjectRouter {
|
|
|
205
215
|
trashed_at: string | null;
|
|
206
216
|
purge_after: string | null;
|
|
207
217
|
pre_trash_state: "active" | "closed" | null;
|
|
218
|
+
retirement?: {
|
|
219
|
+
operationId: string;
|
|
220
|
+
exportId: string;
|
|
221
|
+
closureDigest: string;
|
|
222
|
+
contentDigest: string;
|
|
223
|
+
laneDigest: string;
|
|
224
|
+
acceptedAt: string;
|
|
225
|
+
} | undefined;
|
|
208
226
|
};
|
|
209
227
|
restoreThread(id: string): {
|
|
210
228
|
schema_version: 2;
|
|
@@ -236,6 +254,14 @@ export declare class SqlProjectRouter {
|
|
|
236
254
|
trashed_at: string | null;
|
|
237
255
|
purge_after: string | null;
|
|
238
256
|
pre_trash_state: "active" | "closed" | null;
|
|
257
|
+
retirement?: {
|
|
258
|
+
operationId: string;
|
|
259
|
+
exportId: string;
|
|
260
|
+
closureDigest: string;
|
|
261
|
+
contentDigest: string;
|
|
262
|
+
laneDigest: string;
|
|
263
|
+
acceptedAt: string;
|
|
264
|
+
} | undefined;
|
|
239
265
|
};
|
|
240
266
|
purgeThread(id: string): {
|
|
241
267
|
schema_version: 2;
|
|
@@ -267,7 +293,80 @@ export declare class SqlProjectRouter {
|
|
|
267
293
|
trashed_at: string | null;
|
|
268
294
|
purge_after: string | null;
|
|
269
295
|
pre_trash_state: "active" | "closed" | null;
|
|
296
|
+
retirement?: {
|
|
297
|
+
operationId: string;
|
|
298
|
+
exportId: string;
|
|
299
|
+
closureDigest: string;
|
|
300
|
+
contentDigest: string;
|
|
301
|
+
laneDigest: string;
|
|
302
|
+
acceptedAt: string;
|
|
303
|
+
} | undefined;
|
|
270
304
|
};
|
|
305
|
+
retireThread(id: string, request: ThreadRetireRequest, acceptedLane: readonly ThreadExportDigestEntry[]): {
|
|
306
|
+
schema_version: 2;
|
|
307
|
+
id: string;
|
|
308
|
+
created_at: string;
|
|
309
|
+
updated_at: string;
|
|
310
|
+
repo: {
|
|
311
|
+
root: string;
|
|
312
|
+
base_ref: string;
|
|
313
|
+
} | null;
|
|
314
|
+
title: string | null;
|
|
315
|
+
folder: string | null;
|
|
316
|
+
mode: "agent" | "ask" | "plan";
|
|
317
|
+
auth_preference: "api_key" | "auto" | "subscription";
|
|
318
|
+
access: "external_sandbox_full" | "full" | "inherit_native" | "readonly" | "workspace_write" | null;
|
|
319
|
+
credential_profile_id: string | null;
|
|
320
|
+
primary_harness: string | null;
|
|
321
|
+
eligible_harnesses: string[];
|
|
322
|
+
workspace: {
|
|
323
|
+
mode: "delegated" | "in_place" | "isolated";
|
|
324
|
+
worktree_path: string | null;
|
|
325
|
+
base_sha: string | null;
|
|
326
|
+
delivered_through_run_id: string | null;
|
|
327
|
+
workspace_root: string | null;
|
|
328
|
+
};
|
|
329
|
+
run_ids: string[];
|
|
330
|
+
head_run_id: string | null;
|
|
331
|
+
state: "active" | "closed" | "purged" | "trashed";
|
|
332
|
+
trashed_at: string | null;
|
|
333
|
+
purge_after: string | null;
|
|
334
|
+
pre_trash_state: "active" | "closed" | null;
|
|
335
|
+
retirement?: {
|
|
336
|
+
operationId: string;
|
|
337
|
+
exportId: string;
|
|
338
|
+
closureDigest: string;
|
|
339
|
+
contentDigest: string;
|
|
340
|
+
laneDigest: string;
|
|
341
|
+
acceptedAt: string;
|
|
342
|
+
} | undefined;
|
|
343
|
+
};
|
|
344
|
+
/** The outcome already bound, read in the thread row's own partition, so it still
|
|
345
|
+
* answers after that project was removed. Only a new decision needs it served. */
|
|
346
|
+
retirementOperation(id: string, operationId: string): {
|
|
347
|
+
operationId: string;
|
|
348
|
+
outcome: "abandoned" | "accepted" | "refused";
|
|
349
|
+
code: string | null;
|
|
350
|
+
message: string | null;
|
|
351
|
+
settledAt: string;
|
|
352
|
+
} | null;
|
|
353
|
+
/** Bind a definite refusal or abandonment: this operation can never accept. */
|
|
354
|
+
settleRetirement(id: string, operationId: string, refusal: RetirementRefusal | null): {
|
|
355
|
+
operationId: string;
|
|
356
|
+
outcome: "abandoned" | "accepted" | "refused";
|
|
357
|
+
code: string | null;
|
|
358
|
+
message: string | null;
|
|
359
|
+
settledAt: string;
|
|
360
|
+
};
|
|
361
|
+
threadRecord(id: string): {
|
|
362
|
+
storeId: string;
|
|
363
|
+
thread: Thread;
|
|
364
|
+
} | null;
|
|
365
|
+
threadClosureDocument(id: string, key: string): Buffer<ArrayBufferLike> | null;
|
|
366
|
+
/** An open purge obligation's reason, or null with no open cleanup at all. */
|
|
367
|
+
threadCleanup(id: string): {
|
|
368
|
+
reason: string | null;
|
|
369
|
+
} | null;
|
|
271
370
|
setThreadWorktree(id: string, path: string, base: string, through?: string): void;
|
|
272
371
|
assertKnownIds(threadId: unknown, turnId: unknown): {
|
|
273
372
|
threadId?: string;
|
|
@@ -345,6 +444,14 @@ export declare class SqlProjectRouter {
|
|
|
345
444
|
trashed_at: string | null;
|
|
346
445
|
purge_after: string | null;
|
|
347
446
|
pre_trash_state: "active" | "closed" | null;
|
|
447
|
+
retirement?: {
|
|
448
|
+
operationId: string;
|
|
449
|
+
exportId: string;
|
|
450
|
+
closureDigest: string;
|
|
451
|
+
contentDigest: string;
|
|
452
|
+
laneDigest: string;
|
|
453
|
+
acceptedAt: string;
|
|
454
|
+
} | undefined;
|
|
348
455
|
}[]>;
|
|
349
456
|
healthyProjectRoots(): string[];
|
|
350
457
|
quarantineGhostProjects(): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-router.d.ts","sourceRoot":"","sources":["../../src/store/project-router.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,4BAA4B,EACjC,KAAK,MAAM,EACX,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAQ3F,OAAO,EAAiB,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"project-router.d.ts","sourceRoot":"","sources":["../../src/store/project-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,9 @@ import { recordInterruptedRunlessTurns } from "../runless-turn-recovery.js";
|
|
|
5
5
|
import { isServedPid, requireServedGeneration, servedGenerations, SERVED_PIDS_SQL, } from "./generations.js";
|
|
6
6
|
import { partitionById } from "./partitions.js";
|
|
7
7
|
import { findThreadCreationAcross } from "./thread-replay.js";
|
|
8
|
+
import { readClosureThread, readThreadClosureDocument } from "./thread-closure.js";
|
|
9
|
+
import { runMutation } from "./mutation.js";
|
|
10
|
+
import { acceptRetirement, bindRetirementOutcome, readThreadCleanup, retirementOutcome, } from "./thread-retirement.js";
|
|
8
11
|
import { decodeBody } from "./thread-rows.js";
|
|
9
12
|
import { SqlThreadStore } from "./threads.js";
|
|
10
13
|
import { diskRetentionReferences, diskRetentionThreads } from "./retention-references.js";
|
|
@@ -150,6 +153,14 @@ export class SqlProjectRouter {
|
|
|
150
153
|
createTurn(id, prompt, input = {}) {
|
|
151
154
|
return this.requireThread(id).createTurn(id, prompt, input);
|
|
152
155
|
}
|
|
156
|
+
async stageTurnPrompt(id, prompt) {
|
|
157
|
+
try {
|
|
158
|
+
await this.forThread(id)?.stageTurnPrompt(prompt);
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
/* createTurn decides and reports */
|
|
162
|
+
}
|
|
163
|
+
}
|
|
153
164
|
findTurnByIdempotency(id, input) {
|
|
154
165
|
return this.requireThread(id).findTurnByIdempotency(id, input);
|
|
155
166
|
}
|
|
@@ -165,6 +176,33 @@ export class SqlProjectRouter {
|
|
|
165
176
|
purgeThread(id) {
|
|
166
177
|
return this.requireThread(id).purgeThread(id);
|
|
167
178
|
}
|
|
179
|
+
retireThread(id, request, acceptedLane) {
|
|
180
|
+
const threads = this.requireThread(id);
|
|
181
|
+
return acceptRetirement(threads, threads.obligations, id, request, acceptedLane);
|
|
182
|
+
}
|
|
183
|
+
/** The outcome already bound, read in the thread row's own partition, so it still
|
|
184
|
+
* answers after that project was removed. Only a new decision needs it served. */
|
|
185
|
+
retirementOperation(id, operationId) {
|
|
186
|
+
const row = this.store.prepare("SELECT pid FROM thread WHERE id=?").get(id);
|
|
187
|
+
if (!row)
|
|
188
|
+
throw Object.assign(new Error(`no such thread: ${id}`), { status: 404 });
|
|
189
|
+
return retirementOutcome(this.store, row.pid, id, operationId);
|
|
190
|
+
}
|
|
191
|
+
/** Bind a definite refusal or abandonment: this operation can never accept. */
|
|
192
|
+
settleRetirement(id, operationId, refusal) {
|
|
193
|
+
const { pid } = this.requireThread(id).generation;
|
|
194
|
+
return runMutation(this.store, (tx) => bindRetirementOutcome(tx, pid, id, operationId, refusal));
|
|
195
|
+
}
|
|
196
|
+
threadRecord(id) {
|
|
197
|
+
return readClosureThread(this.store, id);
|
|
198
|
+
}
|
|
199
|
+
threadClosureDocument(id, key) {
|
|
200
|
+
return readThreadClosureDocument(this.store, this.projects.blobs, id, key);
|
|
201
|
+
}
|
|
202
|
+
/** An open purge obligation's reason, or null with no open cleanup at all. */
|
|
203
|
+
threadCleanup(id) {
|
|
204
|
+
return readThreadCleanup(this.projects.obligations, id);
|
|
205
|
+
}
|
|
168
206
|
setThreadWorktree(id, path, base, through) {
|
|
169
207
|
this.requireThread(id).setThreadWorktree(id, path, base, through);
|
|
170
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-router.js","sourceRoot":"","sources":["../../src/store/project-router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-router.js","sourceRoot":"","sources":["../../src/store/project-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-blob.d.ts","sourceRoot":"","sources":["../../src/store/publish-blob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAA0B,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,gFAAgF;AAChF,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,YACmB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,EAGzD;IAED,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,eAAe,CAiC5F;IAED,4FAA4F;IAC5F,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,eAAe,CAYhD;IAED,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"publish-blob.d.ts","sourceRoot":"","sources":["../../src/store/publish-blob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAA0B,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAQL,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,gFAAgF;AAChF,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,YACmB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,EAGzD;IAED,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,eAAe,CAiC5F;IAED,4FAA4F;IAC5F,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,eAAe,CAYhD;IAED,OAAO,CAAC,OAAO;IA+Ef,mGAAmG;IACnG,SAAS,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,GAAG,IAAI,CAQ9C;IAED,OAAO,CAAC,QAAQ;IAuDhB,OAAO,CAAC,OAAO;CAUhB"}
|
|
@@ -31,7 +31,7 @@ export class PublishBlob {
|
|
|
31
31
|
if (prior) {
|
|
32
32
|
const row = readUploadRow(this.store, id);
|
|
33
33
|
if (row?.state === "finalizing")
|
|
34
|
-
this.complete(row);
|
|
34
|
+
this.complete(row, undefined, true);
|
|
35
35
|
return ControlResource.parse(prior.result);
|
|
36
36
|
}
|
|
37
37
|
const upload = this.uploads.get(id);
|
|
@@ -42,7 +42,7 @@ export class PublishBlob {
|
|
|
42
42
|
if (upload.finalization.keyDigest !== keyDigest ||
|
|
43
43
|
upload.finalization.requestDigest !== requestDigest)
|
|
44
44
|
throw resourceError("idempotency key was already used with a different request", 409, "idempotency_conflict");
|
|
45
|
-
return this.complete(upload);
|
|
45
|
+
return this.complete(upload, undefined, true);
|
|
46
46
|
}
|
|
47
47
|
return this.publish(upload, expectedSha256, keyDigest, requestDigest, true);
|
|
48
48
|
}
|
|
@@ -53,7 +53,7 @@ export class PublishBlob {
|
|
|
53
53
|
throw new Error(`upload ${upload.status.uploadId} has no import binding`);
|
|
54
54
|
if (upload.finalization) {
|
|
55
55
|
if (upload.state !== "published")
|
|
56
|
-
return this.complete(upload);
|
|
56
|
+
return this.complete(upload, undefined, true);
|
|
57
57
|
return ControlResource.parse(upload.finalization.result);
|
|
58
58
|
}
|
|
59
59
|
const requestDigest = hashJson({
|
|
@@ -66,22 +66,37 @@ export class PublishBlob {
|
|
|
66
66
|
const id = upload.status.uploadId;
|
|
67
67
|
if (upload.status.state !== "uploaded")
|
|
68
68
|
throw resourceError(`upload ${id} is ${upload.status.state}`, 409, "upload_not_uploaded");
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
const
|
|
69
|
+
// The bytes were hashed as they were written. A restart drops that digest,
|
|
70
|
+
// and only then does publication read the part. Between the hash and the
|
|
71
|
+
// link the hot path does not re-read.
|
|
72
|
+
const remembered = this.uploads.writeDigest(id);
|
|
73
|
+
let sha;
|
|
74
|
+
let size;
|
|
75
|
+
if (remembered !== undefined) {
|
|
76
|
+
sha = remembered;
|
|
77
|
+
size = upload.status.expectedBytes;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const bytes = readFileSync(this.uploads.partPath(id));
|
|
81
|
+
if (bytes.length !== upload.status.expectedBytes)
|
|
82
|
+
throw resourceError("uploaded file no longer matches declared size", 409, "upload_size_mismatch");
|
|
83
|
+
sha = sha256Hex(bytes);
|
|
84
|
+
size = bytes.length;
|
|
85
|
+
}
|
|
73
86
|
if (expectedSha256 !== undefined && expectedSha256 !== `sha256:${sha}`)
|
|
74
87
|
throw resourceError("uploaded byte digest does not match expectedSha256", 409, "digest_mismatch");
|
|
88
|
+
const deduplicated = existsSync(this.blobs.filePath(sha));
|
|
75
89
|
const resource = ControlResource.parse({
|
|
76
90
|
resourceId: newId("res"),
|
|
77
91
|
...(upload.request.purpose ? { purpose: upload.request.purpose } : {}),
|
|
92
|
+
...(upload.import?.lifetime ? { lifetime: upload.import.lifetime } : {}),
|
|
78
93
|
kind: upload.request.kind,
|
|
79
94
|
mime: upload.request.mime,
|
|
80
95
|
name: upload.request.name,
|
|
81
96
|
sha256: `sha256:${sha}`,
|
|
82
|
-
sizeBytes:
|
|
97
|
+
sizeBytes: size,
|
|
83
98
|
createdAt: this.store.now().toISOString(),
|
|
84
|
-
deduplicated
|
|
99
|
+
deduplicated,
|
|
85
100
|
});
|
|
86
101
|
upload.state = "finalizing";
|
|
87
102
|
upload.finalizeSha = sha;
|
|
@@ -105,7 +120,12 @@ export class PublishBlob {
|
|
|
105
120
|
tx.changes.blobChanged(sha);
|
|
106
121
|
tx.changes.uploadChanged(id);
|
|
107
122
|
});
|
|
108
|
-
|
|
123
|
+
// The binding now holds the digest. Every later complete (replay, recovery)
|
|
124
|
+
// verifies the bytes, so the in-memory copy is dropped here, not at restart.
|
|
125
|
+
this.uploads.forgetDigest(id);
|
|
126
|
+
// Dedup must read the blob already on disk. A missing digest must read the
|
|
127
|
+
// part. The hot path has already hashed the bytes it is about to link.
|
|
128
|
+
return this.complete(upload, undefined, remembered === undefined || deduplicated);
|
|
109
129
|
}
|
|
110
130
|
/** Called by the composition's single Obligations.onCleared hook, after its owner notification. */
|
|
111
131
|
onCleared(rows) {
|
|
@@ -119,7 +139,7 @@ export class PublishBlob {
|
|
|
119
139
|
this.defer(this.blobs.gc(sha));
|
|
120
140
|
}
|
|
121
141
|
}
|
|
122
|
-
complete(upload, effects) {
|
|
142
|
+
complete(upload, effects, verify) {
|
|
123
143
|
const resource = upload.finalization.result;
|
|
124
144
|
const row = readResourceRow(this.store, resource.resourceId);
|
|
125
145
|
if (!row)
|
|
@@ -141,8 +161,10 @@ export class PublishBlob {
|
|
|
141
161
|
}
|
|
142
162
|
const sha = resourceSha(resource);
|
|
143
163
|
const path = this.blobs.filePath(sha);
|
|
144
|
-
//
|
|
145
|
-
|
|
164
|
+
// Replay, recovery and dedup pass verify. The hot path already hashed the
|
|
165
|
+
// part while it was written and does not read it again.
|
|
166
|
+
if (verify)
|
|
167
|
+
verifiedResourceBytes(resource, existsSync(path) ? path : this.uploads.partPath(upload.status.uploadId));
|
|
146
168
|
const linked = this.blobs.publishLink(this.uploads.partPath(upload.status.uploadId), sha);
|
|
147
169
|
const generation = effects ? effects.register(this.blobs.dir) : linked.generation;
|
|
148
170
|
// The part stays through the durability barrier. Only the post-clear hook removes it.
|
|
@@ -172,7 +194,7 @@ export class PublishBlob {
|
|
|
172
194
|
if (resourceSha(upload.finalization.result) !== sha || upload.resourceId !== resource_id)
|
|
173
195
|
throw new Error(`publication binding mismatch for ${obligation.key}`);
|
|
174
196
|
// completeOpen owns rematerialization with this process's new registration.
|
|
175
|
-
this.complete(upload, effects);
|
|
197
|
+
this.complete(upload, effects, true);
|
|
176
198
|
}
|
|
177
199
|
}
|
|
178
200
|
//# sourceMappingURL=publish-blob.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-blob.js","sourceRoot":"","sources":["../../src/store/publish-blob.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAa,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EACL,eAAe,EACf,aAAa,EACb,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACX,qBAAqB,GAEtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,gFAAgF;AAChF,MAAM,OAAO,WAAW;IAEH,KAAK;IACL,KAAK;IACL,WAAW;IACX,OAAO;IACP,KAAK;IALxB,YACmB,KAAkB,EAClB,KAAgB,EAChB,WAAwB,EACxB,OAAmB,EACnB,KAAuC;qBAJvC,KAAK;qBACL,KAAK;2BACL,WAAW;uBACX,OAAO;qBACP,KAAK;QAEtB,WAAW,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,6FAA6F;IAC7F,QAAQ,CAAC,EAAU,EAAE,cAAkC,EAAE,SAAkB;QACzE,MAAM,aAAa,GAAG,QAAQ,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,cAAc,IAAI,IAAI,EAAE,CAAC,CAAC;QACzF,MAAM,GAAG,GAAG,SAAS,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjD,MAAM,KAAK,GACT,SAAS,KAAK,SAAS;YACrB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;QACvE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,GAAG,EAAE,KAAK,KAAK,YAAY;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"publish-blob.js","sourceRoot":"","sources":["../../src/store/publish-blob.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Thread } from "@claudexor/schema";
|
|
1
|
+
import { type Thread, type ThreadExportDigestEntry, type ThreadRetirementAcceptance } from "@claudexor/schema";
|
|
2
2
|
import type { PurgeRepositoryRecord } from "@claudexor/workspace";
|
|
3
3
|
import type { EngineStore } from "./store.js";
|
|
4
4
|
import type { Obligations, ObligationHandler } from "./obligations.js";
|
|
@@ -7,6 +7,13 @@ export interface PurgeFilesPayload {
|
|
|
7
7
|
/** The repository holding the thread's worktree registration and branch,
|
|
8
8
|
* recorded by an attempt before Git's first change in it. */
|
|
9
9
|
repository?: PurgeRepositoryRecord;
|
|
10
|
+
/** A conditional retirement's acceptance. */
|
|
11
|
+
retirement?: ThreadRetirementAcceptance;
|
|
12
|
+
/** The lane entries that acceptance read from disk: every attempt deletes only
|
|
13
|
+
* a lane whose remaining entries are among these, byte for byte. */
|
|
14
|
+
acceptedLane?: readonly ThreadExportDigestEntry[];
|
|
15
|
+
/** Why the last attempt left this retirement's cleanup open. */
|
|
16
|
+
lastError?: string;
|
|
10
17
|
}
|
|
11
18
|
/** The obligation keeps the repository an attempt resolved until it clears,
|
|
12
19
|
* so every retry, startup replay included, deletes and syncs in that one. */
|
|
@@ -14,6 +21,8 @@ export interface PurgeRepositoryCustody {
|
|
|
14
21
|
readonly recorded: PurgeRepositoryRecord | null;
|
|
15
22
|
/** Durable before it resolves; the effect deletes nothing in Git earlier. */
|
|
16
23
|
record(repository: PurgeRepositoryRecord): Promise<void>;
|
|
24
|
+
/** A retirement's accepted lane entries; present exactly for a retirement. */
|
|
25
|
+
readonly acceptedLane?: readonly ThreadExportDigestEntry[];
|
|
17
26
|
}
|
|
18
27
|
/** Uses the CLI/workspace's existing purge owner; it reports touched parents. */
|
|
19
28
|
export type PurgeFilesEffect = (thread: Thread, repository?: PurgeRepositoryCustody) => Promise<readonly string[]>;
|
|
@@ -24,7 +33,7 @@ export declare class SqlPurgeFiles {
|
|
|
24
33
|
private readonly pending;
|
|
25
34
|
constructor(store: EngineStore, obligations: Obligations);
|
|
26
35
|
handler(perform: PurgeFilesEffect): ObligationHandler;
|
|
27
|
-
private
|
|
36
|
+
private updatePayload;
|
|
28
37
|
/** Runtime replay uses the same handler as startup, without replaying every
|
|
29
38
|
* open obligation or resetting another effect's materialized state. */
|
|
30
39
|
complete(id: string, perform: PurgeFilesEffect): Promise<void>;
|