glimmervoid 0.46.2-next.166 → 0.46.2-next.167

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.
Files changed (79) hide show
  1. package/dist/bin/glimmervoid.js +4 -4
  2. package/dist/chunks/{adapters-DmzmKIDw.js → adapters-Br_PA1X_.js} +1 -1
  3. package/dist/chunks/{adapters-d3XIppeP.js → adapters-CKy7FjTT.js} +1 -1
  4. package/dist/chunks/{agent-setup-cli-C7x4N5U6.js → agent-setup-cli-C8PNC8YA.js} +1 -1
  5. package/dist/chunks/{kimi-Be_QndbF.js → kimi-BGYddMlv.js} +366 -26
  6. package/dist/chunks/{main-Dyx_oiMS.js → main-DMmxYBnP.js} +23 -161
  7. package/dist/client/assets/{alert-sound-CMw9IYOa.js → alert-sound-CSvkaH2H.js} +1 -1
  8. package/dist/client/assets/alert-sound-CSvkaH2H.js.br +0 -0
  9. package/dist/client/assets/{benchmark-panel-12iKvivr.js → benchmark-panel-mns1UqN5.js} +1 -1
  10. package/dist/client/assets/benchmark-panel-mns1UqN5.js.br +0 -0
  11. package/dist/client/assets/{celebration-player-CpgG9DUA.js → celebration-player-CFSer-rB.js} +1 -1
  12. package/dist/client/assets/celebration-player-CFSer-rB.js.br +0 -0
  13. package/dist/client/assets/{dialogs-x_B527bk.js → dialogs-sZ-eTR1o.js} +1 -1
  14. package/dist/client/assets/dialogs-sZ-eTR1o.js.br +0 -0
  15. package/dist/client/assets/{doc-editor-ui-CIhJUO3J.js → doc-editor-ui-gUZSzoaA.js} +1 -1
  16. package/dist/client/assets/doc-editor-ui-gUZSzoaA.js.br +0 -0
  17. package/dist/client/assets/{feature-hint-MLJvjOT0.js → feature-hint-BwFF1r0i.js} +1 -1
  18. package/dist/client/assets/feature-hint-BwFF1r0i.js.br +0 -0
  19. package/dist/client/assets/{first-run-checklist-s4X-OM4Z.js → first-run-checklist-Cdpb_P4N.js} +1 -1
  20. package/dist/client/assets/first-run-checklist-Cdpb_P4N.js.br +0 -0
  21. package/dist/client/assets/{hooks-panel-121qcKFE.js → hooks-panel-D9BcT9I0.js} +1 -1
  22. package/dist/client/assets/hooks-panel-D9BcT9I0.js.br +0 -0
  23. package/dist/client/assets/{index-BJ8diTZl.js → index-tjVjVTuz.js} +5 -5
  24. package/dist/client/assets/index-tjVjVTuz.js.br +0 -0
  25. package/dist/client/assets/{issues-panel-CMZFcUDT.js → issues-panel-C-9kUGqO.js} +1 -1
  26. package/dist/client/assets/issues-panel-C-9kUGqO.js.br +0 -0
  27. package/dist/client/assets/{nyan-cat-BvxG-Hhz.js → nyan-cat-DLU7L0F2.js} +1 -1
  28. package/dist/client/assets/nyan-cat-DLU7L0F2.js.br +0 -0
  29. package/dist/client/assets/{phone-shell-DtQYi3Yz.js → phone-shell-CAlVRH-A.js} +1 -1
  30. package/dist/client/assets/phone-shell-CAlVRH-A.js.br +0 -0
  31. package/dist/client/assets/{plan-face-BfwHo5re.js → plan-face-WpVYeXGh.js} +1 -1
  32. package/dist/client/assets/plan-face-WpVYeXGh.js.br +0 -0
  33. package/dist/client/assets/{plan-render-QchOXg1E.js → plan-render-D7--c3qq.js} +1 -1
  34. package/dist/client/assets/plan-render-D7--c3qq.js.br +0 -0
  35. package/dist/client/assets/{pr-scope-tabs-BqPN4zAH.js → pr-scope-tabs-SPjQar96.js} +1 -1
  36. package/dist/client/assets/pr-scope-tabs-SPjQar96.js.br +0 -0
  37. package/dist/client/assets/{radar-panel-DQCaWDNM.js → radar-panel-BhU8Tox1.js} +1 -1
  38. package/dist/client/assets/radar-panel-BhU8Tox1.js.br +0 -0
  39. package/dist/client/assets/{resume-dialog-C_NFnnAx.js → resume-dialog-DvcFxs0T.js} +1 -1
  40. package/dist/client/assets/resume-dialog-DvcFxs0T.js.br +0 -0
  41. package/dist/client/assets/{review-queue-panel-DTM1__rk.js → review-queue-panel-CXxo72KX.js} +1 -1
  42. package/dist/client/assets/review-queue-panel-CXxo72KX.js.br +0 -0
  43. package/dist/client/assets/{settings-panel-k5MM_UFC.js → settings-panel-eElgQ9sl.js} +2 -2
  44. package/dist/client/assets/settings-panel-eElgQ9sl.js.br +0 -0
  45. package/dist/client/assets/{shown-lightbox-Bdv2LDYa.js → shown-lightbox-DLBCDlmL.js} +1 -1
  46. package/dist/client/assets/shown-lightbox-DLBCDlmL.js.br +0 -0
  47. package/dist/client/assets/{trace-panel-BlczKgbw.js → trace-panel-B1eQQqmW.js} +1 -1
  48. package/dist/client/assets/trace-panel-B1eQQqmW.js.br +0 -0
  49. package/dist/client/assets/{usage-panel-DeCYlwfG.js → usage-panel-BK3HGdI3.js} +1 -1
  50. package/dist/client/assets/usage-panel-BK3HGdI3.js.br +0 -0
  51. package/dist/client/assets/{visions-panel-IoBQ4LJF.js → visions-panel-BXARteeE.js} +1 -1
  52. package/dist/client/assets/visions-panel-BXARteeE.js.br +0 -0
  53. package/dist/client/index.html +1 -1
  54. package/dist/client/index.html.br +0 -0
  55. package/dist/server/index.js +1 -1
  56. package/package.json +1 -1
  57. package/dist/client/assets/alert-sound-CMw9IYOa.js.br +0 -0
  58. package/dist/client/assets/benchmark-panel-12iKvivr.js.br +0 -0
  59. package/dist/client/assets/celebration-player-CpgG9DUA.js.br +0 -0
  60. package/dist/client/assets/dialogs-x_B527bk.js.br +0 -0
  61. package/dist/client/assets/doc-editor-ui-CIhJUO3J.js.br +0 -0
  62. package/dist/client/assets/feature-hint-MLJvjOT0.js.br +0 -0
  63. package/dist/client/assets/first-run-checklist-s4X-OM4Z.js.br +0 -0
  64. package/dist/client/assets/hooks-panel-121qcKFE.js.br +0 -0
  65. package/dist/client/assets/index-BJ8diTZl.js.br +0 -0
  66. package/dist/client/assets/issues-panel-CMZFcUDT.js.br +0 -0
  67. package/dist/client/assets/nyan-cat-BvxG-Hhz.js.br +0 -0
  68. package/dist/client/assets/phone-shell-DtQYi3Yz.js.br +0 -0
  69. package/dist/client/assets/plan-face-BfwHo5re.js.br +0 -0
  70. package/dist/client/assets/plan-render-QchOXg1E.js.br +0 -0
  71. package/dist/client/assets/pr-scope-tabs-BqPN4zAH.js.br +0 -0
  72. package/dist/client/assets/radar-panel-DQCaWDNM.js.br +0 -0
  73. package/dist/client/assets/resume-dialog-C_NFnnAx.js.br +0 -0
  74. package/dist/client/assets/review-queue-panel-DTM1__rk.js.br +0 -0
  75. package/dist/client/assets/settings-panel-k5MM_UFC.js.br +0 -0
  76. package/dist/client/assets/shown-lightbox-Bdv2LDYa.js.br +0 -0
  77. package/dist/client/assets/trace-panel-BlczKgbw.js.br +0 -0
  78. package/dist/client/assets/usage-panel-DeCYlwfG.js.br +0 -0
  79. package/dist/client/assets/visions-panel-IoBQ4LJF.js.br +0 -0
@@ -70,7 +70,7 @@ var OWN_SUBCOMMAND_RUNNERS = [
70
70
  return runPairCli(subcommandArgs);
71
71
  }],
72
72
  ["agent", async (subcommandArgs) => {
73
- const { runAgentSetupCli } = await import("../chunks/agent-setup-cli-C7x4N5U6.js");
73
+ const { runAgentSetupCli } = await import("../chunks/agent-setup-cli-C8PNC8YA.js");
74
74
  return runAgentSetupCli(subcommandArgs);
75
75
  }],
76
76
  ["settings", async (subcommandArgs) => {
@@ -235,7 +235,7 @@ async function runDoctor() {
235
235
  }
236
236
  switchSection("Agents");
237
237
  try {
238
- const { listAgentIds, describeAgentResolvability, setCustomAgents } = await import("../chunks/adapters-d3XIppeP.js");
238
+ const { listAgentIds, describeAgentResolvability, setCustomAgents } = await import("../chunks/adapters-CKy7FjTT.js");
239
239
  const declaredCustomAgents = await readDeclaredCustomAgents();
240
240
  if (declaredCustomAgents.error) line("config", declaredCustomAgents.error);
241
241
  setCustomAgents(declaredCustomAgents.declared);
@@ -243,7 +243,7 @@ async function runDoctor() {
243
243
  const { label, path: resolvedPath } = describeAgentResolvability(id);
244
244
  line(`${id} (${label})`, resolvedPath ?? missingAgentText(id));
245
245
  }
246
- const { inspectGrokAgentSetup, inspectKimiAgentSetup } = await import("../chunks/agent-setup-cli-C7x4N5U6.js");
246
+ const { inspectGrokAgentSetup, inspectKimiAgentSetup } = await import("../chunks/agent-setup-cli-C8PNC8YA.js");
247
247
  const grokSetup = inspectGrokAgentSetup();
248
248
  line("grok hook setup", `${grokSetup.classification}: ${grokSetup.filePath}`);
249
249
  const kimiSetup = inspectKimiAgentSetup();
@@ -262,7 +262,7 @@ async function runDoctor() {
262
262
  try {
263
263
  const { resolvePackageBin } = await import("../chunks/runtime-paths-Cc0_ZR6V.js");
264
264
  const { execFileSync } = await import("../chunks/child-process-safe-CjVtRjDD.js");
265
- const { inspectGrokAgentSetup } = await import("../chunks/agent-setup-cli-C7x4N5U6.js");
265
+ const { inspectGrokAgentSetup } = await import("../chunks/agent-setup-cli-C8PNC8YA.js");
266
266
  const binPath = resolvePackageBin("cc-safety-net", "cc-safety-net");
267
267
  line("Sane YOLO", binPath || "not installed");
268
268
  if (binPath) line("cc-safety-net version", execFileSync(process.execPath, [binPath, "--version"], {
@@ -7,7 +7,7 @@ import { c as textOr, i as numberOr, s as rawTextOr } from "./coerce-NSst8oRP.js
7
7
  import { n as resolveAgentCommand, t as buildAgentSpawnCommand } from "./spawn-command-Cc40FiZI.js";
8
8
  import { n as parseJsonRecord } from "./json-core-dfa_7Fak.js";
9
9
  import { r as nextBackoffMs } from "./backoff-DjVpfHk7.js";
10
- import { a as classifyAgentTitle, i as grok, o as isBrailleChar, s as isSpinnerChar, t as kimi, u as buildAgentEnv } from "./kimi-Be_QndbF.js";
10
+ import { d as classifyAgentTitle, f as isBrailleChar, g as buildAgentEnv, p as isSpinnerChar, t as kimi, u as grok } from "./kimi-BGYddMlv.js";
11
11
  import { t as buildHookCommand } from "./hook-command-core-qTNK-xMF.js";
12
12
  import { n as isExperimentalBuild, t as compareReleaseVersions } from "./build-channel-DqsP-nkH.js";
13
13
  import { n as mergeCodexPreToolUse, t as HOOK_TOOLS } from "./hook-tools-Cr97Vdap.js";
@@ -1 +1 @@
1
- export { a as describeAgentResolvability, l as listAgentIds, f as setCustomAgents } from "./adapters-DmzmKIDw.js";
1
+ export { a as describeAgentResolvability, l as listAgentIds, f as setCustomAgents } from "./adapters-Br_PA1X_.js";
@@ -1,5 +1,5 @@
1
1
  import { a as isMissingFileError, r as errorMessage } from "./text-DoirglWV.js";
2
- import { c as classifyGrokHooksFile, i as grok, l as renderGrokHooksFile, n as classifyKimiConfig, r as spliceKimiHooksBlock, t as kimi } from "./kimi-Be_QndbF.js";
2
+ import { c as classifyKimiConfig, h as renderGrokHooksFile, l as spliceKimiHooksBlock, m as classifyGrokHooksFile, t as kimi, u as grok } from "./kimi-BGYddMlv.js";
3
3
  import { p as writeTextAtomicSync } from "./json-file-BjFK_eSH.js";
4
4
  import fs from "node:fs";
5
5
  import path from "node:path";
@@ -9,10 +9,11 @@ import { t as HOOK_URL_ENV } from "./hook-relay-core-DA_bz2KA.js";
9
9
  import { a as KIMI_SANE_YOLO_FLAVOR, o as SANE_YOLO_PATH_ENV, r as RTK_PATH_ENV, s as saneYoloEnv } from "./rtk-hook-core-23_GM8RQ.js";
10
10
  import { t as buildHookCommand } from "./hook-command-core-qTNK-xMF.js";
11
11
  import { p as writeTextAtomicSync } from "./json-file-BjFK_eSH.js";
12
- import fs from "node:fs";
12
+ import { createRequire } from "node:module";
13
+ import fs, { closeSync, mkdirSync, openSync, readdirSync, renameSync, rmSync, unlinkSync } from "node:fs";
13
14
  import path from "node:path";
14
15
  import os from "node:os";
15
- import { createHash } from "node:crypto";
16
+ import { createHash, randomUUID } from "node:crypto";
16
17
  //#region session/core/spawn-env.ts
17
18
  var GLIMMERVOID_SCRUB_KEYS = [
18
19
  "GLIMMERVOID_PORT",
@@ -562,28 +563,134 @@ function spliceKimiHooksBlock(configText, block) {
562
563
  var KIMI_CONFIG_NAME = "config.toml";
563
564
  var KIMI_SOURCES_NAME = ".glimmervoid-sources.json";
564
565
  var KIMI_CONFLICTS_NAME = ".glimmervoid-conflicts";
566
+ var KIMI_BASE_NAME = ".glimmervoid-base.toml";
567
+ var KIMI_IN_USE_LOCK_NAME = ".glimmervoid-in-use.lock";
565
568
  var GENERATED_ONLY_NAMES = /* @__PURE__ */ new Set([
566
569
  KIMI_CONFIG_NAME,
567
570
  KIMI_SOURCES_NAME,
568
- KIMI_CONFLICTS_NAME
571
+ KIMI_CONFLICTS_NAME,
572
+ KIMI_BASE_NAME,
573
+ KIMI_IN_USE_LOCK_NAME
569
574
  ]);
570
575
  var FILE_STAMP_PREFIX = "file:";
571
- function generatedKimiConfig(realConfigText, hooksBlock) {
572
- const configText = realConfigText ?? "";
576
+ var TOML_TABLE_HEADER_PATTERN = /^\s*\[\[?([^[\]=]+)\]\]?\s*(?:#.*)?$/;
577
+ var TOML_KEY_PATTERN = /^\s*((?:[A-Za-z0-9_-]+|"[^"]*"|'[^']*')(?:\s*\.\s*(?:[A-Za-z0-9_-]+|"[^"]*"|'[^']*'))*)\s*=/;
578
+ var TOML_MULTILINE_QUOTES = ["\"\"\"", "'''"];
579
+ function withoutBlock(configText) {
573
580
  const span = locateBlock(configText);
574
- if (span === "foreign") return { refusal: "its Glimmervoid hooks block markers are unbalanced" };
575
- const operatorText = span === "absent" ? configText : `${configText.slice(0, span.start)}${configText.slice(span.end)}`;
581
+ if (span === "foreign") return span;
582
+ if (span === "absent") return configText;
583
+ const operatorText = `${configText.slice(0, span.start)}${configText.slice(span.end)}`;
584
+ return operatorText.endsWith("\n\n") ? operatorText.slice(0, -1) : operatorText;
585
+ }
586
+ function togglesMultilineString(line) {
587
+ return TOML_MULTILINE_QUOTES.some((quotes) => line.split(quotes).length % 2 === 0);
588
+ }
589
+ function splitTomlUnits(configText) {
590
+ const units = {
591
+ preamble: "",
592
+ keys: [],
593
+ tables: []
594
+ };
595
+ const tableCounts = /* @__PURE__ */ new Map();
596
+ let current = null;
597
+ let isInTable = false;
598
+ let isInMultilineString = false;
599
+ for (const line of configText.split(/(?<=\n)/)) {
600
+ const header = isInMultilineString ? null : TOML_TABLE_HEADER_PATTERN.exec(line);
601
+ const key = isInMultilineString || isInTable || header ? null : TOML_KEY_PATTERN.exec(line);
602
+ if (togglesMultilineString(line)) isInMultilineString = !isInMultilineString;
603
+ if (header) {
604
+ const headerId = `${line.trim().startsWith("[[") ? "[[" : "["}${(header[1] ?? "").replaceAll(/\s/g, "")}`;
605
+ const occurrence = (tableCounts.get(headerId) ?? 0) + 1;
606
+ tableCounts.set(headerId, occurrence);
607
+ current = {
608
+ id: `${headerId}#${occurrence}`,
609
+ text: line
610
+ };
611
+ units.tables.push(current);
612
+ isInTable = true;
613
+ continue;
614
+ }
615
+ if (key) {
616
+ current = {
617
+ id: (key[1] ?? "").replaceAll(/\s/g, ""),
618
+ text: line
619
+ };
620
+ units.keys.push(current);
621
+ continue;
622
+ }
623
+ if (current) current.text += line;
624
+ if (!current) units.preamble += line;
625
+ }
626
+ return units;
627
+ }
628
+ function isSameUnit(first, second) {
629
+ return first?.text.trimEnd() === second?.text.trimEnd();
630
+ }
631
+ function mergeUnitList(base, ours, theirs) {
632
+ const baseById = new Map(base.map((unit) => [unit.id, unit]));
633
+ const oursById = new Map(ours.map((unit) => [unit.id, unit]));
634
+ const theirIds = new Set(theirs.map((unit) => unit.id));
635
+ const merged = [];
636
+ for (const theirUnit of theirs) {
637
+ const ourUnit = oursById.get(theirUnit.id);
638
+ const isOnlySessionChange = !isSameUnit(ourUnit, baseById.get(theirUnit.id)) && isSameUnit(theirUnit, baseById.get(theirUnit.id));
639
+ if (!isOnlySessionChange) merged.push(theirUnit);
640
+ if (isOnlySessionChange && ourUnit) merged.push(ourUnit);
641
+ }
642
+ for (const ourUnit of ours) if (!theirIds.has(ourUnit.id) && !baseById.has(ourUnit.id)) merged.push(ourUnit);
643
+ return merged;
644
+ }
645
+ function mergeTopLevelKeys(base, ours, theirs) {
646
+ if (theirs === base) return ours;
647
+ if (ours === base) return theirs;
648
+ const [baseUnits, ourUnits, theirUnits] = [
649
+ splitTomlUnits(base),
650
+ splitTomlUnits(ours),
651
+ splitTomlUnits(theirs)
652
+ ];
653
+ const keys = mergeUnitList(baseUnits.keys, ourUnits.keys, theirUnits.keys).map((unit) => `${unit.text.trimEnd()}\n`);
654
+ const tables = mergeUnitList(baseUnits.tables, ourUnits.tables, theirUnits.tables).map((unit) => `\n${unit.text.trimEnd()}\n`);
655
+ return [
656
+ theirUnits.preamble,
657
+ ...keys,
658
+ ...tables
659
+ ].join("");
660
+ }
661
+ var HOOKS_ARRAY_TABLE_ID_PREFIX = "[[hooks#";
662
+ function withoutUnmarkedHooks(ours, base) {
663
+ const baseHookTexts = new Set(splitTomlUnits(base).tables.map((unit) => unit.text.trimEnd()));
664
+ const ourUnits = splitTomlUnits(ours);
665
+ const keptTables = ourUnits.tables.filter((unit) => !unit.id.startsWith(HOOKS_ARRAY_TABLE_ID_PREFIX) || baseHookTexts.has(unit.text.trimEnd()));
666
+ if (keptTables.length === ourUnits.tables.length) return ours;
667
+ return [
668
+ ourUnits.preamble,
669
+ ...ourUnits.keys.map((unit) => unit.text),
670
+ ...keptTables.map((unit) => unit.text)
671
+ ].join("");
672
+ }
673
+ function generatedKimiConfig(sources) {
674
+ const realText = sources.realConfigText ?? "";
675
+ const theirs = withoutBlock(realText);
676
+ if (theirs === "foreign") return { refusal: "its Glimmervoid hooks block markers are unbalanced" };
677
+ const hadBlock = theirs !== realText;
678
+ if (sources.baseConfigText === theirs && sources.generatedConfigText !== null && classifyKimiConfig(sources.generatedConfigText, sources.hooksBlock) === "current") return {
679
+ text: sources.generatedConfigText,
680
+ base: theirs,
681
+ hadBlock
682
+ };
683
+ const ours = sources.generatedConfigText === null ? "foreign" : withoutBlock(sources.generatedConfigText);
684
+ const operatorText = ours === "foreign" || sources.baseConfigText === null ? theirs : mergeTopLevelKeys(sources.baseConfigText, withoutUnmarkedHooks(ours, sources.baseConfigText), theirs);
576
685
  if (definesHooksOutsideArrayTables(operatorText)) return { refusal: "it defines hooks as a key or [hooks] table, which a [[hooks]] block cannot extend" };
577
- const spliced = spliceKimiHooksBlock(operatorText, hooksBlock);
686
+ const spliced = spliceKimiHooksBlock(operatorText, sources.hooksBlock);
578
687
  if ("refused" in spliced) return { refusal: `its hooks are ${spliced.refused}` };
579
688
  return {
580
689
  text: spliced.contents,
581
- hadBlock: span !== "absent"
690
+ base: theirs,
691
+ hadBlock
582
692
  };
583
693
  }
584
- function configSourceStamp(realConfigText, hooksBlock) {
585
- return createHash("sha256").update(realConfigText ?? "").update("\0").update(hooksBlock).digest("hex");
586
- }
587
694
  function linkKindFor(kind, platform) {
588
695
  if (platform !== "win32") return "symlink";
589
696
  return kind === "folder" ? "junction" : "hardlink";
@@ -631,17 +738,20 @@ function planEntryLink(real, generated, inputs) {
631
738
  return adoption === "private" ? adoption : [adoption, link];
632
739
  }
633
740
  function planKimiHome(inputs) {
634
- const config = generatedKimiConfig(inputs.realConfigText, inputs.hooksBlock);
741
+ const config = generatedKimiConfig(inputs);
635
742
  if ("refusal" in config) return {
636
743
  kind: "refused",
637
744
  reason: `the real ${KIMI_CONFIG_NAME} cannot take the hooks block: ${config.refusal}`
638
745
  };
639
746
  const steps = [];
640
- const configStamp = configSourceStamp(inputs.realConfigText, inputs.hooksBlock);
641
- if (!(inputs.generatedConfigText !== null && inputs.sourceStamps["config.toml"] === configStamp && classifyKimiConfig(inputs.generatedConfigText, inputs.hooksBlock) === "current")) steps.push({
747
+ if (config.text !== inputs.generatedConfigText) steps.push({
642
748
  kind: "write-config",
643
749
  text: config.text
644
750
  });
751
+ if (config.base !== inputs.baseConfigText) steps.push({
752
+ kind: "write-base",
753
+ text: config.base
754
+ });
645
755
  const generatedByName = new Map(inputs.generatedEntries.map((entry) => [entry.name, entry]));
646
756
  const realNames = /* @__PURE__ */ new Set();
647
757
  const privateNames = [];
@@ -662,12 +772,165 @@ function planKimiHome(inputs) {
662
772
  return {
663
773
  kind: "ready",
664
774
  steps,
665
- sourceStamps: { [KIMI_CONFIG_NAME]: configStamp },
666
775
  privateNames,
667
776
  hasStaleBlockInRealConfig: config.hadBlock
668
777
  };
669
778
  }
670
779
  //#endregion
780
+ //#region server/guardrails/session-temp-locks.ts
781
+ var LOCK_FILE_SUFFIX = ".lock";
782
+ var SESSION_TEMP_GATE_FILE_NAME = "session-temp.gate";
783
+ var TRASH_FOLDER_PREFIX = ".deleting-";
784
+ var LOCK_INSTANCE_SHAPE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
785
+ var SESSION_ID_SHAPE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
786
+ var requireFromHere = createRequire(import.meta.url);
787
+ var heldLockDescriptorsBySessionId = /* @__PURE__ */ new Map();
788
+ var fileLocks;
789
+ var ownInstanceId;
790
+ function loadFileLocks() {
791
+ if (fileLocks !== void 0) return fileLocks;
792
+ fileLocks = requireNativeFileLocks();
793
+ return fileLocks;
794
+ }
795
+ function requireNativeFileLocks() {
796
+ try {
797
+ return requireFromHere("fs-native-extensions");
798
+ } catch {
799
+ return null;
800
+ }
801
+ }
802
+ function readOwnInstanceId() {
803
+ ownInstanceId ??= randomUUID();
804
+ return ownInstanceId;
805
+ }
806
+ function ownSessionLockPath(policyDir, sessionId) {
807
+ return path.join(policyDir, `${sessionId}.${readOwnInstanceId()}${LOCK_FILE_SUFFIX}`);
808
+ }
809
+ function sessionIdOfLockFile(entryName) {
810
+ if (!entryName.endsWith(LOCK_FILE_SUFFIX)) return null;
811
+ const lockName = entryName.slice(0, -5);
812
+ const instanceSeparatorIndex = lockName.lastIndexOf(".");
813
+ if (instanceSeparatorIndex < 0) return null;
814
+ const sessionId = lockName.slice(0, instanceSeparatorIndex);
815
+ if (!SESSION_ID_SHAPE.test(sessionId) || !LOCK_INSTANCE_SHAPE.test(lockName.slice(instanceSeparatorIndex + 1))) return null;
816
+ return sessionId;
817
+ }
818
+ function openSessionTempGate(policyDir) {
819
+ mkdirSync(policyDir, {
820
+ recursive: true,
821
+ mode: 448
822
+ });
823
+ return openSync(path.join(policyDir, SESSION_TEMP_GATE_FILE_NAME), "a+");
824
+ }
825
+ function closeSessionTempGate(locks, gateDescriptor) {
826
+ try {
827
+ locks.unlock(gateDescriptor);
828
+ } finally {
829
+ closeSync(gateDescriptor);
830
+ }
831
+ }
832
+ function lockOwnSessionFile(locks, lockPath) {
833
+ const lockDescriptor = openSync(lockPath, "a+");
834
+ if (locks.tryLock(lockDescriptor)) return lockDescriptor;
835
+ closeSync(lockDescriptor);
836
+ return null;
837
+ }
838
+ function holdSessionLockWhileGated(locks, policyDir, sessionId, sessionTempFolder) {
839
+ const gateDescriptor = openSessionTempGate(policyDir);
840
+ try {
841
+ locks.waitForLockSync(gateDescriptor, { shared: true });
842
+ const lockDescriptor = lockOwnSessionFile(locks, ownSessionLockPath(policyDir, sessionId));
843
+ if (lockDescriptor !== null) heldLockDescriptorsBySessionId.set(sessionId, lockDescriptor);
844
+ mkdirSync(sessionTempFolder, { recursive: true });
845
+ } finally {
846
+ closeSessionTempGate(locks, gateDescriptor);
847
+ }
848
+ }
849
+ function createHeldSessionTempFolder(policyDir, sessionId, sessionTempFolder) {
850
+ const locks = loadFileLocks();
851
+ if (locks === null || heldLockDescriptorsBySessionId.has(sessionId)) {
852
+ mkdirSync(sessionTempFolder, { recursive: true });
853
+ return;
854
+ }
855
+ holdSessionLockWhileGated(locks, policyDir, sessionId, sessionTempFolder);
856
+ }
857
+ function releaseSessionLock(policyDir, sessionId) {
858
+ const lockDescriptor = heldLockDescriptorsBySessionId.get(sessionId);
859
+ if (lockDescriptor === void 0) return false;
860
+ heldLockDescriptorsBySessionId.delete(sessionId);
861
+ try {
862
+ unlinkSync(ownSessionLockPath(policyDir, sessionId));
863
+ } finally {
864
+ loadFileLocks()?.unlock(lockDescriptor);
865
+ closeSync(lockDescriptor);
866
+ }
867
+ return true;
868
+ }
869
+ function openExistingLockFile(lockPath) {
870
+ try {
871
+ return openSync(lockPath, "r+");
872
+ } catch {
873
+ return null;
874
+ }
875
+ }
876
+ function tryLockOrFalse(locks, lockDescriptor) {
877
+ try {
878
+ return locks.tryLock(lockDescriptor);
879
+ } catch {
880
+ return false;
881
+ }
882
+ }
883
+ function lockIfUnheld(locks, lockPath) {
884
+ const lockDescriptor = openExistingLockFile(lockPath);
885
+ if (lockDescriptor === null) return null;
886
+ if (tryLockOrFalse(locks, lockDescriptor)) return lockDescriptor;
887
+ closeSync(lockDescriptor);
888
+ return null;
889
+ }
890
+ function releaseLockDescriptors(locks, lockDescriptors) {
891
+ for (const lockDescriptor of lockDescriptors) {
892
+ locks.unlock(lockDescriptor);
893
+ closeSync(lockDescriptor);
894
+ }
895
+ }
896
+ function sessionLockPathsIn(policyDir, sessionId) {
897
+ return readdirSync(policyDir).filter((entryName) => sessionIdOfLockFile(entryName) === sessionId).map((entryName) => path.join(policyDir, entryName));
898
+ }
899
+ function moveFolderToTrash(sessionTempFolder, sessionId) {
900
+ const trashFolder = path.join(path.dirname(sessionTempFolder), `${TRASH_FOLDER_PREFIX}${sessionId}-${randomUUID()}`);
901
+ try {
902
+ renameSync(sessionTempFolder, trashFolder);
903
+ return trashFolder;
904
+ } catch (error) {
905
+ if (isMissingFileError(error)) return null;
906
+ throw error;
907
+ }
908
+ }
909
+ function trashFolderIfEveryLockIsFree(locks, policyDir, sessionId, sessionTempFolder, { keepWhenNoLockFiles }) {
910
+ const lockPaths = sessionLockPathsIn(policyDir, sessionId);
911
+ if (keepWhenNoLockFiles && lockPaths.length === 0) return null;
912
+ const claimedLockDescriptors = lockPaths.map((lockPath) => lockIfUnheld(locks, lockPath)).filter((lockDescriptor) => lockDescriptor !== null);
913
+ try {
914
+ if (claimedLockDescriptors.length !== lockPaths.length) return null;
915
+ const trashFolder = moveFolderToTrash(sessionTempFolder, sessionId);
916
+ for (const lockPath of lockPaths) rmSync(lockPath, { force: true });
917
+ return trashFolder;
918
+ } finally {
919
+ releaseLockDescriptors(locks, claimedLockDescriptors);
920
+ }
921
+ }
922
+ function trashSessionTempFolderOnceUnheld(policyDir, sessionId, sessionTempFolder, options) {
923
+ const locks = loadFileLocks();
924
+ if (locks === null) return null;
925
+ const gateDescriptor = openSessionTempGate(policyDir);
926
+ try {
927
+ if (!locks.tryLock(gateDescriptor)) return null;
928
+ return trashFolderIfEveryLockIsFree(locks, policyDir, sessionId, sessionTempFolder, options);
929
+ } finally {
930
+ closeSessionTempGate(locks, gateDescriptor);
931
+ }
932
+ }
933
+ //#endregion
671
934
  //#region session/kimi-home.ts
672
935
  var GENERATED_HOME_MODE = 448;
673
936
  var GENERATED_FILE_MODE = 384;
@@ -824,6 +1087,7 @@ function planFromDisk({ hooksBlock, platform = process.platform }, realHome, gen
824
1087
  realEntries: listRealEntries(realHome, new Set(generatedEntries.filter((entry) => entry.kind === "folder").map((entry) => entry.name))),
825
1088
  generatedEntries,
826
1089
  realConfigText: realConfig.text,
1090
+ baseConfigText: readOptionalText(path.join(generatedHome, KIMI_BASE_NAME)),
827
1091
  generatedConfigText: readOptionalText(path.join(generatedHome, KIMI_CONFIG_NAME)),
828
1092
  hooksBlock,
829
1093
  sourceStamps: readSourceStamps(generatedHome),
@@ -831,7 +1095,9 @@ function planFromDisk({ hooksBlock, platform = process.platform }, realHome, gen
831
1095
  });
832
1096
  }
833
1097
  function stepEntryPath(generatedHome, step) {
834
- return path.join(generatedHome, step.kind === "write-config" ? KIMI_CONFIG_NAME : step.name);
1098
+ if (step.kind === "write-config") return path.join(generatedHome, KIMI_CONFIG_NAME);
1099
+ if (step.kind === "write-base") return path.join(generatedHome, KIMI_BASE_NAME);
1100
+ return path.join(generatedHome, step.name);
835
1101
  }
836
1102
  function promoteIntoRealHome(entryPath, target) {
837
1103
  const resolvedTarget = fs.realpathSync(target);
@@ -878,6 +1144,7 @@ function applyStep(generatedHome, step) {
878
1144
  const entryPath = stepEntryPath(generatedHome, step);
879
1145
  switch (step.kind) {
880
1146
  case "write-config":
1147
+ case "write-base":
881
1148
  writeTextAtomicSync(entryPath, step.text, {
882
1149
  mode: GENERATED_FILE_MODE,
883
1150
  enforceMode: true
@@ -928,7 +1195,7 @@ function prepareKimiHome(options) {
928
1195
  if (plan.kind === "refused") return { refusal: plan.reason };
929
1196
  const keptPrivateNames = /* @__PURE__ */ new Set();
930
1197
  for (const step of plan.steps) {
931
- if (step.kind !== "write-config" && keptPrivateNames.has(step.name)) continue;
1198
+ if ("name" in step && keptPrivateNames.has(step.name)) continue;
932
1199
  try {
933
1200
  applyStep(generatedHome, step);
934
1201
  } catch (error) {
@@ -938,16 +1205,84 @@ function prepareKimiHome(options) {
938
1205
  }
939
1206
  const realHome = realKimiHome(options.env, options.homeDir);
940
1207
  try {
941
- const sourceStamps = {
942
- ...plan.sourceStamps,
943
- ...realFileStamps(realHome)
944
- };
945
- writeTextAtomicSync(path.join(generatedHome, KIMI_SOURCES_NAME), `${JSON.stringify(sourceStamps, null, 2)}\n`, { mode: GENERATED_FILE_MODE });
1208
+ writeTextAtomicSync(path.join(generatedHome, KIMI_SOURCES_NAME), `${JSON.stringify(realFileStamps(realHome), null, 2)}\n`, { mode: GENERATED_FILE_MODE });
946
1209
  } catch (error) {
947
1210
  return { refusal: `${path.join(generatedHome, KIMI_SOURCES_NAME)} cannot be written: ${errorMessage(error)}` };
948
1211
  }
949
1212
  return { home: generatedHome };
950
1213
  }
1214
+ var liveSessionCountByHome = /* @__PURE__ */ new Map();
1215
+ var inUseLockDescriptorByHome = /* @__PURE__ */ new Map();
1216
+ function inUseLockPath(generatedHome) {
1217
+ return path.join(generatedHome, KIMI_IN_USE_LOCK_NAME);
1218
+ }
1219
+ function takeSharedInUseLock(generatedHome) {
1220
+ const locks = loadFileLocks();
1221
+ if (locks === null) return;
1222
+ fs.mkdirSync(generatedHome, {
1223
+ recursive: true,
1224
+ mode: GENERATED_HOME_MODE
1225
+ });
1226
+ const lockDescriptor = fs.openSync(inUseLockPath(generatedHome), "a+", GENERATED_FILE_MODE);
1227
+ locks.waitForLockSync(lockDescriptor, { shared: true });
1228
+ inUseLockDescriptorByHome.set(generatedHome, lockDescriptor);
1229
+ }
1230
+ function dropSharedInUseLock(generatedHome) {
1231
+ const lockDescriptor = inUseLockDescriptorByHome.get(generatedHome);
1232
+ if (lockDescriptor === void 0) return;
1233
+ inUseLockDescriptorByHome.delete(generatedHome);
1234
+ loadFileLocks()?.unlock(lockDescriptor);
1235
+ fs.closeSync(lockDescriptor);
1236
+ }
1237
+ function openInUseLock(generatedHome) {
1238
+ try {
1239
+ return fs.openSync(inUseLockPath(generatedHome), "a+", GENERATED_FILE_MODE);
1240
+ } catch (error) {
1241
+ if (isMissingFileError(error)) return null;
1242
+ throw error;
1243
+ }
1244
+ }
1245
+ function releaseSecretsUnlessHeldElsewhere(generatedHome, { whenLocksMissing }) {
1246
+ const locks = loadFileLocks();
1247
+ if (locks === null) {
1248
+ if (whenLocksMissing === "release") releaseKimiHomeSecrets(generatedHome);
1249
+ return;
1250
+ }
1251
+ const lockDescriptor = openInUseLock(generatedHome);
1252
+ if (lockDescriptor === null) return;
1253
+ try {
1254
+ if (!locks.tryLock(lockDescriptor)) return;
1255
+ releaseKimiHomeSecrets(generatedHome);
1256
+ locks.unlock(lockDescriptor);
1257
+ } finally {
1258
+ fs.closeSync(lockDescriptor);
1259
+ }
1260
+ }
1261
+ function holdKimiHome(generatedHome) {
1262
+ const liveSessionCount = (liveSessionCountByHome.get(generatedHome) ?? 0) + 1;
1263
+ liveSessionCountByHome.set(generatedHome, liveSessionCount);
1264
+ if (liveSessionCount === 1) takeSharedInUseLock(generatedHome);
1265
+ }
1266
+ function releaseKimiHomeSecrets(generatedHome) {
1267
+ for (const name of [KIMI_CONFIG_NAME, KIMI_BASE_NAME]) try {
1268
+ fs.rmSync(path.join(generatedHome, name), { force: true });
1269
+ } catch (error) {
1270
+ console.warn(`[kimi-home] ${path.join(generatedHome, name)} could not be deleted: ${errorMessage(error)}`);
1271
+ }
1272
+ }
1273
+ function releaseKimiHome(generatedHome) {
1274
+ const liveSessionCount = (liveSessionCountByHome.get(generatedHome) ?? 0) - 1;
1275
+ if (liveSessionCount > 0) {
1276
+ liveSessionCountByHome.set(generatedHome, liveSessionCount);
1277
+ return;
1278
+ }
1279
+ liveSessionCountByHome.delete(generatedHome);
1280
+ dropSharedInUseLock(generatedHome);
1281
+ releaseSecretsUnlessHeldElsewhere(generatedHome, { whenLocksMissing: "release" });
1282
+ }
1283
+ function releaseUnheldKimiHomeSecrets(generatedHome) {
1284
+ releaseSecretsUnlessHeldElsewhere(generatedHome, { whenLocksMissing: "keep" });
1285
+ }
951
1286
  //#endregion
952
1287
  //#region session/adapters/kimi.ts
953
1288
  var ID = "kimi";
@@ -1065,10 +1400,14 @@ function expectedHooksBlock() {
1065
1400
  function prepareHome(env) {
1066
1401
  const hooksBlock = expectedHooksBlock();
1067
1402
  if (hooksBlock === null) return { refusal: "the hook relay path cannot be written into a kimi hooks block" };
1068
- return prepareKimiHome({
1403
+ const generatedHome = generatedKimiHomePath(env);
1404
+ holdKimiHome(generatedHome);
1405
+ const prepared = prepareKimiHome({
1069
1406
  env,
1070
1407
  hooksBlock
1071
1408
  });
1409
+ if ("refusal" in prepared) releaseKimiHome(generatedHome);
1410
+ return prepared;
1072
1411
  }
1073
1412
  var WINDOWS_SHAPED_ROOT = /^(?:[A-Za-z]:\/|\/\/)/;
1074
1413
  var MAX_WORKSPACE_SLUG_LENGTH = 40;
@@ -1134,7 +1473,8 @@ var kimi = {
1134
1473
  injection: {
1135
1474
  kind: "generated-home",
1136
1475
  homeEnvName: HOME_ENV_NAME,
1137
- prepareHome
1476
+ prepareHome,
1477
+ releaseHome: releaseKimiHome
1138
1478
  }
1139
1479
  },
1140
1480
  resolveCommand,
@@ -1165,4 +1505,4 @@ var kimi = {
1165
1505
  }
1166
1506
  };
1167
1507
  //#endregion
1168
- export { classifyAgentTitle as a, classifyGrokHooksFile as c, grok as i, renderGrokHooksFile as l, classifyKimiConfig as n, isBrailleChar as o, spliceKimiHooksBlock as r, isSpinnerChar as s, kimi as t, buildAgentEnv as u };
1508
+ export { releaseSessionLock as a, classifyKimiConfig as c, classifyAgentTitle as d, isBrailleChar as f, buildAgentEnv as g, renderGrokHooksFile as h, createHeldSessionTempFolder as i, spliceKimiHooksBlock as l, classifyGrokHooksFile as m, generatedKimiHomePath as n, sessionIdOfLockFile as o, isSpinnerChar as p, releaseUnheldKimiHomeSecrets as r, trashSessionTempFolderOnceUnheld as s, kimi as t, grok as u };