@runeya/runeya 2.0.101 → 2.0.103

package/{chunk-TNBMCKQX.js → chunk-NZNIWJDT.js}

@@ -1,9 +1,3 @@
-import {
-  findThreadDb,
-  lastTurn,
-  threadMessages,
-  threadsStartedAfter
-} from "./chunk-MD3VW4HQ.js";
 import {
   AmbiguousProjectError,
   agentManager,
@@ -24,14 +18,10 @@ import {
   setProjectServices,
   setProjectVault,
   wasRead
-} from "./chunk-BHLCBARP.js";
+} from "./chunk-QIBUMYR6.js";
 import {
-  COMPANION_RELAY_CLOSE,
-  COMPANION_RELAY_OPEN,
-  ProjectSchema,
   allVaultRoots,
   ensureLocalVault,
-  extractCompanionRelay,
   keyedFilePath,
   legacyMachineFilePath,
   listCloudVaults,
@@ -41,7 +31,19 @@ import {
   orgIdOfRoot,
   vaultFor,
   vaultIdOfRoot
-} from "./chunk-NDO5VFZY.js";
+} from "./chunk-KY6KYSOU.js";
+import {
+  COMPANION_RELAY_CLOSE,
+  COMPANION_RELAY_OPEN,
+  ProjectSchema,
+  extractCompanionRelay
+} from "./chunk-QRMG6GMX.js";
+import {
+  findThreadDb,
+  lastTurn,
+  threadMessages,
+  threadsStartedAfter
+} from "./chunk-MD3VW4HQ.js";
 
 // ../server/src/services/companion.ts
 import { EventEmitter as EventEmitter4 } from "events";
@@ -1251,12 +1253,17 @@ function scheduleResync(sessionId) {
     }, RESYNC_DEBOUNCE_MS)
   );
 }
-function handleFsEvent(filename) {
-  if (!filename) return;
-  if (!filename.endsWith(".jsonl")) return;
-  const base = filename.split("/").pop();
+function sessionIdFromWatchedFilename(filename) {
+  if (!filename) return null;
+  if (!filename.endsWith(".jsonl")) return null;
+  const base = filename.split(/[\\/]/).pop();
   const sessionId = base.slice(0, -".jsonl".length);
-  if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(sessionId)) return;
+  if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(sessionId)) return null;
+  return sessionId;
+}
+function handleFsEvent(filename) {
+  const sessionId = sessionIdFromWatchedFilename(filename);
+  if (!sessionId) return;
   lastTranscriptActivity.set(sessionId, Date.now());
   scheduleResync(sessionId);
 }
@@ -1459,6 +1466,195 @@ async function findLivePty(sessionId) {
   return null;
 }
 
+// ../server/src/services/active-session-registry.ts
+var MAX_BUFFER = 5e3;
+var PERSIST_DEBOUNCE_MS = 100;
+var ActiveSessionRegistry = class {
+  sessions = /* @__PURE__ */ new Map();
+  registerClaudeCodeSession(conversationId, proc) {
+    this.assertNoActiveSession(conversationId);
+    const session = {
+      proc,
+      abortController: null,
+      sessionType: "claude-code",
+      conversationId,
+      buffer: [],
+      totalProduced: 0,
+      fullContent: "",
+      parts: [],
+      lastStatus: "",
+      status: "running",
+      persistTimer: null,
+      cleanupTimer: null,
+      notify: /* @__PURE__ */ new Set()
+    };
+    this.sessions.set(conversationId, session);
+    return session;
+  }
+  registerProviderApiSession(conversationId, ac) {
+    this.assertNoActiveSession(conversationId);
+    const session = {
+      proc: null,
+      abortController: ac,
+      sessionType: "provider-api",
+      conversationId,
+      buffer: [],
+      totalProduced: 0,
+      fullContent: "",
+      parts: [],
+      lastStatus: "",
+      status: "running",
+      persistTimer: null,
+      cleanupTimer: null,
+      notify: /* @__PURE__ */ new Set()
+    };
+    this.sessions.set(conversationId, session);
+    return session;
+  }
+  registerDirectProviderApiSession(conversationId) {
+    this.assertNoActiveSession(conversationId);
+    const session = {
+      proc: null,
+      abortController: new AbortController(),
+      sessionType: "provider-api",
+      conversationId,
+      buffer: [],
+      totalProduced: 0,
+      fullContent: "",
+      parts: [],
+      lastStatus: "",
+      status: "running",
+      persistTimer: null,
+      cleanupTimer: null,
+      notify: /* @__PURE__ */ new Set()
+    };
+    this.sessions.set(conversationId, session);
+    return session;
+  }
+  assertNoActiveSession(conversationId) {
+    const existing = this.sessions.get(conversationId);
+    if (existing && existing.status === "running") {
+      throw new Error(`A session is already running for conversation ${conversationId}. Stop it first.`);
+    }
+  }
+  pushEvent(conversationId, event) {
+    if (process.env.RUNEYA_DEBUG) console.log("[chat]: event - ", event.type);
+    const session = this.sessions.get(conversationId);
+    if (!session) return;
+    if (process.env.RUNEYA_DEBUG) console.log("[chat]: event - ", event.type, "session", session.conversationId);
+    if (event.type === "delta") {
+      session.fullContent += event.text;
+      const last = session.parts[session.parts.length - 1];
+      if (last?.type === "text") last.text += event.text;
+      else session.parts.push({ type: "text", text: event.text });
+      this.schedulePersist(session);
+    }
+    if (event.type === "tool_call") {
+      const existing = session.parts.find((p) => p.type === "tool" && p.id === event.id);
+      if (existing) {
+        existing.name = event.name;
+        existing.input = event.input;
+      } else session.parts.push({ type: "tool", id: event.id, name: event.name, input: event.input, rawInput: event.rawInput, pending: true });
+      this.schedulePersist(session);
+    }
+    if (event.type === "tool_result") {
+      const te = session.parts.find((p) => p.type === "tool" && p.id === event.id);
+      if (te) {
+        te.result = event.result;
+        te.isError = event.isError;
+        te.pending = false;
+      } else {
+        session.parts.push({ type: "tool", id: event.id, name: event.name, result: event.result, isError: event.isError, pending: false });
+      }
+      this.schedulePersist(session);
+    }
+    if (event.type === "thinking") {
+      const last = session.parts[session.parts.length - 1];
+      if (last?.type === "thinking") last.text += event.text;
+      else session.parts.push({ type: "thinking", text: event.text });
+    }
+    if (event.type === "status") {
+      session.lastStatus = event.text;
+    }
+    if (session.buffer.length >= MAX_BUFFER) {
+      session.buffer.shift();
+    }
+    if (process.env.RUNEYA_DEBUG) console.log("[chat]: event - ", event.type, "push buffer");
+    session.buffer.push(event);
+    session.totalProduced++;
+    if (process.env.RUNEYA_DEBUG) console.log("[chat]: event - ", event.type, "notify", session.notify.size);
+    for (const cb of session.notify) cb();
+    session.notify.clear();
+  }
+  markDone(conversationId) {
+    if (process.env.RUNEYA_DEBUG) console.log("[chat]: markdone....", conversationId);
+    const session = this.sessions.get(conversationId);
+    if (!session) return;
+    const wasRunning = session.status === "running";
+    session.status = "done";
+    this.persistNow(session);
+    if (wasRunning) emitTurnFinished(conversationId);
+  }
+  get(conversationId) {
+    return this.sessions.get(conversationId);
+  }
+  listActive() {
+    const result = [];
+    for (const session of this.sessions.values()) {
+      result.push({ conversationId: session.conversationId, status: session.status, sessionType: session.sessionType });
+    }
+    return result;
+  }
+  kill(conversationId) {
+    const session = this.sessions.get(conversationId);
+    if (!session) return false;
+    if (session.status === "running") {
+      if (session.agentId && session.agentSpawnId) {
+        agentManager.agentMutation(session.agentId, "ai.kill", { spawnId: session.agentSpawnId }).catch(() => {
+        });
+      }
+      if (session.proc) {
+        try {
+          session.proc.kill();
+        } catch {
+        }
+      }
+      if (session.abortController) {
+        session.abortController.abort();
+      }
+    }
+    return true;
+  }
+  // ── Internal helpers ────────────────────────────────────────────────────
+  schedulePersist(session) {
+    if (session.persistTimer) return;
+    session.persistTimer = setTimeout(() => {
+      session.persistTimer = null;
+      this.persistNow(session);
+    }, PERSIST_DEBOUNCE_MS);
+  }
+  persistNow(session) {
+    if (session.persistTimer) {
+      clearTimeout(session.persistTimer);
+      session.persistTimer = null;
+    }
+    const fullContent = session.fullContent;
+    const parts = session.parts.length > 0 ? [...session.parts] : void 0;
+    conversationStore.updateLastAssistantContent(session.conversationId, fullContent, parts);
+  }
+  cleanupTimers(session) {
+    if (session.persistTimer) {
+      clearTimeout(session.persistTimer);
+      session.persistTimer = null;
+    }
+    if (session.cleanupTimer) {
+      clearTimeout(session.cleanupTimer);
+      session.cleanupTimer = null;
+    }
+  }
+};
+var activeSessionRegistry = new ActiveSessionRegistry();
+
 // ../server/src/services/companion.ts
 var MAX_CONSECUTIVE_RELAUNCHES = 3;
 var MAX_EXCHANGE_CHARS = 2e4;
@@ -1647,6 +1843,9 @@ function companionSystemNote() {
     "et ce que tu n'as pas v\xE9rifi\xE9, plut\xF4t que d'affirmer sans preuve."
   ].join("\n");
 }
+function companionAgentId(livePtyAgentId, lastSessionAgentId) {
+  return livePtyAgentId ?? lastSessionAgentId;
+}
 function trace(conversationId, reason) {
   console.log(`[companion] ${conversationId.slice(0, 8)} \u2014 ${reason}`);
 }
@@ -1660,7 +1859,7 @@ async function runCompanionForTurn(conversationId) {
   if (!hasNew) {
     return trace(conversationId, `rien de neuf \xE0 relire (${messageCount} messages)`);
   }
-  const { startCliSession } = await import("./chat-RWOZHXBX.js");
+  const { startCliSession } = await import("./chat-JZ4UQDWV.js");
   const companionConv = await ensureCompanionConversation(conv);
   const isFirstTurn = (companionConv.messages?.length ?? 0) === 0;
   const exchange = formatExchange(conv.messages, from);
@@ -1668,7 +1867,10 @@ async function runCompanionForTurn(conversationId) {
   const prompt = buildCompanionPrompt(exchange, isFirstTurn, customPrompt);
   const jwt = await signJwt();
   const environmentId = await activeEnvironmentOf(conv);
-  const agentId = (await findLivePty(conv.id))?.agentId;
+  const agentId = companionAgentId(
+    (await findLivePty(conv.id))?.agentId,
+    activeSessionRegistry.get(conv.id)?.agentId
+  );
   const endThinking = beginThinking(conversationId);
   try {
     try {
@@ -1751,7 +1953,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-RWOZHXBX.js");
+    const { startCliSession } = await import("./chat-JZ4UQDWV.js");
     await startCliSession(conv.runner, conv.id, message, { jwt: await signJwt() });
     return "headless";
   } catch (err) {
@@ -1774,7 +1976,7 @@ async function writeToLivePty(conversationId, message) {
 }
 async function companionSettings() {
   try {
-    const { settingsManager } = await import("./settings-manager-YHQ5YHUH.js");
+    const { settingsManager } = await import("./settings-manager-NZV26BC3.js");
     const settings = await settingsManager.getSettings();
     return settings.companion ?? { enabledByDefault: false };
   } catch {
@@ -1855,7 +2057,6 @@ export {
   LocalProjectExistsError,
   projectStore,
   conversationStore,
-  emitTurnFinished,
   findClaudeSessionFile,
   claudeSessionExists,
   readClaudeTranscript,
@@ -1870,6 +2071,7 @@ export {
   noteSpawnConversation,
   observePtyChunk,
   forgetSpawn,
+  activeSessionRegistry,
   MAX_CONSECUTIVE_RELAUNCHES,
   resetRelaunches,
   takeRelaunchSlot,
@@ -1882,6 +2084,7 @@ export {
   COMPANION_SIGNATURE,
   buildRelaunchMessage,
   companionSystemNote,
+  companionAgentId,
   flattenForPty,
   companionThinkingIds,
   isCompanionThinking,
@@ -1892,4 +2095,4 @@ export {
   companionSettings,
   initCompanion
 };
-//# sourceMappingURL=chunk-TNBMCKQX.js.map
+//# sourceMappingURL=chunk-NZNIWJDT.js.map