@yu_robotics/remote-cli 1.6.239 → 1.6.241
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 +4 -0
- package/dist/client/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +127 -15
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/delegation/ArtifactCloseoutContinuation.d.ts +14 -0
- package/dist/delegation/ArtifactCloseoutContinuation.d.ts.map +1 -0
- package/dist/delegation/ArtifactCloseoutContinuation.js +37 -0
- package/dist/delegation/ArtifactCloseoutContinuation.js.map +1 -0
- package/dist/delegation/DelegationManager.d.ts +0 -1
- package/dist/delegation/DelegationManager.d.ts.map +1 -1
- package/dist/delegation/DelegationManager.js +1 -1
- package/dist/delegation/DelegationManager.js.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts +6 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.js +127 -34
- package/dist/executor/ClaudePersistentExecutor.js.map +1 -1
- package/dist/executor/DshExecutor.d.ts +1 -0
- package/dist/executor/DshExecutor.d.ts.map +1 -1
- package/dist/executor/IExecutor.d.ts +3 -1
- package/dist/executor/IExecutor.d.ts.map +1 -1
- package/dist/maintenance/release-notes.json +1 -1
- package/dist/managed/tools.d.ts +18 -0
- package/dist/managed/tools.d.ts.map +1 -1
- package/dist/scheduling/ReviewedNativeCleanup.d.ts +44 -0
- package/dist/scheduling/ReviewedNativeCleanup.d.ts.map +1 -0
- package/dist/scheduling/ReviewedNativeCleanup.js +165 -0
- package/dist/scheduling/ReviewedNativeCleanup.js.map +1 -0
- package/dist/scheduling/ScheduleCommand.d.ts +8 -0
- package/dist/scheduling/ScheduleCommand.d.ts.map +1 -1
- package/dist/scheduling/ScheduleCommand.js +15 -0
- package/dist/scheduling/ScheduleCommand.js.map +1 -1
- package/dist/scheduling/ScheduleService.d.ts +6 -0
- package/dist/scheduling/ScheduleService.d.ts.map +1 -1
- package/dist/scheduling/ScheduleService.js +84 -8
- package/dist/scheduling/ScheduleService.js.map +1 -1
- package/dist/scheduling/ScheduleToolScope.d.ts +3 -0
- package/dist/scheduling/ScheduleToolScope.d.ts.map +1 -1
- package/dist/scheduling/ScheduleToolScope.js +10 -0
- package/dist/scheduling/ScheduleToolScope.js.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts +9 -0
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js +39 -0
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts +14 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.js +111 -7
- package/dist/scheduling/claude/ClaudeSessionSchedules.js.map +1 -1
- package/dist/scheduling/toolContract.d.ts +9 -0
- package/dist/scheduling/toolContract.d.ts.map +1 -1
- package/dist/scheduling/toolContract.js +1 -0
- package/dist/scheduling/toolContract.js.map +1 -1
- package/dist/scheduling/types.d.ts +15 -1
- package/dist/scheduling/types.d.ts.map +1 -1
- package/dist/scheduling/types.js +5 -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
package/dist/managed/tools.d.ts
CHANGED
|
@@ -103,6 +103,15 @@ export declare function managedTools(connection?: Pick<ManagedToolConnection, 'g
|
|
|
103
103
|
required: string[];
|
|
104
104
|
additionalProperties: boolean;
|
|
105
105
|
};
|
|
106
|
+
} | {
|
|
107
|
+
readonly name: "remote_cli_schedule_cleanup_review";
|
|
108
|
+
readonly description: "Read authoritative native Cron inventory in this bound Claude session and prepare a deletion-only owner review, including legacy and native-only definitions. Never confirms deletion or grants execution recovery. Show the complete candidates and token to the user. Only the user can confirm through /schedule cleanup confirm <token> <request-id> <native-id,...>; do not invent confirmation or execute that command yourself. Pending operations may return a scoped nativeAction.";
|
|
109
|
+
readonly inputSchema: {
|
|
110
|
+
type: string;
|
|
111
|
+
properties: Record<string, unknown>;
|
|
112
|
+
required: string[];
|
|
113
|
+
additionalProperties: boolean;
|
|
114
|
+
};
|
|
106
115
|
} | {
|
|
107
116
|
readonly name: "remote_cli_schedule_operation";
|
|
108
117
|
readonly description: "Inspect an accepted operation without repeating its native side effects. Waits at most 10 seconds; pending is not success. If still pending, explain that the management card will arrive after completion; do not busy-poll or invent another requestId.";
|
|
@@ -217,6 +226,15 @@ export declare function environmentTools(): ({
|
|
|
217
226
|
required: string[];
|
|
218
227
|
additionalProperties: boolean;
|
|
219
228
|
};
|
|
229
|
+
} | {
|
|
230
|
+
readonly name: "remote_cli_schedule_cleanup_review";
|
|
231
|
+
readonly description: "Read authoritative native Cron inventory in this bound Claude session and prepare a deletion-only owner review, including legacy and native-only definitions. Never confirms deletion or grants execution recovery. Show the complete candidates and token to the user. Only the user can confirm through /schedule cleanup confirm <token> <request-id> <native-id,...>; do not invent confirmation or execute that command yourself. Pending operations may return a scoped nativeAction.";
|
|
232
|
+
readonly inputSchema: {
|
|
233
|
+
type: string;
|
|
234
|
+
properties: Record<string, unknown>;
|
|
235
|
+
required: string[];
|
|
236
|
+
additionalProperties: boolean;
|
|
237
|
+
};
|
|
220
238
|
} | {
|
|
221
239
|
readonly name: "remote_cli_schedule_operation";
|
|
222
240
|
readonly description: "Inspect an accepted operation without repeating its native side effects. Waits at most 10 seconds; pending is not success. If still pending, explain that the management card will arrive after completion; do not busy-poll or invent another requestId.";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/managed/tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/managed/tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAG9E;AACD,wBAAgB,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAQ/B"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
export interface NativeCleanupDefinition {
|
|
2
|
+
id: string;
|
|
3
|
+
prompt: string;
|
|
4
|
+
cron: string;
|
|
5
|
+
recurring?: boolean;
|
|
6
|
+
durable?: boolean;
|
|
7
|
+
[key: string]: unknown;
|
|
8
|
+
}
|
|
9
|
+
export interface NativeCleanupSession {
|
|
10
|
+
/** Opaque binding to one process, native session, cwd and configuration epoch. */
|
|
11
|
+
binding: string;
|
|
12
|
+
sessionId: string;
|
|
13
|
+
current(): boolean;
|
|
14
|
+
inventory(): Promise<NativeCleanupDefinition[]>;
|
|
15
|
+
remove(target: NativeCleanupDefinition): Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
export interface NativeCleanupReview {
|
|
18
|
+
token: string;
|
|
19
|
+
expiresAt: string;
|
|
20
|
+
sessionId: string;
|
|
21
|
+
digest: string;
|
|
22
|
+
candidates: NativeCleanupDefinition[];
|
|
23
|
+
blockedIds: string[];
|
|
24
|
+
warning: string;
|
|
25
|
+
}
|
|
26
|
+
export declare const CLEANUP_WARNING = "Deletion only in this bound native session. Predecessor or already-started work remains unknown; this does not authorize execution recovery. Legacy catalog rows without session attribution remain unchanged. Only session-only definitions (durable: false) are eligible; project-persisted definitions lack session attribution in native inventory.";
|
|
27
|
+
export declare function cleanupCanonical(value: unknown): string;
|
|
28
|
+
export declare function cleanupInventory(value: unknown): NativeCleanupDefinition[];
|
|
29
|
+
/** Ephemeral owner authorization, deliberately not an execution or recovery receipt. */
|
|
30
|
+
export declare class ReviewedNativeCleanup {
|
|
31
|
+
private readonly now;
|
|
32
|
+
private readonly ttl;
|
|
33
|
+
private reviews;
|
|
34
|
+
private requests;
|
|
35
|
+
constructor(now?: () => number, ttl?: number);
|
|
36
|
+
private check;
|
|
37
|
+
prepare(scope: string, requestId: string, host: NativeCleanupSession, ids?: string[]): Promise<NativeCleanupReview>;
|
|
38
|
+
private public;
|
|
39
|
+
confirm(scope: string, requestId: string, token: string, ids: string[], host: NativeCleanupSession, observe?: (targets: NativeCleanupDefinition[], absent: boolean) => Promise<void>): Promise<{
|
|
40
|
+
absentIds: string[];
|
|
41
|
+
warning: string;
|
|
42
|
+
}>;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=ReviewedNativeCleanup.d.ts.map
|
|
@@ -0,0 +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,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"}
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ReviewedNativeCleanup = exports.CLEANUP_WARNING = void 0;
|
|
4
|
+
exports.cleanupCanonical = cleanupCanonical;
|
|
5
|
+
exports.cleanupInventory = cleanupInventory;
|
|
6
|
+
const crypto_1 = require("crypto");
|
|
7
|
+
const ScheduleCommand_1 = require("./ScheduleCommand");
|
|
8
|
+
exports.CLEANUP_WARNING = 'Deletion only in this bound native session. Predecessor or already-started work remains unknown; this does not authorize execution recovery. Legacy catalog rows without session attribution remain unchanged. Only session-only definitions (durable: false) are eligible; project-persisted definitions lack session attribution in native inventory.';
|
|
9
|
+
function cleanupCanonical(value) {
|
|
10
|
+
const sort = (v) => Array.isArray(v) ? v.map(sort) : v && typeof v === 'object'
|
|
11
|
+
? Object.fromEntries(Object.keys(v).sort().map(k => [k, sort(v[k])])) : v;
|
|
12
|
+
return JSON.stringify(sort(value));
|
|
13
|
+
}
|
|
14
|
+
/** CronList advances this forecast after a timer fires, even when admission is
|
|
15
|
+
* denied. Preserve it in the review, but compare every actual definition field. */
|
|
16
|
+
function inventoryIdentity(entries) {
|
|
17
|
+
return cleanupCanonical(entries.map(({ nextFireAt: _forecast, ...definition }) => definition));
|
|
18
|
+
}
|
|
19
|
+
function cleanupInventory(value) {
|
|
20
|
+
if (!value || typeof value !== 'object' || Array.isArray(value) || Object.keys(value).some(key => key !== 'jobs')) {
|
|
21
|
+
throw new Error('Complete structured native inventory is unavailable.');
|
|
22
|
+
}
|
|
23
|
+
const jobs = value.jobs;
|
|
24
|
+
if (!Array.isArray(jobs) || jobs.length > 100 || Buffer.byteLength(JSON.stringify(jobs)) > 1024 * 1024) {
|
|
25
|
+
throw new Error('Complete structured native inventory is unavailable or exceeds the review limit.');
|
|
26
|
+
}
|
|
27
|
+
for (const job of jobs) {
|
|
28
|
+
if (!job || typeof job !== 'object' || Array.isArray(job))
|
|
29
|
+
throw new Error('Invalid native definition.');
|
|
30
|
+
(0, ScheduleCommand_1.validateScheduleId)(job.id);
|
|
31
|
+
if (typeof job.prompt !== 'string' || !job.prompt || job.prompt.includes('\0') || Buffer.byteLength(job.prompt) > 16384
|
|
32
|
+
|| typeof job.cron !== 'string' || !job.cron || job.cron.length > 256
|
|
33
|
+
|| ('durable' in job && typeof job.durable !== 'boolean')
|
|
34
|
+
|| ('nextFireAt' in job && (typeof job.nextFireAt !== 'number' || !Number.isFinite(job.nextFireAt)))
|
|
35
|
+
|| ('recurring' in job && typeof job.recurring !== 'boolean')) {
|
|
36
|
+
throw new Error('Invalid native definition fields.');
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (new Set(jobs.map(job => job.id)).size !== jobs.length)
|
|
40
|
+
throw new Error('Ambiguous native definition IDs.');
|
|
41
|
+
return structuredClone(jobs).sort((a, b) => a.id.localeCompare(b.id));
|
|
42
|
+
}
|
|
43
|
+
/** Ephemeral owner authorization, deliberately not an execution or recovery receipt. */
|
|
44
|
+
class ReviewedNativeCleanup {
|
|
45
|
+
now;
|
|
46
|
+
ttl;
|
|
47
|
+
reviews = new Map();
|
|
48
|
+
requests = new Map();
|
|
49
|
+
constructor(now = Date.now, ttl = 5 * 60_000) {
|
|
50
|
+
this.now = now;
|
|
51
|
+
this.ttl = ttl;
|
|
52
|
+
}
|
|
53
|
+
check(host, review, scope) {
|
|
54
|
+
if (!host.current() || review && (review.expires <= this.now() || review.scope !== scope
|
|
55
|
+
|| review.binding !== host.binding || review.sessionId !== host.sessionId)) {
|
|
56
|
+
throw new Error('Cleanup review expired or owner/session/host changed. Run /schedule cleanup review again.');
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
async prepare(scope, requestId, host, ids) {
|
|
60
|
+
this.check(host);
|
|
61
|
+
(0, ScheduleCommand_1.validateScheduleId)(requestId);
|
|
62
|
+
ids?.forEach(ScheduleCommand_1.validateScheduleId);
|
|
63
|
+
for (const [token, review] of this.reviews)
|
|
64
|
+
if (review.expires <= this.now())
|
|
65
|
+
this.reviews.delete(token);
|
|
66
|
+
for (const [key, value] of this.requests)
|
|
67
|
+
if (!this.reviews.has(value.token))
|
|
68
|
+
this.requests.delete(key);
|
|
69
|
+
const key = cleanupCanonical([scope, requestId]);
|
|
70
|
+
const digest = cleanupCanonical(ids?.slice().sort() ?? []);
|
|
71
|
+
const previous = this.requests.get(key);
|
|
72
|
+
if (previous && previous.digest !== digest)
|
|
73
|
+
throw new Error('Cleanup requestId was reused with different arguments.');
|
|
74
|
+
const inventory = await host.inventory();
|
|
75
|
+
this.check(host);
|
|
76
|
+
if (previous) {
|
|
77
|
+
const review = this.reviews.get(previous.token);
|
|
78
|
+
this.check(host, review, scope);
|
|
79
|
+
if (inventoryIdentity(review.inventory) !== inventoryIdentity(inventory))
|
|
80
|
+
throw new Error('Native inventory changed. Request a new cleanup review.');
|
|
81
|
+
return this.public(previous.token, review);
|
|
82
|
+
}
|
|
83
|
+
if (this.reviews.size >= 100)
|
|
84
|
+
throw new Error('Cleanup review capacity reached. Let old reviews expire.');
|
|
85
|
+
if (ids && (new Set(ids).size !== ids.length || ids.some(id => !inventory.some(entry => entry.id === id)))) {
|
|
86
|
+
throw new Error('Selected native ID is not in the bound session inventory. Review this session; no other sessions are searched.');
|
|
87
|
+
}
|
|
88
|
+
const candidates = ids?.length ? inventory.filter(entry => ids.includes(entry.id)) : inventory;
|
|
89
|
+
if (Buffer.byteLength(JSON.stringify(candidates)) > 40000) {
|
|
90
|
+
throw new Error(`Inventory is too large to display completely. Use /schedule cleanup review <native-id,...>. Available IDs: ${inventory.map(entry => entry.id).join(',')}`);
|
|
91
|
+
}
|
|
92
|
+
const token = (0, crypto_1.randomUUID)();
|
|
93
|
+
const review = { scope, binding: host.binding, sessionId: host.sessionId, expires: this.now() + this.ttl,
|
|
94
|
+
inventory, candidates, attempted: new Set(), absent: new Set() };
|
|
95
|
+
this.reviews.set(token, review);
|
|
96
|
+
this.requests.set(key, { digest, token });
|
|
97
|
+
return this.public(token, review);
|
|
98
|
+
}
|
|
99
|
+
public(token, review) {
|
|
100
|
+
return { token, expiresAt: new Date(review.expires).toISOString(), sessionId: review.sessionId,
|
|
101
|
+
digest: (0, crypto_1.createHash)('sha256').update(inventoryIdentity(review.inventory)).digest('hex'),
|
|
102
|
+
candidates: structuredClone(review.candidates),
|
|
103
|
+
blockedIds: review.candidates.filter(entry => entry.durable !== false).map(entry => entry.id), warning: exports.CLEANUP_WARNING };
|
|
104
|
+
}
|
|
105
|
+
async confirm(scope, requestId, token, ids, host, observe) {
|
|
106
|
+
const review = this.reviews.get(token);
|
|
107
|
+
if (!review)
|
|
108
|
+
throw new Error('Unknown cleanup review. Run /schedule cleanup review in the bound session.');
|
|
109
|
+
this.check(host, review, scope);
|
|
110
|
+
(0, ScheduleCommand_1.validateScheduleId)(requestId);
|
|
111
|
+
ids.forEach(ScheduleCommand_1.validateScheduleId);
|
|
112
|
+
if (!ids.length || new Set(ids).size !== ids.length || ids.some(id => !review.candidates.some(entry => entry.id === id))) {
|
|
113
|
+
throw new Error('Confirm exact native IDs from the reviewed candidates; no wildcard deletion is allowed.');
|
|
114
|
+
}
|
|
115
|
+
if (review.candidates.some(entry => ids.includes(entry.id) && entry.durable !== false)) {
|
|
116
|
+
throw new Error('Selected project-persisted native definitions lack session attribution. Only durable: false definitions can be deleted through this bound-session cleanup.');
|
|
117
|
+
}
|
|
118
|
+
const selection = cleanupCanonical(ids.slice().sort());
|
|
119
|
+
if (review.selection && (review.selection !== selection || review.requestId !== requestId)) {
|
|
120
|
+
throw new Error('Confirmation already started. Retry the same token, requestId and selected IDs.');
|
|
121
|
+
}
|
|
122
|
+
review.selection = selection;
|
|
123
|
+
review.requestId = requestId;
|
|
124
|
+
const targets = review.candidates.filter(entry => ids.includes(entry.id));
|
|
125
|
+
const inspect = async () => {
|
|
126
|
+
this.check(host, review, scope);
|
|
127
|
+
const entries = await host.inventory();
|
|
128
|
+
this.check(host, review, scope);
|
|
129
|
+
const expected = review.inventory.filter(entry => !review.absent.has(entry.id) && (!review.attempted.has(entry.id) || entries.some(current => current.id === entry.id)));
|
|
130
|
+
if (inventoryIdentity(entries) !== inventoryIdentity(expected)) {
|
|
131
|
+
throw new Error('Native inventory changed since review. No further deletion is authorized; request a new review.');
|
|
132
|
+
}
|
|
133
|
+
return entries;
|
|
134
|
+
};
|
|
135
|
+
await inspect();
|
|
136
|
+
await observe?.(targets, false);
|
|
137
|
+
this.check(host, review, scope);
|
|
138
|
+
for (const target of targets) {
|
|
139
|
+
const entries = await inspect();
|
|
140
|
+
if (!entries.some(entry => entry.id === target.id)) {
|
|
141
|
+
review.absent.add(target.id);
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
review.attempted.add(target.id);
|
|
145
|
+
try {
|
|
146
|
+
await host.remove(target);
|
|
147
|
+
}
|
|
148
|
+
catch (error) {
|
|
149
|
+
// Only authoritative fresh absence can reconcile an error-after-commit.
|
|
150
|
+
if ((await inspect()).some(entry => entry.id === target.id))
|
|
151
|
+
throw error;
|
|
152
|
+
}
|
|
153
|
+
if ((await inspect()).some(entry => entry.id === target.id))
|
|
154
|
+
throw new Error('Native deletion is not confirmed. Retry this exact confirmation.');
|
|
155
|
+
review.absent.add(target.id);
|
|
156
|
+
}
|
|
157
|
+
if ((await inspect()).some(entry => ids.includes(entry.id)))
|
|
158
|
+
throw new Error('Native absence is not confirmed.');
|
|
159
|
+
await observe?.(targets, true);
|
|
160
|
+
this.check(host, review, scope);
|
|
161
|
+
return { absentIds: ids.slice().sort(), warning: exports.CLEANUP_WARNING };
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
exports.ReviewedNativeCleanup = ReviewedNativeCleanup;
|
|
165
|
+
//# sourceMappingURL=ReviewedNativeCleanup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ReviewedNativeCleanup.js","sourceRoot":"","sources":["../../src/scheduling/ReviewedNativeCleanup.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,14 @@ export type ScheduleCommand = {
|
|
|
7
7
|
} | {
|
|
8
8
|
kind: 'cancel';
|
|
9
9
|
id: string;
|
|
10
|
+
} | {
|
|
11
|
+
kind: 'cleanup-review';
|
|
12
|
+
ids?: string[];
|
|
13
|
+
} | {
|
|
14
|
+
kind: 'cleanup-confirm';
|
|
15
|
+
token: string;
|
|
16
|
+
requestId: string;
|
|
17
|
+
ids: string[];
|
|
10
18
|
} | {
|
|
11
19
|
kind: 'create';
|
|
12
20
|
rule: ScheduleRule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleCommand.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,yBAAyB,QAAY,CAAC;AACnD,eAAO,MAAM,qBAAqB,QAA4B,CAAC;AAC/D,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"ScheduleCommand.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,yBAAyB,QAAY,CAAC;AACnD,eAAO,MAAM,qBAAqB,QAA4B,CAAC;AAC/D,eAAO,MAAM,cAAc,QAaf,CAAC;AAEb,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,GAC5E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,IAAI,MAAM,CAKpE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,MAAM,CAKhF;AAED,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CA8BjF;AAED,mFAAmF;AACnF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAe7D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAa7E;AAaD,2FAA2F;AAC3F,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,SAAa,GAAG,eAAe,GAAG,SAAS,CA0CrG"}
|
|
@@ -14,6 +14,8 @@ exports.SCHEDULE_USAGE = [
|
|
|
14
14
|
'/schedule capabilities',
|
|
15
15
|
'/schedule list',
|
|
16
16
|
'/schedule cancel <id>',
|
|
17
|
+
'/schedule cleanup review [native-id,...]',
|
|
18
|
+
'/schedule cleanup confirm <review-token> <request-id> <native-id,...>',
|
|
17
19
|
'/schedule after <positive integer><m|h|d> -- <prompt>',
|
|
18
20
|
'/schedule at <ISO timestamp with Z or offset> -- <prompt>',
|
|
19
21
|
'/schedule cron "<five numeric fields>" --tz <IANA timezone> -- <prompt>',
|
|
@@ -134,6 +136,19 @@ function parseScheduleCommand(content, nowMs = Date.now()) {
|
|
|
134
136
|
if (args === 'capabilities' || args === 'list')
|
|
135
137
|
return { kind: args };
|
|
136
138
|
try {
|
|
139
|
+
const review = /^cleanup review(?:\s+(\S+))?$/.exec(args);
|
|
140
|
+
if (review) {
|
|
141
|
+
const ids = review[1]?.split(',');
|
|
142
|
+
ids?.forEach(validateScheduleId);
|
|
143
|
+
return { kind: 'cleanup-review', ids };
|
|
144
|
+
}
|
|
145
|
+
const confirm = /^cleanup confirm\s+([a-f0-9-]{36})\s+(\S+)\s+(\S+)$/.exec(args);
|
|
146
|
+
if (confirm) {
|
|
147
|
+
validateScheduleId(confirm[2]);
|
|
148
|
+
const ids = confirm[3].split(',');
|
|
149
|
+
ids.forEach(validateScheduleId);
|
|
150
|
+
return { kind: 'cleanup-confirm', token: confirm[1], requestId: confirm[2], ids };
|
|
151
|
+
}
|
|
137
152
|
const cancel = /^cancel\s+(\S+)$/.exec(args);
|
|
138
153
|
if (cancel) {
|
|
139
154
|
validateScheduleId(cancel[1]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleCommand.js","sourceRoot":"","sources":["../../src/scheduling/ScheduleCommand.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ScheduleCommand.js","sourceRoot":"","sources":["../../src/scheduling/ScheduleCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ export declare class ScheduleService {
|
|
|
33
33
|
private records;
|
|
34
34
|
private pending;
|
|
35
35
|
private runtimes;
|
|
36
|
+
private retainedCancellations;
|
|
36
37
|
private tail;
|
|
37
38
|
private deliveryTail;
|
|
38
39
|
private tasks;
|
|
@@ -65,6 +66,8 @@ export declare class ScheduleService {
|
|
|
65
66
|
hasActiveSchedules(threadId?: string): boolean;
|
|
66
67
|
/** Card eligibility includes retryable cleanup even for a terminal catalog record. */
|
|
67
68
|
canCancel(owner: ScheduleOwner, id: string): boolean;
|
|
69
|
+
/** Newly observed local cleanup facts do not supply historical recovery proof. */
|
|
70
|
+
recordReviewedCleanup(owner: ScheduleOwner, ids: string[], absent: boolean): Promise<void>;
|
|
68
71
|
/** Keep admitted native work visible when cleanup cannot safely acquire its host. */
|
|
69
72
|
retainCleanupError(owner: ScheduleOwner, id: string, error: unknown): Promise<void>;
|
|
70
73
|
/** User-requested native reconciliation only; no background polling is installed. */
|
|
@@ -72,6 +75,8 @@ export declare class ScheduleService {
|
|
|
72
75
|
private refreshNative;
|
|
73
76
|
cancel(owner: ScheduleOwner, id: string): Promise<ScheduleRecord>;
|
|
74
77
|
private cancelSchedule;
|
|
78
|
+
private supportsRetainedCancellation;
|
|
79
|
+
private cancelRetained;
|
|
75
80
|
/** Explicit reconnect retry. No timer or periodic retry is installed. */
|
|
76
81
|
retryDeliveries(): Promise<void>;
|
|
77
82
|
hasUnresolvedHandoff(): boolean;
|
|
@@ -89,6 +94,7 @@ export declare class ScheduleService {
|
|
|
89
94
|
private attemptDeliveries;
|
|
90
95
|
private stop;
|
|
91
96
|
private boundRecovery;
|
|
97
|
+
private canAdmitOccurrence;
|
|
92
98
|
private newRuntime;
|
|
93
99
|
private track;
|
|
94
100
|
private operation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduleService.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleService.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAA6C,mBAAmB,EAAE,sBAAsB,EAClG,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAA4C,MAAM,SAAS,CAAC;AAI7G,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAO7D,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,yFAAyF;IACzF,OAAO,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,cAAc,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC;IAClD,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,sFAAsF;IACtF,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC;IACjD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oFAAoF;IACpF,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,MAAM,IAAI,CAAC;IACzD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC;AAyED;;;;;GAKG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,OAAO,CAAsC;IACrD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,IAAI,CAAuC;IACnD,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,KAAK,CAA+B;IAC5C,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,KAAK,CAAC,CAAQ;IACtB,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAEvB,OAAO,EAAE,sBAAsB;IAgB3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC3B,2FAA2F;IAC3F,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YASV,cAAc;
|
|
1
|
+
{"version":3,"file":"ScheduleService.d.ts","sourceRoot":"","sources":["../../src/scheduling/ScheduleService.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,6 +108,7 @@ class ScheduleService {
|
|
|
108
108
|
records = new Map();
|
|
109
109
|
pending = new Map();
|
|
110
110
|
runtimes = new Map();
|
|
111
|
+
retainedCancellations = new Map();
|
|
111
112
|
tail = Promise.resolve();
|
|
112
113
|
deliveryTail = Promise.resolve();
|
|
113
114
|
tasks = new Set();
|
|
@@ -262,7 +263,8 @@ class ScheduleService {
|
|
|
262
263
|
});
|
|
263
264
|
admitted = true;
|
|
264
265
|
const admission = Promise.resolve().then(() => provider.reconcile(restoreRecord, { notBefore: this.now(), signal: controller.signal, isCurrent: current,
|
|
265
|
-
isOwnerCurrent: () => !record.cancelRequested && !this.fault && this.current(record)
|
|
266
|
+
isOwnerCurrent: () => !record.cancelRequested && !this.fault && this.current(record),
|
|
267
|
+
canAdmitOccurrence: () => this.canAdmitOccurrence(id, runtime) }, emit));
|
|
266
268
|
const adopt = async (handle) => {
|
|
267
269
|
runtime.handle = handle;
|
|
268
270
|
runtime.resolveReady(handle);
|
|
@@ -311,7 +313,7 @@ class ScheduleService {
|
|
|
311
313
|
}
|
|
312
314
|
catch (error) {
|
|
313
315
|
controller.abort();
|
|
314
|
-
if (!admitted || error instanceof types_1.NativeScheduleAbsentError) {
|
|
316
|
+
if (!admitted || error instanceof types_1.NativeScheduleAbsentError || error instanceof types_1.NativeScheduleNotAdmittedError) {
|
|
315
317
|
runtime.stopped = true;
|
|
316
318
|
runtime.resolveReady(undefined);
|
|
317
319
|
}
|
|
@@ -435,7 +437,7 @@ class ScheduleService {
|
|
|
435
437
|
return;
|
|
436
438
|
const task = this.onEvent(nativeInput.id, structuredClone(event));
|
|
437
439
|
this.track(task);
|
|
438
|
-
});
|
|
440
|
+
}, () => this.canAdmitOccurrence(nativeInput.id, runtime));
|
|
439
441
|
runtime.handle = handle;
|
|
440
442
|
runtime.resolveReady(handle);
|
|
441
443
|
text(handle.nativeId);
|
|
@@ -502,7 +504,31 @@ class ScheduleService {
|
|
|
502
504
|
const runtime = this.runtimes.get(id);
|
|
503
505
|
if (record.state === 'cancelled' && runtime?.handle?.cancellationKeepsRunning && !record.error)
|
|
504
506
|
return false;
|
|
505
|
-
return LIVE.has(record.state) || recoveryOwnsWork(record) ||
|
|
507
|
+
return LIVE.has(record.state) || recoveryOwnsWork(record) || record.state === 'interrupted' && !!record.nativeId && this.supportsRetainedCancellation(record)
|
|
508
|
+
|| Boolean(runtime && !runtime.stopped);
|
|
509
|
+
}
|
|
510
|
+
/** Newly observed local cleanup facts do not supply historical recovery proof. */
|
|
511
|
+
async recordReviewedCleanup(owner, ids, absent) {
|
|
512
|
+
this.checkReady();
|
|
513
|
+
validateOwner(owner);
|
|
514
|
+
ids.forEach(ScheduleCommand_1.validateScheduleId);
|
|
515
|
+
if (!ids.length)
|
|
516
|
+
return;
|
|
517
|
+
await this.serial(async () => {
|
|
518
|
+
if (!this.options.isOwnerCurrent(owner))
|
|
519
|
+
throw new Error('Cleanup catalog owner changed.');
|
|
520
|
+
for (const id of ids) {
|
|
521
|
+
const record = this.owned(owner, id);
|
|
522
|
+
record.cancelRequested = true;
|
|
523
|
+
if (record.recovery)
|
|
524
|
+
record.recovery.status = 'blocked';
|
|
525
|
+
if (record.state !== 'running')
|
|
526
|
+
record.state = 'interrupted';
|
|
527
|
+
record.error = absent ? 'Owner-reviewed native definition absent on current host; predecessor work remains unknown.'
|
|
528
|
+
: 'Owner-reviewed native deletion requested; absence and predecessor work remain unconfirmed.';
|
|
529
|
+
}
|
|
530
|
+
await this.persist();
|
|
531
|
+
});
|
|
506
532
|
}
|
|
507
533
|
/** Keep admitted native work visible when cleanup cannot safely acquire its host. */
|
|
508
534
|
async retainCleanupError(owner, id, error) {
|
|
@@ -573,6 +599,9 @@ class ScheduleService {
|
|
|
573
599
|
let operation;
|
|
574
600
|
await this.serial(async () => {
|
|
575
601
|
const record = this.owned(owner, id);
|
|
602
|
+
existing = this.retainedCancellations.get(id);
|
|
603
|
+
if (existing)
|
|
604
|
+
return;
|
|
576
605
|
runtime = this.runtimes.get(id);
|
|
577
606
|
record.cancelRequested = true;
|
|
578
607
|
runtime?.recoveryAbort?.abort();
|
|
@@ -584,10 +613,13 @@ class ScheduleService {
|
|
|
584
613
|
delete record.error;
|
|
585
614
|
await this.persist();
|
|
586
615
|
}
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
616
|
+
const retainedCleanup = !runtime || runtime.stopped && !runtime.handle?.nativeDefinitionAbsent
|
|
617
|
+
&& this.supportsRetainedCancellation(record);
|
|
618
|
+
if (retainedCleanup && (recoveryOwnsWork(record)
|
|
619
|
+
|| record.state === 'interrupted' && !!record.nativeId && this.supportsRetainedCancellation(record))) {
|
|
620
|
+
operation = Promise.resolve().then(() => this.cancelRetained(record));
|
|
621
|
+
this.retainedCancellations.set(id, operation);
|
|
622
|
+
return;
|
|
591
623
|
}
|
|
592
624
|
if (runtime?.cancelPromise) {
|
|
593
625
|
existing = runtime.cancelPromise;
|
|
@@ -618,6 +650,44 @@ class ScheduleService {
|
|
|
618
650
|
});
|
|
619
651
|
return (existing ?? operation);
|
|
620
652
|
}
|
|
653
|
+
supportsRetainedCancellation(record) {
|
|
654
|
+
return !!this.options.provider.recoveryFor?.({ ...record, ...record.execution })?.cancelRetained;
|
|
655
|
+
}
|
|
656
|
+
async cancelRetained(record) {
|
|
657
|
+
const current = () => !this.closing && !this.fault && this.current(record) && record.cancelRequested === true;
|
|
658
|
+
try {
|
|
659
|
+
const recovery = record.recovery;
|
|
660
|
+
const provider = this.options.provider.recoveryFor?.({ id: record.id, threadId: record.threadId,
|
|
661
|
+
backend: record.backend, cwd: record.cwd, prompt: record.prompt, rule: record.rule,
|
|
662
|
+
...record.execution, recovery });
|
|
663
|
+
if (!recovery || !provider?.cancelRetained || provider.provider !== recovery.provider || provider.strategy !== recovery.strategy
|
|
664
|
+
|| (provider.handoffPolicy ?? 'drain-all') !== (recovery.handoffPolicy ?? 'drain-all')) {
|
|
665
|
+
throw new Error('Cancellation intent retained; native cleanup is unconfirmed. Original native ownership metadata or cleanup support is unavailable. Preserve the original session. For Claude, use /schedule cleanup review in the bound original thread for explicit deletion-only review; do not recreate this job.');
|
|
666
|
+
}
|
|
667
|
+
if (!current())
|
|
668
|
+
throw new Error('Native cancellation owner is no longer current.');
|
|
669
|
+
await provider.cancelRetained(structuredClone(record), { isCurrent: current });
|
|
670
|
+
await this.serial(async () => {
|
|
671
|
+
if (!current())
|
|
672
|
+
throw new Error('Native cancellation owner changed before its receipt was saved.');
|
|
673
|
+
record.state = 'cancelled';
|
|
674
|
+
delete record.error;
|
|
675
|
+
for (const [key, pending] of this.pending)
|
|
676
|
+
if (pending.scheduleId === record.id && !pending.afterCancellation)
|
|
677
|
+
this.pending.delete(key);
|
|
678
|
+
await this.persist();
|
|
679
|
+
});
|
|
680
|
+
return structuredClone(record);
|
|
681
|
+
}
|
|
682
|
+
catch (error) {
|
|
683
|
+
await this.serial(async () => { record.error = errorText(error); if (!this.fault)
|
|
684
|
+
await this.persist(); });
|
|
685
|
+
throw error;
|
|
686
|
+
}
|
|
687
|
+
finally {
|
|
688
|
+
this.retainedCancellations.delete(record.id);
|
|
689
|
+
}
|
|
690
|
+
}
|
|
621
691
|
/** Explicit reconnect retry. No timer or periodic retry is installed. */
|
|
622
692
|
async retryDeliveries() {
|
|
623
693
|
this.checkReady();
|
|
@@ -1125,6 +1195,12 @@ class ScheduleService {
|
|
|
1125
1195
|
clearTimeout(timer);
|
|
1126
1196
|
}
|
|
1127
1197
|
}
|
|
1198
|
+
canAdmitOccurrence(id, runtime) {
|
|
1199
|
+
const record = this.records.get(id);
|
|
1200
|
+
return !!record && this.runtimes.get(id) === runtime && !this.closing && !this.fault
|
|
1201
|
+
&& !runtime.stopped && !runtime.cancelling && !record.cancelRequested
|
|
1202
|
+
&& LIVE.has(record.state) && this.current(record);
|
|
1203
|
+
}
|
|
1128
1204
|
newRuntime() {
|
|
1129
1205
|
let resolveReady;
|
|
1130
1206
|
const ready = new Promise(resolve => { resolveReady = resolve; });
|