@runeya/runeya 2.0.135 → 2.0.137

package/{chunk-M3UUGW5Z.js → chunk-P65BO7WZ.js}

@@ -30,7 +30,7 @@ import {
   runCompanionNow,
   syncConversationFromClaudeTranscript,
   verifyJwt
-} from "./chunk-GISLEYNE.js";
+} from "./chunk-FJLMXLMK.js";
 import {
   StoreDiskCoordinator,
   agentManager,
@@ -49,7 +49,7 @@ import {
   recordLocalRemoval,
   refsOfProjectId,
   serviceStore
-} from "./chunk-7JAJSV4L.js";
+} from "./chunk-J4GLFY7G.js";
 import {
   atomicWriteJsonSecure,
   atomicWriteSecure,
@@ -106,7 +106,7 @@ import {
 import {
   isCliAvailable,
   resolveCliInvocation
-} from "./chunk-4RMM2OUU.js";
+} from "./chunk-NURPXHLB.js";
 
 // ../server/src/trpc/routers/chat.ts
 import { z as z9 } from "zod";
@@ -649,6 +649,18 @@ var FILENAME = "environment-overrides.json";
 var EnvironmentOverridesStore = class {
   data = {};
   loaded = false;
+  /**
+   * Le coordinateur partagé par les stores : un seul rechargement à la fois,
+   * jamais pendant une écriture, et une substitution atomique à la fin.
+   *
+   * Ce store faisait sa propre cuisine et se marquait « chargé » avant ses
+   * `await` : toute lecture concurrente repartait avec une table vide — une
+   * surcharge déjà écrite paraissait absente, et l'assistant réclamait au
+   * déverrouillage des variables que ce poste avait déjà renseignées.
+   */
+  disk = new StoreDiskCoordinator();
+  /** Ce que le disque portait au dernier chargement (cf. `load`). */
+  fingerprint = "";
   diskEncryptedSlots = {};
   /**
    * Les surcharges dont le secret ne s'est pas ouvert.
@@ -658,7 +670,6 @@ var EnvironmentOverridesStore = class {
    * manquait que la clé.
    */
   unreadableSecrets = /* @__PURE__ */ new Set();
-  saveQueue = Promise.resolve();
   /** Which vault each override was read from, until its project is known. */
   roots = /* @__PURE__ */ new Map();
   /**
@@ -683,24 +694,52 @@ var EnvironmentOverridesStore = class {
   getLegacyFilePath() {
     return legacyMachineFilePath(FILENAME);
   }
-  /**
-   * Read every vault, then the places older versions used.
-   *
-   * Variable ids are unique, so merging the files cannot collide; a vault read
-   * later simply wins over a legacy copy of the same override.
-   */
-  async load() {
-    if (this.loaded) return;
-    if (!getEncryptionKey()) return;
-    this.loaded = true;
-    await ensureProjectsLoaded();
+  /** Les fichiers qui portent des surcharges : les coffres, et l'emplacement d'avant. */
+  async sourcePaths() {
     const roots = await allVaultRoots();
-    const sources = [
+    return [
       this.getLegacyFilePath(),
       await keyedFilePath(FILENAME),
       ...roots.map((root) => join4(root, FILENAME))
     ];
-    for (const path of sources) {
+  }
+  /**
+   * Charger, et recharger quand les fichiers ont bougé sous nos pieds.
+   *
+   * L'empreinte se prend **après** `ensureProjectsLoaded` : la liste des coffres
+   * en dépend, et une empreinte prise sur une liste incomplète ne ressemblerait
+   * à aucune des suivantes — le store se rechargerait à chaque lecture.
+   */
+  async load() {
+    await this.disk.load(async () => {
+      if (!getEncryptionKey()) return null;
+      await ensureProjectsLoaded();
+      const fingerprint = await fingerprintFiles(await this.sourcePaths());
+      if (this.loaded && fingerprint === this.fingerprint) return null;
+      const next = await this.readVaults();
+      return () => {
+        this.data = next.data;
+        this.diskEncryptedSlots = next.diskEncryptedSlots;
+        this.roots = next.roots;
+        this.unreadableSecrets = next.unreadableSecrets;
+        this.fingerprint = fingerprint;
+        this.loaded = true;
+      };
+    });
+  }
+  /**
+   * Read every vault, then the places older versions used, into fresh tables
+   * that `load` swaps in at once.
+   *
+   * Variable ids are unique, so merging the files cannot collide; a vault read
+   * later simply wins over a legacy copy of the same override.
+   */
+  async readVaults() {
+    const data = {};
+    const diskEncryptedSlots = {};
+    const roots = /* @__PURE__ */ new Map();
+    const unreadableSecrets = /* @__PURE__ */ new Set();
+    for (const path of await this.sourcePaths()) {
       let parsed;
       try {
         parsed = JSON.parse(await readFile2(path, "utf-8"));
@@ -708,24 +747,24 @@ var EnvironmentOverridesStore = class {
         continue;
       }
       Object.assign(
-        this.diskEncryptedSlots,
+        diskEncryptedSlots,
         extractEncryptedVariableSlots(parsed)
       );
       const decrypted = decryptVariableSlots(
         parsed,
         "environment-overrides",
-        (variableId) => this.unreadableSecrets.add(variableId),
+        (variableId) => unreadableSecrets.add(variableId),
         vaultIdOfRoot(dirname2(path))
       );
       for (const [id, override] of Object.entries(decrypted)) {
-        this.data[id] = { value: override.value };
-        this.roots.set(id, dirname2(path));
+        data[id] = { value: override.value };
+        roots.set(id, dirname2(path));
       }
     }
+    return { data, diskEncryptedSlots, roots, unreadableSecrets };
   }
   save() {
-    this.saveQueue = this.saveQueue.then(() => this.doSave()).catch(() => this.doSave());
-    return this.saveQueue;
+    return this.disk.save(() => this.doSave());
   }
   /**
    * Write each vault that holds — or held — an override.
@@ -1394,11 +1433,11 @@ function toList(raw) {
   }
   return text.split(",").map((v) => v.trim().replace(/^["'[]+|["'\]]+$/g, "")).filter(Boolean);
 }
-function clearable(raw, parse2, key) {
+function clearable(raw, parse, key) {
   if (raw === void 0) return {};
   const text = String(raw).trim();
   if (!text || text === "null") return { [key]: null };
-  return { [key]: parse2(text) };
+  return { [key]: parse(text) };
 }
 function gitTarget(p) {
   return {
@@ -3274,360 +3313,6 @@ var serviceRouter = router({
   })
 });
 
-// ../server/src/services/claude-usage.ts
-import pty from "@lydell/node-pty";
-import { execSync } from "child_process";
-var MONTHS = {
-  jan: 0,
-  feb: 1,
-  mar: 2,
-  apr: 3,
-  may: 4,
-  jun: 5,
-  jul: 6,
-  aug: 7,
-  sep: 8,
-  oct: 9,
-  nov: 10,
-  dec: 11
-};
-function parseResetsAt(str) {
-  const tzMatch = str.match(/\(([^)]+)\)/);
-  const tz = tzMatch?.[1] ?? "UTC";
-  const dateStr = str.replace(/\([^)]+\)/, "").replaceAll("\xB7", "").trim();
-  const withTime = dateStr.match(/^([A-Za-z]{3})(\d+),(\d+)(am|pm)$/i);
-  const withoutTime = dateStr.match(/^([A-Za-z]{3})(\d+)$/i);
-  const timeOnly = dateStr.match(/^(\d+)(?::(\d+))?(am|pm)$/i);
-  let month, day, hour = 0, minute = 0;
-  const year = (/* @__PURE__ */ new Date()).getFullYear();
-  if (withTime) {
-    month = MONTHS[withTime[1].toLowerCase()] ?? 0;
-    day = Number.parseInt(withTime[2]);
-    hour = Number.parseInt(withTime[3]);
-    if (withTime[4].toLowerCase() === "pm" && hour !== 12) hour += 12;
-    if (withTime[4].toLowerCase() === "am" && hour === 12) hour = 0;
-  } else if (withoutTime) {
-    month = MONTHS[withoutTime[1].toLowerCase()] ?? 0;
-    day = Number.parseInt(withoutTime[2]);
-  } else if (timeOnly) {
-    hour = Number.parseInt(timeOnly[1]);
-    minute = timeOnly[2] ? Number.parseInt(timeOnly[2]) : 0;
-    if (timeOnly[3].toLowerCase() === "pm" && hour !== 12) hour += 12;
-    if (timeOnly[3].toLowerCase() === "am" && hour === 12) hour = 0;
-    const now = /* @__PURE__ */ new Date();
-    const parts = new Intl.DateTimeFormat("en", { timeZone: tz, year: "numeric", month: "2-digit", day: "2-digit" }).formatToParts(now);
-    month = Number.parseInt(parts.find((p) => p.type === "month").value) - 1;
-    day = Number.parseInt(parts.find((p) => p.type === "day").value);
-  } else {
-    return str;
-  }
-  const approxUtc = new Date(Date.UTC(year, month, day, hour, 0));
-  const offsetStr = new Intl.DateTimeFormat("en", {
-    timeZone: tz,
-    timeZoneName: "shortOffset"
-  }).formatToParts(approxUtc).find((p) => p.type === "timeZoneName")?.value ?? "GMT+0";
-  const offsetMatch = offsetStr.match(/GMT([+-])(\d+)(?::(\d+))?/);
-  const sign = offsetMatch?.[1] === "-" ? -1 : 1;
-  const offsetMinutes = sign * (Number.parseInt(offsetMatch?.[2] ?? "0") * 60 + Number.parseInt(offsetMatch?.[3] ?? "0"));
-  const utc = new Date(Date.UTC(year, month, day, hour, minute) - offsetMinutes * 6e4);
-  return utc.toISOString();
-}
-function extractSection(text, startPattern, endPattern) {
-  const start = text.search(startPattern);
-  if (start === -1) return null;
-  const after = text.slice(start);
-  const end = endPattern ? after.search(endPattern) : after.length;
-  return end === -1 ? after : after.slice(0, end);
-}
-function extractPercent(section) {
-  const m = section?.match(/(\d+)%\s*used/i);
-  return m ? Number.parseInt(m[1]) : null;
-}
-function extractResets(section) {
-  const m = section?.match(/Rese[ts]+\s*(.+?)(?=Current|Extra|$)/is);
-  return m ? m[1].replaceAll(/\s+/g, " ").trim() : null;
-}
-function parse(text) {
-  const flat = text.replaceAll("\n", " ").replaceAll(/\s+/g, " ");
-  const result = {};
-  const sessionSec = extractSection(flat, /Current\s*session/i, /Current\s*week|Extra\s*usage/i);
-  if (sessionSec) {
-    const resets = extractResets(sessionSec);
-    result.current_session = {
-      percent: extractPercent(sessionSec),
-      resetsAt: resets ? parseResetsAt(resets) : null
-    };
-  }
-  const weekAllSec = extractSection(flat, /Current\s*week\s*\(all\s*models?\)/i, /Current\s*week\s*\(Sonnet/i);
-  if (weekAllSec) {
-    const resets = extractResets(weekAllSec);
-    result.current_week_all = {
-      percent: extractPercent(weekAllSec),
-      resetsAt: resets ? parseResetsAt(resets) : null
-    };
-  }
-  const weekSonnetSec = extractSection(flat, /Current\s*week\s*\(Sonnet\s*only\)/i, /Extra\s*usage/i);
-  if (weekSonnetSec) {
-    const resets = extractResets(weekSonnetSec);
-    result.current_week_sonnet = {
-      percent: extractPercent(weekSonnetSec),
-      resetsAt: resets ? parseResetsAt(resets) : null
-    };
-  }
-  const extraSec = extractSection(flat, /Extra\s*usage(?!\s*not)/i, null);
-  if (extraSec && !/not\s*enabled/i.test(extraSec.slice(0, 40))) {
-    const spent = extraSec.match(/\$([\d.]+)\s*\/\s*\$([\d.]+)\s*spent/i);
-    const resets = extractResets(extraSec);
-    result.extra_usage = {
-      percent: extractPercent(extraSec),
-      spent: spent ? Number.parseFloat(spent[1]) : null,
-      limit: spent ? Number.parseFloat(spent[2]) : null,
-      resetsAt: resets ? parseResetsAt(resets) : null
-    };
-  }
-  return result;
-}
-function getClaudeUsage() {
-  return new Promise((resolve2, reject) => {
-    const env2 = { ...process.env };
-    delete env2["CLAUDECODE"];
-    let claudeBin = "claude";
-    if (process.platform !== "win32") {
-      try {
-        claudeBin = execSync("which claude", { encoding: "utf8" }).trim().split("\n")[0].trim() || "claude";
-      } catch {
-      }
-    }
-    const invocation = resolveCliInvocation(claudeBin, ["/usage"]);
-    let term = null;
-    try {
-      term = pty.spawn(invocation.command, invocation.args, {
-        name: "xterm-256color",
-        cols: 200,
-        rows: 40,
-        env: env2
-      });
-    } catch (err) {
-      reject(err);
-      return;
-    }
-    let buffer = "";
-    let done = false;
-    let debounce = null;
-    function finish() {
-      if (done) return;
-      done = true;
-      if (debounce) clearTimeout(debounce);
-      clearTimeout(hardTimeout);
-      term?.kill();
-      const clean = buffer.replaceAll(/\x1b\[[0-9;]*X/g, "\n").replaceAll(/\x1b\[[0-9;]*[mGKHFABCDJsu]/g, "").replaceAll(/\x1b[^a-zA-Z]*[a-zA-Z]/g, "").replaceAll("\r", "");
-      resolve2(parse(clean));
-    }
-    const hardTimeout = setTimeout(() => {
-      if (!done) finish();
-    }, 15e3);
-    term.onData((data) => {
-      buffer += data;
-      if (buffer.includes("%")) {
-        if (debounce) clearTimeout(debounce);
-        debounce = setTimeout(finish, 800);
-      }
-    });
-    term.onExit(() => {
-      finish();
-    });
-  });
-}
-async function getClaudeUsageEntries() {
-  const usage = await getClaudeUsage();
-  const entries = [];
-  if (usage.current_session) {
-    entries.push({
-      label: "Session",
-      percentage: usage.current_session.percent,
-      next_reset: usage.current_session.resetsAt
-    });
-  }
-  if (usage.current_week_all) {
-    entries.push({
-      label: "Week",
-      percentage: usage.current_week_all.percent,
-      next_reset: usage.current_week_all.resetsAt
-    });
-  }
-  if (usage.current_week_sonnet) {
-    entries.push({
-      label: "Sonnet",
-      percentage: usage.current_week_sonnet.percent,
-      next_reset: usage.current_week_sonnet.resetsAt
-    });
-  }
-  if (usage.extra_usage) {
-    entries.push({
-      label: "Extra",
-      percentage: usage.extra_usage.percent,
-      next_reset: usage.extra_usage.resetsAt
-    });
-  }
-  return entries;
-}
-
-// ../server/src/services/codex-usage.ts
-import pty2 from "@lydell/node-pty";
-var MONTHS2 = {
-  jan: 0,
-  feb: 1,
-  mar: 2,
-  apr: 3,
-  may: 4,
-  jun: 5,
-  jul: 6,
-  aug: 7,
-  sep: 8,
-  oct: 9,
-  nov: 10,
-  dec: 11
-};
-function parseResetToIso(raw) {
-  const value = raw.replace(/^\(*/, "").replace(/\)*$/, "").replace(/^resets?\s*/i, "").trim();
-  const now = /* @__PURE__ */ new Date();
-  const timeOnly = value.match(/^(\d{1,2}):(\d{2})$/);
-  if (timeOnly) {
-    const hour = Number.parseInt(timeOnly[1], 10);
-    const minute = Number.parseInt(timeOnly[2], 10);
-    const date = new Date(now);
-    date.setHours(hour, minute, 0, 0);
-    if (date.getTime() <= now.getTime()) {
-      date.setDate(date.getDate() + 1);
-    }
-    return date.toISOString();
-  }
-  const withDate = value.match(/^(\d{1,2}):(\d{2})\s+on\s+(\d{1,2})\s+([A-Za-z]{3})$/i);
-  if (withDate) {
-    const hour = Number.parseInt(withDate[1], 10);
-    const minute = Number.parseInt(withDate[2], 10);
-    const day = Number.parseInt(withDate[3], 10);
-    const month = MONTHS2[withDate[4].toLowerCase()];
-    if (month === void 0) return null;
-    let year = now.getFullYear();
-    let date = new Date(year, month, day, hour, minute, 0, 0);
-    if (date.getTime() <= now.getTime()) {
-      year += 1;
-      date = new Date(year, month, day, hour, minute, 0, 0);
-    }
-    return date.toISOString();
-  }
-  return null;
-}
-function stripAnsi(text) {
-  return text.replace(/[\u001b\u009b][[\]()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "").replaceAll("\r", "");
-}
-function parseCodexStatusText(text) {
-  const clean = stripAnsi(text);
-  const normalizedLines = clean.replace(/[│╭╰╮╯─]/g, " ").split("\n").map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
-  const entries = [];
-  let pendingIndex = null;
-  for (const line of normalizedLines) {
-    const sameLine = line.match(/^(.+?limit)\s*:\s*(?:\[[^\]]*\]\s*)?(\d+)%\s*left(?:\s*\((?:resets?\s+)?([^)]+)\))?$/i);
-    if (sameLine) {
-      const label = sameLine[1].trim();
-      const left = Number.parseInt(sameLine[2], 10);
-      const used = Number.isNaN(left) ? null : Math.max(0, Math.min(100, 100 - left));
-      const nextReset = sameLine[3] ? parseResetToIso(sameLine[3]) ?? null : null;
-      entries.push({ label, percentage: used, next_reset: nextReset });
-      pendingIndex = nextReset ? null : entries.length - 1;
-      continue;
-    }
-    const splitReset = line.match(/^\(?\s*resets?\s+([^)]+)\)?$/i);
-    if (splitReset && pendingIndex !== null) {
-      entries[pendingIndex].next_reset = parseResetToIso(splitReset[1]) ?? null;
-      pendingIndex = null;
-    }
-  }
-  if (entries.length === 0) {
-    const statuslineMatch = clean.match(/·\s*(\d+)%\s*left/i);
-    if (statuslineMatch) {
-      const left = Number.parseInt(statuslineMatch[1], 10);
-      const used = Number.isNaN(left) ? null : Math.max(0, Math.min(100, 100 - left));
-      entries.push({ label: "Usage", percentage: used, next_reset: null });
-    }
-  }
-  return entries;
-}
-function getCodexUsageEntries() {
-  return new Promise((resolve2, reject) => {
-    let term = null;
-    try {
-      const invocation = resolveCliInvocation("codex", []);
-      term = pty2.spawn(invocation.command, invocation.args, {
-        name: "xterm-256color",
-        cols: 220,
-        rows: 40,
-        env: process.env
-      });
-    } catch (err) {
-      reject(err);
-      return;
-    }
-    let buffer = "";
-    let done = false;
-    const queuedInputs = ["/status", "/status", "/status", "/exit"];
-    let queuedIndex = 0;
-    let inputDrainDebounce = null;
-    let promptSeen = false;
-    const finish = () => {
-      if (done) return;
-      done = true;
-      if (inputDrainDebounce) clearTimeout(inputDrainDebounce);
-      clearTimeout(initialTrigger);
-      clearTimeout(hardTimeout);
-      term?.kill();
-      if (process.env["CODEX_USAGE_DEBUG"] === "1") {
-        const debugClean = stripAnsi(buffer).slice(-6e3);
-        process.stdout.write("[codex-usage] raw tail:\n" + debugClean + "\n");
-      }
-      resolve2(parseCodexStatusText(buffer));
-    };
-    const hardTimeout = setTimeout(() => {
-      finish();
-    }, 25e3);
-    const sendNextInputIfReady = () => {
-      if (done) return;
-      if (!promptSeen) return;
-      if (queuedIndex >= queuedInputs.length) return;
-      const value = queuedInputs[queuedIndex];
-      queuedIndex += 1;
-      promptSeen = false;
-      term?.write(`${value}\r`);
-    };
-    const initialTrigger = setTimeout(() => {
-      promptSeen = true;
-      sendNextInputIfReady();
-    }, 6e3);
-    term.onData((data) => {
-      buffer += data;
-      if (data.includes("\x1B[6n")) {
-        term?.write("\x1B[25;1R");
-      }
-      if (data.includes("\u203A")) {
-        promptSeen = true;
-      }
-      if (inputDrainDebounce) clearTimeout(inputDrainDebounce);
-      inputDrainDebounce = setTimeout(sendNextInputIfReady, 120);
-      if (/(\d+)\s*h\s+limit\s*:/i.test(buffer) && /weekly\s+limit\s*:/i.test(buffer)) {
-        setTimeout(finish, 800);
-      }
-      if (/data not available yet/i.test(buffer) && queuedIndex >= queuedInputs.length - 1) {
-        setTimeout(finish, 400);
-      }
-    });
-    term.onExit(() => {
-      clearTimeout(initialTrigger);
-      finish();
-    });
-  });
-}
-
 // ../server/src/services/scenario-store.ts
 function normalizeNode(raw) {
   const aiCli = raw.aiCli ?? "claude-code";
@@ -5691,7 +5376,7 @@ function tailTranscript(opts) {
 
 // ../server/src/services/ai-runners/claude-pty-runner.ts
 async function getAgentManager() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-TUFAFC6U.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-FUU72VGH.js");
   return agentManager2;
 }
 function buildPtyArgs(params, sessionId, opts) {
@@ -6385,7 +6070,7 @@ async function shutdownCodexAppServer() {
   }
 }
 async function getAgentManager2() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-TUFAFC6U.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-FUU72VGH.js");
   return agentManager2;
 }
 function parseRuneyaCurlCommand(command) {
@@ -7512,9 +7197,9 @@ var chatRouter = router({
           agentId,
           "ai.findPtyBySession",
           { sessionId: input.id }
-        ).then((pty3) => {
-          if (pty3?.status === "running") {
-            return agentManager.agentMutation(agentId, "ai.kill", { spawnId: pty3.spawnId });
+        ).then((pty) => {
+          if (pty?.status === "running") {
+            return agentManager.agentMutation(agentId, "ai.kill", { spawnId: pty.spawnId });
           }
         }).catch(() => {
         });
@@ -7625,20 +7310,6 @@ Return ONLY the improved text, no explanation, no preamble.`;
     return { enhanced: input.text };
   }),
   listClaudeCodeModels: protectedProcedure.query(() => ["opus", "sonnet", "haiku"]),
-  getClaudeUsage: protectedProcedure.query(async () => {
-    try {
-      return await getClaudeUsageEntries();
-    } catch {
-      return null;
-    }
-  }),
-  getCodexUsage: protectedProcedure.query(async () => {
-    try {
-      return await getCodexUsageEntries();
-    } catch {
-      return null;
-    }
-  }),
   getStreamingStatus: protectedProcedure.query(() => activeSessionRegistry.listActive()),
   stopSession: protectedProcedure.input(z9.object({ conversationId: ConversationIdSchema })).mutation(({ input }) => {
     if (process.env.RUNEYA_DEBUG) console.log("[chat]: stopSession");
@@ -8431,4 +8102,4 @@ export {
   startCliSession,
   chatRouter
 };
-//# sourceMappingURL=chunk-M3UUGW5Z.js.map
+//# sourceMappingURL=chunk-P65BO7WZ.js.map