@yu_robotics/remote-cli 1.6.251 → 1.6.252
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/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +4 -3
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.js +54 -8
- package/dist/executor/ClaudePersistentExecutor.js.map +1 -1
- package/dist/maintenance/release-notes.json +1 -1
- package/dist/scheduling/ReviewedNativeCleanup.d.ts +1 -1
- package/dist/scheduling/ReviewedNativeCleanup.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCleanup.d.ts +1 -0
- package/dist/scheduling/ScheduleCleanup.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCleanup.js +2 -1
- package/dist/scheduling/ScheduleCleanup.js.map +1 -1
- package/dist/scheduling/SchedulePurgeVerification.js +4 -4
- package/dist/scheduling/SchedulePurgeVerification.js.map +1 -1
- package/dist/scheduling/ScheduleService.d.ts +2 -1
- package/dist/scheduling/ScheduleService.d.ts.map +1 -1
- package/dist/scheduling/ScheduleService.js +85 -26
- package/dist/scheduling/ScheduleService.js.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts +15 -3
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js +111 -7
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleProcesses.d.ts +14 -0
- package/dist/scheduling/claude/ClaudeScheduleProcesses.d.ts.map +1 -0
- package/dist/scheduling/claude/ClaudeScheduleProcesses.js +86 -0
- package/dist/scheduling/claude/ClaudeScheduleProcesses.js.map +1 -0
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts +6 -0
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.js +35 -2
- package/dist/scheduling/claude/ClaudeSessionSchedules.js.map +1 -1
- package/dist/scheduling/types.d.ts +4 -0
- package/dist/scheduling/types.d.ts.map +1 -1
- package/dist/scheduling/types.js +6 -1
- package/dist/scheduling/types.js.map +1 -1
- package/native/prebuilds/darwin-arm64/managed_native.node +0 -0
- package/native/prebuilds/darwin-arm64/manifest.json +1 -1
- package/native/prebuilds/darwin-x64/managed_native.node +0 -0
- package/native/prebuilds/darwin-x64/manifest.json +1 -1
- package/native/prebuilds/win32-arm64/managed_native.node +0 -0
- package/native/prebuilds/win32-arm64/manifest.json +1 -1
- package/native/prebuilds/win32-x64/managed_native.node +0 -0
- package/native/prebuilds/win32-x64/manifest.json +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,7 @@ export interface NativeCleanupSession {
|
|
|
12
12
|
sessionId: string;
|
|
13
13
|
/** Framework-captured location and retirement proof, never model arguments. */
|
|
14
14
|
cwd?: string;
|
|
15
|
-
retirementConfirmed?(): boolean;
|
|
15
|
+
retirementConfirmed?(ownerToken?: string): boolean;
|
|
16
16
|
/** Unsettled mutation receipts retain their operational record. */
|
|
17
17
|
mutationPending?(): boolean;
|
|
18
18
|
current(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReviewedNativeCleanup.d.ts","sourceRoot":"","sources":["../../src/scheduling/ReviewedNativeCleanup.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IACjF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AACD,MAAM,WAAW,oBAAoB;IACnC,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"ReviewedNativeCleanup.d.ts","sourceRoot":"","sources":["../../src/scheduling/ReviewedNativeCleanup.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IACjF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AACD,MAAM,WAAW,oBAAoB;IACnC,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,+EAA+E;IAC/E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mBAAmB,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACnD,mEAAmE;IACnE,eAAe,CAAC,IAAI,OAAO,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC;IACnB,SAAS,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD;AACD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IACpE,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,eAAO,MAAM,eAAe,4VAA4V,CAAC;AACzX,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAIvD;AAMD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,uBAAuB,EAAE,CAqB1E;AAMD,wFAAwF;AACxF,qBAAa,qBAAqB;IAGpB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAAa,OAAO,CAAC,QAAQ,CAAC,GAAG;IAFjE,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,QAAQ,CAAwD;gBAC3C,GAAG,eAAW,EAAmB,GAAG,SAAa;IAC9E,OAAO,CAAC,KAAK;IAMP,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA8BzH,OAAO,CAAC,MAAM;IAMR,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,oBAAoB,EACtG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,uBAAuB,EAAE,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CA2CvI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleCleanup.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleCleanup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG,wBAAwB,GAAG,qBAAqB,GAAG,cAAc,CAAC;AAC9F,2FAA2F;AAC3F,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,IAAI,CAAC;IACrB,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ScheduleCleanup.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleCleanup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG,wBAAwB,GAAG,qBAAqB,GAAG,cAAc,CAAC;AAC9F,2FAA2F;AAC3F,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,IAAI,CAAC;IACrB,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;CACnH;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAI3D;AACD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAA8D;AAEhH,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,GAAG,qBAAqB,CAoBlG;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,qBAAqB;;;;;;;;EAI3D;AACD,MAAM,MAAM,sBAAsB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC"}
|
|
@@ -28,7 +28,8 @@ function cleanupRecord(record, reason) {
|
|
|
28
28
|
&& !/[\x00-\x1f\x7f]/.test(identity.sessionId)
|
|
29
29
|
&& (record.backend !== 'claude' || /^[a-f0-9-]{36}$/.test(identity.marker ?? ''))) {
|
|
30
30
|
result.attribution = { sessionId: identity.sessionId, promptHash: promptHash(record.prompt), rule: structuredClone(record.rule),
|
|
31
|
-
...(record.backend === 'claude' ? { marker: identity.marker
|
|
31
|
+
...(record.backend === 'claude' ? { marker: identity.marker,
|
|
32
|
+
...(/^[a-f0-9-]{36}$/.test(identity.ownerToken ?? '') && { ownerToken: identity.ownerToken }) } : {}) };
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
catch { /* Missing or malformed legacy attribution is not invented. */ }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleCleanup.js","sourceRoot":"","sources":["../../src/scheduling/ScheduleCleanup.ts"],"names":[],"mappings":";;AAcA,sCAIC;AACD,gCAAgH;AAEhH,
|
|
1
|
+
{"version":3,"file":"ScheduleCleanup.js","sourceRoot":"","sources":["../../src/scheduling/ScheduleCleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,9 +38,9 @@ async function verifySchedulePurge(record, host, current, accept) {
|
|
|
38
38
|
const marker = `[remote-cli:${identity.marker}]`;
|
|
39
39
|
if (entries.some(entry => entry.id === record.nativeId || entry.prompt.includes(marker)))
|
|
40
40
|
return unresolved('native_absence_unknown', 'The original native ID or marker is still present. Use cleanup review/delete for the exact definition, then retry these managed IDs; siblings are never swept.');
|
|
41
|
-
if (!host.retirementConfirmed?.())
|
|
41
|
+
if (!host.retirementConfirmed?.(identity.ownerToken))
|
|
42
42
|
return unresolved('predecessor_unknown', 'Fresh original-session inventory confirms definition absence, but predecessor or admitted work is unconfirmed. Cancellation intent is saved; native cleanup remains unresolved until framework retirement proof is available.');
|
|
43
|
-
return accept({ status: 'verified', isCurrent: () => valid() && !host.mutationPending?.() && host.retirementConfirmed?.() === true });
|
|
43
|
+
return accept({ status: 'verified', isCurrent: () => valid() && !host.mutationPending?.() && host.retirementConfirmed?.(identity.ownerToken) === true });
|
|
44
44
|
}
|
|
45
45
|
/** A digest preserves exact deletion attribution after user text has been erased.
|
|
46
46
|
* This callback has no execution or recovery path and never searches sessions. */
|
|
@@ -89,8 +89,8 @@ async function verifyCleanup(record, host, current, accept) {
|
|
|
89
89
|
if (identity(after) !== identity(entries.filter(entry => entry.id !== target.id)))
|
|
90
90
|
return unresolved('native_absence_unknown');
|
|
91
91
|
}
|
|
92
|
-
if (!host.retirementConfirmed?.())
|
|
92
|
+
if (!host.retirementConfirmed?.(a.ownerToken))
|
|
93
93
|
return unresolved('predecessor_unknown');
|
|
94
|
-
return accept({ status: 'verified', isCurrent: () => valid() && !host.mutationPending?.() && host.retirementConfirmed?.() === true });
|
|
94
|
+
return accept({ status: 'verified', isCurrent: () => valid() && !host.mutationPending?.() && host.retirementConfirmed?.(a.ownerToken) === true });
|
|
95
95
|
}
|
|
96
96
|
//# sourceMappingURL=SchedulePurgeVerification.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchedulePurgeVerification.js","sourceRoot":"","sources":["../../src/scheduling/SchedulePurgeVerification.ts"],"names":[],"mappings":";;AAOA,kDA8BC;AArCD,uDAA2E;AAC3E,mEAAwG;AAIxG;gFACgF;AACzE,KAAK,UAAU,mBAAmB,CAAI,MAAwD,EAAE,IAAsC,EAC3I,OAAsB,EAAE,MAAuD;IAC/E,MAAM,UAAU,GAAG,CAAC,MAAyE,EAAE,MAAc,EAAE,EAAE,CAC/G,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,qEAAqE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACtN,IAAI,IAAI,EAAE,eAAe,EAAE,EAAE;QAAE,OAAO,UAAU,CAAC,wBAAwB,EAAE,0BAA0B,CAAC,CAAC;IACvG,IAAI,gBAAgB,IAAI,MAAM;QAAE,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ;QAAE,OAAO,UAAU,CAAC,cAAc,EACxE,iMAAiM,CAAC,CAAC;IACrM,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC,qBAAqB,EACtE,gLAAgL,CAAC,CAAC;IACpL,IAAI,
|
|
1
|
+
{"version":3,"file":"SchedulePurgeVerification.js","sourceRoot":"","sources":["../../src/scheduling/SchedulePurgeVerification.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,6 +115,7 @@ export declare class ScheduleService {
|
|
|
115
115
|
/** Sequential startup/reconnect reconciliation. Never drives the native schedule clock. */
|
|
116
116
|
recover(): Promise<void>;
|
|
117
117
|
private recoverWaiting;
|
|
118
|
+
private releaseRecoveryAdmission;
|
|
118
119
|
private checkpoint;
|
|
119
120
|
private validateCheckpoint;
|
|
120
121
|
private recoveryDiagnostic;
|
|
@@ -161,7 +162,7 @@ export declare class ScheduleService {
|
|
|
161
162
|
canCancel(owner: ScheduleOwner, id: string): boolean;
|
|
162
163
|
/** Newly observed cleanup facts never supply historical recovery proof. The optional
|
|
163
164
|
* retirement callback is framework-owned and checked under the native cleanup lease. */
|
|
164
|
-
recordReviewedCleanup(owner: ScheduleOwner, ids: string[], absent: boolean, retirementConfirmed?: () => boolean): Promise<void>;
|
|
165
|
+
recordReviewedCleanup(owner: ScheduleOwner, ids: string[], absent: boolean, retirementConfirmed?: (record: Readonly<ScheduleRecord>) => boolean): Promise<void>;
|
|
165
166
|
/** Keep admitted native work visible when cleanup cannot safely acquire its host. */
|
|
166
167
|
retainCleanupError(owner: ScheduleOwner, id: string, error: unknown): Promise<void>;
|
|
167
168
|
/** Observe native inventory without deleting definitions or retiring native work. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleService.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ScheduleService.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleService.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,9 +96,10 @@ function sameOwner(left, right) {
|
|
|
96
96
|
function sameCleanupOwner(left, right) {
|
|
97
97
|
return left.threadId === right.threadId && left.openId === right.openId;
|
|
98
98
|
}
|
|
99
|
-
/**
|
|
99
|
+
/** Failed future-only history is inactive; live runtimes still own admission.
|
|
100
|
+
* Other providers retain their existing native cleanup obligations. */
|
|
100
101
|
function recoveryOwnsWork(record) {
|
|
101
|
-
return !!record.recovery && (!['completed', 'cancelled'].includes(record.state)
|
|
102
|
+
return !!record.recovery && !(record.state === 'failed' && record.recovery.futureOnly) && (!['completed', 'cancelled'].includes(record.state)
|
|
102
103
|
|| !!record.error?.startsWith('Native process exit unconfirmed:'));
|
|
103
104
|
}
|
|
104
105
|
function deliveryId(scheduleId, occurrenceId) {
|
|
@@ -184,6 +185,16 @@ class ScheduleService {
|
|
|
184
185
|
}
|
|
185
186
|
continue; // Terminal tombstones always win over a stale recovery checkpoint.
|
|
186
187
|
}
|
|
188
|
+
// A consumed future-only attempt or an already blocked interrupted row
|
|
189
|
+
// cannot regain automatic admission after another service restart.
|
|
190
|
+
if (record.recovery?.futureOnly && (record.state === 'creating'
|
|
191
|
+
|| record.state === 'interrupted' && record.recovery.status === 'blocked')) {
|
|
192
|
+
record.state = 'failed';
|
|
193
|
+
record.recovery.status = 'blocked';
|
|
194
|
+
record.error ??= 'Interrupted native restoration quarantined; original session and cleanup evidence retained.';
|
|
195
|
+
changed = true;
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
187
198
|
if (LIVE.has(record.state) || record.recovery?.status === 'pending'
|
|
188
199
|
|| record.state === 'interrupted' && record.recovery?.futureOnly && record.rule.kind === 'cron') {
|
|
189
200
|
const futureOnly = record.recovery?.futureOnly && record.rule.kind === 'cron';
|
|
@@ -262,6 +273,15 @@ class ScheduleService {
|
|
|
262
273
|
runtime.completed = new Set(record.completedOccurrences);
|
|
263
274
|
const controller = new AbortController();
|
|
264
275
|
runtime.recoveryAbort = controller;
|
|
276
|
+
// Admission contention has not consumed this job's clean checkpoint.
|
|
277
|
+
// Leave it pending so the exact earlier runtime can release the thread.
|
|
278
|
+
try {
|
|
279
|
+
runtime.releaseAdmission = this.options.acquireRecovery?.(structuredClone(record));
|
|
280
|
+
}
|
|
281
|
+
catch (error) {
|
|
282
|
+
await this.recoveryDiagnostic(record, errorText(error));
|
|
283
|
+
continue;
|
|
284
|
+
}
|
|
265
285
|
this.runtimes.set(id, runtime);
|
|
266
286
|
const current = () => !controller.signal.aborted && !this.closing && !this.fault && !record.cancelRequested
|
|
267
287
|
&& this.current(record) && this.options.canRecover?.(structuredClone(record)) === true;
|
|
@@ -279,7 +299,6 @@ class ScheduleService {
|
|
|
279
299
|
let admitted = false;
|
|
280
300
|
let succeeded = false;
|
|
281
301
|
try {
|
|
282
|
-
runtime.releaseAdmission = this.options.acquireRecovery?.(structuredClone(record));
|
|
283
302
|
await this.serial(async () => {
|
|
284
303
|
if (!current())
|
|
285
304
|
throw new Error('Recovery admission expired.');
|
|
@@ -290,6 +309,7 @@ class ScheduleService {
|
|
|
290
309
|
await this.persist();
|
|
291
310
|
});
|
|
292
311
|
admitted = true;
|
|
312
|
+
runtime.recoveryAdmitted = true;
|
|
293
313
|
const admission = Promise.resolve().then(() => provider.reconcile(restoreRecord, { notBefore: this.now(), signal: controller.signal, isCurrent: current,
|
|
294
314
|
isOwnerCurrent: () => !record.cancelRequested && !this.fault && this.current(record),
|
|
295
315
|
canAdmitOccurrence: () => this.canAdmitOccurrence(id, runtime) }, emit));
|
|
@@ -316,12 +336,28 @@ class ScheduleService {
|
|
|
316
336
|
await this.stop(id, runtime).catch(() => { });
|
|
317
337
|
}
|
|
318
338
|
runtime.resolveReady(runtime.handle);
|
|
339
|
+
if (!runtime.handle && (error instanceof types_1.NativeScheduleRecoverySettledError
|
|
340
|
+
|| error instanceof types_1.NativeScheduleNotAdmittedError || error instanceof types_1.NativeScheduleAbsentError)) {
|
|
341
|
+
runtime.stopped = true;
|
|
342
|
+
this.releaseRecoveryAdmission(runtime);
|
|
343
|
+
if (this.runtimes.get(id) === runtime)
|
|
344
|
+
this.runtimes.delete(id);
|
|
345
|
+
}
|
|
319
346
|
// A rejection without a handle is not proof that native admission never happened.
|
|
320
347
|
throw error;
|
|
321
348
|
});
|
|
322
349
|
const handle = await Promise.race([receipt, new Promise((_, reject) => {
|
|
323
|
-
timer = setTimeout(() => {
|
|
350
|
+
timer = setTimeout(() => {
|
|
351
|
+
controller.abort();
|
|
352
|
+
reject(new Error(record.recovery?.futureOnly
|
|
353
|
+
? 'Native recovery timed out; this job will not restart automatically. Native settlement and cleanup remain separate.'
|
|
354
|
+
: 'Native recovery timed out; ownership retained, do not recreate.'));
|
|
355
|
+
}, this.options.recoveryTimeoutMs ?? 30_000);
|
|
324
356
|
})]);
|
|
357
|
+
// Native recovery and inventory validation settled. A later deadline
|
|
358
|
+
// must not abort the adopted handle while its active checkpoint is saved.
|
|
359
|
+
clearTimeout(timer);
|
|
360
|
+
timer = undefined;
|
|
325
361
|
text(handle.nativeId);
|
|
326
362
|
// The provider's reconcile contract includes inventory validation; list is
|
|
327
363
|
// additionally required to verify the returned handle before activating it.
|
|
@@ -331,6 +367,10 @@ class ScheduleService {
|
|
|
331
367
|
if (!current())
|
|
332
368
|
throw new Error('Recovery owner retired before receipt persistence.');
|
|
333
369
|
record.nativeId = handle.nativeId;
|
|
370
|
+
if (handle.recoveryIdentity) {
|
|
371
|
+
text(handle.recoveryIdentity, 8192);
|
|
372
|
+
record.recovery.identity = handle.recoveryIdentity;
|
|
373
|
+
}
|
|
334
374
|
if (record.state === 'creating')
|
|
335
375
|
record.state = 'active';
|
|
336
376
|
record.recovery.status = 'eligible';
|
|
@@ -341,12 +381,15 @@ class ScheduleService {
|
|
|
341
381
|
}
|
|
342
382
|
catch (error) {
|
|
343
383
|
controller.abort();
|
|
344
|
-
if (!admitted || error instanceof types_1.NativeScheduleAbsentError || error instanceof types_1.NativeScheduleNotAdmittedError) {
|
|
384
|
+
if (!admitted || error instanceof types_1.NativeScheduleAbsentError || error instanceof types_1.NativeScheduleNotAdmittedError || error instanceof types_1.NativeScheduleRecoverySettledError) {
|
|
345
385
|
runtime.stopped = true;
|
|
346
386
|
runtime.resolveReady(undefined);
|
|
347
387
|
}
|
|
348
388
|
// Do not retry an ambiguous mutation or release its handle on a timeout.
|
|
349
|
-
|
|
389
|
+
if (admitted)
|
|
390
|
+
await this.blockRecovery(record, errorText(error), !!record.recovery?.futureOnly);
|
|
391
|
+
else
|
|
392
|
+
await this.recoveryDiagnostic(record, errorText(error));
|
|
350
393
|
if (runtime.handle)
|
|
351
394
|
await this.stop(id, runtime).catch(() => { });
|
|
352
395
|
else if (runtime.stopped)
|
|
@@ -356,8 +399,7 @@ class ScheduleService {
|
|
|
356
399
|
if (timer)
|
|
357
400
|
clearTimeout(timer);
|
|
358
401
|
if (succeeded || runtime.stopped) {
|
|
359
|
-
|
|
360
|
-
runtime.releaseAdmission = undefined;
|
|
402
|
+
this.releaseRecoveryAdmission(runtime);
|
|
361
403
|
}
|
|
362
404
|
}
|
|
363
405
|
}
|
|
@@ -376,6 +418,20 @@ class ScheduleService {
|
|
|
376
418
|
released.add(record.threadId);
|
|
377
419
|
}
|
|
378
420
|
}
|
|
421
|
+
releaseRecoveryAdmission(runtime) {
|
|
422
|
+
const release = runtime.releaseAdmission;
|
|
423
|
+
runtime.releaseAdmission = undefined;
|
|
424
|
+
release?.();
|
|
425
|
+
if (!release || !runtime.recoveryAdmitted || !runtime.recoveryAbort?.signal.aborted)
|
|
426
|
+
return;
|
|
427
|
+
// Join the current pass before retrying untouched siblings. Failed rows are
|
|
428
|
+
// never candidates, and canRecover/acquireRecovery recheck newer admission.
|
|
429
|
+
const retry = Promise.resolve(this.recoveryRun).catch(() => { }).then(() => {
|
|
430
|
+
if (!this.closing && !this.fault && this.hasPendingRecovery())
|
|
431
|
+
return this.recover();
|
|
432
|
+
});
|
|
433
|
+
this.track(retry);
|
|
434
|
+
}
|
|
379
435
|
checkpoint(value) {
|
|
380
436
|
return { version: 1, provider: value.provider, strategy: value.strategy, identity: value.identity,
|
|
381
437
|
...(value.orderlyOnly && { orderlyOnly: true }), ...(value.futureOnly && { futureOnly: true }), ...(value.handoffPolicy && { handoffPolicy: value.handoffPolicy }), ...(value.handoff && { handoff: value.handoff }),
|
|
@@ -396,12 +452,13 @@ class ScheduleService {
|
|
|
396
452
|
text(value.identity, 8192);
|
|
397
453
|
}
|
|
398
454
|
async recoveryDiagnostic(record, reason) {
|
|
399
|
-
await this.serial(async () => { record.error = reason;
|
|
455
|
+
await this.serial(async () => { record.error = reason; if (!this.fault)
|
|
456
|
+
await this.persist(); });
|
|
400
457
|
}
|
|
401
|
-
async blockRecovery(record, reason) {
|
|
458
|
+
async blockRecovery(record, reason, quarantine = false) {
|
|
402
459
|
await this.serial(async () => {
|
|
403
460
|
if (!['completed', 'cancelled'].includes(record.state))
|
|
404
|
-
record.state = 'interrupted';
|
|
461
|
+
record.state = quarantine ? 'failed' : 'interrupted';
|
|
405
462
|
record.recovery.status = 'blocked';
|
|
406
463
|
record.error = reason;
|
|
407
464
|
if (!this.fault)
|
|
@@ -948,7 +1005,7 @@ class ScheduleService {
|
|
|
948
1005
|
const runtime = this.runtimes.get(id);
|
|
949
1006
|
if (record.state === 'cancelled' && runtime?.handle?.cancellationKeepsRunning && !record.error)
|
|
950
1007
|
return false;
|
|
951
|
-
return LIVE.has(record.state) || recoveryOwnsWork(record) || record.state
|
|
1008
|
+
return LIVE.has(record.state) || recoveryOwnsWork(record) || ['interrupted', 'failed'].includes(record.state) && !!record.nativeId && this.supportsRetainedCancellation(record)
|
|
952
1009
|
|| Boolean(runtime && !runtime.stopped);
|
|
953
1010
|
}
|
|
954
1011
|
/** Newly observed cleanup facts never supply historical recovery proof. The optional
|
|
@@ -973,7 +1030,7 @@ class ScheduleService {
|
|
|
973
1030
|
record.error = absent ? 'Owner-reviewed native definition absent on current host; predecessor work remains unknown.'
|
|
974
1031
|
: 'Owner-reviewed native deletion requested; absence and predecessor work remain unconfirmed.';
|
|
975
1032
|
const runtime = this.runtimes.get(id);
|
|
976
|
-
if (absent && retirementConfirmed?.() === true && (!runtime || runtime.stopped && !runtime.running.size)
|
|
1033
|
+
if (absent && retirementConfirmed?.(record) === true && (!runtime || runtime.stopped && !runtime.running.size)
|
|
977
1034
|
&& !this.recordOperations.has(id) && !this.recoveryRun && !this.refreshes && !this.retainedCancellations.has(id)) {
|
|
978
1035
|
record.state = 'cancelled';
|
|
979
1036
|
record.cleanupConfirmed = true;
|
|
@@ -1084,8 +1141,8 @@ class ScheduleService {
|
|
|
1084
1141
|
}
|
|
1085
1142
|
const retainedCleanup = !runtime || runtime.stopped && !runtime.handle?.nativeDefinitionAbsent
|
|
1086
1143
|
&& this.supportsRetainedCancellation(record);
|
|
1087
|
-
if (retainedCleanup && (recoveryOwnsWork(record)
|
|
1088
|
-
|| record.state
|
|
1144
|
+
if (retainedCleanup && (recoveryOwnsWork(record) || record.state === 'failed' && !!record.recovery
|
|
1145
|
+
|| ['interrupted', 'failed'].includes(record.state) && !!record.nativeId && this.supportsRetainedCancellation(record))) {
|
|
1089
1146
|
operation = Promise.resolve().then(() => this.cancelRetained(record));
|
|
1090
1147
|
this.retainedCancellations.set(id, operation);
|
|
1091
1148
|
return;
|
|
@@ -1166,8 +1223,8 @@ class ScheduleService {
|
|
|
1166
1223
|
}
|
|
1167
1224
|
hasUnresolvedHandoff() { return this.handoffUnresolved; }
|
|
1168
1225
|
hasUnresolvedRecovery() {
|
|
1169
|
-
return [...this.
|
|
1170
|
-
&& record.recovery?.status !== 'eligible');
|
|
1226
|
+
return [...this.runtimes.values()].some(runtime => !!runtime.recoveryAbort && !runtime.stopped && runtime.recoveryAbort.signal.aborted)
|
|
1227
|
+
|| [...this.records.values()].some(record => recoveryOwnsWork(record) && record.recovery?.status !== 'eligible');
|
|
1171
1228
|
}
|
|
1172
1229
|
hasPendingRecovery() {
|
|
1173
1230
|
return [...this.records.values()].some(record => record.state === 'interrupted' && record.recovery?.status === 'pending');
|
|
@@ -1313,7 +1370,8 @@ class ScheduleService {
|
|
|
1313
1370
|
}
|
|
1314
1371
|
/** Providers with durable intent must complete handoff before unrelated host teardown. */
|
|
1315
1372
|
requiresShutdownHandoff() {
|
|
1316
|
-
return [...this.records.values()].some(record => !!record.recovery
|
|
1373
|
+
return [...this.records.values()].some(record => !!record.recovery
|
|
1374
|
+
&& (!(record.state === 'failed' && record.recovery.futureOnly) || !!this.runtimes.get(record.id) && !this.runtimes.get(record.id).stopped));
|
|
1317
1375
|
}
|
|
1318
1376
|
destroy() {
|
|
1319
1377
|
if (this.hostRetirement && !this.hostsRetired)
|
|
@@ -1476,8 +1534,7 @@ class ScheduleService {
|
|
|
1476
1534
|
// after a failed cancellation cleanup. Never downgrade confirmed exit.
|
|
1477
1535
|
if (event.type === 'stopped' && event.exitConfirmed !== false) {
|
|
1478
1536
|
runtime.stopped = true;
|
|
1479
|
-
|
|
1480
|
-
runtime.releaseAdmission = undefined;
|
|
1537
|
+
this.releaseRecoveryAdmission(runtime);
|
|
1481
1538
|
if (record.error?.startsWith('Native process exit unconfirmed:')) {
|
|
1482
1539
|
delete record.error;
|
|
1483
1540
|
await this.persist();
|
|
@@ -1516,9 +1573,10 @@ class ScheduleService {
|
|
|
1516
1573
|
await this.persist();
|
|
1517
1574
|
return;
|
|
1518
1575
|
}
|
|
1576
|
+
const finishingFailed = record.state === 'failed' && event.type === 'completed' && runtime.running.has(event.occurrenceId);
|
|
1519
1577
|
const finishingCancelled = record.state === 'cancelled' && runtime.handle?.cancellationKeepsRunning
|
|
1520
1578
|
&& event.type === 'completed' && runtime.running.has(event.occurrenceId);
|
|
1521
|
-
if ((!finishingCancelled && record.state === 'cancelled') || record.state === 'failed' || record.state === 'completed')
|
|
1579
|
+
if ((!finishingCancelled && record.state === 'cancelled') || record.state === 'failed' && !finishingFailed || record.state === 'completed')
|
|
1522
1580
|
return;
|
|
1523
1581
|
if (event.type === 'stopped') {
|
|
1524
1582
|
if (LIVE.has(record.state)) {
|
|
@@ -1578,7 +1636,7 @@ class ScheduleService {
|
|
|
1578
1636
|
record.state = 'completed';
|
|
1579
1637
|
cleanup = true;
|
|
1580
1638
|
}
|
|
1581
|
-
else if (record.state !== 'interrupted') {
|
|
1639
|
+
else if (record.state !== 'interrupted' && record.state !== 'failed') {
|
|
1582
1640
|
record.state = runtime.running.size ? 'running' : 'active';
|
|
1583
1641
|
if (record.recovery && !runtime.running.size)
|
|
1584
1642
|
record.recovery.status = 'eligible';
|
|
@@ -1681,8 +1739,7 @@ class ScheduleService {
|
|
|
1681
1739
|
if (handle?.retirementConfirmed !== false && (!handle?.cancellationKeepsRunning || !runtime.running.size))
|
|
1682
1740
|
runtime.stopped = true;
|
|
1683
1741
|
if (runtime.stopped) {
|
|
1684
|
-
|
|
1685
|
-
runtime.releaseAdmission = undefined;
|
|
1742
|
+
this.releaseRecoveryAdmission(runtime);
|
|
1686
1743
|
await this.rememberCleanup(id, runtime);
|
|
1687
1744
|
}
|
|
1688
1745
|
}
|
|
@@ -1727,7 +1784,7 @@ class ScheduleService {
|
|
|
1727
1784
|
canAdmitOccurrence(id, runtime) {
|
|
1728
1785
|
const record = this.records.get(id);
|
|
1729
1786
|
return !!record && this.runtimes.get(id) === runtime && !this.closing && !this.hostRetirement && !this.fault
|
|
1730
|
-
&& !runtime.stopped && !runtime.cancelling && !record.cancelRequested
|
|
1787
|
+
&& !runtime.stopped && !runtime.cancelling && !runtime.recoveryAbort?.signal.aborted && !record.cancelRequested
|
|
1731
1788
|
&& LIVE.has(record.state) && this.current(record);
|
|
1732
1789
|
}
|
|
1733
1790
|
newRuntime() {
|
|
@@ -1944,8 +2001,10 @@ class ScheduleService {
|
|
|
1944
2001
|
if (entry.nativeId !== undefined)
|
|
1945
2002
|
text(entry.nativeId);
|
|
1946
2003
|
if (entry.attribution !== undefined) {
|
|
1947
|
-
const a = object(entry.attribution, ['sessionId', 'marker', 'promptHash', 'rule']);
|
|
2004
|
+
const a = object(entry.attribution, ['sessionId', 'marker', 'ownerToken', 'promptHash', 'rule']);
|
|
1948
2005
|
text(a.sessionId);
|
|
2006
|
+
if (a.ownerToken !== undefined && (entry.backend !== 'claude' || typeof a.ownerToken !== 'string' || !/^[a-f0-9-]{36}$/.test(a.ownerToken)))
|
|
2007
|
+
throw new Error('Invalid cleanup owner incarnation.');
|
|
1949
2008
|
if (typeof a.promptHash !== 'string' || !/^[a-f0-9]{64}$/.test(a.promptHash)
|
|
1950
2009
|
|| (entry.backend === 'claude' ? typeof a.marker !== 'string' || !/^[a-f0-9-]{36}$/.test(a.marker) : a.marker !== undefined))
|
|
1951
2010
|
throw new Error('Invalid cleanup attribution.');
|