@i14ks/ccv 0.40.0 → 0.42.0
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/bundle/ccv.mjs +722 -145
- package/package.json +1 -1
- package/web/assets/{codemirror-BFhD_Qok.js → codemirror-D_aocakD.js} +1 -1
- package/web/assets/{index-Bng1dR8P.js → index-Ah1jCJ1U.js} +1 -1
- package/web/assets/{index-DkREaKVS.js → index-B0wzgXzo.js} +1 -1
- package/web/assets/{index-C0UJgxDk.js → index-BUB7eB21.js} +1 -1
- package/web/assets/{index-Jk59gidx.js → index-Bqw5VmKB.js} +1 -1
- package/web/assets/index-C43uypKd.css +1 -0
- package/web/assets/{index-DGvQxxdB.js → index-CGl8tRHI.js} +1 -1
- package/web/assets/{index-D6n8Nr5h.js → index-CTJjaC2C.js} +1 -1
- package/web/assets/{index-MdNspwJW.js → index-CU5O6qy8.js} +1 -1
- package/web/assets/{index-BqphMi4s.js → index-D3QPzaZ2.js} +1 -1
- package/web/assets/{index-DwvMx-lF.js → index-DP6n5Sf2.js} +1 -1
- package/web/assets/{index-BKQ3S7R4.js → index-DRswmveP.js} +1 -1
- package/web/assets/{index-BeqGzcF4.js → index-DSyXOala.js} +1 -1
- package/web/assets/{index-Cp-Vx5md.js → index-Daw0RVbK.js} +1 -1
- package/web/assets/{index-H0NO4iIy.js → index-Djyf6cqy.js} +1 -1
- package/web/assets/{index-Sbrdg0Zd.js → index-HJo8MrpC.js} +1 -1
- package/web/assets/{index-CTd3OD36.js → index-Jj_AHiE6.js} +1 -1
- package/web/assets/{index-BfM9EE1E.js → index-UG3FALpE.js} +1 -1
- package/web/assets/{index-CO8tJjX2.js → index-aSVj6-S6.js} +1 -1
- package/web/assets/{index-C--xwv_c.js → index-k5pUSa38.js} +1 -1
- package/web/assets/{index-DswRCrFR.js → index-kZWq9En4.js} +1 -1
- package/web/assets/index-tzF8oiHD.js +135 -0
- package/web/index.html +2 -2
- package/web/assets/index-D48z24MD.js +0 -134
- package/web/assets/index-DmlVq6mR.css +0 -1
package/bundle/ccv.mjs
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
// dist/ccv.js
|
|
4
4
|
import { spawn as spawn3 } from "node:child_process";
|
|
5
|
-
import { readFile as
|
|
6
|
-
import
|
|
5
|
+
import { readFile as readFile19 } from "node:fs/promises";
|
|
6
|
+
import path27 from "node:path";
|
|
7
7
|
import { fileURLToPath } from "node:url";
|
|
8
8
|
import { parseArgs } from "node:util";
|
|
9
9
|
|
|
@@ -146,9 +146,9 @@ function envDefaults() {
|
|
|
146
146
|
|
|
147
147
|
// ../host/dist/server.js
|
|
148
148
|
import { createServer } from "node:http";
|
|
149
|
-
import { createReadStream, existsSync as
|
|
150
|
-
import
|
|
151
|
-
import { homedir as
|
|
149
|
+
import { createReadStream, existsSync as existsSync6, statSync as statSync3 } from "node:fs";
|
|
150
|
+
import path26 from "node:path";
|
|
151
|
+
import { homedir as homedir8 } from "node:os";
|
|
152
152
|
import { randomUUID as randomUUID6 } from "node:crypto";
|
|
153
153
|
import { WebSocketServer } from "ws";
|
|
154
154
|
import { renameSession as renameSession2 } from "@anthropic-ai/claude-agent-sdk";
|
|
@@ -198,6 +198,56 @@ function hashText(text) {
|
|
|
198
198
|
return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(36);
|
|
199
199
|
}
|
|
200
200
|
|
|
201
|
+
// ../host/dist/usage-probe.js
|
|
202
|
+
import { query } from "@anthropic-ai/claude-agent-sdk";
|
|
203
|
+
|
|
204
|
+
// ../host/dist/async-queue.js
|
|
205
|
+
var AsyncQueue = class {
|
|
206
|
+
#items = [];
|
|
207
|
+
#resolvers = [];
|
|
208
|
+
#closed = false;
|
|
209
|
+
push(item) {
|
|
210
|
+
if (this.#closed)
|
|
211
|
+
return;
|
|
212
|
+
const resolve = this.#resolvers.shift();
|
|
213
|
+
if (resolve) {
|
|
214
|
+
resolve({ value: item, done: false });
|
|
215
|
+
} else {
|
|
216
|
+
this.#items.push(item);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
close() {
|
|
220
|
+
if (this.#closed)
|
|
221
|
+
return;
|
|
222
|
+
this.#closed = true;
|
|
223
|
+
for (const resolve of this.#resolvers) {
|
|
224
|
+
resolve({ value: void 0, done: true });
|
|
225
|
+
}
|
|
226
|
+
this.#resolvers = [];
|
|
227
|
+
}
|
|
228
|
+
get closed() {
|
|
229
|
+
return this.#closed;
|
|
230
|
+
}
|
|
231
|
+
[Symbol.asyncIterator]() {
|
|
232
|
+
return {
|
|
233
|
+
next: () => {
|
|
234
|
+
const item = this.#items.shift();
|
|
235
|
+
if (item !== void 0) {
|
|
236
|
+
return Promise.resolve({ value: item, done: false });
|
|
237
|
+
}
|
|
238
|
+
if (this.#closed) {
|
|
239
|
+
return Promise.resolve({ value: void 0, done: true });
|
|
240
|
+
}
|
|
241
|
+
return new Promise((resolve) => this.#resolvers.push(resolve));
|
|
242
|
+
},
|
|
243
|
+
return: () => {
|
|
244
|
+
this.close();
|
|
245
|
+
return Promise.resolve({ value: void 0, done: true });
|
|
246
|
+
}
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
};
|
|
250
|
+
|
|
201
251
|
// ../host/dist/accounts.js
|
|
202
252
|
import { randomUUID } from "node:crypto";
|
|
203
253
|
import { lstat, mkdir, readFile as readFile2, readdir, rename, stat, symlink, writeFile } from "node:fs/promises";
|
|
@@ -405,7 +455,7 @@ async function exists(file) {
|
|
|
405
455
|
return lstat(file).then(() => true, () => false);
|
|
406
456
|
}
|
|
407
457
|
async function isRealEntry(file) {
|
|
408
|
-
return lstat(file).then((
|
|
458
|
+
return lstat(file).then((stat4) => !stat4.isSymbolicLink(), () => false);
|
|
409
459
|
}
|
|
410
460
|
async function candidateConfigDirs() {
|
|
411
461
|
const home = homedir2();
|
|
@@ -430,15 +480,70 @@ async function isDirectory(file) {
|
|
|
430
480
|
return stat(file).then((s) => s.isDirectory(), () => false);
|
|
431
481
|
}
|
|
432
482
|
|
|
483
|
+
// ../host/dist/usage-probe.js
|
|
484
|
+
var PROBE_TIMEOUT_MS = 2e4;
|
|
485
|
+
async function probeUsage(configDir) {
|
|
486
|
+
const inbox = new AsyncQueue();
|
|
487
|
+
const options2 = { settingSources: [], persistSession: false };
|
|
488
|
+
const executable = claudeExecutable();
|
|
489
|
+
if (executable.path) {
|
|
490
|
+
options2.pathToClaudeCodeExecutable = executable.path;
|
|
491
|
+
if (executable.executable)
|
|
492
|
+
options2.executable = executable.executable;
|
|
493
|
+
}
|
|
494
|
+
if (configDir)
|
|
495
|
+
options2.env = accountEnv(configDir);
|
|
496
|
+
const q = query({ prompt: inbox, options: options2 });
|
|
497
|
+
let timer;
|
|
498
|
+
try {
|
|
499
|
+
const raw = await Promise.race([
|
|
500
|
+
q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET(),
|
|
501
|
+
new Promise((_, reject) => {
|
|
502
|
+
timer = setTimeout(() => reject(new Error("usage probe timeout")), PROBE_TIMEOUT_MS);
|
|
503
|
+
})
|
|
504
|
+
]);
|
|
505
|
+
return toUsageState(raw);
|
|
506
|
+
} catch {
|
|
507
|
+
return null;
|
|
508
|
+
} finally {
|
|
509
|
+
if (timer)
|
|
510
|
+
clearTimeout(timer);
|
|
511
|
+
inbox.close();
|
|
512
|
+
try {
|
|
513
|
+
q.close();
|
|
514
|
+
} catch {
|
|
515
|
+
}
|
|
516
|
+
}
|
|
517
|
+
}
|
|
518
|
+
function toUsageState(raw) {
|
|
519
|
+
const limits = raw.rate_limits ?? {};
|
|
520
|
+
return {
|
|
521
|
+
available: raw.rate_limits_available === true,
|
|
522
|
+
plan: raw.subscription_type ?? "",
|
|
523
|
+
fiveHour: toWindow(limits.five_hour),
|
|
524
|
+
sevenDay: toWindow(limits.seven_day),
|
|
525
|
+
sevenDayOpus: toWindow(limits.seven_day_opus),
|
|
526
|
+
fetchedAt: Date.now()
|
|
527
|
+
};
|
|
528
|
+
}
|
|
529
|
+
function toWindow(raw) {
|
|
530
|
+
if (!raw || typeof raw.utilization !== "number")
|
|
531
|
+
return null;
|
|
532
|
+
return {
|
|
533
|
+
utilization: Math.min(100, Math.max(0, raw.utilization)),
|
|
534
|
+
resetsAt: typeof raw.resets_at === "string" ? raw.resets_at : ""
|
|
535
|
+
};
|
|
536
|
+
}
|
|
537
|
+
|
|
433
538
|
// ../host/dist/workspace-ids.js
|
|
434
539
|
function workspaceIdRemap(paths, sessionsOf) {
|
|
435
540
|
const byLegacy = /* @__PURE__ */ new Map();
|
|
436
|
-
for (const
|
|
437
|
-
const id = workspaceIdFromPath(
|
|
438
|
-
for (const legacy of formerWorkspaceIdsFromPath(
|
|
541
|
+
for (const path28 of paths) {
|
|
542
|
+
const id = workspaceIdFromPath(path28);
|
|
543
|
+
for (const legacy of formerWorkspaceIdsFromPath(path28)) {
|
|
439
544
|
const group = byLegacy.get(legacy) ?? [];
|
|
440
545
|
if (!group.some((target) => target.id === id))
|
|
441
|
-
group.push({ id, path:
|
|
546
|
+
group.push({ id, path: path28 });
|
|
442
547
|
byLegacy.set(legacy, group);
|
|
443
548
|
}
|
|
444
549
|
}
|
|
@@ -472,54 +577,7 @@ function workspaceIdRemap(paths, sessionsOf) {
|
|
|
472
577
|
import { EventEmitter as EventEmitter2 } from "node:events";
|
|
473
578
|
import { randomUUID as randomUUID2 } from "node:crypto";
|
|
474
579
|
import path6 from "node:path";
|
|
475
|
-
import { query, renameSession } from "@anthropic-ai/claude-agent-sdk";
|
|
476
|
-
|
|
477
|
-
// ../host/dist/async-queue.js
|
|
478
|
-
var AsyncQueue = class {
|
|
479
|
-
#items = [];
|
|
480
|
-
#resolvers = [];
|
|
481
|
-
#closed = false;
|
|
482
|
-
push(item) {
|
|
483
|
-
if (this.#closed)
|
|
484
|
-
return;
|
|
485
|
-
const resolve = this.#resolvers.shift();
|
|
486
|
-
if (resolve) {
|
|
487
|
-
resolve({ value: item, done: false });
|
|
488
|
-
} else {
|
|
489
|
-
this.#items.push(item);
|
|
490
|
-
}
|
|
491
|
-
}
|
|
492
|
-
close() {
|
|
493
|
-
if (this.#closed)
|
|
494
|
-
return;
|
|
495
|
-
this.#closed = true;
|
|
496
|
-
for (const resolve of this.#resolvers) {
|
|
497
|
-
resolve({ value: void 0, done: true });
|
|
498
|
-
}
|
|
499
|
-
this.#resolvers = [];
|
|
500
|
-
}
|
|
501
|
-
get closed() {
|
|
502
|
-
return this.#closed;
|
|
503
|
-
}
|
|
504
|
-
[Symbol.asyncIterator]() {
|
|
505
|
-
return {
|
|
506
|
-
next: () => {
|
|
507
|
-
const item = this.#items.shift();
|
|
508
|
-
if (item !== void 0) {
|
|
509
|
-
return Promise.resolve({ value: item, done: false });
|
|
510
|
-
}
|
|
511
|
-
if (this.#closed) {
|
|
512
|
-
return Promise.resolve({ value: void 0, done: true });
|
|
513
|
-
}
|
|
514
|
-
return new Promise((resolve) => this.#resolvers.push(resolve));
|
|
515
|
-
},
|
|
516
|
-
return: () => {
|
|
517
|
-
this.close();
|
|
518
|
-
return Promise.resolve({ value: void 0, done: true });
|
|
519
|
-
}
|
|
520
|
-
};
|
|
521
|
-
}
|
|
522
|
-
};
|
|
580
|
+
import { query as query2, renameSession } from "@anthropic-ai/claude-agent-sdk";
|
|
523
581
|
|
|
524
582
|
// ../host/dist/files.js
|
|
525
583
|
import { cp, lstat as lstat2, mkdir as mkdir2, readFile as readFile3, readdir as readdir2, realpath, rename as renamePath, rm, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
|
|
@@ -593,8 +651,8 @@ var ProjectFiles = class {
|
|
|
593
651
|
* он один раз проверяет корень, а дальше обход и так не выходит за
|
|
594
652
|
* найденные внутри него каталоги.
|
|
595
653
|
*/
|
|
596
|
-
async search(
|
|
597
|
-
const needle =
|
|
654
|
+
async search(query3) {
|
|
655
|
+
const needle = query3.trim().toLowerCase();
|
|
598
656
|
if (!needle)
|
|
599
657
|
return { entries: [], truncated: false };
|
|
600
658
|
const root = await this.#resolve("");
|
|
@@ -648,8 +706,8 @@ var ProjectFiles = class {
|
|
|
648
706
|
* открыть в редакторе. Симлинки не разворачиваются вовсе: их цель — уже файл
|
|
649
707
|
* где-то в дереве, и он будет прочитан по своему собственному пути.
|
|
650
708
|
*/
|
|
651
|
-
async grep(
|
|
652
|
-
const needle =
|
|
709
|
+
async grep(query3) {
|
|
710
|
+
const needle = query3.trim().toLowerCase();
|
|
653
711
|
if (!needle)
|
|
654
712
|
return { matches: [], truncated: false };
|
|
655
713
|
const root = await this.#resolve("");
|
|
@@ -1975,7 +2033,7 @@ var ClaudeSession = class extends EventEmitter2 {
|
|
|
1975
2033
|
options2.strictMcpConfig = true;
|
|
1976
2034
|
}
|
|
1977
2035
|
this.#resetTasks();
|
|
1978
|
-
const q =
|
|
2036
|
+
const q = query2({ prompt: this.#inbox, options: options2 });
|
|
1979
2037
|
this.#query = q;
|
|
1980
2038
|
void this.#consume(q);
|
|
1981
2039
|
if (restarted)
|
|
@@ -2559,7 +2617,7 @@ var ClaudeSession = class extends EventEmitter2 {
|
|
|
2559
2617
|
this.#usageInFlight = true;
|
|
2560
2618
|
try {
|
|
2561
2619
|
const raw = await q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET();
|
|
2562
|
-
this.#usage =
|
|
2620
|
+
this.#usage = toUsageState2(raw);
|
|
2563
2621
|
this.emit("usage", this.#usage);
|
|
2564
2622
|
} catch {
|
|
2565
2623
|
} finally {
|
|
@@ -3353,7 +3411,7 @@ function toSlashCommand(command) {
|
|
|
3353
3411
|
aliases: command.aliases ?? []
|
|
3354
3412
|
};
|
|
3355
3413
|
}
|
|
3356
|
-
function
|
|
3414
|
+
function toUsageState2(raw) {
|
|
3357
3415
|
const limits = raw.rate_limits ?? {};
|
|
3358
3416
|
return {
|
|
3359
3417
|
available: raw.rate_limits_available === true,
|
|
@@ -5178,9 +5236,9 @@ function parsePatch(raw) {
|
|
|
5178
5236
|
body = "";
|
|
5179
5237
|
}
|
|
5180
5238
|
total += body.length;
|
|
5181
|
-
const
|
|
5239
|
+
const path28 = status === "deleted" ? oldPath : newPath || oldPath;
|
|
5182
5240
|
files.push({
|
|
5183
|
-
path:
|
|
5241
|
+
path: path28,
|
|
5184
5242
|
oldPath: status === "renamed" ? oldPath : "",
|
|
5185
5243
|
status,
|
|
5186
5244
|
added: count(body, "+"),
|
|
@@ -5192,10 +5250,10 @@ function parsePatch(raw) {
|
|
|
5192
5250
|
return { files, truncated };
|
|
5193
5251
|
}
|
|
5194
5252
|
function stripPrefix(value) {
|
|
5195
|
-
const
|
|
5196
|
-
if (
|
|
5253
|
+
const path28 = unquote(value.trim());
|
|
5254
|
+
if (path28 === "/dev/null")
|
|
5197
5255
|
return "";
|
|
5198
|
-
return
|
|
5256
|
+
return path28.replace(/^[ab]\//, "");
|
|
5199
5257
|
}
|
|
5200
5258
|
function count(body, mark) {
|
|
5201
5259
|
let n = 0;
|
|
@@ -5474,10 +5532,10 @@ var ProjectFinder = class {
|
|
|
5474
5532
|
* в следующий ответ. Ждать его здесь нельзя: это две секунды на нажатие
|
|
5475
5533
|
* клавиши.
|
|
5476
5534
|
*/
|
|
5477
|
-
find(
|
|
5535
|
+
find(query3) {
|
|
5478
5536
|
if (Date.now() - this.#loadedAt > CACHE_TTL)
|
|
5479
5537
|
void this.#refresh();
|
|
5480
|
-
const needles = tokens(
|
|
5538
|
+
const needles = tokens(query3);
|
|
5481
5539
|
if (needles.length === 0)
|
|
5482
5540
|
return { candidates: [], truncated: false };
|
|
5483
5541
|
const open = new Map(this.registry.list().map((workspace) => [workspace.path.toLowerCase(), workspace]));
|
|
@@ -5629,8 +5687,8 @@ var ProjectFinder = class {
|
|
|
5629
5687
|
function usable(dir) {
|
|
5630
5688
|
return !contains(os2.tmpdir(), dir) && existsSync2(dir);
|
|
5631
5689
|
}
|
|
5632
|
-
function tokens(
|
|
5633
|
-
return
|
|
5690
|
+
function tokens(query3) {
|
|
5691
|
+
return query3.toLowerCase().split(/[^a-z0-9а-яё]+/i).filter(Boolean);
|
|
5634
5692
|
}
|
|
5635
5693
|
function matches(value, needles) {
|
|
5636
5694
|
const flat = value.toLowerCase().replace(/[^a-z0-9а-яё]+/gi, "");
|
|
@@ -5673,11 +5731,11 @@ var FINDER_SCHEMA = {
|
|
|
5673
5731
|
additionalProperties: false
|
|
5674
5732
|
};
|
|
5675
5733
|
var AGENT_LIMIT = 5;
|
|
5676
|
-
function finderPrompt(
|
|
5734
|
+
function finderPrompt(query3, roots) {
|
|
5677
5735
|
return [
|
|
5678
5736
|
"\u041D\u0430\u0439\u0434\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u043D\u0430 \u044D\u0442\u043E\u043C \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u0435 \u043F\u043E \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u044E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F.",
|
|
5679
5737
|
"",
|
|
5680
|
-
`\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435: ${
|
|
5738
|
+
`\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435: ${query3}`,
|
|
5681
5739
|
"",
|
|
5682
5740
|
"\u0418\u0441\u043A\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0432\u043D\u0443\u0442\u0440\u0438 \u044D\u0442\u0438\u0445 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u043E\u0432:",
|
|
5683
5741
|
...roots.map((root) => `- ${root}`),
|
|
@@ -5760,6 +5818,27 @@ var WorkspaceRegistry = class {
|
|
|
5760
5818
|
await mkdir6(path13.dirname(this.#storePath), { recursive: true });
|
|
5761
5819
|
await writeFile7(this.#storePath, JSON.stringify(this.#entries, null, 2), "utf8");
|
|
5762
5820
|
}
|
|
5821
|
+
/**
|
|
5822
|
+
* Каталог `from` переехал в `to` — записи проектов внутри него следуют за
|
|
5823
|
+
* ним. Возвращает пары «прежний путь → новый» для всех затронутых проектов.
|
|
5824
|
+
*/
|
|
5825
|
+
async relocate(from, to) {
|
|
5826
|
+
const moved = [];
|
|
5827
|
+
for (const entry of this.#entries) {
|
|
5828
|
+
if (!isUnder(from, entry.path))
|
|
5829
|
+
continue;
|
|
5830
|
+
const next = path13.join(to, path13.relative(from, entry.path));
|
|
5831
|
+
moved.push({ from: entry.path, to: next });
|
|
5832
|
+
entry.path = next;
|
|
5833
|
+
}
|
|
5834
|
+
if (moved.length > 0)
|
|
5835
|
+
await this.#persist();
|
|
5836
|
+
return moved;
|
|
5837
|
+
}
|
|
5838
|
+
/** Все записи реестра, включая архивные, — пути каталогов. */
|
|
5839
|
+
allPaths() {
|
|
5840
|
+
return this.#entries.map((e) => e.path);
|
|
5841
|
+
}
|
|
5763
5842
|
/** Активные проекты. */
|
|
5764
5843
|
list() {
|
|
5765
5844
|
return this.#entries.filter((e) => !e.archivedAt).map((e) => toInfo(e));
|
|
@@ -5815,6 +5894,16 @@ var WorkspaceRegistry = class {
|
|
|
5815
5894
|
await this.#persist();
|
|
5816
5895
|
return closed;
|
|
5817
5896
|
}
|
|
5897
|
+
/** Убрать проекты из реестра совсем — каталоги на диске не трогаются. */
|
|
5898
|
+
async unmark(ids) {
|
|
5899
|
+
const doomed = new Set(ids);
|
|
5900
|
+
const removed = this.#entries.filter((e) => doomed.has(workspaceIdFromPath(e.path)));
|
|
5901
|
+
if (removed.length === 0)
|
|
5902
|
+
return [];
|
|
5903
|
+
this.#entries = this.#entries.filter((e) => !removed.includes(e));
|
|
5904
|
+
await this.#persist();
|
|
5905
|
+
return removed.map((e) => toInfo(e));
|
|
5906
|
+
}
|
|
5818
5907
|
/** Вернуть проекты из архива в активный список. */
|
|
5819
5908
|
async restore(ids) {
|
|
5820
5909
|
const wanted = new Set(ids);
|
|
@@ -5954,6 +6043,12 @@ function toInfo(entry) {
|
|
|
5954
6043
|
function isEntry(value) {
|
|
5955
6044
|
return typeof value === "object" && value !== null && typeof value.path === "string" && (value.archivedAt === void 0 || typeof value.archivedAt === "number");
|
|
5956
6045
|
}
|
|
6046
|
+
function isUnder(parent, child) {
|
|
6047
|
+
const norm = (value) => path13.resolve(value).replace(/[\\/]+$/, "").toLowerCase();
|
|
6048
|
+
const p = norm(parent);
|
|
6049
|
+
const c = norm(child);
|
|
6050
|
+
return c === p || c.startsWith(`${p}${path13.sep}`.toLowerCase()) || c.startsWith(`${p}/`);
|
|
6051
|
+
}
|
|
5957
6052
|
|
|
5958
6053
|
// ../host/dist/archive.js
|
|
5959
6054
|
import { mkdir as mkdir7, readFile as readFile9, writeFile as writeFile8 } from "node:fs/promises";
|
|
@@ -6466,6 +6561,47 @@ var Folders = class {
|
|
|
6466
6561
|
await this.#persist();
|
|
6467
6562
|
return changed;
|
|
6468
6563
|
}
|
|
6564
|
+
/**
|
|
6565
|
+
* Папки проектов — каталоги на диске (id `dir:<имя>`), здесь хранится только
|
|
6566
|
+
* их цвет. Прежние метки без каталога отбрасываются: переносить каталоги за
|
|
6567
|
+
* человека без спроса хуже, чем потерять метку.
|
|
6568
|
+
*/
|
|
6569
|
+
async dropLegacyWorkspaceFolders() {
|
|
6570
|
+
let changed = false;
|
|
6571
|
+
for (const id of [...this.#workspaceFolders.keys()]) {
|
|
6572
|
+
if (!id.startsWith("dir:")) {
|
|
6573
|
+
this.#workspaceFolders.delete(id);
|
|
6574
|
+
changed = true;
|
|
6575
|
+
}
|
|
6576
|
+
}
|
|
6577
|
+
if (this.#workspaceAssignments.size > 0) {
|
|
6578
|
+
this.#workspaceAssignments.clear();
|
|
6579
|
+
changed = true;
|
|
6580
|
+
}
|
|
6581
|
+
if (changed)
|
|
6582
|
+
await this.#persist();
|
|
6583
|
+
}
|
|
6584
|
+
diskFolderColor(id) {
|
|
6585
|
+
return this.#workspaceFolders.get(id)?.color;
|
|
6586
|
+
}
|
|
6587
|
+
/** Запомнить цвет папки-каталога; пустая запись появляется при первом цвете. */
|
|
6588
|
+
async setDiskFolderColor(id, name, color) {
|
|
6589
|
+
if (!this.#workspaceFolders.has(id))
|
|
6590
|
+
this.#workspaceFolders.set(id, { name });
|
|
6591
|
+
return this.setColor(id, color);
|
|
6592
|
+
}
|
|
6593
|
+
/** Папку переименовали на диске — цвет едет под новый id. */
|
|
6594
|
+
async renameDiskFolder(oldId, newId, name) {
|
|
6595
|
+
const record = this.#workspaceFolders.get(oldId);
|
|
6596
|
+
this.#workspaceFolders.delete(oldId);
|
|
6597
|
+
if (record)
|
|
6598
|
+
this.#workspaceFolders.set(newId, { ...record, name });
|
|
6599
|
+
await this.#persist();
|
|
6600
|
+
}
|
|
6601
|
+
async forgetDiskFolder(id) {
|
|
6602
|
+
if (this.#workspaceFolders.delete(id))
|
|
6603
|
+
await this.#persist();
|
|
6604
|
+
}
|
|
6469
6605
|
/** Все папки — для кадра `folder.list`. */
|
|
6470
6606
|
list() {
|
|
6471
6607
|
return {
|
|
@@ -6693,10 +6829,225 @@ function isPinnedFolder(value) {
|
|
|
6693
6829
|
return typeof value === "object" && value !== null && typeof value.name === "string";
|
|
6694
6830
|
}
|
|
6695
6831
|
|
|
6696
|
-
// ../host/dist/
|
|
6697
|
-
import {
|
|
6832
|
+
// ../host/dist/project-folders.js
|
|
6833
|
+
import { existsSync as existsSync5, watch } from "node:fs";
|
|
6834
|
+
import { mkdir as mkdir11, readdir as readdir5, rmdir } from "node:fs/promises";
|
|
6835
|
+
import path19 from "node:path";
|
|
6836
|
+
|
|
6837
|
+
// ../host/dist/project-move.js
|
|
6838
|
+
import { existsSync as existsSync4 } from "node:fs";
|
|
6839
|
+
import { readFile as readFile13, readdir as readdir4, rename as rename2, stat as stat3 } from "node:fs/promises";
|
|
6698
6840
|
import { homedir as homedir5 } from "node:os";
|
|
6699
6841
|
import path18 from "node:path";
|
|
6842
|
+
var ACTIVE_WINDOW_MS = 2 * 6e4;
|
|
6843
|
+
function transcriptDirName(cwd) {
|
|
6844
|
+
return cwd.replace(/[^a-zA-Z0-9]/g, "-");
|
|
6845
|
+
}
|
|
6846
|
+
function isInside(parent, child) {
|
|
6847
|
+
const norm = (value) => path18.resolve(value).replace(/[\\/]+$/, "").toLowerCase();
|
|
6848
|
+
const p = norm(parent);
|
|
6849
|
+
const c = norm(child);
|
|
6850
|
+
return c === p || c.startsWith(p + path18.sep.toLowerCase()) || c.startsWith(`${p}/`);
|
|
6851
|
+
}
|
|
6852
|
+
async function externalAgentActivity(dirs, configDirs, now = Date.now()) {
|
|
6853
|
+
for (const dir of dirs) {
|
|
6854
|
+
const name = transcriptDirName(dir);
|
|
6855
|
+
for (const config of configDirs) {
|
|
6856
|
+
const t = await newestMtime(path18.join(config, "projects", name), 1);
|
|
6857
|
+
if (t !== null && now - t < ACTIVE_WINDOW_MS)
|
|
6858
|
+
return "Claude Code";
|
|
6859
|
+
}
|
|
6860
|
+
}
|
|
6861
|
+
if (await codexActive(dirs, now))
|
|
6862
|
+
return "Codex";
|
|
6863
|
+
return null;
|
|
6864
|
+
}
|
|
6865
|
+
async function newestMtime(dir, depth) {
|
|
6866
|
+
let newest = null;
|
|
6867
|
+
let entries;
|
|
6868
|
+
try {
|
|
6869
|
+
entries = await readdir4(dir);
|
|
6870
|
+
} catch {
|
|
6871
|
+
return null;
|
|
6872
|
+
}
|
|
6873
|
+
for (const entry of entries) {
|
|
6874
|
+
const file = path18.join(dir, entry);
|
|
6875
|
+
const info = await stat3(file).catch(() => null);
|
|
6876
|
+
if (!info)
|
|
6877
|
+
continue;
|
|
6878
|
+
if (info.isDirectory()) {
|
|
6879
|
+
if (depth > 0) {
|
|
6880
|
+
const inner = await newestMtime(file, depth - 1);
|
|
6881
|
+
if (inner !== null && (newest === null || inner > newest))
|
|
6882
|
+
newest = inner;
|
|
6883
|
+
}
|
|
6884
|
+
continue;
|
|
6885
|
+
}
|
|
6886
|
+
if (newest === null || info.mtimeMs > newest)
|
|
6887
|
+
newest = info.mtimeMs;
|
|
6888
|
+
}
|
|
6889
|
+
return newest;
|
|
6890
|
+
}
|
|
6891
|
+
async function codexActive(dirs, now) {
|
|
6892
|
+
const root = path18.join(process.env.CODEX_HOME?.trim() || path18.join(homedir5(), ".codex"), "sessions");
|
|
6893
|
+
const days = /* @__PURE__ */ new Set();
|
|
6894
|
+
for (const offset of [0, 1]) {
|
|
6895
|
+
const d = new Date(now - offset * 864e5);
|
|
6896
|
+
days.add(path18.join(root, String(d.getFullYear()), String(d.getMonth() + 1).padStart(2, "0"), String(d.getDate()).padStart(2, "0")));
|
|
6897
|
+
}
|
|
6898
|
+
for (const day of days) {
|
|
6899
|
+
const files = await readdir4(day).catch(() => []);
|
|
6900
|
+
for (const name of files) {
|
|
6901
|
+
if (!name.endsWith(".jsonl"))
|
|
6902
|
+
continue;
|
|
6903
|
+
const file = path18.join(day, name);
|
|
6904
|
+
const info = await stat3(file).catch(() => null);
|
|
6905
|
+
if (!info || now - info.mtimeMs >= ACTIVE_WINDOW_MS)
|
|
6906
|
+
continue;
|
|
6907
|
+
const head = (await readFile13(file, "utf8").catch(() => "")).slice(0, 4e3);
|
|
6908
|
+
const text = head.replace(/\\\\/g, "\\").toLowerCase();
|
|
6909
|
+
if (dirs.some((dir) => text.includes(dir.toLowerCase()) || head.includes(dir.replace(/\\/g, "\\\\")))) {
|
|
6910
|
+
return true;
|
|
6911
|
+
}
|
|
6912
|
+
}
|
|
6913
|
+
}
|
|
6914
|
+
return false;
|
|
6915
|
+
}
|
|
6916
|
+
function busyMessage(error) {
|
|
6917
|
+
const code = error?.code;
|
|
6918
|
+
if (code === "EBUSY" || code === "EPERM" || code === "EACCES") {
|
|
6919
|
+
return "\u041A\u0430\u0442\u0430\u043B\u043E\u0433 \u0437\u0430\u043D\u044F\u0442: \u0432 \u043D\u0451\u043C \u0438\u043B\u0438 \u0432 \u0435\u0433\u043E \u0444\u0430\u0439\u043B\u0430\u0445 \u0447\u0442\u043E-\u0442\u043E \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 (\u0430\u0433\u0435\u043D\u0442, \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B, \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440). \u0417\u0430\u043A\u0440\u043E\u0439\u0442\u0435 \u044D\u0442\u043E \u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0438\u0442\u0435.";
|
|
6920
|
+
}
|
|
6921
|
+
return null;
|
|
6922
|
+
}
|
|
6923
|
+
async function moveDirectory(from, to, projects, configDirs) {
|
|
6924
|
+
if (existsSync4(to))
|
|
6925
|
+
throw new Error(`\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442: ${to}`);
|
|
6926
|
+
if (isInside(from, to))
|
|
6927
|
+
throw new Error("\u041D\u0435\u043B\u044C\u0437\u044F \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0432\u043D\u0443\u0442\u0440\u044C \u0441\u0430\u043C\u043E\u0433\u043E \u0441\u0435\u0431\u044F");
|
|
6928
|
+
const transcripts = [];
|
|
6929
|
+
for (const project of projects) {
|
|
6930
|
+
const next = path18.join(to, path18.relative(from, project));
|
|
6931
|
+
for (const config of configDirs) {
|
|
6932
|
+
const source = path18.join(config, "projects", transcriptDirName(project));
|
|
6933
|
+
const target = path18.join(config, "projects", transcriptDirName(next));
|
|
6934
|
+
if (!existsSync4(source))
|
|
6935
|
+
continue;
|
|
6936
|
+
if (existsSync4(target)) {
|
|
6937
|
+
throw new Error(`\u0423 \u043D\u043E\u0432\u043E\u0433\u043E \u043F\u0443\u0442\u0438 \u0443\u0436\u0435 \u0435\u0441\u0442\u044C \u0442\u0440\u0430\u043D\u0441\u043A\u0440\u0438\u043F\u0442\u044B Claude Code: ${target}`);
|
|
6938
|
+
}
|
|
6939
|
+
transcripts.push({ from: source, to: target });
|
|
6940
|
+
}
|
|
6941
|
+
}
|
|
6942
|
+
try {
|
|
6943
|
+
await rename2(from, to);
|
|
6944
|
+
} catch (error) {
|
|
6945
|
+
const busy = busyMessage(error);
|
|
6946
|
+
if (error.code === "EXDEV") {
|
|
6947
|
+
throw new Error("\u041F\u0435\u0440\u0435\u043D\u043E\u0441 \u043D\u0430 \u0434\u0440\u0443\u0433\u043E\u0439 \u0434\u0438\u0441\u043A \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u2014 \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u0435 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0432\u0440\u0443\u0447\u043D\u0443\u044E");
|
|
6948
|
+
}
|
|
6949
|
+
throw new Error(busy ?? `\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u0441\u0442\u0438\u0442\u044C \u043A\u0430\u0442\u0430\u043B\u043E\u0433: ${error.message}`);
|
|
6950
|
+
}
|
|
6951
|
+
const done = [];
|
|
6952
|
+
try {
|
|
6953
|
+
for (const move of transcripts) {
|
|
6954
|
+
await rename2(move.from, move.to);
|
|
6955
|
+
done.push(move);
|
|
6956
|
+
}
|
|
6957
|
+
} catch (error) {
|
|
6958
|
+
for (const move of done.reverse())
|
|
6959
|
+
await rename2(move.to, move.from).catch(() => void 0);
|
|
6960
|
+
await rename2(to, from).catch(() => void 0);
|
|
6961
|
+
throw new Error(`\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0435\u0440\u0435\u043D\u0435\u0441\u0442\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u0440\u0438\u043F\u0442\u044B, \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0451\u043D \u043D\u0430 \u043C\u0435\u0441\u0442\u043E: ${error.message}`);
|
|
6962
|
+
}
|
|
6963
|
+
}
|
|
6964
|
+
|
|
6965
|
+
// ../host/dist/project-folders.js
|
|
6966
|
+
var FOLDER_PREFIX = "dir:";
|
|
6967
|
+
var SKIP = /* @__PURE__ */ new Set(["node_modules", "$recycle.bin", "system volume information"]);
|
|
6968
|
+
function folderIdFor(name) {
|
|
6969
|
+
return `${FOLDER_PREFIX}${name}`;
|
|
6970
|
+
}
|
|
6971
|
+
function folderNameOf(id) {
|
|
6972
|
+
return id.startsWith(FOLDER_PREFIX) ? id.slice(FOLDER_PREFIX.length) : null;
|
|
6973
|
+
}
|
|
6974
|
+
function cleanFolderName(raw) {
|
|
6975
|
+
const name = raw.trim();
|
|
6976
|
+
if (!name)
|
|
6977
|
+
throw new Error("\u0414\u0430\u0439\u0442\u0435 \u043F\u0430\u043F\u043A\u0435 \u0438\u043C\u044F");
|
|
6978
|
+
if (/[\\/:*?"<>|]/.test(name) || name === "." || name === ".." || name.endsWith(".")) {
|
|
6979
|
+
throw new Error('\u0412 \u0438\u043C\u0435\u043D\u0438 \u043F\u0430\u043F\u043A\u0438 \u043D\u0435\u043B\u044C\u0437\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \\ / : * ? " < > | \u0438 \u0442\u043E\u0447\u043A\u0443 \u0432 \u043A\u043E\u043D\u0446\u0435');
|
|
6980
|
+
}
|
|
6981
|
+
return name;
|
|
6982
|
+
}
|
|
6983
|
+
async function listDiskFolders(root, projectPaths) {
|
|
6984
|
+
const projects = new Set(projectPaths.map((p) => path19.resolve(p).toLowerCase()));
|
|
6985
|
+
const entries = await readdir5(root, { withFileTypes: true }).catch(() => []);
|
|
6986
|
+
const names2 = [];
|
|
6987
|
+
for (const entry of entries) {
|
|
6988
|
+
if (!entry.isDirectory() || entry.name.startsWith(".") || SKIP.has(entry.name.toLowerCase()))
|
|
6989
|
+
continue;
|
|
6990
|
+
const dir = path19.join(root, entry.name);
|
|
6991
|
+
if (projects.has(path19.resolve(dir).toLowerCase()))
|
|
6992
|
+
continue;
|
|
6993
|
+
if (existsSync5(path19.join(dir, ".git")))
|
|
6994
|
+
continue;
|
|
6995
|
+
names2.push(entry.name);
|
|
6996
|
+
}
|
|
6997
|
+
return names2.sort((a, b) => a.localeCompare(b));
|
|
6998
|
+
}
|
|
6999
|
+
async function listUnopened(dir, projectPaths, limit = 200) {
|
|
7000
|
+
const projects = new Set(projectPaths.map((p) => path19.resolve(p).toLowerCase()));
|
|
7001
|
+
const entries = await readdir5(dir, { withFileTypes: true }).catch(() => []);
|
|
7002
|
+
return entries.filter((e) => e.isDirectory() && !e.name.startsWith(".") && !SKIP.has(e.name.toLowerCase())).map((e) => ({ name: e.name, path: path19.join(dir, e.name) })).filter((e) => !projects.has(path19.resolve(e.path).toLowerCase())).sort((a, b) => a.name.localeCompare(b.name)).slice(0, limit);
|
|
7003
|
+
}
|
|
7004
|
+
function folderOfProject(root, projectPath, folders) {
|
|
7005
|
+
const parent = path19.dirname(path19.resolve(projectPath));
|
|
7006
|
+
if (path19.resolve(path19.dirname(parent)).toLowerCase() !== path19.resolve(root).toLowerCase())
|
|
7007
|
+
return null;
|
|
7008
|
+
const name = path19.basename(parent);
|
|
7009
|
+
return folders.has(name) ? folderIdFor(name) : null;
|
|
7010
|
+
}
|
|
7011
|
+
async function createDiskFolder(root, rawName) {
|
|
7012
|
+
const name = cleanFolderName(rawName);
|
|
7013
|
+
const dir = path19.join(root, name);
|
|
7014
|
+
if (existsSync5(dir))
|
|
7015
|
+
throw new Error(`\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442: ${dir}`);
|
|
7016
|
+
await mkdir11(dir, { recursive: true });
|
|
7017
|
+
return name;
|
|
7018
|
+
}
|
|
7019
|
+
async function foreignContent(dir, projectPaths) {
|
|
7020
|
+
const projects = new Set(projectPaths.map((p) => path19.resolve(p).toLowerCase()));
|
|
7021
|
+
for (const entry of await readdir5(dir).catch(() => [])) {
|
|
7022
|
+
if (!projects.has(path19.resolve(path19.join(dir, entry)).toLowerCase()))
|
|
7023
|
+
return entry;
|
|
7024
|
+
}
|
|
7025
|
+
return null;
|
|
7026
|
+
}
|
|
7027
|
+
async function removeEmptyDir(dir) {
|
|
7028
|
+
await rmdir(dir);
|
|
7029
|
+
}
|
|
7030
|
+
function watchRoot(root, onChange) {
|
|
7031
|
+
let timer;
|
|
7032
|
+
try {
|
|
7033
|
+
const recursive = process.platform === "win32" || process.platform === "darwin";
|
|
7034
|
+
const watcher = watch(root, { recursive }, (_event, file) => {
|
|
7035
|
+
if (file && /(^|[\\/])(node_modules|\.git)([\\/]|$)/i.test(String(file)))
|
|
7036
|
+
return;
|
|
7037
|
+
clearTimeout(timer);
|
|
7038
|
+
timer = setTimeout(onChange, 300);
|
|
7039
|
+
});
|
|
7040
|
+
watcher.on("error", () => watcher.close());
|
|
7041
|
+
return watcher;
|
|
7042
|
+
} catch {
|
|
7043
|
+
return null;
|
|
7044
|
+
}
|
|
7045
|
+
}
|
|
7046
|
+
|
|
7047
|
+
// ../host/dist/app-settings.js
|
|
7048
|
+
import { mkdir as mkdir12, readFile as readFile14, writeFile as writeFile12 } from "node:fs/promises";
|
|
7049
|
+
import { homedir as homedir6 } from "node:os";
|
|
7050
|
+
import path20 from "node:path";
|
|
6700
7051
|
var DEFAULT_AUTO_ARCHIVE_AFTER_MS = 2 * 24 * 60 * 60 * 1e3;
|
|
6701
7052
|
var MIN_AUTO_ARCHIVE_AFTER_MS = 60 * 60 * 1e3;
|
|
6702
7053
|
var DEFAULT_AUTO_STOP_AFTER_MS = 10 * 60 * 1e3;
|
|
@@ -6746,17 +7097,18 @@ var DEFAULT_APP_SETTINGS = {
|
|
|
6746
7097
|
// Включено: запрос без VPN может стоить аккаунта, а тому, у кого маршрут и
|
|
6747
7098
|
// так из разрешённой страны, защита ничем не мешает.
|
|
6748
7099
|
networkGuardEnabled: true,
|
|
6749
|
-
networkGuardBlockedCountries: DEFAULT_BLOCKED_COUNTRIES
|
|
7100
|
+
networkGuardBlockedCountries: DEFAULT_BLOCKED_COUNTRIES,
|
|
7101
|
+
projectsRoot: null
|
|
6750
7102
|
};
|
|
6751
7103
|
var AppSettingsStore = class {
|
|
6752
7104
|
#settings = { ...DEFAULT_APP_SETTINGS };
|
|
6753
7105
|
#storePath;
|
|
6754
7106
|
constructor(dataDir) {
|
|
6755
|
-
this.#storePath =
|
|
7107
|
+
this.#storePath = path20.join(dataDir, "app-settings.json");
|
|
6756
7108
|
}
|
|
6757
7109
|
async load() {
|
|
6758
7110
|
try {
|
|
6759
|
-
const raw = await
|
|
7111
|
+
const raw = await readFile14(this.#storePath, "utf8");
|
|
6760
7112
|
this.#settings = sanitize2(JSON.parse(raw), DEFAULT_APP_SETTINGS);
|
|
6761
7113
|
} catch {
|
|
6762
7114
|
this.#settings = { ...DEFAULT_APP_SETTINGS };
|
|
@@ -6776,7 +7128,7 @@ var AppSettingsStore = class {
|
|
|
6776
7128
|
async update(patch) {
|
|
6777
7129
|
const next = sanitize2(patch, this.#settings);
|
|
6778
7130
|
this.#settings = next;
|
|
6779
|
-
await
|
|
7131
|
+
await mkdir12(path20.dirname(this.#storePath), { recursive: true });
|
|
6780
7132
|
await writeFile12(this.#storePath, JSON.stringify(next, null, 2), "utf8");
|
|
6781
7133
|
return this.current;
|
|
6782
7134
|
}
|
|
@@ -6844,10 +7196,15 @@ function sanitize2(value, fallback) {
|
|
|
6844
7196
|
...new Set(countries.filter((c) => typeof c === "string").map((c) => c.trim().toUpperCase()).filter((c) => /^[A-Z]{2}$/.test(c)))
|
|
6845
7197
|
];
|
|
6846
7198
|
}
|
|
7199
|
+
if (record.projectsRoot === null)
|
|
7200
|
+
result.projectsRoot = null;
|
|
7201
|
+
else if (typeof record.projectsRoot === "string" && record.projectsRoot.trim()) {
|
|
7202
|
+
result.projectsRoot = record.projectsRoot.trim();
|
|
7203
|
+
}
|
|
6847
7204
|
return result;
|
|
6848
7205
|
}
|
|
6849
7206
|
function claudeHome() {
|
|
6850
|
-
return
|
|
7207
|
+
return path20.join(homedir6(), ".claude");
|
|
6851
7208
|
}
|
|
6852
7209
|
function writableRoots(mode, cwd, workspacePaths) {
|
|
6853
7210
|
if (mode === "all")
|
|
@@ -6857,7 +7214,7 @@ function writableRoots(mode, cwd, workspacePaths) {
|
|
|
6857
7214
|
return [...roots];
|
|
6858
7215
|
for (const workspace of [cwd, ...workspacePaths]) {
|
|
6859
7216
|
roots.add(workspace);
|
|
6860
|
-
const parent =
|
|
7217
|
+
const parent = path20.dirname(workspace);
|
|
6861
7218
|
if (parent !== workspace)
|
|
6862
7219
|
roots.add(parent);
|
|
6863
7220
|
}
|
|
@@ -6865,19 +7222,19 @@ function writableRoots(mode, cwd, workspacePaths) {
|
|
|
6865
7222
|
}
|
|
6866
7223
|
|
|
6867
7224
|
// ../host/dist/handoff-store.js
|
|
6868
|
-
import { mkdir as
|
|
6869
|
-
import
|
|
7225
|
+
import { mkdir as mkdir13, readFile as readFile15, readdir as readdir6, rm as rm4, writeFile as writeFile13 } from "node:fs/promises";
|
|
7226
|
+
import path21 from "node:path";
|
|
6870
7227
|
var HandoffStore = class {
|
|
6871
7228
|
#dir;
|
|
6872
7229
|
constructor(dataDir) {
|
|
6873
|
-
this.#dir =
|
|
7230
|
+
this.#dir = path21.join(dataDir, "handoffs");
|
|
6874
7231
|
}
|
|
6875
7232
|
async get(sessionId) {
|
|
6876
7233
|
const file = this.#file(sessionId);
|
|
6877
7234
|
if (!file)
|
|
6878
7235
|
return null;
|
|
6879
7236
|
try {
|
|
6880
|
-
const parsed = JSON.parse(await
|
|
7237
|
+
const parsed = JSON.parse(await readFile15(file, "utf8"));
|
|
6881
7238
|
return typeof parsed.text === "string" ? parsed : null;
|
|
6882
7239
|
} catch {
|
|
6883
7240
|
return null;
|
|
@@ -6887,7 +7244,7 @@ var HandoffStore = class {
|
|
|
6887
7244
|
const file = this.#file(handoff.sessionId);
|
|
6888
7245
|
if (!file)
|
|
6889
7246
|
return;
|
|
6890
|
-
await
|
|
7247
|
+
await mkdir13(this.#dir, { recursive: true });
|
|
6891
7248
|
await writeFile13(file, JSON.stringify(handoff, null, 2), "utf8");
|
|
6892
7249
|
}
|
|
6893
7250
|
async remove(sessionId) {
|
|
@@ -6898,7 +7255,7 @@ var HandoffStore = class {
|
|
|
6898
7255
|
/** id всех сохранённых хэндоффов. */
|
|
6899
7256
|
async list() {
|
|
6900
7257
|
try {
|
|
6901
|
-
return (await
|
|
7258
|
+
return (await readdir6(this.#dir)).filter((name) => name.endsWith(".json")).map((name) => name.slice(0, -".json".length));
|
|
6902
7259
|
} catch {
|
|
6903
7260
|
return [];
|
|
6904
7261
|
}
|
|
@@ -6907,7 +7264,7 @@ var HandoffStore = class {
|
|
|
6907
7264
|
#file(sessionId) {
|
|
6908
7265
|
if (!/^[\w-]{1,128}$/.test(sessionId))
|
|
6909
7266
|
return null;
|
|
6910
|
-
return
|
|
7267
|
+
return path21.join(this.#dir, `${sessionId}.json`);
|
|
6911
7268
|
}
|
|
6912
7269
|
};
|
|
6913
7270
|
var SAME_WINDOW_MS = 5 * 6e4;
|
|
@@ -6916,11 +7273,11 @@ var LimitStopState = class {
|
|
|
6916
7273
|
#fired = {};
|
|
6917
7274
|
#storePath;
|
|
6918
7275
|
constructor(dataDir) {
|
|
6919
|
-
this.#storePath =
|
|
7276
|
+
this.#storePath = path21.join(dataDir, "limit-stop.json");
|
|
6920
7277
|
}
|
|
6921
7278
|
async load() {
|
|
6922
7279
|
try {
|
|
6923
|
-
const parsed = JSON.parse(await
|
|
7280
|
+
const parsed = JSON.parse(await readFile15(this.#storePath, "utf8"));
|
|
6924
7281
|
this.#fired = {};
|
|
6925
7282
|
const read = (source) => {
|
|
6926
7283
|
const out = {};
|
|
@@ -6964,7 +7321,7 @@ var LimitStopState = class {
|
|
|
6964
7321
|
}
|
|
6965
7322
|
async #mark(account, limit, until) {
|
|
6966
7323
|
this.#fired[account] = { ...this.#fired[account], [limit]: until };
|
|
6967
|
-
await
|
|
7324
|
+
await mkdir13(path21.dirname(this.#storePath), { recursive: true });
|
|
6968
7325
|
const { [MAIN_ACCOUNT_ID]: main = {}, ...others } = this.#fired;
|
|
6969
7326
|
await writeFile13(this.#storePath, JSON.stringify({ ...main, ...others }, null, 2), "utf8");
|
|
6970
7327
|
}
|
|
@@ -7070,9 +7427,9 @@ function capitalize(text) {
|
|
|
7070
7427
|
}
|
|
7071
7428
|
|
|
7072
7429
|
// ../host/dist/plugins.js
|
|
7073
|
-
import { readFile as
|
|
7074
|
-
import { homedir as
|
|
7075
|
-
import
|
|
7430
|
+
import { readFile as readFile16 } from "node:fs/promises";
|
|
7431
|
+
import { homedir as homedir7 } from "node:os";
|
|
7432
|
+
import path22 from "node:path";
|
|
7076
7433
|
var TIMEOUT_MS2 = 12e4;
|
|
7077
7434
|
var SAFE_ARG = /^[A-Za-z0-9][A-Za-z0-9._@/-]*$/;
|
|
7078
7435
|
var PluginCli = class {
|
|
@@ -7171,10 +7528,10 @@ async function readCatalog(markets, installed) {
|
|
|
7171
7528
|
return lists.flat().sort((a, b) => a.name.localeCompare(b.name));
|
|
7172
7529
|
}
|
|
7173
7530
|
async function readMarketplace(market, installed) {
|
|
7174
|
-
const root = market.installLocation ||
|
|
7531
|
+
const root = market.installLocation || path22.join(homedir7(), ".claude", "plugins", "marketplaces", market.name);
|
|
7175
7532
|
let manifest;
|
|
7176
7533
|
try {
|
|
7177
|
-
const text = await
|
|
7534
|
+
const text = await readFile16(path22.join(root, ".claude-plugin", "marketplace.json"), "utf8");
|
|
7178
7535
|
manifest = JSON.parse(text);
|
|
7179
7536
|
} catch {
|
|
7180
7537
|
return [];
|
|
@@ -7426,8 +7783,8 @@ function describe5(error) {
|
|
|
7426
7783
|
|
|
7427
7784
|
// ../host/dist/relay-link.js
|
|
7428
7785
|
import { EventEmitter as EventEmitter5 } from "node:events";
|
|
7429
|
-
import { readFile as
|
|
7430
|
-
import
|
|
7786
|
+
import { readFile as readFile17, writeFile as writeFile14, rm as rm5, mkdir as mkdir14 } from "node:fs/promises";
|
|
7787
|
+
import path23 from "node:path";
|
|
7431
7788
|
import { hostname } from "node:os";
|
|
7432
7789
|
import WebSocket from "ws";
|
|
7433
7790
|
|
|
@@ -7482,7 +7839,7 @@ var RelayLink = class extends EventEmitter5 {
|
|
|
7482
7839
|
#log;
|
|
7483
7840
|
constructor(options2) {
|
|
7484
7841
|
super();
|
|
7485
|
-
this.#file =
|
|
7842
|
+
this.#file = path23.join(options2.dataDir, "relay.json");
|
|
7486
7843
|
this.#defaultUrl = options2.defaultUrl.replace(/\/+$/, "");
|
|
7487
7844
|
this.#log = options2.log ?? ((msg) => console.log(`[relay] ${msg}`));
|
|
7488
7845
|
}
|
|
@@ -7563,7 +7920,7 @@ var RelayLink = class extends EventEmitter5 {
|
|
|
7563
7920
|
}
|
|
7564
7921
|
async #read() {
|
|
7565
7922
|
try {
|
|
7566
|
-
const raw = await
|
|
7923
|
+
const raw = await readFile17(this.#file, "utf8");
|
|
7567
7924
|
const parsed = JSON.parse(raw);
|
|
7568
7925
|
if (typeof parsed !== "object" || parsed === null)
|
|
7569
7926
|
return null;
|
|
@@ -7576,7 +7933,7 @@ var RelayLink = class extends EventEmitter5 {
|
|
|
7576
7933
|
}
|
|
7577
7934
|
}
|
|
7578
7935
|
async #write(credentials) {
|
|
7579
|
-
await
|
|
7936
|
+
await mkdir14(path23.dirname(this.#file), { recursive: true });
|
|
7580
7937
|
await writeFile14(this.#file, `${JSON.stringify(credentials, null, 2)}
|
|
7581
7938
|
`, {
|
|
7582
7939
|
encoding: "utf8",
|
|
@@ -7834,7 +8191,7 @@ function humanize(error) {
|
|
|
7834
8191
|
// ../host/dist/terminal.js
|
|
7835
8192
|
import { EventEmitter as EventEmitter6 } from "node:events";
|
|
7836
8193
|
import { access as access2, constants as constants2 } from "node:fs/promises";
|
|
7837
|
-
import
|
|
8194
|
+
import path24 from "node:path";
|
|
7838
8195
|
import { randomUUID as randomUUID5 } from "node:crypto";
|
|
7839
8196
|
var SCROLLBACK_BYTES = 256 * 1024;
|
|
7840
8197
|
var FLUSH_MS = 12;
|
|
@@ -8004,22 +8361,22 @@ async function defaultShell() {
|
|
|
8004
8361
|
if (pwsh)
|
|
8005
8362
|
return { file: pwsh, args: [], title: "pwsh" };
|
|
8006
8363
|
const system = process.env.SystemRoot ?? "C:\\Windows";
|
|
8007
|
-
const powershell =
|
|
8364
|
+
const powershell = path24.join(system, "System32/WindowsPowerShell/v1.0/powershell.exe");
|
|
8008
8365
|
if (await exists3(powershell))
|
|
8009
8366
|
return { file: powershell, args: [], title: "powershell" };
|
|
8010
8367
|
return { file: process.env.COMSPEC ?? "cmd.exe", args: [], title: "cmd" };
|
|
8011
8368
|
}
|
|
8012
8369
|
const shell = process.env.SHELL;
|
|
8013
8370
|
if (shell && await exists3(shell))
|
|
8014
|
-
return { file: shell, args: [], title:
|
|
8371
|
+
return { file: shell, args: [], title: path24.basename(shell) };
|
|
8015
8372
|
if (await exists3("/bin/bash"))
|
|
8016
8373
|
return { file: "/bin/bash", args: [], title: "bash" };
|
|
8017
8374
|
return { file: "/bin/sh", args: [], title: "sh" };
|
|
8018
8375
|
}
|
|
8019
8376
|
async function findOnPath(name) {
|
|
8020
|
-
const dirs = (process.env.PATH ?? "").split(
|
|
8377
|
+
const dirs = (process.env.PATH ?? "").split(path24.delimiter).filter(Boolean);
|
|
8021
8378
|
for (const dir of dirs) {
|
|
8022
|
-
const candidate =
|
|
8379
|
+
const candidate = path24.join(dir, name);
|
|
8023
8380
|
if (await exists3(candidate))
|
|
8024
8381
|
return candidate;
|
|
8025
8382
|
}
|
|
@@ -8030,10 +8387,10 @@ function exists3(file) {
|
|
|
8030
8387
|
}
|
|
8031
8388
|
|
|
8032
8389
|
// ../host/dist/mcp-config.js
|
|
8033
|
-
import { readFile as
|
|
8034
|
-
import
|
|
8390
|
+
import { readFile as readFile18, writeFile as writeFile15, mkdir as mkdir15 } from "node:fs/promises";
|
|
8391
|
+
import path25 from "node:path";
|
|
8035
8392
|
var MCP_FILE = ".mcp.json";
|
|
8036
|
-
var LOCAL_SETTINGS2 =
|
|
8393
|
+
var LOCAL_SETTINGS2 = path25.join(".claude", "settings.local.json");
|
|
8037
8394
|
var queues = /* @__PURE__ */ new Map();
|
|
8038
8395
|
function serialize(cwd, work) {
|
|
8039
8396
|
const previous = queues.get(cwd) ?? Promise.resolve();
|
|
@@ -8042,7 +8399,7 @@ function serialize(cwd, work) {
|
|
|
8042
8399
|
return next;
|
|
8043
8400
|
}
|
|
8044
8401
|
async function readProjectServers(cwd) {
|
|
8045
|
-
const file = await readJson(
|
|
8402
|
+
const file = await readJson(path25.join(cwd, MCP_FILE));
|
|
8046
8403
|
const servers = file?.mcpServers;
|
|
8047
8404
|
if (!servers || typeof servers !== "object")
|
|
8048
8405
|
return {};
|
|
@@ -8050,23 +8407,23 @@ async function readProjectServers(cwd) {
|
|
|
8050
8407
|
}
|
|
8051
8408
|
function addProjectServer(cwd, name, config) {
|
|
8052
8409
|
return serialize(cwd, async () => {
|
|
8053
|
-
const file = await readJson(
|
|
8410
|
+
const file = await readJson(path25.join(cwd, MCP_FILE)) ?? {};
|
|
8054
8411
|
const servers = file.mcpServers ?? {};
|
|
8055
8412
|
servers[name] = config;
|
|
8056
8413
|
file.mcpServers = servers;
|
|
8057
|
-
await writeJson(
|
|
8414
|
+
await writeJson(path25.join(cwd, MCP_FILE), file);
|
|
8058
8415
|
await approve(cwd, name);
|
|
8059
8416
|
});
|
|
8060
8417
|
}
|
|
8061
8418
|
function removeProjectServer(cwd, name) {
|
|
8062
8419
|
return serialize(cwd, async () => {
|
|
8063
|
-
const file = await readJson(
|
|
8420
|
+
const file = await readJson(path25.join(cwd, MCP_FILE));
|
|
8064
8421
|
const servers = file?.mcpServers;
|
|
8065
8422
|
if (!servers || !(name in servers))
|
|
8066
8423
|
return false;
|
|
8067
8424
|
delete servers[name];
|
|
8068
|
-
await writeJson(
|
|
8069
|
-
const settingsPath =
|
|
8425
|
+
await writeJson(path25.join(cwd, MCP_FILE), file);
|
|
8426
|
+
const settingsPath = path25.join(cwd, LOCAL_SETTINGS2);
|
|
8070
8427
|
const settings = await readJson(settingsPath);
|
|
8071
8428
|
const enabled = settings?.enabledMcpjsonServers;
|
|
8072
8429
|
if (settings && Array.isArray(enabled) && enabled.includes(name)) {
|
|
@@ -8077,7 +8434,7 @@ function removeProjectServer(cwd, name) {
|
|
|
8077
8434
|
});
|
|
8078
8435
|
}
|
|
8079
8436
|
async function approve(cwd, name) {
|
|
8080
|
-
const file =
|
|
8437
|
+
const file = path25.join(cwd, LOCAL_SETTINGS2);
|
|
8081
8438
|
const settings = await readJson(file) ?? {};
|
|
8082
8439
|
const enabled = Array.isArray(settings.enabledMcpjsonServers) ? settings.enabledMcpjsonServers : [];
|
|
8083
8440
|
if (!enabled.includes(name))
|
|
@@ -8116,20 +8473,20 @@ function describeConfig(config) {
|
|
|
8116
8473
|
}
|
|
8117
8474
|
async function readJson(file) {
|
|
8118
8475
|
try {
|
|
8119
|
-
const raw = await
|
|
8476
|
+
const raw = await readFile18(file, "utf8");
|
|
8120
8477
|
const parsed = JSON.parse(raw);
|
|
8121
8478
|
return parsed && typeof parsed === "object" ? parsed : null;
|
|
8122
8479
|
} catch (error) {
|
|
8123
8480
|
if (error.code === "ENOENT")
|
|
8124
8481
|
return null;
|
|
8125
8482
|
if (error instanceof SyntaxError) {
|
|
8126
|
-
throw new Error(`\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0440\u0430\u0437\u043E\u0431\u0440\u0430\u0442\u044C ${
|
|
8483
|
+
throw new Error(`\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0440\u0430\u0437\u043E\u0431\u0440\u0430\u0442\u044C ${path25.basename(file)}: ${error.message}`);
|
|
8127
8484
|
}
|
|
8128
8485
|
throw error;
|
|
8129
8486
|
}
|
|
8130
8487
|
}
|
|
8131
8488
|
async function writeJson(file, data) {
|
|
8132
|
-
await
|
|
8489
|
+
await mkdir15(path25.dirname(file), { recursive: true });
|
|
8133
8490
|
await writeFile15(file, `${JSON.stringify(data, null, 2)}
|
|
8134
8491
|
`, "utf8");
|
|
8135
8492
|
}
|
|
@@ -8196,6 +8553,13 @@ var HostServer = class {
|
|
|
8196
8553
|
#limitStopping = false;
|
|
8197
8554
|
/** Последний снимок лимитов Claude по аккаунтам — им сверяется ход без промпта. */
|
|
8198
8555
|
#lastUsage = /* @__PURE__ */ new Map();
|
|
8556
|
+
/** Снимки лимитов аккаунтов без живой сессии — отдельно от `#lastUsage`: на них не срабатывает остановка по лимиту. */
|
|
8557
|
+
#probedUsage = /* @__PURE__ */ new Map();
|
|
8558
|
+
#usageInFlight = false;
|
|
8559
|
+
/** Имена папок проектов на диске — кэш, чтобы синхронные сборщики списков не ходили на диск. */
|
|
8560
|
+
#diskFolders = [];
|
|
8561
|
+
#rootWatcher = null;
|
|
8562
|
+
#watchedRoot = "";
|
|
8199
8563
|
/**
|
|
8200
8564
|
* Сессии, которым человек сам написал после срабатывания порога: id
|
|
8201
8565
|
* сессии → окно → срок, до которого оно было отмечено сработавшим. Это его
|
|
@@ -8275,6 +8639,33 @@ var HostServer = class {
|
|
|
8275
8639
|
liveSessions: live.filter((s) => s.accountId === a.id).length
|
|
8276
8640
|
}));
|
|
8277
8641
|
}
|
|
8642
|
+
/**
|
|
8643
|
+
* Лимиты всех аккаунтов. С живой сессией — её снимок (заодно освежаем), без
|
|
8644
|
+
* неё — короткий процесс CLI без промпта. Сначала отдаём известное, чтобы
|
|
8645
|
+
* карточки не ждали сети, потом — свежее.
|
|
8646
|
+
*/
|
|
8647
|
+
async #refreshAccountUsage() {
|
|
8648
|
+
if (this.#usageInFlight)
|
|
8649
|
+
return;
|
|
8650
|
+
this.#usageInFlight = true;
|
|
8651
|
+
try {
|
|
8652
|
+
const known = () => Object.fromEntries(this.#accounts.all.map((a) => [a.id, this.#lastUsage.get(a.id) ?? this.#probedUsage.get(a.id) ?? null]));
|
|
8653
|
+
this.#broadcast({ type: "accounts.usage", usage: known() });
|
|
8654
|
+
await Promise.all(this.#accounts.all.map(async (account) => {
|
|
8655
|
+
const live = [...this.#sessions.values()].find((s) => s instanceof ClaudeSession && s.accountId === account.id && s.state !== "closed");
|
|
8656
|
+
if (live) {
|
|
8657
|
+
await live.refreshUsage(true);
|
|
8658
|
+
return;
|
|
8659
|
+
}
|
|
8660
|
+
const fresh = await probeUsage(account.configDir);
|
|
8661
|
+
if (fresh)
|
|
8662
|
+
this.#probedUsage.set(account.id, fresh);
|
|
8663
|
+
}));
|
|
8664
|
+
this.#broadcast({ type: "accounts.usage", usage: known() });
|
|
8665
|
+
} finally {
|
|
8666
|
+
this.#usageInFlight = false;
|
|
8667
|
+
}
|
|
8668
|
+
}
|
|
8278
8669
|
/** Список аккаунтов и, для каждого, кто в нём вошёл. Вход спрашивается у CLI — это процесс на аккаунт. */
|
|
8279
8670
|
async #accountsFrame() {
|
|
8280
8671
|
const accounts = this.#accountList();
|
|
@@ -8294,7 +8685,7 @@ var HostServer = class {
|
|
|
8294
8685
|
const status = await new AuthCli(configDir).status().catch(() => null);
|
|
8295
8686
|
if (!status?.loggedIn)
|
|
8296
8687
|
return null;
|
|
8297
|
-
const used = this.#accounts.all.find((a) =>
|
|
8688
|
+
const used = this.#accounts.all.find((a) => path26.resolve(this.#accounts.effectiveDir(a.id)).toLowerCase() === configDir.toLowerCase());
|
|
8298
8689
|
return {
|
|
8299
8690
|
configDir,
|
|
8300
8691
|
email: status.email,
|
|
@@ -8337,8 +8728,10 @@ var HostServer = class {
|
|
|
8337
8728
|
await this.#pins.load();
|
|
8338
8729
|
await this.#order.load();
|
|
8339
8730
|
await this.#folders.load();
|
|
8731
|
+
await this.#folders.dropLegacyWorkspaceFolders();
|
|
8340
8732
|
await this.#carryOverWorkspaceIds();
|
|
8341
8733
|
await this.#settings.load();
|
|
8734
|
+
await this.#refreshDiskFolders();
|
|
8342
8735
|
this.#wireNetworkGuard();
|
|
8343
8736
|
await this.#accounts.load();
|
|
8344
8737
|
await this.#limitStop.load();
|
|
@@ -8397,6 +8790,7 @@ var HostServer = class {
|
|
|
8397
8790
|
for (const auth of this.#auths.values())
|
|
8398
8791
|
auth.cancel();
|
|
8399
8792
|
this.#terminals.closeAll();
|
|
8793
|
+
this.#rootWatcher?.close();
|
|
8400
8794
|
await this.#relay.close();
|
|
8401
8795
|
await Promise.all([...this.#sessions.values()].map((s) => s.close("host shutdown")));
|
|
8402
8796
|
this.#sessions.clear();
|
|
@@ -8522,7 +8916,7 @@ var HostServer = class {
|
|
|
8522
8916
|
/** Активные и архивные проекты разом, с папкой каждого — для `workspace.list`. */
|
|
8523
8917
|
#workspaceLists() {
|
|
8524
8918
|
const withFolder = (w) => {
|
|
8525
|
-
const folderId = this.#
|
|
8919
|
+
const folderId = folderOfProject(this.#projectsRoot(), w.path, new Set(this.#diskFolders));
|
|
8526
8920
|
return folderId ? { ...w, folderId } : w;
|
|
8527
8921
|
};
|
|
8528
8922
|
return {
|
|
@@ -8534,12 +8928,151 @@ var HostServer = class {
|
|
|
8534
8928
|
this.#broadcast({ type: "workspace.list", ...this.#workspaceLists() });
|
|
8535
8929
|
}
|
|
8536
8930
|
#sendFolders(client) {
|
|
8537
|
-
|
|
8931
|
+
void this.#sendFoldersNow(client);
|
|
8932
|
+
}
|
|
8933
|
+
/** Корень проектов: выбранный в настройках или самый обжитой каталог проектов. */
|
|
8934
|
+
#projectsRoot() {
|
|
8935
|
+
return this.#settings.current.projectsRoot ?? this.#roots()[0] ?? homedir8();
|
|
8936
|
+
}
|
|
8937
|
+
async #refreshDiskFolders() {
|
|
8938
|
+
this.#diskFolders = await listDiskFolders(this.#projectsRoot(), this.#workspaces.allPaths());
|
|
8939
|
+
this.#watchProjectsRoot();
|
|
8940
|
+
}
|
|
8941
|
+
/** Следим за корнем: папки появляются и исчезают и без ccv. */
|
|
8942
|
+
#watchProjectsRoot() {
|
|
8943
|
+
const root = this.#projectsRoot();
|
|
8944
|
+
if (root === this.#watchedRoot)
|
|
8945
|
+
return;
|
|
8946
|
+
this.#rootWatcher?.close();
|
|
8947
|
+
this.#watchedRoot = root;
|
|
8948
|
+
this.#rootWatcher = watchRoot(root, () => {
|
|
8949
|
+
void this.#refreshDiskFolders().then(() => {
|
|
8950
|
+
this.#sendFolders();
|
|
8951
|
+
this.#broadcastWorkspaces();
|
|
8952
|
+
});
|
|
8953
|
+
});
|
|
8954
|
+
}
|
|
8955
|
+
async #sendFoldersNow(client) {
|
|
8956
|
+
await this.#refreshDiskFolders();
|
|
8957
|
+
const lists = this.#folders.list();
|
|
8958
|
+
const frame = {
|
|
8959
|
+
type: "folder.list",
|
|
8960
|
+
...lists,
|
|
8961
|
+
projectsRoot: this.#projectsRoot(),
|
|
8962
|
+
workspaceFolders: await Promise.all(this.#diskFolders.map(async (name) => {
|
|
8963
|
+
const id = folderIdFor(name);
|
|
8964
|
+
const color = this.#folders.diskFolderColor(id);
|
|
8965
|
+
const unopened = await listUnopened(path26.join(this.#projectsRoot(), name), this.#workspaces.allPaths());
|
|
8966
|
+
return {
|
|
8967
|
+
id,
|
|
8968
|
+
name,
|
|
8969
|
+
...color ? { color } : {},
|
|
8970
|
+
unopened,
|
|
8971
|
+
path: path26.join(this.#projectsRoot(), name)
|
|
8972
|
+
};
|
|
8973
|
+
}))
|
|
8974
|
+
};
|
|
8538
8975
|
if (client)
|
|
8539
8976
|
this.#send(client, frame);
|
|
8540
8977
|
else
|
|
8541
8978
|
this.#broadcast(frame);
|
|
8542
8979
|
}
|
|
8980
|
+
#configDirs() {
|
|
8981
|
+
return this.#accounts.all.map((a) => this.#accounts.effectiveDir(a.id));
|
|
8982
|
+
}
|
|
8983
|
+
/**
|
|
8984
|
+
* Можно ли трогать каталоги: ни сессия, ни терминал ccv, ни агент, запущенный
|
|
8985
|
+
* снаружи, не должны работать внутри. Отказ — понятной фразой, до любых изменений.
|
|
8986
|
+
*/
|
|
8987
|
+
async #guardMove(dirs) {
|
|
8988
|
+
const inside = (target) => dirs.some((dir) => isInside(dir, target));
|
|
8989
|
+
const affected = new Set([...this.#workspaces.list(), ...this.#workspaces.listArchived()].filter((w) => inside(w.path)).map((w) => w.id));
|
|
8990
|
+
const live = [...this.#sessions.values()].filter((sess) => sess.state !== "closed" && affected.has(sess.workspaceId));
|
|
8991
|
+
if (live.length > 0) {
|
|
8992
|
+
throw new Error(`\u0412 \u043F\u0440\u043E\u0435\u043A\u0442\u0435 \u0438\u0434\u0443\u0442 \u0441\u0435\u0441\u0441\u0438\u0438 (${live.length}) \u2014 \u0437\u0430\u043A\u0440\u043E\u0439\u0442\u0435 \u0438\u0445, \u043F\u043E\u0442\u043E\u043C \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0438\u0442\u0435`);
|
|
8993
|
+
}
|
|
8994
|
+
if (this.#terminals.list().some((t) => affected.has(t.workspaceId))) {
|
|
8995
|
+
throw new Error("\u0412 \u043F\u0440\u043E\u0435\u043A\u0442\u0435 \u043E\u0442\u043A\u0440\u044B\u0442 \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B \u2014 \u0437\u0430\u043A\u0440\u043E\u0439\u0442\u0435 \u0435\u0433\u043E, \u043F\u043E\u0442\u043E\u043C \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0438\u0442\u0435");
|
|
8996
|
+
}
|
|
8997
|
+
const paths = [.../* @__PURE__ */ new Set([...dirs, ...this.#workspaces.allPaths().filter(inside)])];
|
|
8998
|
+
const agent = await externalAgentActivity(paths, this.#configDirs());
|
|
8999
|
+
if (agent) {
|
|
9000
|
+
throw new Error(`\u041F\u043E\u0445\u043E\u0436\u0435, \u0432 \u043F\u0440\u043E\u0435\u043A\u0442\u0435 \u0441\u0435\u0439\u0447\u0430\u0441 \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 ${agent} (\u0437\u0430\u043F\u0443\u0449\u0435\u043D\u043D\u044B\u0439 \u043D\u0435 \u0438\u0437 ccv). \u0414\u043E\u0436\u0434\u0438\u0442\u0435\u0441\u044C \u043A\u043E\u043D\u0446\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u0438\u043B\u0438 \u043E\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0435 \u0435\u0433\u043E, \u043F\u043E\u0442\u043E\u043C \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0438\u0442\u0435`);
|
|
9001
|
+
}
|
|
9002
|
+
}
|
|
9003
|
+
/**
|
|
9004
|
+
* Переместить каталог и всё, что к нему привязано: транскрипты Claude Code,
|
|
9005
|
+
* запись реестра и записи под id проектов (архив, закрепления, порядок, папки).
|
|
9006
|
+
*/
|
|
9007
|
+
async #relocate(from, to) {
|
|
9008
|
+
await this.#guardMove([from]);
|
|
9009
|
+
const inside = this.#workspaces.allPaths().filter((p) => isInside(from, p));
|
|
9010
|
+
await moveDirectory(from, to, inside, this.#configDirs());
|
|
9011
|
+
const moved = await this.#workspaces.relocate(from, to);
|
|
9012
|
+
const ids = new Map(moved.map((m) => [workspaceIdFromPath(m.from), workspaceIdFromPath(m.to)]));
|
|
9013
|
+
const remap = {
|
|
9014
|
+
targets: (id) => ids.has(id) ? [ids.get(id)] : [],
|
|
9015
|
+
owner: async (id) => ids.get(id)
|
|
9016
|
+
};
|
|
9017
|
+
await this.#antigravity.remapWorkspaceIds(remap);
|
|
9018
|
+
await this.#archive.remapWorkspaceIds(remap);
|
|
9019
|
+
await this.#pins.remapWorkspaceIds(remap);
|
|
9020
|
+
await this.#order.remapWorkspaceIds(remap);
|
|
9021
|
+
await this.#folders.remapWorkspaceIds(remap);
|
|
9022
|
+
this.#diskAccounts.clear();
|
|
9023
|
+
await this.#refreshDiskFolders();
|
|
9024
|
+
this.#broadcastWorkspaces();
|
|
9025
|
+
this.#sendFolders();
|
|
9026
|
+
for (const move of moved)
|
|
9027
|
+
await this.#sendSessionList(workspaceIdFromPath(move.to));
|
|
9028
|
+
}
|
|
9029
|
+
async #moveProjectToFolder(workspaceId, folderId) {
|
|
9030
|
+
const workspace = this.#workspaces.find(workspaceId);
|
|
9031
|
+
if (!workspace)
|
|
9032
|
+
throw new Error("\u041F\u0440\u043E\u0435\u043A\u0442 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D");
|
|
9033
|
+
const root = this.#projectsRoot();
|
|
9034
|
+
let parent = root;
|
|
9035
|
+
if (folderId !== null) {
|
|
9036
|
+
const name = folderNameOf(folderId);
|
|
9037
|
+
if (!name || !this.#diskFolders.includes(name))
|
|
9038
|
+
throw new Error("\u041F\u0430\u043F\u043A\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u0432 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430 \u043D\u0430 \u0434\u0438\u0441\u043A\u0435");
|
|
9039
|
+
parent = path26.join(root, name);
|
|
9040
|
+
}
|
|
9041
|
+
const to = path26.join(parent, path26.basename(workspace.path));
|
|
9042
|
+
if (path26.resolve(to).toLowerCase() === path26.resolve(workspace.path).toLowerCase())
|
|
9043
|
+
return;
|
|
9044
|
+
await this.#relocate(workspace.path, to);
|
|
9045
|
+
}
|
|
9046
|
+
async #renameDiskFolder(folderId, rawName) {
|
|
9047
|
+
const old = folderNameOf(folderId);
|
|
9048
|
+
if (!old)
|
|
9049
|
+
return;
|
|
9050
|
+
const name = cleanFolderName(rawName);
|
|
9051
|
+
if (name === old)
|
|
9052
|
+
return;
|
|
9053
|
+
const root = this.#projectsRoot();
|
|
9054
|
+
await this.#relocate(path26.join(root, old), path26.join(root, name));
|
|
9055
|
+
await this.#folders.renameDiskFolder(folderId, folderIdFor(name), name);
|
|
9056
|
+
this.#sendFolders();
|
|
9057
|
+
}
|
|
9058
|
+
async #deleteDiskFolder(folderId) {
|
|
9059
|
+
const name = folderNameOf(folderId);
|
|
9060
|
+
if (!name)
|
|
9061
|
+
return;
|
|
9062
|
+
const dir = path26.join(this.#projectsRoot(), name);
|
|
9063
|
+
const foreign = await foreignContent(dir, this.#workspaces.allPaths());
|
|
9064
|
+
if (foreign) {
|
|
9065
|
+
throw new Error(`\u0412 \u043F\u0430\u043F\u043A\u0435 \u0435\u0441\u0442\u044C \xAB${foreign}\xBB, \u044D\u0442\u043E \u043D\u0435 \u043F\u0440\u043E\u0435\u043A\u0442 ccv \u2014 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u044D\u0442\u043E \u0438 \u0443\u0434\u0430\u043B\u0438\u0442\u0435 \u043F\u0430\u043F\u043A\u0443 \u0441\u043D\u043E\u0432\u0430`);
|
|
9066
|
+
}
|
|
9067
|
+
for (const project of this.#workspaces.allPaths().filter((p) => isInside(dir, p))) {
|
|
9068
|
+
await this.#relocate(project, path26.join(this.#projectsRoot(), path26.basename(project)));
|
|
9069
|
+
}
|
|
9070
|
+
await removeEmptyDir(dir);
|
|
9071
|
+
await this.#folders.forgetDiskFolder(folderId);
|
|
9072
|
+
await this.#refreshDiskFolders();
|
|
9073
|
+
this.#sendFolders();
|
|
9074
|
+
this.#broadcastWorkspaces();
|
|
9075
|
+
}
|
|
8543
9076
|
async #handleFrame(socket, frame) {
|
|
8544
9077
|
switch (frame.type) {
|
|
8545
9078
|
case "hello":
|
|
@@ -8589,6 +9122,21 @@ var HostServer = class {
|
|
|
8589
9122
|
this.#broadcastWorkspaces();
|
|
8590
9123
|
return;
|
|
8591
9124
|
}
|
|
9125
|
+
case "workspace.unmark": {
|
|
9126
|
+
const removed = await this.#workspaces.unmark(frame.workspaceIds);
|
|
9127
|
+
if (removed.length === 0)
|
|
9128
|
+
return;
|
|
9129
|
+
const gone = new Set(removed.map((w) => w.id));
|
|
9130
|
+
for (const session of [...this.#sessions.values()]) {
|
|
9131
|
+
if (!gone.has(session.workspaceId))
|
|
9132
|
+
continue;
|
|
9133
|
+
await this.#dropSession(session.id, "workspace unmarked");
|
|
9134
|
+
}
|
|
9135
|
+
await this.#refreshDiskFolders();
|
|
9136
|
+
this.#broadcastWorkspaces();
|
|
9137
|
+
this.#sendFolders();
|
|
9138
|
+
return;
|
|
9139
|
+
}
|
|
8592
9140
|
case "workspace.restore": {
|
|
8593
9141
|
const restored = await this.#workspaces.restore(frame.workspaceIds);
|
|
8594
9142
|
if (restored.length === 0)
|
|
@@ -8615,7 +9163,16 @@ var HostServer = class {
|
|
|
8615
9163
|
this.#send(socket, { type: "workspace.roots", roots: this.#roots() });
|
|
8616
9164
|
return;
|
|
8617
9165
|
case "workspace.create": {
|
|
8618
|
-
|
|
9166
|
+
let parent = frame.parent;
|
|
9167
|
+
if (frame.folderId) {
|
|
9168
|
+
const name = folderNameOf(frame.folderId);
|
|
9169
|
+
await this.#refreshDiskFolders();
|
|
9170
|
+
if (!name || !this.#diskFolders.includes(name))
|
|
9171
|
+
throw new Error("\u041F\u0430\u043F\u043A\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u0432 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430 \u043D\u0430 \u0434\u0438\u0441\u043A\u0435");
|
|
9172
|
+
parent = path26.join(this.#projectsRoot(), name);
|
|
9173
|
+
}
|
|
9174
|
+
const { workspace, warnings } = await this.#workspaces.create(parent, frame.name, frame.init);
|
|
9175
|
+
await this.#refreshDiskFolders();
|
|
8619
9176
|
this.#broadcastWorkspaces();
|
|
8620
9177
|
this.#send(socket, { type: "workspace.created", workspace, warnings });
|
|
8621
9178
|
await this.#closeFinder();
|
|
@@ -8709,20 +9266,31 @@ var HostServer = class {
|
|
|
8709
9266
|
} else if (frame.scope === "pinned") {
|
|
8710
9267
|
await this.#folders.createPinnedFolder(frame.name);
|
|
8711
9268
|
} else {
|
|
8712
|
-
await this.#
|
|
9269
|
+
await createDiskFolder(this.#projectsRoot(), frame.name);
|
|
8713
9270
|
}
|
|
8714
9271
|
this.#sendFolders();
|
|
8715
9272
|
return;
|
|
8716
9273
|
}
|
|
8717
9274
|
case "folder.rename":
|
|
9275
|
+
if (folderNameOf(frame.folderId)) {
|
|
9276
|
+
await this.#renameDiskFolder(frame.folderId, frame.name);
|
|
9277
|
+
return;
|
|
9278
|
+
}
|
|
8718
9279
|
if (await this.#folders.rename(frame.folderId, frame.name))
|
|
8719
9280
|
this.#sendFolders();
|
|
8720
9281
|
return;
|
|
8721
|
-
case "folder.setColor":
|
|
8722
|
-
|
|
9282
|
+
case "folder.setColor": {
|
|
9283
|
+
const diskName = folderNameOf(frame.folderId);
|
|
9284
|
+
const changed = diskName ? await this.#folders.setDiskFolderColor(frame.folderId, diskName, frame.color) : await this.#folders.setColor(frame.folderId, frame.color);
|
|
9285
|
+
if (changed)
|
|
8723
9286
|
this.#sendFolders();
|
|
8724
9287
|
return;
|
|
9288
|
+
}
|
|
8725
9289
|
case "folder.delete": {
|
|
9290
|
+
if (folderNameOf(frame.folderId)) {
|
|
9291
|
+
await this.#deleteDiskFolder(frame.folderId);
|
|
9292
|
+
return;
|
|
9293
|
+
}
|
|
8726
9294
|
const removed = await this.#folders.delete(frame.folderId);
|
|
8727
9295
|
if (!removed)
|
|
8728
9296
|
return;
|
|
@@ -8745,8 +9313,7 @@ var HostServer = class {
|
|
|
8745
9313
|
await this.#folders.assignPinnedSession(frame.itemId, frame.folderId);
|
|
8746
9314
|
await this.#sendPinned();
|
|
8747
9315
|
} else {
|
|
8748
|
-
await this.#
|
|
8749
|
-
this.#broadcastWorkspaces();
|
|
9316
|
+
await this.#moveProjectToFolder(frame.itemId, frame.folderId);
|
|
8750
9317
|
}
|
|
8751
9318
|
return;
|
|
8752
9319
|
}
|
|
@@ -9246,6 +9813,11 @@ var HostServer = class {
|
|
|
9246
9813
|
const before = this.#settings.current;
|
|
9247
9814
|
const settings = await this.#settings.update(frame.settings);
|
|
9248
9815
|
this.#broadcast({ type: "settings.state", settings });
|
|
9816
|
+
if (settings.projectsRoot !== before.projectsRoot) {
|
|
9817
|
+
await this.#refreshDiskFolders();
|
|
9818
|
+
this.#sendFolders();
|
|
9819
|
+
this.#broadcastWorkspaces();
|
|
9820
|
+
}
|
|
9249
9821
|
if (settings.autoArchiveAfterMs !== before.autoArchiveAfterMs) {
|
|
9250
9822
|
for (const workspace of this.#workspaces.list()) {
|
|
9251
9823
|
await this.#sendSessionList(workspace.id);
|
|
@@ -9316,6 +9888,8 @@ var HostServer = class {
|
|
|
9316
9888
|
if (frame.configDir !== void 0) {
|
|
9317
9889
|
this.#authFor(frame.accountId).cancel();
|
|
9318
9890
|
this.#auths.delete(frame.accountId);
|
|
9891
|
+
this.#lastUsage.delete(frame.accountId);
|
|
9892
|
+
this.#probedUsage.delete(frame.accountId);
|
|
9319
9893
|
}
|
|
9320
9894
|
await this.#sendAccounts();
|
|
9321
9895
|
return;
|
|
@@ -9340,6 +9914,9 @@ var HostServer = class {
|
|
|
9340
9914
|
await this.#sendSessionList(workspace.id);
|
|
9341
9915
|
return;
|
|
9342
9916
|
}
|
|
9917
|
+
case "accounts.usage":
|
|
9918
|
+
await this.#refreshAccountUsage();
|
|
9919
|
+
return;
|
|
9343
9920
|
case "accounts.discover":
|
|
9344
9921
|
this.#send(socket, {
|
|
9345
9922
|
type: "accounts.candidates",
|
|
@@ -10151,7 +10728,7 @@ var HostServer = class {
|
|
|
10151
10728
|
*/
|
|
10152
10729
|
#roots() {
|
|
10153
10730
|
const roots = this.#finder.roots();
|
|
10154
|
-
return roots.length > 0 ? roots : [
|
|
10731
|
+
return roots.length > 0 ? roots : [homedir8()];
|
|
10155
10732
|
}
|
|
10156
10733
|
/**
|
|
10157
10734
|
* Где сессии этого каталога разрешено писать без вопроса.
|
|
@@ -10163,22 +10740,22 @@ var HostServer = class {
|
|
|
10163
10740
|
#writableRoots(cwd) {
|
|
10164
10741
|
return writableRoots(this.#settings.current.folderAccess, cwd, this.#workspaces.list().map((workspace) => workspace.path));
|
|
10165
10742
|
}
|
|
10166
|
-
#findWithAgent(
|
|
10743
|
+
#findWithAgent(query3) {
|
|
10167
10744
|
const roots = this.#finder.roots();
|
|
10168
10745
|
if (roots.length === 0) {
|
|
10169
10746
|
this.#broadcast({
|
|
10170
10747
|
type: "workspace.candidates",
|
|
10171
|
-
query:
|
|
10748
|
+
query: query3,
|
|
10172
10749
|
source: "agent",
|
|
10173
10750
|
candidates: [],
|
|
10174
10751
|
truncated: false
|
|
10175
10752
|
});
|
|
10176
10753
|
return;
|
|
10177
10754
|
}
|
|
10178
|
-
this.#finderQuery =
|
|
10755
|
+
this.#finderQuery = query3;
|
|
10179
10756
|
const session = this.#ensureFinder(roots);
|
|
10180
10757
|
this.#broadcast({ type: "finder.opened", sessionId: session.id });
|
|
10181
|
-
session.sendPrompt(finderPrompt(
|
|
10758
|
+
session.sendPrompt(finderPrompt(query3, roots));
|
|
10182
10759
|
}
|
|
10183
10760
|
#ensureFinder(roots) {
|
|
10184
10761
|
const existing = this.#finderSession;
|
|
@@ -10500,15 +11077,15 @@ var HostServer = class {
|
|
|
10500
11077
|
}
|
|
10501
11078
|
#serveStatic(req, res) {
|
|
10502
11079
|
const webRoot = this.#options.webRoot;
|
|
10503
|
-
if (!webRoot || !
|
|
11080
|
+
if (!webRoot || !existsSync6(webRoot)) {
|
|
10504
11081
|
res.writeHead(200, { "content-type": "text/plain; charset=utf-8" });
|
|
10505
11082
|
res.end("CCV host is running. UI is served by the Vite dev server.\n");
|
|
10506
11083
|
return;
|
|
10507
11084
|
}
|
|
10508
11085
|
const url2 = new URL(req.url ?? "/", "http://localhost");
|
|
10509
|
-
const requested =
|
|
10510
|
-
const target = requested.startsWith(webRoot) &&
|
|
10511
|
-
if (!
|
|
11086
|
+
const requested = path26.join(webRoot, path26.normalize(url2.pathname));
|
|
11087
|
+
const target = requested.startsWith(webRoot) && existsSync6(requested) && statSync3(requested).isFile() ? requested : path26.join(webRoot, "index.html");
|
|
11088
|
+
if (!existsSync6(target)) {
|
|
10512
11089
|
res.writeHead(404).end("not found");
|
|
10513
11090
|
return;
|
|
10514
11091
|
}
|
|
@@ -10533,7 +11110,7 @@ function contentType(file) {
|
|
|
10533
11110
|
".svg": "image/svg+xml",
|
|
10534
11111
|
".woff2": "font/woff2"
|
|
10535
11112
|
};
|
|
10536
|
-
return types[
|
|
11113
|
+
return types[path26.extname(file)] ?? "application/octet-stream";
|
|
10537
11114
|
}
|
|
10538
11115
|
function antigravitySummary(record) {
|
|
10539
11116
|
return {
|
|
@@ -10563,8 +11140,8 @@ function antigravitySummary(record) {
|
|
|
10563
11140
|
}
|
|
10564
11141
|
|
|
10565
11142
|
// dist/ccv.js
|
|
10566
|
-
var HERE =
|
|
10567
|
-
var PACKAGE_ROOT =
|
|
11143
|
+
var HERE = path27.dirname(fileURLToPath(import.meta.url));
|
|
11144
|
+
var PACKAGE_ROOT = path27.resolve(HERE, "..");
|
|
10568
11145
|
var USAGE = `ccv \u2014 Claude Code Visual: \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u0445\u043E\u0441\u0442 Claude Code \u0441 \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u043E\u043C \u0432 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0435.
|
|
10569
11146
|
|
|
10570
11147
|
\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435:
|
|
@@ -10631,7 +11208,7 @@ var server = new HostServer({
|
|
|
10631
11208
|
dataDir: defaults.dataDir,
|
|
10632
11209
|
// UI лежит в пакете рядом с бандлом — это и есть разница между установленной
|
|
10633
11210
|
// утилитой и запуском из репозитория, где сборка живёт в `apps/web/dist`.
|
|
10634
|
-
webRoot: process.env.CCV_WEB_ROOT ??
|
|
11211
|
+
webRoot: process.env.CCV_WEB_ROOT ?? path27.join(PACKAGE_ROOT, "web"),
|
|
10635
11212
|
version,
|
|
10636
11213
|
relayUrl: defaults.relayUrl
|
|
10637
11214
|
});
|
|
@@ -10660,7 +11237,7 @@ for (const signal of ["SIGINT", "SIGTERM"]) {
|
|
|
10660
11237
|
}
|
|
10661
11238
|
async function packageVersion() {
|
|
10662
11239
|
try {
|
|
10663
|
-
const text = await
|
|
11240
|
+
const text = await readFile19(path27.join(PACKAGE_ROOT, "package.json"), "utf8");
|
|
10664
11241
|
return JSON.parse(text).version ?? "0.0.0";
|
|
10665
11242
|
} catch {
|
|
10666
11243
|
return "0.0.0";
|