@yu_robotics/remote-cli 1.6.224 → 1.6.225
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -0
- package/dist/commands/delegationStorage.d.ts +3 -1
- package/dist/commands/delegationStorage.d.ts.map +1 -1
- package/dist/commands/delegationStorage.js +17 -1
- package/dist/commands/delegationStorage.js.map +1 -1
- package/dist/delegation/DelegatedWorkspaceManager.d.ts +15 -0
- package/dist/delegation/DelegatedWorkspaceManager.d.ts.map +1 -1
- package/dist/delegation/DelegatedWorkspaceManager.js +45 -2
- package/dist/delegation/DelegatedWorkspaceManager.js.map +1 -1
- package/dist/delegation/DelegationManager.d.ts +1 -0
- package/dist/delegation/DelegationManager.d.ts.map +1 -1
- package/dist/delegation/DelegationManager.js +40 -4
- package/dist/delegation/DelegationManager.js.map +1 -1
- package/dist/delegation/LegacyWorkspaceCleanup.d.ts +14 -1
- package/dist/delegation/LegacyWorkspaceCleanup.d.ts.map +1 -1
- package/dist/delegation/LegacyWorkspaceCleanup.js +324 -4
- package/dist/delegation/LegacyWorkspaceCleanup.js.map +1 -1
- package/dist/delegation/WorkspaceDisposal.d.ts +1 -1
- package/dist/delegation/WorkspaceDisposal.d.ts.map +1 -1
- package/dist/delegation/WorkspaceDisposal.js +5 -1
- package/dist/delegation/WorkspaceDisposal.js.map +1 -1
- package/dist/maintenance/release-notes.json +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/README.md
CHANGED
|
@@ -593,6 +593,31 @@ survive disposable checkout removal.
|
|
|
593
593
|
The local CLI owns this lifecycle; native backends, non-Git FIFO scheduling,
|
|
594
594
|
Router protocol, and old-peer compatibility are unchanged.
|
|
595
595
|
|
|
596
|
+
On Linux hosts with the existing disposal proofs, CLI 1.6.225 automatically
|
|
597
|
+
discards verified temporary checkouts of terminated workers whose artifact capture
|
|
598
|
+
failed. Completion is
|
|
599
|
+
recorded durably so a missing artifact does not repeatedly block later replies.
|
|
600
|
+
This can discard unsubmitted worker files; rerun the worker if its output is
|
|
601
|
+
needed. Valid pending artifacts retain the ordinary review and integration flow.
|
|
602
|
+
Cleanup is limited to the exact owned checkout and its Git registration; external
|
|
603
|
+
symlink targets, the coordinator checkout, and native conversation history are
|
|
604
|
+
preserved. Active workers, conflicting ownership, and unsafe filesystem boundaries
|
|
605
|
+
remain excluded from automatic removal. Potential credential files are held;
|
|
606
|
+
unchanged tracked environment templates are allowed only after comparison with the
|
|
607
|
+
worker input. macOS and Windows retain their existing conservative workspace
|
|
608
|
+
policy. This behavior requires a CLI upgrade.
|
|
609
|
+
|
|
610
|
+
A local operator can retry one eligible failed worker without stopping unrelated
|
|
611
|
+
workers or the daemon:
|
|
612
|
+
|
|
613
|
+
```bash
|
|
614
|
+
remote-cli delegation storage discard-failed --task <task-id> --lane <lane-id>
|
|
615
|
+
```
|
|
616
|
+
|
|
617
|
+
The command verifies the same target, exit and filesystem evidence as automatic
|
|
618
|
+
cleanup. It does not discard normal pending artifacts. The separate historical
|
|
619
|
+
`scan`, `plan` and `discard` maintenance flow retains its offline requirements.
|
|
620
|
+
|
|
596
621
|
From CLI 1.6.138, already settled artifact receipts are validated without requiring
|
|
597
622
|
an idle source workspace; another busy thread does not reopen completed delivery.
|
|
598
623
|
Pending or unverifiable outcomes still require closeout, and history reconciliation
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { Command } from 'commander';
|
|
2
2
|
import { LegacyWorkspaceCleanup } from '../delegation/LegacyWorkspaceCleanup';
|
|
3
3
|
export interface DelegationStorageOptions {
|
|
4
|
+
task?: string;
|
|
5
|
+
lane?: string;
|
|
4
6
|
plan?: string;
|
|
5
7
|
out?: string;
|
|
6
8
|
discardContents?: boolean;
|
|
@@ -10,6 +12,6 @@ export interface DelegationStorageOptions {
|
|
|
10
12
|
maxSeconds?: string;
|
|
11
13
|
}
|
|
12
14
|
/** Local-only output may contain repository paths and thread identities. Never forward it to chat. */
|
|
13
|
-
export declare function delegationStorageCommand(action: 'scan' | 'plan' | 'discard', options?: DelegationStorageOptions, cleanup?: LegacyWorkspaceCleanup): Promise<unknown>;
|
|
15
|
+
export declare function delegationStorageCommand(action: 'scan' | 'plan' | 'discard' | 'discard-failed', options?: DelegationStorageOptions, cleanup?: LegacyWorkspaceCleanup): Promise<unknown>;
|
|
14
16
|
export declare function registerDelegationStorage(program: Command): void;
|
|
15
17
|
//# sourceMappingURL=delegationStorage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegationStorage.d.ts","sourceRoot":"","sources":["../../src/commands/delegationStorage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAsB,MAAM,sCAAsC,CAAC;AAElG,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,sGAAsG;AACtG,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,OAAO,GAAE,wBAA6B,
|
|
1
|
+
{"version":3,"file":"delegationStorage.d.ts","sourceRoot":"","sources":["../../src/commands/delegationStorage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAsB,MAAM,sCAAsC,CAAC;AAElG,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,sGAAsG;AACtG,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,gBAAgB,EAAE,OAAO,GAAE,wBAA6B,EAC3I,OAAO,yBAAqE,GAAG,OAAO,CAAC,OAAO,CAAC,CAehG;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgChE"}
|
|
@@ -10,6 +10,11 @@ const path_1 = __importDefault(require("path"));
|
|
|
10
10
|
const LegacyWorkspaceCleanup_1 = require("../delegation/LegacyWorkspaceCleanup");
|
|
11
11
|
/** Local-only output may contain repository paths and thread identities. Never forward it to chat. */
|
|
12
12
|
async function delegationStorageCommand(action, options = {}, cleanup = new LegacyWorkspaceCleanup_1.LegacyWorkspaceCleanup(path_1.default.join(os_1.default.homedir(), '.remote-cli'))) {
|
|
13
|
+
if (action === 'discard-failed') {
|
|
14
|
+
if (!options.task || !options.lane)
|
|
15
|
+
throw new Error('Require an exact --task and --lane');
|
|
16
|
+
return cleanup.discardFailedWorker(options.lane, options.task);
|
|
17
|
+
}
|
|
13
18
|
const limits = { entries: Number(options.maxEntries ?? 100_000), bytes: Number(options.maxBytes ?? 1024 ** 3),
|
|
14
19
|
seconds: Number(options.maxSeconds ?? 120) };
|
|
15
20
|
if (action === 'scan')
|
|
@@ -26,7 +31,18 @@ async function delegationStorageCommand(action, options = {}, cleanup = new Lega
|
|
|
26
31
|
}
|
|
27
32
|
function registerDelegationStorage(program) {
|
|
28
33
|
const storage = program.command('delegation').description('Inspect local managed delegation storage')
|
|
29
|
-
.command('storage').description('
|
|
34
|
+
.command('storage').description('Guarded historical and failed-worker maintenance; never stops services');
|
|
35
|
+
storage.command('discard-failed').description('Discard one proven stopped failed worker with no artifact; preserve native history and other workers')
|
|
36
|
+
.requiredOption('--task <id>', 'Exact failed task UUID').requiredOption('--lane <id>', 'Exact owned lane UUID')
|
|
37
|
+
.action(async (options) => {
|
|
38
|
+
try {
|
|
39
|
+
console.log(JSON.stringify(await delegationStorageCommand('discard-failed', options)));
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
console.error(error instanceof Error ? error.message : 'Failed-worker disposal held');
|
|
43
|
+
process.exitCode = 1;
|
|
44
|
+
}
|
|
45
|
+
});
|
|
30
46
|
for (const action of ['scan', 'plan', 'discard']) {
|
|
31
47
|
const command = storage.command(action).description(action === 'scan' ? 'Read-only bounded disk inventory (no store initialization)'
|
|
32
48
|
: action === 'plan' ? 'Freeze eligible checkout identities and contents in a new manifest'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegationStorage.js","sourceRoot":"","sources":["../../src/commands/delegationStorage.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"delegationStorage.js","sourceRoot":"","sources":["../../src/commands/delegationStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,7 @@ export interface WorkspaceArtifactSummary {
|
|
|
41
41
|
targetRef: string;
|
|
42
42
|
};
|
|
43
43
|
holdReason?: string;
|
|
44
|
+
failedCollection?: boolean;
|
|
44
45
|
cleanup?: WorkspaceCleanupHold;
|
|
45
46
|
/** Explicit loss of the original checkout; not successful collection or delivery. */
|
|
46
47
|
discarded?: {
|
|
@@ -93,6 +94,17 @@ export interface DelegatedWorkspace {
|
|
|
93
94
|
ino: number;
|
|
94
95
|
};
|
|
95
96
|
cleanup?: WorkspaceCleanupHold;
|
|
97
|
+
/** Exact acquisition proof, persisted before any fallible artifact capture. */
|
|
98
|
+
exitConfirmation?: {
|
|
99
|
+
taskId: string;
|
|
100
|
+
contextGeneration: number;
|
|
101
|
+
confirmedAt: number;
|
|
102
|
+
};
|
|
103
|
+
/** Collection failure is distinct from a valid pending or recovery artifact. */
|
|
104
|
+
failedCollection?: {
|
|
105
|
+
taskId: string;
|
|
106
|
+
state: 'failed' | 'cancelled' | 'timed_out' | 'interrupted';
|
|
107
|
+
};
|
|
96
108
|
}
|
|
97
109
|
interface Artifact {
|
|
98
110
|
taskId: string;
|
|
@@ -162,6 +174,9 @@ export declare class DelegatedWorkspaceManager {
|
|
|
162
174
|
unavailableLanes(): Promise<Set<string>>;
|
|
163
175
|
prepare(lane: DelegatedWorkerLane, source: DelegatedWorkspaceSource, input: GitCheckpoint, taskId: string): Promise<DelegatedWorkspace>;
|
|
164
176
|
private prepareLocked;
|
|
177
|
+
confirmWorkerExit(workspace: DelegatedWorkspace, contextGeneration: number): Promise<void>;
|
|
178
|
+
discardFailedWorker(laneId: string, taskId: string, state?: 'failed' | 'cancelled' | 'timed_out' | 'interrupted'): Promise<void>;
|
|
179
|
+
isDiscarded(workspace: DelegatedWorkspace): Promise<boolean>;
|
|
165
180
|
collect(workspace: DelegatedWorkspace, successful: boolean, options?: WorkspaceCollectionOptions): Promise<DelegatedArtifactView>;
|
|
166
181
|
private collectLocked;
|
|
167
182
|
private finishCollection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelegatedWorkspaceManager.d.ts","sourceRoot":"","sources":["../../src/delegation/DelegatedWorkspaceManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAMjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EACL,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"DelegatedWorkspaceManager.d.ts","sourceRoot":"","sources":["../../src/delegation/DelegatedWorkspaceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const LfsCheckout_1 = require("./LfsCheckout");
|
|
|
17
17
|
const GitPaths_1 = require("./GitPaths");
|
|
18
18
|
const AtomicFile_1 = require("./AtomicFile");
|
|
19
19
|
const LegacyWorkspaceCleanup_1 = require("./LegacyWorkspaceCleanup");
|
|
20
|
+
const OwnershipRuntime_1 = require("./OwnershipRuntime");
|
|
20
21
|
const WorkspaceDisposal_1 = require("./WorkspaceDisposal");
|
|
21
22
|
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
|
|
22
23
|
const RECORD_BYTES = 128 * 1024;
|
|
@@ -187,6 +188,37 @@ class DelegatedWorkspaceManager {
|
|
|
187
188
|
await this.validateWorkspace(workspace);
|
|
188
189
|
return workspace;
|
|
189
190
|
}
|
|
191
|
+
async confirmWorkerExit(workspace, contextGeneration) {
|
|
192
|
+
await this.withLane(workspace.laneId, async () => {
|
|
193
|
+
const current = await this.read('lanes', workspace.laneId);
|
|
194
|
+
if (!current || current.taskId !== workspace.taskId || current.disposalPolicy !== 1
|
|
195
|
+
|| !Number.isSafeInteger(contextGeneration) || contextGeneration < 0)
|
|
196
|
+
throw new Error('Worker exit acquisition changed');
|
|
197
|
+
await this.validateWorkspaceRecord(current);
|
|
198
|
+
const stat = await promises_1.default.lstat(current.directory);
|
|
199
|
+
if (stat.isSymbolicLink() || !stat.isDirectory() || stat.dev !== current.checkoutIdentity?.dev || stat.ino !== current.checkoutIdentity?.ino)
|
|
200
|
+
throw new Error('Worker exit checkout identity changed');
|
|
201
|
+
await this.write('lanes', current.laneId, { ...current,
|
|
202
|
+
exitConfirmation: { taskId: current.taskId, contextGeneration, confirmedAt: Date.now() } }, true);
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
async discardFailedWorker(laneId, taskId, state) {
|
|
206
|
+
await this.withLane(laneId, async () => {
|
|
207
|
+
await this.initialize();
|
|
208
|
+
const current = await this.read('lanes', laneId);
|
|
209
|
+
if (!current || current.taskId !== taskId)
|
|
210
|
+
throw new Error('Failed worker acquisition changed');
|
|
211
|
+
if (state && !current.failedCollection) {
|
|
212
|
+
if (current.exitConfirmation?.taskId !== taskId)
|
|
213
|
+
throw new Error('Worker group exit is not recorded');
|
|
214
|
+
await this.write('lanes', laneId, { ...current, failedCollection: { taskId, state } }, true);
|
|
215
|
+
}
|
|
216
|
+
await new LegacyWorkspaceCleanup_1.LegacyWorkspaceCleanup(path_1.default.dirname(this.directory)).discardFailedWorker(laneId, taskId, this.ownership);
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
async isDiscarded(workspace) {
|
|
220
|
+
return !!await (0, LegacyWorkspaceCleanup_1.completedLegacyDiscard)(this.directory, workspace.laneId, workspace.taskId);
|
|
221
|
+
}
|
|
190
222
|
async collect(workspace, successful, options = {}) {
|
|
191
223
|
return this.withLane(workspace.laneId, async () => {
|
|
192
224
|
try {
|
|
@@ -626,6 +658,7 @@ class DelegatedWorkspaceManager {
|
|
|
626
658
|
outputCommit: artifact?.output, baseCommit: artifact?.input?.commit, exports: artifact?.exports,
|
|
627
659
|
disposalPolicy: workspace?.disposalPolicy, checkoutState: workspace?.checkoutState,
|
|
628
660
|
blocked: workspace?.blocked, pendingTaskId: workspace?.pendingTaskId,
|
|
661
|
+
...(workspace?.failedCollection?.taskId === workspace?.taskId && workspace?.failedCollection ? { failedCollection: true } : {}),
|
|
629
662
|
exitConfirmed: artifact?.closeout?.taskId === artifact?.taskId && Number.isFinite(artifact?.closeout?.exitConfirmedAt),
|
|
630
663
|
recoverable: artifact?.closeout?.recoverable === true, recovery: artifact?.recovery,
|
|
631
664
|
cleanup: workspace?.cleanup,
|
|
@@ -1443,7 +1476,7 @@ class DelegatedWorkspaceManager {
|
|
|
1443
1476
|
throw error;
|
|
1444
1477
|
}
|
|
1445
1478
|
}
|
|
1446
|
-
async write(kind, id, record) {
|
|
1479
|
+
async write(kind, id, record, durable = false) {
|
|
1447
1480
|
this.assertId(id);
|
|
1448
1481
|
await this.initialize();
|
|
1449
1482
|
const data = JSON.stringify(record);
|
|
@@ -1451,9 +1484,19 @@ class DelegatedWorkspaceManager {
|
|
|
1451
1484
|
throw new Error('Worker workspace record is too large');
|
|
1452
1485
|
const target = path_1.default.join(this.directory, kind, `${id}.json`);
|
|
1453
1486
|
const temporary = `${target}.${(0, crypto_1.randomUUID)()}.tmp`;
|
|
1454
|
-
await promises_1.default.
|
|
1487
|
+
const handle = await promises_1.default.open(temporary, 'wx', 0o600);
|
|
1488
|
+
try {
|
|
1489
|
+
await handle.writeFile(data);
|
|
1490
|
+
if (durable)
|
|
1491
|
+
await handle.sync();
|
|
1492
|
+
}
|
|
1493
|
+
finally {
|
|
1494
|
+
await handle.close();
|
|
1495
|
+
}
|
|
1455
1496
|
try {
|
|
1456
1497
|
await (0, AtomicFile_1.replaceAtomicFile)(temporary, target);
|
|
1498
|
+
if (durable)
|
|
1499
|
+
(0, OwnershipRuntime_1.syncDirectory)(path_1.default.dirname(target));
|
|
1457
1500
|
}
|
|
1458
1501
|
finally {
|
|
1459
1502
|
await promises_1.default.rm(temporary, { force: true });
|