@yu_robotics/remote-cli 1.6.205 → 1.6.208
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 +23 -2
- package/dist/client/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +2 -1
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +9 -0
- package/dist/commands/config.js.map +1 -1
- package/dist/config/ConfigManager.d.ts +3 -4
- package/dist/config/ConfigManager.d.ts.map +1 -1
- package/dist/config/ConfigManager.js +57 -9
- package/dist/config/ConfigManager.js.map +1 -1
- package/dist/delegation/DelegatedWorkspaceManager.d.ts +13 -1
- package/dist/delegation/DelegatedWorkspaceManager.d.ts.map +1 -1
- package/dist/delegation/DelegatedWorkspaceManager.js +127 -15
- package/dist/delegation/DelegatedWorkspaceManager.js.map +1 -1
- package/dist/delegation/DelegationManager.d.ts +1 -1
- package/dist/delegation/DelegationManager.d.ts.map +1 -1
- package/dist/delegation/DelegationManager.js +3 -2
- package/dist/delegation/DelegationManager.js.map +1 -1
- package/dist/delegation/GitCheckpoint.d.ts +10 -2
- package/dist/delegation/GitCheckpoint.d.ts.map +1 -1
- package/dist/delegation/GitCheckpoint.js +278 -42
- package/dist/delegation/GitCheckpoint.js.map +1 -1
- package/dist/delegation/SharedSymlinks.d.ts +46 -0
- package/dist/delegation/SharedSymlinks.d.ts.map +1 -0
- package/dist/delegation/SharedSymlinks.js +216 -0
- package/dist/delegation/SharedSymlinks.js.map +1 -0
- package/dist/maintenance/release-notes.json +1 -1
- package/dist/types/config.d.ts +4 -0
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/config.js +0 -3
- package/dist/types/config.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3F;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,wBAAwB;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAOD;;GAEG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CA6B9B"}
|
package/dist/commands/config.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configCommand = configCommand;
|
|
4
|
+
const SharedSymlinks_1 = require("../delegation/SharedSymlinks");
|
|
4
5
|
const ConfigManager_1 = require("../config/ConfigManager");
|
|
5
6
|
const SessionResumeService_1 = require("../session/SessionResumeService");
|
|
6
7
|
/**
|
|
@@ -132,6 +133,14 @@ async function handleSetConfig(config, options) {
|
|
|
132
133
|
error: `Cannot modify protected key: ${key}`,
|
|
133
134
|
};
|
|
134
135
|
}
|
|
136
|
+
if (key === 'delegation' || key.startsWith('delegation.')) {
|
|
137
|
+
if (key !== 'delegation.sharedSymlinks')
|
|
138
|
+
return { success: false, error: 'Only delegation.sharedSymlinks is supported.' };
|
|
139
|
+
const grants = (0, SharedSymlinks_1.parseSharedSymlinkGrants)(JSON.parse(value));
|
|
140
|
+
await (0, SharedSymlinks_1.validateSharedLocations)(grants);
|
|
141
|
+
await config.set('delegation', { sharedSymlinks: grants });
|
|
142
|
+
return { success: true, value: grants };
|
|
143
|
+
}
|
|
135
144
|
// Validate specific keys
|
|
136
145
|
if (key === 'serverUrl') {
|
|
137
146
|
if (!isValidUrl(value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,10 +27,9 @@ export declare class ConfigManager {
|
|
|
27
27
|
* @returns Whether it is valid
|
|
28
28
|
*/
|
|
29
29
|
private static isValidConfig;
|
|
30
|
-
/**
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
*/
|
|
30
|
+
/** Read current managed-only grants without replacing runtime configuration or migrating disk data. */
|
|
31
|
+
getSharedSymlinks(): Promise<import("../delegation/SharedSymlinks").SharedSymlinkGrant[]>;
|
|
32
|
+
/** Return an independent configuration snapshot. */
|
|
34
33
|
getConfig(): Config;
|
|
35
34
|
/**
|
|
36
35
|
* Get configuration directory path
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigManager.d.ts","sourceRoot":"","sources":["../../src/config/ConfigManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConfigManager.d.ts","sourceRoot":"","sources":["../../src/config/ConfigManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAkB,MAAM,iBAAiB,CAAC;AAEzD;;;GAGG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;IAMP;;;OAGG;WACU,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IA0CjD,yEAAyE;IACzE,OAAO,CAAC,MAAM,CAAC,+BAA+B;IA2B9C;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAehC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAiB5B,uGAAuG;IACjG,iBAAiB;IAkBvB,oDAAoD;IACpD,SAAS,IAAI,MAAM;IAInB;;;OAGG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;YACW,UAAU;IAuBxB;;;OAGG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB3D;;;OAGG;IACG,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D;;;OAGG;IACG,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;OAGG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzD;;;OAGG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD;;;OAGG;IACG,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS1D;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtC;;;OAGG;IACH,YAAY,IAAI,MAAM;IAItB;;;OAGG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C;;;;OAIG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI7B;;;;OAIG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IAczB;;;;OAIG;IACG,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrD;;;OAGG;IACH,MAAM,IAAI,MAAM;CAGjB"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ConfigManager = void 0;
|
|
7
|
+
const SharedSymlinks_1 = require("../delegation/SharedSymlinks");
|
|
7
8
|
const promises_1 = __importDefault(require("fs/promises"));
|
|
8
9
|
const path_1 = __importDefault(require("path"));
|
|
9
10
|
const os_1 = __importDefault(require("os"));
|
|
@@ -125,10 +126,29 @@ class ConfigManager {
|
|
|
125
126
|
typeof config.server.reconnectInterval === 'number' &&
|
|
126
127
|
typeof config.server.heartbeatInterval === 'number');
|
|
127
128
|
}
|
|
128
|
-
/**
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
129
|
+
/** Read current managed-only grants without replacing runtime configuration or migrating disk data. */
|
|
130
|
+
async getSharedSymlinks() {
|
|
131
|
+
let content;
|
|
132
|
+
try {
|
|
133
|
+
content = await promises_1.default.readFile(this.configFile, 'utf-8');
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
if (error.code === 'ENOENT')
|
|
137
|
+
return [];
|
|
138
|
+
throw new Error('Unable to load shared-symlink grants; managed admission is denied.');
|
|
139
|
+
}
|
|
140
|
+
try {
|
|
141
|
+
const saved = JSON.parse(content);
|
|
142
|
+
if (!saved || typeof saved !== 'object' || Array.isArray(saved))
|
|
143
|
+
throw new Error();
|
|
144
|
+
return (0, SharedSymlinks_1.delegationSharedSymlinks)(saved.delegation);
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
// Parser and filesystem details can contain private configuration data.
|
|
148
|
+
throw new Error('Invalid shared-symlink configuration; managed admission is denied.');
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
/** Return an independent configuration snapshot. */
|
|
132
152
|
getConfig() {
|
|
133
153
|
return JSON.parse(JSON.stringify(this.config));
|
|
134
154
|
}
|
|
@@ -149,8 +169,36 @@ class ConfigManager {
|
|
|
149
169
|
/**
|
|
150
170
|
* Save configuration to file
|
|
151
171
|
*/
|
|
152
|
-
async saveConfig() {
|
|
153
|
-
|
|
172
|
+
async saveConfig(replaceDelegation = false) {
|
|
173
|
+
const saved = { ...this.config };
|
|
174
|
+
if (!replaceDelegation) {
|
|
175
|
+
// Runtime instances may outlive external grant edits. An unrelated save
|
|
176
|
+
// must neither erase a new grant nor resurrect one that was revoked.
|
|
177
|
+
let content;
|
|
178
|
+
try {
|
|
179
|
+
content = await promises_1.default.readFile(this.configFile, 'utf-8');
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
if (error.code !== 'ENOENT')
|
|
183
|
+
throw new Error('Unable to preserve shared-symlink policy while saving configuration.');
|
|
184
|
+
content = '{}';
|
|
185
|
+
}
|
|
186
|
+
let current;
|
|
187
|
+
try {
|
|
188
|
+
const parsed = JSON.parse(content);
|
|
189
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
|
|
190
|
+
throw new Error();
|
|
191
|
+
current = parsed;
|
|
192
|
+
}
|
|
193
|
+
catch {
|
|
194
|
+
throw new Error('Invalid configuration; shared-symlink policy was not overwritten.');
|
|
195
|
+
}
|
|
196
|
+
if (Object.hasOwn(current, 'delegation'))
|
|
197
|
+
saved.delegation = current.delegation;
|
|
198
|
+
else
|
|
199
|
+
delete saved.delegation;
|
|
200
|
+
}
|
|
201
|
+
await promises_1.default.writeFile(this.configFile, JSON.stringify(saved, null, 2), 'utf-8');
|
|
154
202
|
}
|
|
155
203
|
/**
|
|
156
204
|
* Add allowed directory
|
|
@@ -225,7 +273,7 @@ class ConfigManager {
|
|
|
225
273
|
*/
|
|
226
274
|
async resetToDefaults() {
|
|
227
275
|
this.config = { ...config_1.DEFAULT_CONFIG };
|
|
228
|
-
await this.saveConfig();
|
|
276
|
+
await this.saveConfig(true);
|
|
229
277
|
}
|
|
230
278
|
/**
|
|
231
279
|
* Export configuration as JSON string
|
|
@@ -245,7 +293,7 @@ class ConfigManager {
|
|
|
245
293
|
throw new Error('Invalid config structure');
|
|
246
294
|
}
|
|
247
295
|
this.config = config;
|
|
248
|
-
await this.saveConfig();
|
|
296
|
+
await this.saveConfig(true);
|
|
249
297
|
}
|
|
250
298
|
catch (error) {
|
|
251
299
|
if (error instanceof SyntaxError) {
|
|
@@ -301,7 +349,7 @@ class ConfigManager {
|
|
|
301
349
|
// Set value
|
|
302
350
|
target[lastKey] = value;
|
|
303
351
|
// Save configuration
|
|
304
|
-
await this.saveConfig();
|
|
352
|
+
await this.saveConfig(keyPath === 'delegation' || keyPath.startsWith('delegation.'));
|
|
305
353
|
}
|
|
306
354
|
/**
|
|
307
355
|
* Get all configuration (alias for getConfig)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../src/config/ConfigManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../src/config/ConfigManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,11 @@ export interface DelegatedWorkspace {
|
|
|
72
72
|
taskId: string;
|
|
73
73
|
taskRef: string;
|
|
74
74
|
input: GitCheckpoint;
|
|
75
|
+
/** Identity of the owned link node, never the mutable shared target. */
|
|
76
|
+
sharedLinkIdentities?: {
|
|
77
|
+
path: string;
|
|
78
|
+
identity: string;
|
|
79
|
+
}[];
|
|
75
80
|
pendingTaskId?: string;
|
|
76
81
|
blocked?: boolean;
|
|
77
82
|
checkoutState?: 'present' | 'reclaiming' | 'reclaimed';
|
|
@@ -124,6 +129,8 @@ export interface DelegatedArtifactView {
|
|
|
124
129
|
outputCommit: string;
|
|
125
130
|
changedFiles: string[];
|
|
126
131
|
filesTruncated: boolean;
|
|
132
|
+
sharedLinkPaths?: string[];
|
|
133
|
+
sharingWarning?: string;
|
|
127
134
|
deliveredAtHead?: string;
|
|
128
135
|
recovery?: {
|
|
129
136
|
beforeRef: string;
|
|
@@ -141,12 +148,13 @@ export interface IntegrationOwner {
|
|
|
141
148
|
export declare class DelegatedWorkspaceManager {
|
|
142
149
|
private readonly directory;
|
|
143
150
|
private readonly disposalSupported;
|
|
151
|
+
private readonly sharedSymlinks;
|
|
144
152
|
private static readonly operations;
|
|
145
153
|
private ownership?;
|
|
146
154
|
private beforeMutation?;
|
|
147
155
|
private readonly repositoryContext;
|
|
148
156
|
setOwnership(ownership: DelegationOwnership, beforeMutation: () => Promise<void>): void;
|
|
149
|
-
constructor(directory?: string, disposalSupported?: boolean);
|
|
157
|
+
constructor(directory?: string, disposalSupported?: boolean, sharedSymlinks?: () => unknown | Promise<unknown>);
|
|
150
158
|
discover(cwd: string): Promise<DelegatedWorkspaceSource | undefined>;
|
|
151
159
|
baseline(source: DelegatedWorkspaceSource): Promise<GitCheckpoint>;
|
|
152
160
|
unavailableLanes(): Promise<Set<string>>;
|
|
@@ -221,6 +229,10 @@ export declare class DelegatedWorkspaceManager {
|
|
|
221
229
|
private validateWorkspace;
|
|
222
230
|
private assertLifecycle;
|
|
223
231
|
private validateWorkspaceRecord;
|
|
232
|
+
private sharedOptions;
|
|
233
|
+
private verifySharedCheckout;
|
|
234
|
+
private verifySavedSharedLinks;
|
|
235
|
+
private mapSharedLinks;
|
|
224
236
|
private assertClean;
|
|
225
237
|
private worktreeDirectory;
|
|
226
238
|
private inputRef;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelegatedWorkspaceManager.d.ts","sourceRoot":"","sources":["../../src/delegation/DelegatedWorkspaceManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DelegatedWorkspaceManager.d.ts","sourceRoot":"","sources":["../../src/delegation/DelegatedWorkspaceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DelegatedWorkspaceManager = exports.WORKSPACE_INVENTORY_PAGE_LIMIT = void 0;
|
|
7
|
+
const SharedSymlinks_1 = require("./SharedSymlinks");
|
|
7
8
|
const async_hooks_1 = require("async_hooks");
|
|
8
9
|
const crypto_1 = require("crypto");
|
|
9
10
|
const fs_1 = require("fs");
|
|
@@ -32,6 +33,7 @@ function inside(root, child) {
|
|
|
32
33
|
class DelegatedWorkspaceManager {
|
|
33
34
|
directory;
|
|
34
35
|
disposalSupported;
|
|
36
|
+
sharedSymlinks;
|
|
35
37
|
static operations = new Map();
|
|
36
38
|
ownership;
|
|
37
39
|
beforeMutation;
|
|
@@ -40,9 +42,10 @@ class DelegatedWorkspaceManager {
|
|
|
40
42
|
this.ownership = ownership;
|
|
41
43
|
this.beforeMutation = beforeMutation;
|
|
42
44
|
}
|
|
43
|
-
constructor(directory = path_1.default.join(os_1.default.homedir(), '.remote-cli', 'delegation-workspaces'), disposalSupported = process.platform === 'linux') {
|
|
45
|
+
constructor(directory = path_1.default.join(os_1.default.homedir(), '.remote-cli', 'delegation-workspaces'), disposalSupported = process.platform === 'linux', sharedSymlinks = () => undefined) {
|
|
44
46
|
this.directory = directory;
|
|
45
47
|
this.disposalSupported = disposalSupported;
|
|
48
|
+
this.sharedSymlinks = sharedSymlinks;
|
|
46
49
|
}
|
|
47
50
|
async discover(cwd) {
|
|
48
51
|
// Avoid starting Git for ordinary directories (including environments without Git).
|
|
@@ -76,7 +79,9 @@ class DelegatedWorkspaceManager {
|
|
|
76
79
|
}
|
|
77
80
|
async baseline(source) {
|
|
78
81
|
await this.validateSource(source);
|
|
79
|
-
|
|
82
|
+
const grants = (0, SharedSymlinks_1.parseSharedSymlinkGrants)(await this.sharedSymlinks()).filter(grant => grant.root === source.root);
|
|
83
|
+
await (0, SharedSymlinks_1.validateSharedLocations)(grants);
|
|
84
|
+
return (0, GitCheckpoint_1.captureCheckpoint)(source.root, { sharedSymlinks: grants, forbiddenTargets: [path_1.default.resolve(this.directory), source.commonDirectory] });
|
|
80
85
|
}
|
|
81
86
|
async unavailableLanes() {
|
|
82
87
|
const blocked = new Set();
|
|
@@ -112,6 +117,8 @@ class DelegatedWorkspaceManager {
|
|
|
112
117
|
if (!GitCheckpoint_1.GIT_OID.test(input.head) || !GitCheckpoint_1.GIT_OID.test(input.tree) || !GitCheckpoint_1.GIT_OID.test(input.commit)) {
|
|
113
118
|
throw new Error('Invalid worker input checkpoint');
|
|
114
119
|
}
|
|
120
|
+
if (input.sharedSymlinkPolicy && input.sharedSymlinkPolicy.root !== source.root)
|
|
121
|
+
throw new Error('Shared-link policy belongs to another source repository');
|
|
115
122
|
const directory = this.worktreeDirectory(source, lane.id);
|
|
116
123
|
const taskRef = `refs/remote-cli/tasks/${taskId}`;
|
|
117
124
|
let previous = await this.read('lanes', lane.id);
|
|
@@ -127,11 +134,18 @@ class DelegatedWorkspaceManager {
|
|
|
127
134
|
}
|
|
128
135
|
if (previous && previous.checkoutState !== 'reclaimed') {
|
|
129
136
|
await this.validateWorkspace(previous);
|
|
130
|
-
await this.
|
|
137
|
+
await this.verifySavedSharedLinks(previous);
|
|
138
|
+
await this.assertClean(previous.directory, previous.input);
|
|
131
139
|
const indexEntries = (await (0, GitCheckpoint_1.runGit)(previous.directory, ['ls-files', '-v', '-z'])).toString('utf8').split('\0').filter(Boolean);
|
|
132
140
|
if (indexEntries.some(entry => !entry.startsWith('H '))) {
|
|
133
141
|
throw new Error('Worker checkout has hidden index state; manual recovery is required');
|
|
134
142
|
}
|
|
143
|
+
// Persist a hold before any partial remapping inside this owned checkout.
|
|
144
|
+
if (previous.input.sharedLinks?.length) {
|
|
145
|
+
await this.write('lanes', previous.laneId, { ...previous, blocked: true });
|
|
146
|
+
await this.validateWorkspace(previous);
|
|
147
|
+
await this.mapSharedLinks(previous.directory, previous.input, false);
|
|
148
|
+
}
|
|
135
149
|
// Never reset unknown files, including ignored files that checkout could overwrite.
|
|
136
150
|
await (0, GitCheckpoint_1.runGit)(directory, ['checkout', '--detach', '--no-overwrite-ignore', input.commit]);
|
|
137
151
|
}
|
|
@@ -164,6 +178,11 @@ class DelegatedWorkspaceManager {
|
|
|
164
178
|
workspaceGeneration: lane.workspaceGeneration, source, directory,
|
|
165
179
|
cwd: path_1.default.join(directory, source.relativeCwd), taskId, taskRef, input, checkoutState: 'present',
|
|
166
180
|
disposalPolicy, checkoutIdentity: { dev: identity.dev, ino: identity.ino } };
|
|
181
|
+
if (input.sharedLinks?.length) {
|
|
182
|
+
await this.write('lanes', lane.id, { ...workspace, blocked: true });
|
|
183
|
+
await this.validateWorkspace(workspace);
|
|
184
|
+
workspace.sharedLinkIdentities = await this.mapSharedLinks(directory, input, true);
|
|
185
|
+
}
|
|
167
186
|
await this.write('lanes', lane.id, workspace);
|
|
168
187
|
await this.validateWorkspace(workspace);
|
|
169
188
|
return workspace;
|
|
@@ -186,6 +205,10 @@ class DelegatedWorkspaceManager {
|
|
|
186
205
|
throw new Error('Worker workspace task changed before collection');
|
|
187
206
|
}
|
|
188
207
|
await this.validateWorkspace(workspace);
|
|
208
|
+
if (JSON.stringify([record.input.sharedLinks, record.input.sharedSymlinkPolicy]) !== JSON.stringify([workspace.input.sharedLinks, workspace.input.sharedSymlinkPolicy]))
|
|
209
|
+
throw new Error('Saved shared-link task policy changed');
|
|
210
|
+
await this.verifySavedSharedLinks(record);
|
|
211
|
+
await this.verifySharedCheckout(workspace.directory, workspace.input);
|
|
189
212
|
const saved = await this.read('artifacts', workspace.taskId);
|
|
190
213
|
if (saved && record.disposalPolicy === 1) {
|
|
191
214
|
await this.validateArtifact(saved, { threadId: record.threadId, cwd: record.source.cwd, workspaceGeneration: record.workspaceGeneration });
|
|
@@ -198,7 +221,7 @@ class DelegatedWorkspaceManager {
|
|
|
198
221
|
return this.finishCollection(record, saved, options);
|
|
199
222
|
}
|
|
200
223
|
const artifact = await this.withRepository(workspace.source, async () => {
|
|
201
|
-
const checkpoint = await (0, GitCheckpoint_1.captureCheckpoint)(workspace.directory);
|
|
224
|
+
const checkpoint = await (0, GitCheckpoint_1.captureCheckpoint)(workspace.directory, this.sharedOptions(workspace.input, true));
|
|
202
225
|
const opaque = (await (0, GitCheckpoint_1.runGit)(workspace.directory, ['ls-tree', '-r', '-z', workspace.input.tree]))
|
|
203
226
|
.toString('utf8').split('\0').filter(entry => entry.startsWith('160000 commit '))
|
|
204
227
|
.map(entry => entry.slice(entry.indexOf('\t') + 1));
|
|
@@ -232,7 +255,7 @@ class DelegatedWorkspaceManager {
|
|
|
232
255
|
// Mixed reset only updates OUR index/branch to the preserved working files. Never touches the parent index.
|
|
233
256
|
await (0, GitCheckpoint_1.runGit)(workspace.directory, ['reset', '--mixed', output]);
|
|
234
257
|
await (0, GitCheckpoint_1.runGit)(workspace.directory, ['update-ref', workspace.taskRef, output]);
|
|
235
|
-
await this.assertClean(workspace.directory);
|
|
258
|
+
await this.assertClean(workspace.directory, workspace.input);
|
|
236
259
|
// Persist pending before proof/export, so a failed proof cannot hide changed output.
|
|
237
260
|
await this.write('lanes', workspace.laneId, { ...record,
|
|
238
261
|
pendingTaskId: artifact.disposition === 'pending' ? artifact.taskId : undefined });
|
|
@@ -287,7 +310,7 @@ class DelegatedWorkspaceManager {
|
|
|
287
310
|
if (action !== 'inspect' && action !== 'apply' && action !== 'retain') {
|
|
288
311
|
throw new Error('Artifact action must be inspect, apply, or retain');
|
|
289
312
|
}
|
|
290
|
-
const current = await (0, GitCheckpoint_1.captureCheckpoint)(artifact.source.root);
|
|
313
|
+
const current = await (0, GitCheckpoint_1.captureCheckpoint)(artifact.source.root, this.sharedOptions(artifact.input, false));
|
|
291
314
|
if (action !== 'inspect' && (typeof expectedRevision !== 'string' || expectedRevision !== current.revision)) {
|
|
292
315
|
throw new Error('Delivery workspace changed; inspect the artifact again before integrating');
|
|
293
316
|
}
|
|
@@ -887,6 +910,7 @@ class DelegatedWorkspaceManager {
|
|
|
887
910
|
}
|
|
888
911
|
async verifyCheckout(workspace, artifact) {
|
|
889
912
|
await this.validateWorkspace(workspace);
|
|
913
|
+
await this.verifySavedSharedLinks(workspace);
|
|
890
914
|
const disposable = workspace.disposalPolicy === 1 && artifact.disposalPolicy === 1;
|
|
891
915
|
const registered = await this.registration(workspace.source, workspace.directory);
|
|
892
916
|
if (!registered || registered.locked || registered.head !== artifact.output
|
|
@@ -896,7 +920,9 @@ class DelegatedWorkspaceManager {
|
|
|
896
920
|
throw new Error('Worker checkout is locked, unresolved, or no longer at its saved output');
|
|
897
921
|
}
|
|
898
922
|
if (disposable) {
|
|
899
|
-
if (
|
|
923
|
+
if (workspace.input.sharedLinks?.length)
|
|
924
|
+
await this.assertClean(workspace.directory, workspace.input, true);
|
|
925
|
+
else if ((await (0, GitCheckpoint_1.runGit)(workspace.directory, ['status', '--porcelain=v1', '-z', '--untracked-files=no'])).length) {
|
|
900
926
|
throw new WorkspaceDisposal_1.WorkspaceCleanupError('tracked-files-changed');
|
|
901
927
|
}
|
|
902
928
|
const entries = (await (0, GitCheckpoint_1.runGit)(workspace.directory, ['ls-files', '-v', '-z'])).toString('utf8').split('\0').filter(Boolean);
|
|
@@ -904,7 +930,7 @@ class DelegatedWorkspaceManager {
|
|
|
904
930
|
throw new WorkspaceDisposal_1.WorkspaceCleanupError('hidden-index-state');
|
|
905
931
|
}
|
|
906
932
|
else
|
|
907
|
-
await this.assertClean(workspace.directory);
|
|
933
|
+
await this.assertClean(workspace.directory, workspace.input);
|
|
908
934
|
// Git status and a copied index can hide changed bytes behind assume-unchanged,
|
|
909
935
|
// skip-worktree, or stat-cache flags. Hash actual bytes without filters or index metadata.
|
|
910
936
|
const files = new Map();
|
|
@@ -943,6 +969,8 @@ class DelegatedWorkspaceManager {
|
|
|
943
969
|
await (0, WorkspaceDisposal_1.assertDisposableTree)(workspace.directory);
|
|
944
970
|
await (0, WorkspaceDisposal_1.verifyWorkspaceExports)(await this.exportDirectory(artifact.taskId), artifact.exports ?? [], workspace.directory);
|
|
945
971
|
}
|
|
972
|
+
const shared = new Map((workspace.input.sharedLinks ?? []).map(b => [b.path, b]));
|
|
973
|
+
await this.verifySharedCheckout(workspace.directory, workspace.input, artifact.tree);
|
|
946
974
|
const walk = async (relative) => {
|
|
947
975
|
const absolute = path_1.default.join(workspace.directory, relative);
|
|
948
976
|
if (await promises_1.default.realpath(absolute) !== absolute)
|
|
@@ -977,9 +1005,15 @@ class DelegatedWorkspaceManager {
|
|
|
977
1005
|
return;
|
|
978
1006
|
}
|
|
979
1007
|
const hash = (0, crypto_1.createHash)(expected.oid.length === 64 ? 'sha256' : 'sha1');
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
1008
|
+
const binding = shared.get(child);
|
|
1009
|
+
const nativeLink = !binding && stat.isSymbolicLink() ? await promises_1.default.readlink(file, { encoding: 'buffer' }) : undefined;
|
|
1010
|
+
if (nativeLink && !Buffer.from(nativeLink.toString('utf8')).equals(nativeLink))
|
|
1011
|
+
throw new Error('Invalid checkout symbolic-link text');
|
|
1012
|
+
const linkBytes = binding ? Buffer.from(binding.linkText)
|
|
1013
|
+
: nativeLink ? Buffer.from((0, GitCheckpoint_1.gitLinkTarget)(nativeLink.toString('utf8'))) : undefined;
|
|
1014
|
+
hash.update(`blob ${linkBytes?.length ?? stat.size}\0`);
|
|
1015
|
+
if (linkBytes)
|
|
1016
|
+
hash.update(linkBytes);
|
|
983
1017
|
else {
|
|
984
1018
|
// Each concurrent reader owns its buffer; hash every byte without filters.
|
|
985
1019
|
const buffer = Buffer.alloc(Math.min(1024 * 1024, Math.max(1, stat.size)));
|
|
@@ -1020,6 +1054,7 @@ class DelegatedWorkspaceManager {
|
|
|
1020
1054
|
await walk('');
|
|
1021
1055
|
if (files.size)
|
|
1022
1056
|
throw new Error('Saved checkout files are missing');
|
|
1057
|
+
await this.verifySavedSharedLinks(workspace);
|
|
1023
1058
|
}
|
|
1024
1059
|
async registration(source, directory) {
|
|
1025
1060
|
let selected = false;
|
|
@@ -1076,6 +1111,11 @@ class DelegatedWorkspaceManager {
|
|
|
1076
1111
|
// Never replace a live repository directory with a worker file or symbolic link.
|
|
1077
1112
|
const changes = (await (0, GitCheckpoint_1.runGit)(artifact.source.root, ['diff', '--name-only', '--no-renames', '-z',
|
|
1078
1113
|
artifact.input.tree, artifact.tree, '--'])).toString('utf8').split('\0').filter(Boolean);
|
|
1114
|
+
for (const binding of artifact.input.sharedLinks ?? []) {
|
|
1115
|
+
if (changes.some(file => file === binding.path || file.startsWith(`${binding.path}/`) || binding.path.startsWith(`${file}/`))) {
|
|
1116
|
+
throw new Error('Shared link-node changes require manual integration; shared target edits are never included in artifacts.');
|
|
1117
|
+
}
|
|
1118
|
+
}
|
|
1079
1119
|
for (const name of currentRepositories.keys()) {
|
|
1080
1120
|
if (!expectedRepositories.has(name) && changes.some(file => file.startsWith(`${name}/`))
|
|
1081
1121
|
|| changes.some(file => name === file || name.startsWith(`${file}/`))) {
|
|
@@ -1117,7 +1157,7 @@ class DelegatedWorkspaceManager {
|
|
|
1117
1157
|
const mergedTree = await (0, GitCheckpoint_1.gitText)(integrationDirectory, ['write-tree']);
|
|
1118
1158
|
const patch = await (0, GitCheckpoint_1.runGit)(artifact.source.root, ['diff', '--binary', '--no-ext-diff', '--no-textconv',
|
|
1119
1159
|
current.tree, mergedTree, '--']);
|
|
1120
|
-
if ((await (0, GitCheckpoint_1.captureCheckpoint)(artifact.source.root)).revision !== current.revision) {
|
|
1160
|
+
if ((await (0, GitCheckpoint_1.captureCheckpoint)(artifact.source.root, this.sharedOptions(artifact.input, false))).revision !== current.revision) {
|
|
1121
1161
|
throw new Error('Delivery workspace changed during integration; no patch was applied');
|
|
1122
1162
|
}
|
|
1123
1163
|
if (patch.length) {
|
|
@@ -1185,7 +1225,9 @@ class DelegatedWorkspaceManager {
|
|
|
1185
1225
|
changedFiles: files.slice(0, 60), filesTruncated: files.length > 60,
|
|
1186
1226
|
...(artifact.deliveredAtHead ? { deliveredAtHead: artifact.deliveredAtHead } : {}),
|
|
1187
1227
|
...(artifact.recovery ? { recovery: artifact.recovery } : {}),
|
|
1188
|
-
...(artifact.exports ? { exports: artifact.exports } : {})
|
|
1228
|
+
...(artifact.exports ? { exports: artifact.exports } : {}),
|
|
1229
|
+
...(artifact.input.sharedLinks?.length ? { sharedLinkPaths: artifact.input.sharedLinks.map(b => b.path),
|
|
1230
|
+
sharingWarning: 'These links reach shared original data. Target edits are direct and are not captured, merged, reverted, or backed up by worktree artifacts.' } : {}) };
|
|
1189
1231
|
}
|
|
1190
1232
|
async assertSelectedScope(artifact) {
|
|
1191
1233
|
// Rename detection hides the removed source path from --name-only; validate BOTH endpoints.
|
|
@@ -1204,6 +1246,8 @@ class DelegatedWorkspaceManager {
|
|
|
1204
1246
|
|| artifact.deliveredAtHead !== undefined && (!GitCheckpoint_1.GIT_OID.test(artifact.deliveredAtHead) || artifact.disposition !== 'applied')) {
|
|
1205
1247
|
throw new Error('Invalid or foreign worker artifact');
|
|
1206
1248
|
}
|
|
1249
|
+
if (artifact.input.sharedSymlinkPolicy && artifact.input.sharedSymlinkPolicy.root !== artifact.source.root)
|
|
1250
|
+
throw new Error('Saved shared-link policy belongs to another repository');
|
|
1207
1251
|
await this.validateSource(artifact.source);
|
|
1208
1252
|
if (await (0, GitCheckpoint_1.gitText)(artifact.source.root, ['rev-parse', this.outputRef(artifact.taskId)]) !== artifact.output
|
|
1209
1253
|
|| await (0, GitCheckpoint_1.gitText)(artifact.source.root, ['rev-parse', this.inputRef(artifact.taskId)]) !== artifact.input.commit
|
|
@@ -1260,8 +1304,76 @@ class DelegatedWorkspaceManager {
|
|
|
1260
1304
|
throw new Error('Owned worker worktree identity changed');
|
|
1261
1305
|
}
|
|
1262
1306
|
}
|
|
1263
|
-
|
|
1264
|
-
if (
|
|
1307
|
+
sharedOptions(input, physical) {
|
|
1308
|
+
if (input.sharedLinks === undefined && input.sharedSymlinkPolicy === undefined)
|
|
1309
|
+
return {};
|
|
1310
|
+
if (!input.sharedLinks?.length || !input.sharedSymlinkPolicy)
|
|
1311
|
+
throw new Error('Invalid saved shared-link policy');
|
|
1312
|
+
return { policy: input.sharedSymlinkPolicy, bindings: input.sharedLinks, physical,
|
|
1313
|
+
forbiddenTargets: [path_1.default.resolve(this.directory)] };
|
|
1314
|
+
}
|
|
1315
|
+
async verifySharedCheckout(directory, input, tree = input.tree) {
|
|
1316
|
+
const options = this.sharedOptions(input, true);
|
|
1317
|
+
if (!input.sharedLinks?.length)
|
|
1318
|
+
return;
|
|
1319
|
+
const common = await promises_1.default.realpath(path_1.default.resolve(directory, await (0, GitCheckpoint_1.gitText)(directory, ['rev-parse', '--git-common-dir'])));
|
|
1320
|
+
const context = new SharedSymlinks_1.SharedLinkCapture(directory, { ...options, forbiddenTargets: [path_1.default.resolve(this.directory), common] });
|
|
1321
|
+
await context.initialize();
|
|
1322
|
+
const entries = (await (0, GitCheckpoint_1.runGit)(directory, ['ls-tree', '-r', '-z', tree])).toString('utf8').split('\0');
|
|
1323
|
+
const indexed = (await (0, GitCheckpoint_1.runGit)(directory, ['ls-files', '--stage', '-z'])).toString('utf8').split('\0');
|
|
1324
|
+
for (const b of context.bindings) {
|
|
1325
|
+
const entry = entries.find(e => e.slice(e.indexOf('\t') + 1) === b.path);
|
|
1326
|
+
const oid = entry && /^120000 blob ([a-f0-9]+)\t/.exec(entry)?.[1];
|
|
1327
|
+
if (!oid || (0, SharedSymlinks_1.sharedLinkBlob)(b.linkText, oid.length) !== oid)
|
|
1328
|
+
throw new Error('Saved logical shared link changed; manual recovery is required');
|
|
1329
|
+
if (!indexed.includes(`120000 ${oid} 0\t${b.path}`))
|
|
1330
|
+
throw new Error('Shared link-node staged index changes require manual recovery');
|
|
1331
|
+
}
|
|
1332
|
+
}
|
|
1333
|
+
async verifySavedSharedLinks(workspace) {
|
|
1334
|
+
if (!workspace.input.sharedLinks?.length)
|
|
1335
|
+
return;
|
|
1336
|
+
const identities = workspace.sharedLinkIdentities;
|
|
1337
|
+
if (!Array.isArray(identities) || identities.length !== workspace.input.sharedLinks.length
|
|
1338
|
+
|| new Set(identities.map(item => item.path)).size !== identities.length)
|
|
1339
|
+
throw new Error('Saved shared-link node identities are unavailable');
|
|
1340
|
+
for (const binding of workspace.input.sharedLinks) {
|
|
1341
|
+
const expected = identities.find(item => item.path === binding.path);
|
|
1342
|
+
const actual = await (0, SharedSymlinks_1.readNativeSharedLink)(workspace.directory, binding.path);
|
|
1343
|
+
if (!expected || expected.identity !== actual.identity || actual.text !== binding.target)
|
|
1344
|
+
throw new Error('Owned shared-link node was replaced; the checkout is retained for recovery');
|
|
1345
|
+
}
|
|
1346
|
+
}
|
|
1347
|
+
async mapSharedLinks(directory, input, install) {
|
|
1348
|
+
const options = this.sharedOptions(input, true);
|
|
1349
|
+
const common = await promises_1.default.realpath(path_1.default.resolve(directory, await (0, GitCheckpoint_1.gitText)(directory, ['rev-parse', '--git-common-dir'])));
|
|
1350
|
+
const context = new SharedSymlinks_1.SharedLinkCapture(directory, { ...options, forbiddenTargets: [path_1.default.resolve(this.directory), common] });
|
|
1351
|
+
await context.verifyTargets();
|
|
1352
|
+
if (!install)
|
|
1353
|
+
await this.verifySharedCheckout(directory, input);
|
|
1354
|
+
for (const binding of context.bindings) {
|
|
1355
|
+
const current = await (0, SharedSymlinks_1.readNativeSharedLink)(directory, binding.path);
|
|
1356
|
+
if (current.text !== (install ? binding.linkText : binding.target))
|
|
1357
|
+
throw new Error('Shared-link checkout pointer changed; manual recovery is required');
|
|
1358
|
+
await promises_1.default.unlink(path_1.default.join(directory, binding.path));
|
|
1359
|
+
await promises_1.default.symlink(install ? binding.target : binding.linkText, path_1.default.join(directory, binding.path), binding.kind);
|
|
1360
|
+
}
|
|
1361
|
+
if (install)
|
|
1362
|
+
await this.verifySharedCheckout(directory, input);
|
|
1363
|
+
return Promise.all(context.bindings.map(async (binding) => ({ path: binding.path, identity: (await (0, SharedSymlinks_1.readNativeSharedLink)(directory, binding.path)).identity })));
|
|
1364
|
+
}
|
|
1365
|
+
async assertClean(directory, input, trackedOnly = false) {
|
|
1366
|
+
const status = await (0, GitCheckpoint_1.runGit)(directory, ['status', '--porcelain=v1', '-z', `--untracked-files=${trackedOnly ? 'no' : 'all'}`]);
|
|
1367
|
+
if (!input?.sharedLinks?.length) {
|
|
1368
|
+
if (status.length)
|
|
1369
|
+
throw new Error('Worker worktree contains unaccounted changes; manual recovery is required');
|
|
1370
|
+
return;
|
|
1371
|
+
}
|
|
1372
|
+
await this.verifySharedCheckout(directory, input);
|
|
1373
|
+
if ((await (0, GitCheckpoint_1.runGit)(directory, ['diff', '--cached', '--name-only', '-z', 'HEAD', '--'])).length)
|
|
1374
|
+
throw new Error('Shared-link checkout has staged changes');
|
|
1375
|
+
const allowed = new Set(input.sharedLinks.map(b => ` M ${b.path}`));
|
|
1376
|
+
if (status.toString('utf8').split('\0').filter(Boolean).some(entry => !allowed.has(entry))) {
|
|
1265
1377
|
throw new Error('Worker worktree contains unaccounted changes; manual recovery is required');
|
|
1266
1378
|
}
|
|
1267
1379
|
}
|