@kaitranntt/ccs 8.8.1-dev.14 → 8.8.1-dev.16

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.
@@ -0,0 +1,5 @@
1
+ export type DivergedFileAdoption = 'not-claimed' | 'claimed';
2
+ export declare function assertAdoptionPathAbsent(managedPath: string, adoption: DivergedFileAdoption): void;
3
+ export declare function recoverOrphanedCanonicalClaim(canonicalPath: string): boolean;
4
+ export declare function adoptDivergedFileContent(divergedPath: string, canonicalPath: string): DivergedFileAdoption;
5
+ //# sourceMappingURL=diverged-file-adopter.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diverged-file-adopter.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/diverged-file-adopter.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,SAAS,CAAC;AAqB7D,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,oBAAoB,GAC7B,IAAI,CAMN;AAED,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CA6C5E;AA6JD,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,oBAAoB,CA2HtB"}
@@ -0,0 +1,361 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.adoptDivergedFileContent = exports.recoverOrphanedCanonicalClaim = exports.assertAdoptionPathAbsent = void 0;
27
+ const fs = __importStar(require("fs"));
28
+ const path = __importStar(require("path"));
29
+ const ui_1 = require("../../utils/ui");
30
+ const fs_helpers_1 = require("./fs-helpers");
31
+ let adoptionClaimSequence = 0;
32
+ function resolveLexicalSymlinkChain(targetPath) {
33
+ let currentPath = path.resolve(targetPath);
34
+ const visited = new Set();
35
+ while (true) {
36
+ if (visited.has(currentPath)) {
37
+ throw Object.assign(new TypeError(`Symlink loop while resolving ${targetPath}`), {
38
+ code: 'ELOOP',
39
+ });
40
+ }
41
+ visited.add(currentPath);
42
+ const stats = (0, fs_helpers_1.getLstatSync)(currentPath);
43
+ if (!stats?.isSymbolicLink())
44
+ return currentPath;
45
+ currentPath = path.resolve(path.dirname(currentPath), fs.readlinkSync(currentPath));
46
+ }
47
+ }
48
+ function assertAdoptionPathAbsent(managedPath, adoption) {
49
+ if (adoption === 'claimed' && (0, fs_helpers_1.getLstatSync)(managedPath)) {
50
+ throw Object.assign(new TypeError(`Path reappeared during reconciliation: ${managedPath}`), {
51
+ code: 'EEXIST',
52
+ });
53
+ }
54
+ }
55
+ exports.assertAdoptionPathAbsent = assertAdoptionPathAbsent;
56
+ function recoverOrphanedCanonicalClaim(canonicalPath) {
57
+ const writePath = resolveLexicalSymlinkChain(canonicalPath);
58
+ const directory = path.dirname(writePath);
59
+ const prefix = `${path.basename(writePath)}.ccs-canonical-claim-`;
60
+ let candidates;
61
+ try {
62
+ candidates = fs
63
+ .readdirSync(directory)
64
+ .filter((entry) => entry.startsWith(prefix))
65
+ .map((entry) => path.join(directory, entry))
66
+ .filter((entryPath) => fs.lstatSync(entryPath).isFile())
67
+ .sort((left, right) => fs.statSync(right).mtimeMs - fs.statSync(left).mtimeMs);
68
+ }
69
+ catch (err) {
70
+ if (err.code === 'ENOENT')
71
+ return false;
72
+ throw err;
73
+ }
74
+ const claimPath = candidates[0];
75
+ if (!claimPath)
76
+ return false;
77
+ let recovered = false;
78
+ if (!(0, fs_helpers_1.getLstatSync)(writePath)) {
79
+ fs.linkSync(claimPath, writePath);
80
+ fs.unlinkSync(claimPath);
81
+ candidates.shift();
82
+ recovered = true;
83
+ console.log((0, ui_1.warn)(`Recovered interrupted canonical adoption at ${canonicalPath}`));
84
+ }
85
+ for (const leftoverClaim of candidates) {
86
+ const recoveryBase = `${writePath}.ccs-canonical-recovery`;
87
+ let sequence = 0;
88
+ while (true) {
89
+ const recoveryPath = sequence === 0 ? recoveryBase : `${recoveryBase}-${sequence}`;
90
+ try {
91
+ fs.linkSync(leftoverClaim, recoveryPath);
92
+ fs.unlinkSync(leftoverClaim);
93
+ console.log((0, ui_1.warn)(`Quarantined interrupted canonical claim at ${recoveryPath}`));
94
+ break;
95
+ }
96
+ catch (err) {
97
+ if (err.code !== 'EEXIST')
98
+ throw err;
99
+ sequence++;
100
+ }
101
+ }
102
+ }
103
+ return recovered;
104
+ }
105
+ exports.recoverOrphanedCanonicalClaim = recoverOrphanedCanonicalClaim;
106
+ function preserveClaim(claimPath, divergedPath, reason) {
107
+ const recoveryBase = `${divergedPath}.ccs-adopt-recovery`;
108
+ let sequence = 0;
109
+ while (true) {
110
+ const recoveryPath = sequence === 0 ? recoveryBase : `${recoveryBase}-${sequence}`;
111
+ try {
112
+ // link() is an atomic no-replace operation, so concurrent CCS
113
+ // processes cannot overwrite each other's recovery artifacts.
114
+ fs.linkSync(claimPath, recoveryPath);
115
+ try {
116
+ fs.unlinkSync(claimPath);
117
+ }
118
+ catch {
119
+ // Both names preserve the same bytes; leaving the claim is safe.
120
+ }
121
+ console.log((0, ui_1.warn)(`${reason}; preserved content at ${recoveryPath}`));
122
+ return recoveryPath;
123
+ }
124
+ catch (err) {
125
+ const code = err.code;
126
+ if (code === 'EEXIST') {
127
+ sequence++;
128
+ continue;
129
+ }
130
+ console.log((0, ui_1.warn)(`${reason}; content remains at ${claimPath}${code ? ` (${code})` : ''}`));
131
+ return claimPath;
132
+ }
133
+ }
134
+ }
135
+ function validateManagedJson(filePath, content) {
136
+ if (path.extname(filePath).toLowerCase() !== '.json') {
137
+ return true;
138
+ }
139
+ try {
140
+ const parsed = JSON.parse(content.toString('utf8'));
141
+ if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
142
+ return false;
143
+ }
144
+ if (path.basename(filePath) === 'installed_plugins.json') {
145
+ const registry = parsed;
146
+ return (typeof registry.plugins === 'object' &&
147
+ registry.plugins !== null &&
148
+ !Array.isArray(registry.plugins));
149
+ }
150
+ return true;
151
+ }
152
+ catch {
153
+ return false;
154
+ }
155
+ }
156
+ function atomicWriteFile(targetPath, content, mode) {
157
+ const tempPath = `${targetPath}.ccs-write-${process.pid}-${Date.now()}-${adoptionClaimSequence++}`;
158
+ let descriptor = null;
159
+ try {
160
+ descriptor = fs.openSync(tempPath, 'wx', mode);
161
+ fs.fchmodSync(descriptor, mode);
162
+ fs.writeFileSync(descriptor, content);
163
+ fs.fsyncSync(descriptor);
164
+ fs.closeSync(descriptor);
165
+ descriptor = null;
166
+ fs.linkSync(tempPath, targetPath);
167
+ fs.unlinkSync(tempPath);
168
+ }
169
+ catch (err) {
170
+ if (descriptor !== null) {
171
+ fs.closeSync(descriptor);
172
+ }
173
+ try {
174
+ fs.unlinkSync(tempPath);
175
+ }
176
+ catch {
177
+ // The temp file may not have been created or may already have been renamed.
178
+ }
179
+ throw err;
180
+ }
181
+ }
182
+ function publishBackupNoReplace(sourcePath, canonicalPath) {
183
+ const basePath = `${canonicalPath}.bak-ccs-adopt`;
184
+ const content = fs.readFileSync(sourcePath);
185
+ const mode = fs.statSync(sourcePath).mode & 0o777;
186
+ let sequence = 0;
187
+ while (true) {
188
+ const backupPath = sequence === 0 ? basePath : `${basePath}-${sequence}`;
189
+ try {
190
+ atomicWriteFile(backupPath, content, mode);
191
+ return backupPath;
192
+ }
193
+ catch (err) {
194
+ if (err.code !== 'EEXIST')
195
+ throw err;
196
+ sequence++;
197
+ }
198
+ }
199
+ }
200
+ function publishAdoptedRecoveryNoReplace(sourcePath, divergedPath) {
201
+ const basePath = `${divergedPath}.ccs-adopted-recovery`;
202
+ const content = fs.readFileSync(sourcePath);
203
+ const mode = fs.statSync(sourcePath).mode & 0o777;
204
+ let sequence = 0;
205
+ while (true) {
206
+ const recoveryPath = sequence === 0 ? basePath : `${basePath}-${sequence}`;
207
+ try {
208
+ atomicWriteFile(recoveryPath, content, mode);
209
+ return recoveryPath;
210
+ }
211
+ catch (err) {
212
+ if (err.code !== 'EEXIST')
213
+ throw err;
214
+ sequence++;
215
+ }
216
+ }
217
+ }
218
+ function restoreCanonicalClaim(claimPath, writePath, canonicalPath) {
219
+ try {
220
+ fs.linkSync(claimPath, writePath);
221
+ fs.unlinkSync(claimPath);
222
+ }
223
+ catch (err) {
224
+ if (err.code !== 'EEXIST')
225
+ throw err;
226
+ publishBackupNoReplace(claimPath, canonicalPath);
227
+ fs.unlinkSync(claimPath);
228
+ }
229
+ }
230
+ function getCanonicalFile(canonicalPath) {
231
+ const canonicalLstat = (0, fs_helpers_1.getLstatSync)(canonicalPath);
232
+ if (!canonicalLstat) {
233
+ return { content: null, mode: 0o600, mtimeMs: null, writePath: canonicalPath };
234
+ }
235
+ let writePath = canonicalPath;
236
+ if (canonicalLstat.isSymbolicLink()) {
237
+ writePath = fs.realpathSync.native(canonicalPath);
238
+ }
239
+ const canonicalStats = fs.statSync(canonicalPath);
240
+ if (!canonicalStats.isFile()) {
241
+ throw Object.assign(new TypeError(`Canonical path is not a regular file: ${canonicalPath}`), {
242
+ code: 'EINVAL',
243
+ });
244
+ }
245
+ return {
246
+ content: fs.readFileSync(canonicalPath),
247
+ mode: canonicalStats.mode & 0o777,
248
+ mtimeMs: canonicalStats.mtimeMs,
249
+ writePath,
250
+ };
251
+ }
252
+ function adoptDivergedFileContent(divergedPath, canonicalPath) {
253
+ const initialStats = (0, fs_helpers_1.getLstatSync)(divergedPath);
254
+ if (!initialStats?.isFile()) {
255
+ return 'not-claimed';
256
+ }
257
+ const claimPath = `${divergedPath}.ccs-adopt-claim-${process.pid}-${Date.now()}-${adoptionClaimSequence++}`;
258
+ try {
259
+ fs.renameSync(divergedPath, claimPath);
260
+ }
261
+ catch (err) {
262
+ const code = err.code;
263
+ console.log((0, ui_1.warn)(`Unable to claim diverged ${divergedPath}; preserving original${code ? ` (${code})` : ''}`));
264
+ throw err;
265
+ }
266
+ let canonicalClaimPath = null;
267
+ let canonicalWritePath = null;
268
+ let divergencePreserved = false;
269
+ try {
270
+ const claimedStats = fs.lstatSync(claimPath);
271
+ if (!claimedStats.isFile()) {
272
+ preserveClaim(claimPath, divergedPath, `Refusing non-regular divergence at ${divergedPath}`);
273
+ divergencePreserved = true;
274
+ throw Object.assign(new TypeError(`Refusing non-regular divergence at ${divergedPath}`), {
275
+ code: 'EINVAL',
276
+ });
277
+ }
278
+ if ((0, fs_helpers_1.getLstatSync)(divergedPath)) {
279
+ preserveClaim(claimPath, divergedPath, `Concurrent replacement detected at ${divergedPath}`);
280
+ divergencePreserved = true;
281
+ throw Object.assign(new TypeError(`Concurrent replacement detected at ${divergedPath}`), {
282
+ code: 'EEXIST',
283
+ });
284
+ }
285
+ const diverged = fs.readFileSync(claimPath);
286
+ if (!validateManagedJson(divergedPath, diverged)) {
287
+ preserveClaim(claimPath, divergedPath, `Refusing malformed managed JSON at ${divergedPath}`);
288
+ return 'claimed';
289
+ }
290
+ const canonical = getCanonicalFile(canonicalPath);
291
+ let current = canonical.content;
292
+ let publishMode = canonical.mode;
293
+ if (current) {
294
+ canonicalWritePath = canonical.writePath;
295
+ canonicalClaimPath = `${canonical.writePath}.ccs-canonical-claim-${process.pid}-${Date.now()}-${adoptionClaimSequence++}`;
296
+ fs.renameSync(canonical.writePath, canonicalClaimPath);
297
+ const currentStats = fs.statSync(canonicalClaimPath);
298
+ publishMode = currentStats.mode & 0o777;
299
+ current = fs.readFileSync(canonicalClaimPath);
300
+ if (diverged.equals(current)) {
301
+ restoreCanonicalClaim(canonicalClaimPath, canonical.writePath, canonicalPath);
302
+ canonicalClaimPath = null;
303
+ fs.unlinkSync(claimPath);
304
+ return 'claimed';
305
+ }
306
+ if (claimedStats.mtimeMs <= currentStats.mtimeMs) {
307
+ restoreCanonicalClaim(canonicalClaimPath, canonical.writePath, canonicalPath);
308
+ canonicalClaimPath = null;
309
+ preserveClaim(claimPath, divergedPath, `Refusing stale or ambiguously-timed divergence at ${divergedPath}`);
310
+ return 'claimed';
311
+ }
312
+ }
313
+ if (canonicalClaimPath) {
314
+ publishBackupNoReplace(canonicalClaimPath, canonicalPath);
315
+ }
316
+ publishAdoptedRecoveryNoReplace(claimPath, divergedPath);
317
+ atomicWriteFile(canonical.writePath, diverged, publishMode);
318
+ if (!fs.readFileSync(canonicalPath).equals(diverged)) {
319
+ throw Object.assign(new TypeError(`Canonical adoption postcondition failed: ${canonicalPath}`), {
320
+ code: 'EAGAIN',
321
+ });
322
+ }
323
+ if (canonicalClaimPath) {
324
+ fs.unlinkSync(canonicalClaimPath);
325
+ canonicalClaimPath = null;
326
+ }
327
+ if ((0, fs_helpers_1.getLstatSync)(divergedPath)) {
328
+ preserveClaim(claimPath, divergedPath, `Concurrent replacement detected at ${divergedPath}`);
329
+ divergencePreserved = true;
330
+ throw Object.assign(new TypeError(`Concurrent replacement detected at ${divergedPath}`), {
331
+ code: 'EEXIST',
332
+ });
333
+ }
334
+ fs.unlinkSync(claimPath);
335
+ console.log((0, ui_1.info)(`Adopted diverged ${path.basename(divergedPath)} content into ${canonicalPath}`));
336
+ return 'claimed';
337
+ }
338
+ catch (err) {
339
+ if (canonicalClaimPath && canonicalWritePath) {
340
+ restoreCanonicalClaim(canonicalClaimPath, canonicalWritePath, canonicalPath);
341
+ canonicalClaimPath = null;
342
+ }
343
+ if (divergencePreserved) {
344
+ throw err;
345
+ }
346
+ if (!(0, fs_helpers_1.getLstatSync)(divergedPath)) {
347
+ try {
348
+ fs.renameSync(claimPath, divergedPath);
349
+ }
350
+ catch {
351
+ preserveClaim(claimPath, divergedPath, `Unable to restore diverged ${divergedPath}`);
352
+ }
353
+ }
354
+ else {
355
+ preserveClaim(claimPath, divergedPath, `Unable to restore diverged ${divergedPath}`);
356
+ }
357
+ throw err;
358
+ }
359
+ }
360
+ exports.adoptDivergedFileContent = adoptDivergedFileContent;
361
+ //# sourceMappingURL=diverged-file-adopter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diverged-file-adopter.js","sourceRoot":"","sources":["../../../src/management/shared-manager/diverged-file-adopter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAE7B,uCAA4C;AAC5C,6CAA4C;AAI5C,IAAI,qBAAqB,GAAG,CAAC,CAAC;AAE9B,SAAS,0BAA0B,CAAC,UAAkB;IACpD,IAAI,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,gCAAgC,UAAU,EAAE,CAAC,EAAE;gBAC/E,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE;YAAE,OAAO,WAAW,CAAC;QACjD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;IACtF,CAAC;AACH,CAAC;AAED,SAAgB,wBAAwB,CACtC,WAAmB,EACnB,QAA8B;IAE9B,IAAI,QAAQ,KAAK,SAAS,IAAI,IAAA,yBAAY,EAAC,WAAW,CAAC,EAAE,CAAC;QACxD,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,0CAA0C,WAAW,EAAE,CAAC,EAAE;YAC1F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AATD,4DASC;AAED,SAAgB,6BAA6B,CAAC,aAAqB;IACjE,MAAM,SAAS,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,uBAAuB,CAAC;IAClE,IAAI,UAAoB,CAAC;IACzB,IAAI,CAAC;QACH,UAAU,GAAG,EAAE;aACZ,WAAW,CAAC,SAAS,CAAC;aACtB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;aAC3C,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;aACvD,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IACnF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACnE,MAAM,GAAG,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAE7B,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,CAAC,IAAA,yBAAY,EAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAClC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACzB,UAAU,CAAC,KAAK,EAAE,CAAC;QACnB,SAAS,GAAG,IAAI,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,+CAA+C,aAAa,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,MAAM,aAAa,IAAI,UAAU,EAAE,CAAC;QACvC,MAAM,YAAY,GAAG,GAAG,SAAS,yBAAyB,CAAC;QAC3D,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,QAAQ,EAAE,CAAC;YACnF,IAAI,CAAC;gBACH,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;gBACzC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,8CAA8C,YAAY,EAAE,CAAC,CAAC,CAAC;gBAChF,MAAM;YACR,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;oBAAE,MAAM,GAAG,CAAC;gBAChE,QAAQ,EAAE,CAAC;YACb,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AA7CD,sEA6CC;AAED,SAAS,aAAa,CAAC,SAAiB,EAAE,YAAoB,EAAE,MAAc;IAC5E,MAAM,YAAY,GAAG,GAAG,YAAY,qBAAqB,CAAC;IAC1D,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,IAAI,QAAQ,EAAE,CAAC;QACnF,IAAI,CAAC;YACH,8DAA8D;YAC9D,8DAA8D;YAC9D,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACrC,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;YAAC,MAAM,CAAC;gBACP,iEAAiE;YACnE,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,GAAG,MAAM,0BAA0B,YAAY,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;YACjD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,QAAQ,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,GAAG,MAAM,wBAAwB,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3F,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB,EAAE,OAAe;IAC5D,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY,CAAC;QAC/D,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,wBAAwB,EAAE,CAAC;YACzD,MAAM,QAAQ,GAAG,MAAiC,CAAC;YACnD,OAAO,CACL,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ;gBACpC,QAAQ,CAAC,OAAO,KAAK,IAAI;gBACzB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CACjC,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB,EAAE,OAAe,EAAE,IAAY;IACxE,MAAM,QAAQ,GAAG,GAAG,UAAU,cAAc,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,qBAAqB,EAAE,EAAE,CAAC;IACnG,IAAI,UAAU,GAAkB,IAAI,CAAC;IACrC,IAAI,CAAC;QACH,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAChC,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACtC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACzB,UAAU,GAAG,IAAI,CAAC;QAClB,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAClC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;QAC9E,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAkB,EAAE,aAAqB;IACvE,MAAM,QAAQ,GAAG,GAAG,aAAa,gBAAgB,CAAC;IAClD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC;IAClD,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;QACzE,IAAI,CAAC;YACH,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC3C,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAC;YAChE,QAAQ,EAAE,CAAC;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,+BAA+B,CAAC,UAAkB,EAAE,YAAoB;IAC/E,MAAM,QAAQ,GAAG,GAAG,YAAY,uBAAuB,CAAC;IACxD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC;IAClD,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;QAC3E,IAAI,CAAC;YACH,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7C,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAC;YAChE,QAAQ,EAAE,CAAC;QACb,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAiB,EAAE,SAAiB,EAAE,aAAqB;IACxF,IAAI,CAAC;QACH,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAClC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAC;QAChE,sBAAsB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACjD,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,aAAqB;IAM7C,MAAM,cAAc,GAAG,IAAA,yBAAY,EAAC,aAAa,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;IACjF,CAAC;IAED,IAAI,SAAS,GAAG,aAAa,CAAC;IAC9B,IAAI,cAAc,CAAC,cAAc,EAAE,EAAE,CAAC;QACpC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,cAAc,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAClD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,yCAAyC,aAAa,EAAE,CAAC,EAAE;YAC3F,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC;QACvC,IAAI,EAAE,cAAc,CAAC,IAAI,GAAG,KAAK;QACjC,OAAO,EAAE,cAAc,CAAC,OAAO;QAC/B,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,aAAqB;IAErB,MAAM,YAAY,GAAG,IAAA,yBAAY,EAAC,YAAY,CAAC,CAAC;IAChD,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;QAC5B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,YAAY,oBAAoB,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,qBAAqB,EAAE,EAAE,CAAC;IAC5G,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;QACjD,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EACF,4BAA4B,YAAY,wBAAwB,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3F,CACF,CAAC;QACF,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3B,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC7F,mBAAmB,GAAG,IAAI,CAAC;YAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,sCAAsC,YAAY,EAAE,CAAC,EAAE;gBACvF,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAA,yBAAY,EAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC7F,mBAAmB,GAAG,IAAI,CAAC;YAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,sCAAsC,YAAY,EAAE,CAAC,EAAE;gBACvF,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;YACjD,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC7F,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAClD,IAAI,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAChC,IAAI,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;QACjC,IAAI,OAAO,EAAE,CAAC;YACZ,kBAAkB,GAAG,SAAS,CAAC,SAAS,CAAC;YACzC,kBAAkB,GAAG,GAAG,SAAS,CAAC,SAAS,wBAAwB,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC1H,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YACrD,WAAW,GAAG,YAAY,CAAC,IAAI,GAAG,KAAK,CAAC;YACxC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;YAC9C,IAAI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7B,qBAAqB,CAAC,kBAAkB,EAAE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBAC9E,kBAAkB,GAAG,IAAI,CAAC;gBAC1B,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACzB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,IAAI,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;gBACjD,qBAAqB,CAAC,kBAAkB,EAAE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBAC9E,kBAAkB,GAAG,IAAI,CAAC;gBAC1B,aAAa,CACX,SAAS,EACT,YAAY,EACZ,qDAAqD,YAAY,EAAE,CACpE,CAAC;gBACF,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;QAED,IAAI,kBAAkB,EAAE,CAAC;YACvB,sBAAsB,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAC5D,CAAC;QACD,+BAA+B,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAEzD,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,MAAM,MAAM,CAAC,MAAM,CACjB,IAAI,SAAS,CAAC,4CAA4C,aAAa,EAAE,CAAC,EAC1E;gBACE,IAAI,EAAE,QAAQ;aACf,CACF,CAAC;QACJ,CAAC;QACD,IAAI,kBAAkB,EAAE,CAAC;YACvB,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;YAClC,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,IAAA,yBAAY,EAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,sCAAsC,YAAY,EAAE,CAAC,CAAC;YAC7F,mBAAmB,GAAG,IAAI,CAAC;YAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,sCAAsC,YAAY,EAAE,CAAC,EAAE;gBACvF,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QACD,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACzB,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EAAC,oBAAoB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,iBAAiB,aAAa,EAAE,CAAC,CACtF,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;YAC7C,qBAAqB,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;YAC7E,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,IAAI,CAAC,IAAA,yBAAY,EAAC,YAAY,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACzC,CAAC;YAAC,MAAM,CAAC;gBACP,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,8BAA8B,YAAY,EAAE,CAAC,CAAC;YACvF,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,8BAA8B,YAAY,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AA9HD,4DA8HC"}
@@ -11,6 +11,15 @@
11
11
  /// <reference types="node" />
12
12
  import * as fs from 'fs';
13
13
  import type { SharedItem } from './types';
14
+ /**
15
+ * Claude Code saves managed files (settings.json, plugins/installed_plugins.json)
16
+ * with an atomic write (temp file + rename), which replaces a managed symlink
17
+ * with a regular file holding the user's latest changes — see #57 and #1681.
18
+ * When reconciliation finds such a diverged regular file, adopt its content
19
+ * into the canonical ~/.claude file before re-creating the symlink, instead
20
+ * of discarding the user's changes. The previous canonical content is kept
21
+ * in a `.bak-ccs-adopt` backup alongside it.
22
+ */
14
23
  /**
15
24
  * Return canonical realpath for a path. Falls back to the lexical resolve
16
25
  * when realpath fails (e.g. path does not exist).
@@ -1 +1 @@
1
- {"version":3,"file":"fs-helpers.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/fs-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM/D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWtF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAQjF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAyBzF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAsBrE;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5E;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,CAS3E;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,IAAI,CAShE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAetF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAYjB"}
1
+ {"version":3,"file":"fs-helpers.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/fs-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAGzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;;;;;;;GAQG;AACH;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM/D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWtF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAQjF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAyBzF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAsBrE;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY5E;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvE;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,CAAC,CAS3E;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,EAAE,CAAC,KAAK,GAAG,IAAI,CAShE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAetF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAYjB"}
@@ -36,6 +36,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.getConflictCopyPath = exports.fileContentsEqual = exports.getLstatSync = exports.getLstat = exports.ensureDirectory = exports.pathExists = exports.moveDirectory = exports.copyDirectoryFallback = exports.removeExistingPath = exports.symlinkPointsTo = exports.isPathWithinDirectory = exports.resolveCanonicalPath = void 0;
37
37
  const fs = __importStar(require("fs"));
38
38
  const path = __importStar(require("path"));
39
+ /**
40
+ * Claude Code saves managed files (settings.json, plugins/installed_plugins.json)
41
+ * with an atomic write (temp file + rename), which replaces a managed symlink
42
+ * with a regular file holding the user's latest changes — see #57 and #1681.
43
+ * When reconciliation finds such a diverged regular file, adopt its content
44
+ * into the canonical ~/.claude file before re-creating the symlink, instead
45
+ * of discarding the user's changes. The previous canonical content is kept
46
+ * in a `.bak-ccs-adopt` backup alongside it.
47
+ */
39
48
  /**
40
49
  * Return canonical realpath for a path. Falls back to the lexical resolve
41
50
  * when realpath fails (e.g. path does not exist).
@@ -1 +1 @@
1
- {"version":3,"file":"fs-helpers.js","sourceRoot":"","sources":["../../../src/management/shared-manager/fs-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-helpers.js","sourceRoot":"","sources":["../../../src/management/shared-manager/fs-helpers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-layout-internals.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAOxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAsBxE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CA6CxF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE,CAgCxE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAgD9F"}
1
+ {"version":3,"file":"plugin-layout-internals.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAOxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAyBxE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAmExF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE,CAyCxE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAgD9F"}
@@ -38,6 +38,7 @@ exports.detachManagedPluginLayout = exports.getSharedPluginLinkItems = exports.l
38
38
  const fs = __importStar(require("fs"));
39
39
  const path = __importStar(require("path"));
40
40
  const ui_1 = require("../../utils/ui");
41
+ const diverged_file_adopter_1 = require("./diverged-file-adopter");
41
42
  const fs_helpers_1 = require("./fs-helpers");
42
43
  const plugin_metadata_normalizer_1 = require("./plugin-metadata-normalizer");
43
44
  const types_1 = require("./types");
@@ -51,6 +52,9 @@ function ensureSharedPluginLayoutDefaults(claudeDir) {
51
52
  fs.mkdirSync(pluginsDir, { recursive: true, mode: 0o700 });
52
53
  for (const entry of types_1.SHARED_PLUGIN_ENTRIES) {
53
54
  const entryPath = path.join(pluginsDir, entry.name);
55
+ if (entry.type === 'file') {
56
+ (0, diverged_file_adopter_1.recoverOrphanedCanonicalClaim)(entryPath);
57
+ }
54
58
  if (fs.existsSync(entryPath)) {
55
59
  continue;
56
60
  }
@@ -91,18 +95,37 @@ function linkInstancePlugins(roots, instancePath) {
91
95
  for (const item of getSharedPluginLinkItems(roots.sharedDir)) {
92
96
  const targetEntryPath = path.join(targetPath, item.name);
93
97
  const linkEntryPath = path.join(linkPath, item.name);
94
- (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type);
98
+ let adoption = 'not-claimed';
99
+ if (item.type === 'file') {
100
+ adoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkEntryPath, path.join(roots.claudeDir, 'plugins', item.name));
101
+ if (adoption === 'not-claimed') {
102
+ (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type);
103
+ }
104
+ }
105
+ else {
106
+ (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type);
107
+ }
108
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkEntryPath, adoption);
109
+ if ((0, fs_helpers_1.getLstatSync)(linkEntryPath)) {
110
+ console.log((0, ui_1.warn)(`Skipping plugins/${item.name}: path reappeared during reconciliation`));
111
+ continue;
112
+ }
95
113
  try {
96
114
  const symlinkType = item.type === 'directory' ? 'dir' : 'file';
97
115
  fs.symlinkSync(targetEntryPath, linkEntryPath, symlinkType);
98
116
  }
99
117
  catch (_err) {
118
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkEntryPath, adoption);
119
+ if ((0, fs_helpers_1.getLstatSync)(linkEntryPath)) {
120
+ console.log((0, ui_1.warn)(`Skipping plugins/${item.name}: path reappeared during reconciliation`));
121
+ continue;
122
+ }
100
123
  if (process.platform === 'win32') {
101
124
  if (item.type === 'directory') {
102
125
  (0, fs_helpers_1.copyDirectoryFallback)(targetEntryPath, linkEntryPath);
103
126
  }
104
127
  else {
105
- fs.copyFileSync(targetEntryPath, linkEntryPath);
128
+ fs.copyFileSync(targetEntryPath, linkEntryPath, fs.constants.COPYFILE_EXCL);
106
129
  }
107
130
  console.log((0, ui_1.warn)(`Symlink failed for plugins/${item.name}, copied instead (enable Developer Mode)`));
108
131
  }
@@ -122,7 +145,14 @@ function getSharedPluginLinkItems(sharedDir) {
122
145
  const sharedPluginsPath = path.join(sharedDir, 'plugins');
123
146
  const items = new Map(types_1.SHARED_PLUGIN_ENTRIES.map((entry) => [entry.name, { ...entry }]));
124
147
  for (const entry of fs.readdirSync(sharedPluginsPath, { withFileTypes: true })) {
125
- if (items.has(entry.name) || types_1.INSTANCE_LOCAL_PLUGIN_METADATA_FILES.has(entry.name)) {
148
+ if (items.has(entry.name) ||
149
+ types_1.INSTANCE_LOCAL_PLUGIN_METADATA_FILES.has(entry.name) ||
150
+ entry.name.includes('.bak-ccs-adopt') ||
151
+ entry.name.includes('.ccs-adopt-') ||
152
+ entry.name.includes('.ccs-adopted-recovery') ||
153
+ entry.name.includes('.ccs-canonical-claim-') ||
154
+ entry.name.includes('.ccs-canonical-recovery') ||
155
+ entry.name.includes('.ccs-write-')) {
126
156
  continue;
127
157
  }
128
158
  const entryPath = path.join(sharedPluginsPath, entry.name);
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-layout-internals.js","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-layout-internals.js","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAE7B,uCAAsC;AACtC,mEAIiC;AACjC,6CAKsB;AAEtB,6EAAiF;AACjF,mCAIiB;AAQjB;;;;GAIG;AACH,SAAgB,gCAAgC,CAAC,SAAiB;IAChE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACnD,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3D,KAAK,MAAM,KAAK,IAAI,6BAAqB,EAAE,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,IAAA,qDAA6B,EAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,SAAS;QACX,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,yCAAiC,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;IACjF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC5C,EAAE,CAAC,aAAa,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAzBD,4EAyBC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,KAAwB,EAAE,YAAoB;IAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACzD,IAAI,SAAS,GAAoB,IAAI,CAAC;IAEtC,IAAI,CAAC;QACH,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,IAAI,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC3E,IAAA,+BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QAC3C,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,QAAQ,GAAgD,aAAa,CAAC;QAE1E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,QAAQ,GAAG,IAAA,gDAAwB,EACjC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CACjD,CAAC;YACF,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC/B,IAAA,+BAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAA,+BAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,IAAA,gDAAwB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,IAAA,yBAAY,EAAC,aAAa,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,oBAAoB,IAAI,CAAC,IAAI,yCAAyC,CAAC,CAAC,CAAC;YAC1F,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/D,EAAE,CAAC,WAAW,CAAC,eAAe,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,IAAA,gDAAwB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,IAAA,yBAAY,EAAC,aAAa,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,oBAAoB,IAAI,CAAC,IAAI,yCAAyC,CAAC,CAAC,CAAC;gBAC1F,SAAS;YACX,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC9B,IAAA,kCAAqB,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;gBACxD,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;gBAC9E,CAAC;gBACD,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EAAC,8BAA8B,IAAI,CAAC,IAAI,0CAA0C,CAAC,CACxF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC;YACb,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAnED,kDAmEC;AAED;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,SAAiB;IACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,6BAAqB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CACjE,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/E,IACE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YACrB,4CAAoC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAClC,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC;YACH,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;YACjD,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EACF,oBAAoB,KAAK,CAAC,IAAI,0CAA0C,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnG,CACF,CAAC;YACF,SAAS;QACX,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;SACjD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AAC7B,CAAC;AAzCD,4DAyCC;AAED;;;;;GAKG;AACH,SAAgB,yBAAyB,CAAC,KAAwB,EAAE,YAAoB;IACtF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEhE,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;QAC3B,IAAI,IAAA,4BAAe,EAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAC;YACpD,IAAA,+BAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,CAAC;YACjC,SAAS;QACX,CAAC;QAED,IAAI,IAAA,4BAAe,EAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9E,IAAA,+BAAkB,EAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,qBAAqB,GAAG,IAAI,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IAED,IAAA,8DAAiC,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAEvD,IAAI,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AAhDD,8DAgDC"}
@@ -1 +1 @@
1
- {"version":3,"file":"shared-dir-linker.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAcH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAYxE;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAsChF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAuEhE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAwCpF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAyBtF"}
1
+ {"version":3,"file":"shared-dir-linker.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAmBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAYxE;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAsChF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CA6FhE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CA2DpF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAyBtF"}
@@ -42,6 +42,7 @@ exports.detachSharedDirectories = exports.linkSharedDirectories = exports.ensure
42
42
  const fs = __importStar(require("fs"));
43
43
  const path = __importStar(require("path"));
44
44
  const ui_1 = require("../../utils/ui");
45
+ const diverged_file_adopter_1 = require("./diverged-file-adopter");
45
46
  const fs_helpers_1 = require("./fs-helpers");
46
47
  const plugin_metadata_normalizer_1 = require("./plugin-metadata-normalizer");
47
48
  const plugin_layout_internals_1 = require("./plugin-layout-internals");
@@ -104,6 +105,9 @@ function ensureSharedDirectories(roots) {
104
105
  for (const item of types_1.SHARED_ITEMS) {
105
106
  const claudePath = path.join(claudeDir, item.name);
106
107
  const sharedPath = path.join(sharedDir, item.name);
108
+ if (item.type === 'file') {
109
+ (0, diverged_file_adopter_1.recoverOrphanedCanonicalClaim)(claudePath);
110
+ }
107
111
  if (!(0, fs_helpers_1.getLstatSync)(claudePath)) {
108
112
  if (item.type === 'directory') {
109
113
  fs.mkdirSync(claudePath, { recursive: true, mode: 0o700 });
@@ -116,7 +120,9 @@ function ensureSharedDirectories(roots) {
116
120
  console.log((0, ui_1.warn)(`Skipping ${item.name}: circular symlink detected`));
117
121
  continue;
118
122
  }
123
+ let sharedAdoption = 'not-claimed';
119
124
  if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
125
+ let removeExisting = true;
120
126
  try {
121
127
  const stats = fs.lstatSync(sharedPath);
122
128
  if (stats.isSymbolicLink()) {
@@ -130,24 +136,38 @@ function ensureSharedDirectories(roots) {
130
136
  catch (_err) {
131
137
  // Continue to recreate
132
138
  }
133
- if (item.type === 'directory') {
139
+ if (item.type === 'file') {
140
+ sharedAdoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(sharedPath, claudePath);
141
+ removeExisting = sharedAdoption === 'not-claimed';
142
+ }
143
+ if (item.type === 'directory' && removeExisting) {
134
144
  fs.rmSync(sharedPath, { recursive: true, force: true });
135
145
  }
136
- else {
146
+ else if (removeExisting) {
137
147
  fs.unlinkSync(sharedPath);
138
148
  }
149
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
150
+ }
151
+ if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
152
+ console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
153
+ continue;
139
154
  }
140
155
  try {
141
156
  const symlinkType = item.type === 'directory' ? 'dir' : 'file';
142
157
  fs.symlinkSync(claudePath, sharedPath, symlinkType);
143
158
  }
144
159
  catch (_err) {
160
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
161
+ if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
162
+ console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
163
+ continue;
164
+ }
145
165
  if (process.platform === 'win32') {
146
166
  if (item.type === 'directory') {
147
167
  (0, fs_helpers_1.copyDirectoryFallback)(claudePath, sharedPath);
148
168
  }
149
169
  else if (item.type === 'file') {
150
- fs.copyFileSync(claudePath, sharedPath);
170
+ fs.copyFileSync(claudePath, sharedPath, fs.constants.COPYFILE_EXCL);
151
171
  }
152
172
  console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
153
173
  }
@@ -171,18 +191,37 @@ function linkSharedDirectories(roots, instancePath) {
171
191
  }
172
192
  const linkPath = path.join(instancePath, item.name);
173
193
  const targetPath = path.join(sharedDir, item.name);
174
- (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
194
+ let adoption = 'not-claimed';
195
+ if (item.type === 'file') {
196
+ adoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkPath, path.join(roots.claudeDir, item.name));
197
+ if (adoption === 'not-claimed') {
198
+ (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
199
+ }
200
+ }
201
+ else {
202
+ (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
203
+ }
204
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkPath, adoption);
205
+ if ((0, fs_helpers_1.getLstatSync)(linkPath)) {
206
+ console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
207
+ continue;
208
+ }
175
209
  try {
176
210
  const symlinkType = item.type === 'directory' ? 'dir' : 'file';
177
211
  fs.symlinkSync(targetPath, linkPath, symlinkType);
178
212
  }
179
213
  catch (_err) {
214
+ (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkPath, adoption);
215
+ if ((0, fs_helpers_1.getLstatSync)(linkPath)) {
216
+ console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
217
+ continue;
218
+ }
180
219
  if (process.platform === 'win32') {
181
220
  if (item.type === 'directory') {
182
221
  (0, fs_helpers_1.copyDirectoryFallback)(targetPath, linkPath);
183
222
  }
184
223
  else if (item.type === 'file') {
185
- fs.copyFileSync(targetPath, linkPath);
224
+ fs.copyFileSync(targetPath, linkPath, fs.constants.COPYFILE_EXCL);
186
225
  }
187
226
  console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
188
227
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shared-dir-linker.js","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-dir-linker.js","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kaitranntt/ccs",
3
- "version": "8.8.1-dev.14",
3
+ "version": "8.8.1-dev.16",
4
4
  "description": "Claude Codex Switch - Instant profile switching between Claude, GLM, Kimi, and more",
5
5
  "keywords": [
6
6
  "cli",