@runeya/runeya 2.0.121 → 2.0.123

package/{chunk-3N55WR7F.js → chunk-N3ZI35SC.js}

@@ -1,8 +1,9 @@
 import {
+  atomicWriteSecure,
   hasChangedSinceRead,
   rememberFile,
   wasRead
-} from "./chunk-YZU5FNXR.js";
+} from "./chunk-HK5QNU6P.js";
 import {
   SchemaVersionSchema,
   SettingsPrivateSchema,
@@ -17,7 +18,7 @@ import {
 } from "./chunk-ZFELQG4B.js";
 
 // ../server/src/services/settings-manager.ts
-import { readFile, writeFile, rename, mkdir, chmod } from "fs/promises";
+import { readFile } from "fs/promises";
 import { join } from "path";
 var SETTINGS_FILE = "settings.json";
 var SETTINGS_PRIVATE_FILE = "settings.private.json";
@@ -42,13 +43,8 @@ var SettingsManager = class {
     return vault ?? "";
   }
   async atomicWrite(filename, data, vault) {
-    const root = this.rootOf(vault);
-    await mkdir(root, { recursive: true });
-    const filePath = join(root, filename);
-    const tmpPath = filePath + ".tmp";
-    await writeFile(tmpPath, JSON.stringify(data, null, 2), "utf-8");
-    await rename(tmpPath, filePath);
-    await chmod(filePath, 384);
+    const filePath = join(this.rootOf(vault), filename);
+    await atomicWriteSecure(filePath, JSON.stringify(data, null, 2));
     await rememberFile(filePath);
   }
   /**
@@ -164,12 +160,7 @@ var SettingsManager = class {
   }
   async saveSchemaVersion(sv) {
     this.schemaVersion = sv;
-    await mkdir(machineRoot(), { recursive: true });
-    const filePath = machineFilePath(SCHEMA_VERSION_FILE);
-    const tmpPath = filePath + ".tmp";
-    await writeFile(tmpPath, JSON.stringify(sv, null, 2), "utf-8");
-    await rename(tmpPath, filePath);
-    await chmod(filePath, 384);
+    await atomicWriteSecure(machineFilePath(SCHEMA_VERSION_FILE), JSON.stringify(sv, null, 2));
   }
   getCurrentSchemaVersion() {
     return CURRENT_SCHEMA_VERSION;
@@ -180,4 +171,4 @@ var settingsManager = new SettingsManager();
 export {
   settingsManager
 };
-//# sourceMappingURL=chunk-3N55WR7F.js.map
+//# sourceMappingURL=chunk-N3ZI35SC.js.map

package/chunk-N3ZI35SC.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../server/src/services/settings-manager.ts"],"sourcesContent":["import { readFile } from 'node:fs/promises';\nimport { env } from '../config/env.js';\nimport { join } from 'node:path';\nimport { machineFilePath, legacyMachineFilePath, machineRoot, orgVaultRoot } from './vault-resolver.js';\nimport { SettingsSchema, SchemaVersionSchema, SettingsPrivateSchema } from '@runeya/packages-shared';\nimport type { Settings, SchemaVersion, SettingsPrivate } from '@runeya/packages-shared';\nimport { rememberFile, hasChangedSinceRead, wasRead } from './disk-freshness.js';\nimport { atomicWriteSecure } from './run-store-utils.js';\n\nconst SETTINGS_FILE = 'settings.json';\nconst SETTINGS_PRIVATE_FILE = 'settings.private.json';\nconst SCHEMA_VERSION_FILE = 'schema-version.json';\nconst CURRENT_SCHEMA_VERSION = 4;\n\n/**\n * Les réglages vivent dans le coffre de ce qu'ils configurent.\n *\n * Ils étaient au niveau machine — un fichier pour tout le poste — alors qu'ils\n * décrivent des choses qui appartiennent à des organisations différentes : les\n * fournisseurs d'IA qui paient le travail d'une équipe, les scénarios qui\n * décrivent ses services. Un réglage global obligeait donc à partager la clé\n * machine pour partager un secret d'organisation.\n *\n * `vault` désigne le coffre : l'identifiant d'une organisation, ou l'absence\n * pour le répertoire de lancement — celui d'un projet local, qui n'appartient à\n * personne d'autre. Rien ne reste au niveau machine sinon la session cloud,\n * irréductible puisque c'est elle qui donne accès aux organisations.\n */\nclass SettingsManager {\n  private settings = new Map<string, Settings>();\n  private settingsPrivate = new Map<string, SettingsPrivate>();\n  private schemaVersion: SchemaVersion | null = null;\n\n  /**\n   * Le coffre visé, sous forme de racine sur le disque.\n   *\n   * Sans organisation, la racine machine — pas le répertoire de lancement. Ce\n   * n'est pas un reste de l'ancien monde : y écrire forcerait un `.runeya` à\n   * exister chez quelqu'un qui ne travaille que sur des projets cloud, ce que\n   * les coffres ont justement supprimé (et ce qu'un test garde).\n   */\n  private rootOf(vault?: string): string {\n    return vault ? orgVaultRoot(vault) : machineRoot();\n  }\n\n  private cacheKey(vault?: string): string {\n    return vault ?? '';\n  }\n\n  private async atomicWrite(filename: string, data: unknown, vault?: string): Promise<void> {\n    const filePath = join(this.rootOf(vault), filename);\n    await atomicWriteSecure(filePath, JSON.stringify(data, null, 2));\n    // Notre propre écriture devient la référence : sans elle, la lecture\n    // suivante prendrait ce fichier pour l'œuvre d'une autre instance et\n    // relirait pour rien.\n    await rememberFile(filePath);\n  }\n\n  /**\n   * Le cache de ce coffre fait-il encore foi ?\n   *\n   * Plusieurs Runeya partagent la racine machine — l'application installée et\n   * celle qu'on développe, couramment — et écrivent donc le même fichier. Un\n   * cache peuplé une fois et jamais revu rend l'état du démarrage pour\n   * toujours, et la sauvegarde suivante le réinstalle sur le disque : ce que\n   * l'autre instance avait écrit entre-temps disparaît. Les réglages sont\n   * l'endroit où cela coûte le plus cher, parce qu'un coffre n'a qu'un fichier\n   * pour toute l'organisation — un projet, lui, a le sien.\n   *\n   * Un fichier jamais lu n'est pas périmé : c'est un coffre neuf, dont les\n   * défauts viennent d'être écrits.\n   */\n  private async isStale(filename: string, vault?: string): Promise<boolean> {\n    const path = join(this.rootOf(vault), filename);\n    return wasRead(path) && await hasChangedSinceRead(path);\n  }\n\n  /**\n   * Lire le fichier de CE coffre, et rien d'autre.\n   *\n   * Pas de repli sur un autre emplacement : un réglage lu ailleurs que là où il\n   * est écrit fait deux vérités pour un même fait, et l'accord entre les deux\n   * devient une chose de plus à tenir. Ce que les versions précédentes ont\n   * écrit ailleurs est déplacé une fois pour toutes par\n   * `migrateSettingsIntoVaults`, pas relu indéfiniment.\n   */\n  private async readJson<T>(filename: string, vault?: string): Promise<T | null> {\n    const path = join(this.rootOf(vault), filename);\n    try {\n      const parsed = JSON.parse(await readFile(path, 'utf-8')) as T;\n      // Repère pris après coup : c'est cette lecture-là que le cache reflète.\n      await rememberFile(path);\n      return parsed;\n    } catch {\n      return null;\n    }\n  }\n\n  /** Vide les caches — après un déplacement de fichiers sous nos pieds. */\n  forget(): void {\n    this.settings.clear();\n    this.settingsPrivate.clear();\n  }\n\n  /** Un fichier qui appartient au poste, pas à un coffre. */\n  private async readMachineJson<T>(filename: string): Promise<T | null> {\n    for (const path of [machineFilePath(filename), legacyMachineFilePath(filename)]) {\n      try {\n        return JSON.parse(await readFile(path, 'utf-8')) as T;\n      } catch {\n        // Try the next location.\n      }\n    }\n    return null;\n  }\n\n  async getSettings(vault?: string): Promise<Settings> {\n    const key = this.cacheKey(vault);\n    let current = this.settings.get(key);\n    if (current && await this.isStale(SETTINGS_FILE, vault)) current = undefined;\n    if (!current) {\n      const raw = await this.readJson<unknown>(SETTINGS_FILE, vault);\n      const parsed = raw ? SettingsSchema.safeParse(raw) : null;\n      if (parsed?.success) {\n        current = parsed.data;\n        this.settings.set(key, current);\n      } else {\n        current = SettingsSchema.parse({ mode: env.MODE, cloudUrl: env.CLOUD_URL ?? null });\n        await this.saveSettings(current, vault);\n      }\n    }\n    return current;\n  }\n\n  async saveSettings(settings: Settings, vault?: string): Promise<void> {\n    this.settings.set(this.cacheKey(vault), settings);\n    await this.atomicWrite(SETTINGS_FILE, settings, vault);\n  }\n\n  async getPrivateSettings(vault?: string): Promise<SettingsPrivate> {\n    const key = this.cacheKey(vault);\n    let current = this.settingsPrivate.get(key);\n    if (current && await this.isStale(SETTINGS_PRIVATE_FILE, vault)) current = undefined;\n    if (!current) {\n      const raw = await this.readJson<unknown>(SETTINGS_PRIVATE_FILE, vault);\n      const parsed = raw ? SettingsPrivateSchema.safeParse(raw) : null;\n      if (parsed?.success) {\n        current = parsed.data;\n        this.settingsPrivate.set(key, current);\n      } else {\n        current = SettingsPrivateSchema.parse({});\n        await this.savePrivateSettings(current, vault);\n      }\n    }\n    return current;\n  }\n\n  async savePrivateSettings(settings: SettingsPrivate, vault?: string): Promise<void> {\n    this.settingsPrivate.set(this.cacheKey(vault), settings);\n    await this.atomicWrite(SETTINGS_PRIVATE_FILE, settings, vault);\n  }\n\n  /**\n   * La version de schéma reste au niveau machine, et ce n'est pas un oubli :\n   * elle ne configure rien, elle date les migrations des données de ce poste.\n   */\n  async getSchemaVersion(): Promise<SchemaVersion> {\n    if (!this.schemaVersion) {\n      const raw = await this.readMachineJson<unknown>(SCHEMA_VERSION_FILE);\n      const parsed = raw ? SchemaVersionSchema.safeParse(raw) : null;\n      if (parsed?.success) {\n        this.schemaVersion = parsed.data;\n      } else {\n        this.schemaVersion = { version: CURRENT_SCHEMA_VERSION, migratedAt: new Date() };\n        await this.saveSchemaVersion(this.schemaVersion);\n      }\n    }\n    return this.schemaVersion;\n  }\n\n  async saveSchemaVersion(sv: SchemaVersion): Promise<void> {\n    this.schemaVersion = sv;\n    await atomicWriteSecure(machineFilePath(SCHEMA_VERSION_FILE), JSON.stringify(sv, null, 2));\n  }\n\n  getCurrentSchemaVersion(): number {\n    return CURRENT_SCHEMA_VERSION;\n  }\n}\n\nexport const settingsManager = new SettingsManager();\n"],"mappings":"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","names":[]}

package/{chunk-OVV52N5F.js → chunk-TNJFDWJX.js}

@@ -6,6 +6,7 @@ import {
 } from "./chunk-MD3VW4HQ.js";
 import {
   AmbiguousProjectError,
+  StoreDiskCoordinator,
   agentManager,
   decryptValue,
   encryptValue,
@@ -21,13 +22,14 @@ import {
   serviceStore,
   setProjectServices,
   setProjectVault
-} from "./chunk-CNTL6NVU.js";
+} from "./chunk-MSLFR2EN.js";
 import {
+  atomicWriteSecure,
   fingerprintFiles,
   hasChangedSinceRead,
   rememberFile,
   wasRead
-} from "./chunk-YZU5FNXR.js";
+} from "./chunk-HK5QNU6P.js";
 import {
   COMPANION_RELAY_CLOSE,
   COMPANION_RELAY_OPEN,
@@ -53,14 +55,14 @@ import { EventEmitter as EventEmitter4 } from "events";
 
 // ../server/src/services/conversation-store.ts
 import { randomUUID as randomUUID2 } from "crypto";
-import { readFile as readFile3, writeFile as writeFile4, rename as rename3, mkdir as mkdir3, chmod as chmod3 } from "fs/promises";
+import { readFile as readFile3, mkdir as mkdir2 } from "fs/promises";
 import { dirname, join as join4 } from "path";
 import { EventEmitter as EventEmitter2 } from "events";
 
 // ../server/src/services/project-store.ts
 import { randomUUID } from "crypto";
 import { EventEmitter } from "events";
-import { readFile as readFile2, writeFile as writeFile3, rename as rename2, mkdir as mkdir2, chmod as chmod2, rm } from "fs/promises";
+import { readFile as readFile2, rename as rename2, rm } from "fs/promises";
 import { join as join3 } from "path";
 
 // ../server/src/utils/ensure-data-gitignore.ts
@@ -280,22 +282,17 @@ var ProjectStore = class {
    * côté existe pour lui.
    */
   fingerprint = "";
+  disk = new StoreDiskCoordinator();
   /** Emits `'saved'` after every persisted mutation, for the cloud sync bridge. */
   events = new EventEmitter();
   getFilePath(root = localVaultRoot()) {
     return join3(root, FILENAME2);
   }
-  async writeAtomic(filePath, data) {
-    const tmpPath = filePath + ".tmp";
-    await writeFile3(tmpPath, data, "utf-8");
-    await rename2(tmpPath, filePath);
-    await chmod2(filePath, 384);
-  }
   /** Adopt a project read from disk, remembering which vault it came from. */
-  async absorb(p, root) {
+  async absorb(into, p, root) {
     const projectEnvs = await environmentStore.getByProjectId(p.id).catch(() => []);
     const defaultEnv = projectEnvs.find((e) => e.default);
-    this.projects.set(projectKey(p), {
+    into.set(projectKey(p), {
       ...p,
       environmentIds: p.environmentIds ?? [],
       groupOrder: p.groupOrder ?? [],
@@ -333,46 +330,47 @@ var ProjectStore = class {
    * reviendrait à exiger un redémarrage pour les voir.
    */
   async load() {
-    const fingerprint = await this.diskFingerprint();
-    if (this.loaded && fingerprint === this.fingerprint) return;
-    const previous = this.projects;
-    this.projects = /* @__PURE__ */ new Map();
-    this.loaded = true;
-    this.fingerprint = fingerprint;
-    try {
-      await this.readVaults(previous);
-    } catch (err) {
-      this.projects = previous;
-      this.fingerprint = "";
-      throw err;
+    let migrated = false;
+    await this.disk.load(async () => {
+      const fingerprint = await this.diskFingerprint();
+      if (this.loaded && fingerprint === this.fingerprint) return null;
+      const next = await this.readVaults();
+      return () => {
+        for (const [key, project] of next.projects) {
+          const before = this.projects.get(key)?.activeEnvironmentId;
+          if (before && project.environmentIds.includes(before)) {
+            project.activeEnvironmentId = before;
+          }
+        }
+        this.projects = next.projects;
+        this.fingerprint = fingerprint;
+        this.loaded = true;
+        migrated = next.migrated;
+      };
+    });
+    if (migrated) {
+      await this.save();
+      await serviceStore.relocateAll();
+      await environmentStore.relocateAll();
     }
   }
-  /** Le parcours proprement dit, isolé pour que `load` puisse le rattraper. */
-  async readVaults(previous) {
+  /** Le parcours proprement dit, dans une table neuve que `load` substitue. */
+  async readVaults() {
+    const projects = /* @__PURE__ */ new Map();
     const { local, strayCloud } = await readLocalProject();
-    if (local) await this.absorb(local, localVaultRoot());
+    if (local) await this.absorb(projects, local, localVaultRoot());
     let migrated = false;
     for (const project of strayCloud) {
       try {
-        await this.absorb(project, vaultFor(project).root);
+        await this.absorb(projects, project, vaultFor(project).root);
         migrated = true;
       } catch {
       }
     }
     for (const { project, root } of await readCloudProjects()) {
-      await this.absorb(project, root);
-    }
-    for (const [key, project] of this.projects) {
-      const before = previous.get(key)?.activeEnvironmentId;
-      if (before && project.environmentIds.includes(before)) {
-        project.activeEnvironmentId = before;
-      }
-    }
-    if (migrated) {
-      await this.save();
-      await serviceStore.relocateAll();
-      await environmentStore.relocateAll();
+      await this.absorb(projects, project, root);
     }
+    return { projects, migrated };
   }
   /**
    * Persist every vault this store knows about.
@@ -381,7 +379,10 @@ var ProjectStore = class {
    * that moved between vaults — a local project adopted by an org, a cloud
    * project pulled for the first time — from lingering in the vault it left.
    */
-  async save() {
+  save() {
+    return this.disk.save(() => this.writeVaults());
+  }
+  async writeVaults() {
     const locals = [];
     const cloud = [];
     for (const project of this.projects.values()) {
@@ -398,7 +399,7 @@ var ProjectStore = class {
     if (local) {
       await ensureLocalVault();
       await ensureDataGitignore(localVaultRoot());
-      await this.writeAtomic(this.getFilePath(), JSON.stringify(toDiskForm(local), null, 2));
+      await atomicWriteSecure(this.getFilePath(), JSON.stringify(toDiskForm(local), null, 2));
     } else {
       await rm(this.getFilePath(), { force: true }).catch(() => {
       });
@@ -406,8 +407,7 @@ var ProjectStore = class {
     await rename2(join3(localVaultRoot(), LEGACY_FILENAME), join3(localVaultRoot(), LEGACY_FILENAME + ".bak")).catch(() => {
     });
     for (const { project, root } of cloud) {
-      await mkdir2(root, { recursive: true });
-      await this.writeAtomic(this.getFilePath(root), JSON.stringify(toDiskForm(project), null, 2));
+      await atomicWriteSecure(this.getFilePath(root), JSON.stringify(toDiskForm(project), null, 2));
       setProjectVault(project, root);
     }
     this.fingerprint = await this.diskFingerprint();
@@ -741,7 +741,7 @@ var ConversationStore = class {
    */
   fingerprint = "";
   events = new EventEmitter2().setMaxListeners(0);
-  saveQueue = Promise.resolve();
+  disk = new StoreDiskCoordinator();
   snapshotConversation(conv) {
     return structuredClone(conv);
   }
@@ -770,7 +770,7 @@ var ConversationStore = class {
     }
   }
   async ensureDir() {
-    await mkdir3(dirname(await this.getFilePath()), { recursive: true });
+    await mkdir2(dirname(await this.getFilePath()), { recursive: true });
   }
   encryptMessages(messages, vault) {
     return encryptValue(JSON.stringify(messages), vault);
@@ -878,16 +878,26 @@ ${new Error("trace").stack}`
     if (!getEncryptionKey()) {
       return;
     }
-    const fingerprint = await this.diskFingerprint();
-    if (this.loaded && fingerprint === this.fingerprint) return;
-    this.loaded = true;
-    this.fingerprint = fingerprint;
-    this.unreadable.clear();
-    await ensureProjectsLoaded();
-    const sources = await this.sourcePaths();
-    this.conversations.clear();
-    this.roots.clear();
-    for (const { path, legacy } of sources) {
+    await this.disk.load(async () => {
+      const fingerprint = await this.diskFingerprint();
+      if (this.loaded && fingerprint === this.fingerprint) return null;
+      await ensureProjectsLoaded();
+      const next = await this.readSources();
+      return () => {
+        this.conversations = next.conversations;
+        this.roots = next.roots;
+        this.unreadable = next.unreadable;
+        this.fingerprint = fingerprint;
+        this.loaded = true;
+      };
+    });
+  }
+  /** Lire toutes les sources dans des tables neuves, que `load` substitue d'un coup. */
+  async readSources() {
+    const conversations = /* @__PURE__ */ new Map();
+    const roots = /* @__PURE__ */ new Map();
+    const unreadable = /* @__PURE__ */ new Map();
+    for (const { path, legacy } of await this.sourcePaths()) {
       let data;
       try {
         data = JSON.parse(await readFile3(path, "utf-8"));
@@ -901,15 +911,16 @@ ${new Error("trace").stack}`
         try {
           const conv = this.fromDisk(item, vaultIdOfRoot(root));
           if (!conv.projectId && inherited) conv.projectId = inherited;
-          this.conversations.set(item.id, conv);
-          this.roots.set(item.id, root);
+          conversations.set(item.id, conv);
+          roots.set(item.id, root);
         } catch {
-          const bucket = this.unreadable.get(root) ?? [];
+          const bucket = unreadable.get(root) ?? [];
           bucket.push(item);
-          this.unreadable.set(root, bucket);
+          unreadable.set(root, bucket);
         }
       }
     }
+    return { conversations, roots, unreadable };
   }
   /**
    * Oublier ce qui a été lu, pour tout relire sous la clé courante.
@@ -976,11 +987,7 @@ ${new Error("trace").stack}`
         );
         continue;
       }
-      await mkdir3(root, { recursive: true });
-      const tmpPath = `${filePath}.tmp`;
-      await writeFile4(tmpPath, JSON.stringify(data, null, 2), "utf-8");
-      await rename3(tmpPath, filePath);
-      await chmod3(filePath, 384);
+      await atomicWriteSecure(filePath, JSON.stringify(data, null, 2));
       await rememberFile(filePath);
     }
     this.fingerprint = await this.diskFingerprint();
@@ -1019,11 +1026,8 @@ ${new Error("trace").stack}`
     await this.load();
     await this.save();
   }
-  async save() {
-    const write = this.saveQueue.then(() => this.saveInternal());
-    this.saveQueue = write.catch(() => {
-    });
-    return write;
+  save() {
+    return this.disk.save(() => this.saveInternal());
   }
   async list() {
     await this.load();
@@ -2018,7 +2022,7 @@ async function runCompanionForTurn(conversationId) {
   if (!hasNew) {
     return skip(conversationId, "nothingNew", `rien de neuf \xE0 relire (${messageCount} messages)`);
   }
-  const { startCliSession } = await import("./chat-VL6BIVO5.js");
+  const { startCliSession } = await import("./chat-MOAVENBI.js");
   const companionConv = await ensureCompanionConversation(conv);
   const isFirstTurn = (companionConv.messages?.length ?? 0) === 0;
   const exchange = formatExchange(conv.messages, from);
@@ -2132,7 +2136,7 @@ async function deliverToMainConversation(conv, message) {
 async function attemptDelivery(conv, message) {
   if (await writeToLivePty(conv.id, message)) return "pty";
   try {
-    const { startCliSession } = await import("./chat-VL6BIVO5.js");
+    const { startCliSession } = await import("./chat-MOAVENBI.js");
     await startCliSession(conv.runner, conv.id, message, { jwt: await signJwt() });
     return "headless";
   } catch (err) {
@@ -2155,7 +2159,7 @@ async function writeToLivePty(conversationId, message) {
 }
 async function companionSettings() {
   try {
-    const { settingsManager } = await import("./settings-manager-ROWQ5GC2.js");
+    const { settingsManager } = await import("./settings-manager-MAVD4GAS.js");
     const settings = await settingsManager.getSettings();
     return settings.companion ?? { enabledByDefault: false };
   } catch {
@@ -2284,4 +2288,4 @@ export {
   runCompanionNow,
   initCompanion
 };
-//# sourceMappingURL=chunk-OVV52N5F.js.map
+//# sourceMappingURL=chunk-TNJFDWJX.js.map