@runeya/runeya 2.0.143 → 2.0.145

package/{chunk-P73PTVII.js → chunk-ONVAH65J.js}

@@ -1,10 +1,13 @@
 import {
   settingsManager
-} from "./chunk-UR3HL373.js";
+} from "./chunk-FE53XX4M.js";
 import {
   COMPANION_SIGNATURE,
   activeSessionRegistry,
   claudeSessionExists,
+  companionCreateDefaults,
+  companionInstructions,
+  companionSettings,
   companionSkips,
   companionSystemNote,
   companionThinkingIds,
@@ -35,7 +38,7 @@ import {
   stopCompanion,
   syncConversationFromClaudeTranscript,
   verifyJwt
-} from "./chunk-NSS47H26.js";
+} from "./chunk-Q4RPY3VW.js";
 import {
   StoreDiskCoordinator,
   agentManager,
@@ -54,7 +57,11 @@ import {
   recordLocalRemoval,
   refsOfProjectId,
   serviceStore
-} from "./chunk-GXE5TLLJ.js";
+} from "./chunk-QF56Z6LI.js";
+import {
+  isCliAvailable,
+  resolveCliInvocation
+} from "./chunk-OZBSOSAS.js";
 import {
   atomicWriteJsonSecure,
   atomicWriteSecure,
@@ -65,12 +72,24 @@ import {
   renameWithRetry,
   resolveConversationRunDir,
   wasRead
-} from "./chunk-7L6AQUBR.js";
+} from "./chunk-NCO4OOYT.js";
+import {
+  allVaultRoots,
+  env,
+  keyedFilePath,
+  legacyMachineFilePath,
+  listOrgVaults,
+  machineFilePath,
+  machineRoot,
+  orgVaultRoot,
+  vaultIdOfRoot
+} from "./chunk-KS7A5CTW.js";
 import {
   AGENT_STOP_FETCH_TIMEOUT,
   ApiKeysFileSchema,
   BUILTIN_VARIABLES,
   BootstrapCommandSchema,
+  CLAUDE_CODE_MODELS,
   DockerConfigSchema,
   HealthCheckSchema,
   JSLogParserSchema,
@@ -95,22 +114,7 @@ import {
   serviceUrlValues,
   urlHostFor,
   withDeprecatedAliases
-} from "./chunk-XAFOP677.js";
-import {
-  allVaultRoots,
-  env,
-  keyedFilePath,
-  legacyMachineFilePath,
-  listOrgVaults,
-  machineFilePath,
-  machineRoot,
-  orgVaultRoot,
-  vaultIdOfRoot
-} from "./chunk-IXO5KIO5.js";
-import {
-  isCliAvailable,
-  resolveCliInvocation
-} from "./chunk-OZBSOSAS.js";
+} from "./chunk-MZSDTA4A.js";
 
 // ../server/src/trpc/routers/chat.ts
 import { z as z9 } from "zod";
@@ -4257,12 +4261,12 @@ function getCloudApiUrl() {
   return (env.CLOUD_URL ?? DEFAULT_CLOUD_API_URL).replace(/\/+$/, "");
 }
 async function orgCloudUrl(orgId) {
-  const { readOrgClouds } = await import("./vault-resolver-VK6W5J6W.js");
+  const { readOrgClouds } = await import("./vault-resolver-PN3TYCLJ.js");
   const clouds = await readOrgClouds();
   return (clouds[orgId] ?? getCloudApiUrl()).replace(/\/+$/, "");
 }
 async function accountForOrg(orgId) {
-  const { readOrgAccounts, readOrgClouds } = await import("./vault-resolver-VK6W5J6W.js");
+  const { readOrgAccounts, readOrgClouds } = await import("./vault-resolver-PN3TYCLJ.js");
   const [stampedAccounts, stampedClouds, accounts] = await Promise.all([
     readOrgAccounts(),
     readOrgClouds(),
@@ -4479,7 +4483,7 @@ var cloudAuthRouter = router({
    * du projet ouvert, sous quel compte il se synchronise.
    */
   accounts: protectedProcedure.query(async () => {
-    const { readOrgAccounts } = await import("./vault-resolver-VK6W5J6W.js");
+    const { readOrgAccounts } = await import("./vault-resolver-PN3TYCLJ.js");
     return { accounts: await cloudSessionStore.list(), orgAccounts: await readOrgAccounts() };
   }),
   /** The cloud session (user + org), fetched with the stored token. */
@@ -4497,7 +4501,7 @@ var cloudAuthRouter = router({
       const identity = await readCloudIdentity(account.cloudUrl, await cloudSessionStore.getToken(accountId) ?? "");
       if (identity) {
         const settled = await cloudSessionStore.describe(accountId, identity);
-        const { renameOrgAccount } = await import("./vault-resolver-VK6W5J6W.js");
+        const { renameOrgAccount } = await import("./vault-resolver-PN3TYCLJ.js");
         await renameOrgAccount(accountId, settled);
       }
     }
@@ -5427,7 +5431,7 @@ function tailTranscript(opts) {
 
 // ../server/src/services/ai-runners/claude-pty-runner.ts
 async function getAgentManager() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-M4NA5YFD.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-THV3LJOF.js");
   return agentManager2;
 }
 function buildPtyArgs(params, sessionId, opts) {
@@ -6121,7 +6125,7 @@ async function shutdownCodexAppServer() {
   }
 }
 async function getAgentManager2() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-M4NA5YFD.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-THV3LJOF.js");
   return agentManager2;
 }
 function parseRuneyaCurlCommand(command) {
@@ -6554,6 +6558,52 @@ var CodexRunner = class {
   }
 };
 
+// ../server/src/services/cli-models.ts
+var CACHE_MS = 5 * 6e4;
+var MAX_PAGES = 10;
+var codexCache = /* @__PURE__ */ new Map();
+function parseCodexModels(result) {
+  const data = result?.data;
+  if (!Array.isArray(data)) return [];
+  const models = [];
+  for (const item of data) {
+    if (!item || item.hidden === true || typeof item.model !== "string" || !item.model) continue;
+    const label = typeof item.displayName === "string" && item.displayName ? item.displayName : item.model;
+    models.push({ value: item.model, label });
+  }
+  return models;
+}
+async function fetchCodexModels(agentId) {
+  const models = [];
+  let cursor;
+  for (let page = 0; page < MAX_PAGES; page++) {
+    const res = await agentManager.agentMutation(
+      agentId,
+      "ai.codexRequest",
+      { method: "model/list", params: cursor ? { cursor } : {} }
+    );
+    models.push(...parseCodexModels(res?.result));
+    cursor = res?.result?.nextCursor;
+    if (!cursor) break;
+  }
+  return models;
+}
+async function listCliModels(runner, agentId) {
+  if (runner === "claude-code") return CLAUDE_CODE_MODELS.map((m) => ({ value: m, label: m }));
+  const target = agentId ?? agentManager.getDefaultAgentId();
+  if (!target) return [];
+  const cached = codexCache.get(target);
+  if (cached && Date.now() - cached.at < CACHE_MS) return cached.models;
+  try {
+    const models = await fetchCodexModels(target);
+    codexCache.set(target, { at: Date.now(), models });
+    return models;
+  } catch (err) {
+    console.warn(`[cli-models] model/list a \xE9chou\xE9 sur l'agent ${target}:`, err.message);
+    return [];
+  }
+}
+
 // ../server/src/trpc/routers/chat.ts
 function toConversationSummary(conv) {
   const { messages, ...rest } = conv;
@@ -6822,6 +6872,7 @@ async function buildCliSystemContext(conv, jwt) {
   const resolvedServices = await Promise.all(ownServices.map((s) => resolveServiceVariables(s)));
   let systemContext = generateAdminLlmsTxt(resolvedServices, jwt, project);
   if (!conv?.isCompanion) systemContext += "\n\n" + companionSystemNote();
+  else systemContext += "\n\n" + companionInstructions((await companionSettings()).prompt);
   systemContext += await kanbanContextFor(conv, {
     ...ref?.id ? { projectId: ref.id } : {},
     ...ref?.orgId ? { orgId: ref.orgId } : {}
@@ -6943,7 +6994,7 @@ async function startCodexSession(convId, prompt, opts = {}) {
     apiBaseUrl: `http://localhost:${env.PORT}`,
     apiToken: opts.jwt ?? "",
     model: opts.model ?? "",
-    effort: "normal",
+    effort: opts.effort ?? "normal",
     signal: ac.signal,
     skipTokenInstructions: true,
     images: opts.images,
@@ -7091,10 +7142,13 @@ var chatRouter = router({
         if (!scenario) throw new TRPCError4({ code: "NOT_FOUND", message: "Scenario not found" });
       }
       const machineSettings = await settingsManager.getSettings();
-      const companionByDefault = machineSettings.companion?.enabledByDefault ?? false;
+      const companionDefaults = companionCreateDefaults(
+        machineSettings.companion ?? { enabledByDefault: false },
+        input.runner
+      );
       const extra = {
         ...input.agentId ? { agentId: input.agentId } : {},
-        ...companionByDefault ? { companionEnabled: true } : {}
+        ...companionDefaults
       };
       const conv = await conversationStore.create(
         input.title,
@@ -7141,7 +7195,11 @@ var chatRouter = router({
     setCompanion: protectedProcedure.input(z9.object({
       id: Id128Schema,
       enabled: z9.boolean(),
-      runner: z9.enum(["claude-code", "codex"]).optional()
+      runner: z9.enum(["claude-code", "codex"]).optional(),
+      /** Chaîne vide = modèle par défaut du runner. */
+      model: z9.string().max(200).optional(),
+      /** Chaîne vide = effort par défaut. */
+      effort: z9.enum(["low", "normal", "high", ""]).optional()
     })).mutation(async ({ input }) => {
       const existing = await conversationStore.get(input.id);
       if (!existing) throw new TRPCError4({ code: "NOT_FOUND", message: "Conversation not found" });
@@ -7150,7 +7208,9 @@ var chatRouter = router({
       }
       const conv = await conversationStore.update(input.id, {
         companionEnabled: input.enabled,
-        ...input.runner ? { companionRunner: input.runner } : {}
+        ...input.runner ? { companionRunner: input.runner } : {},
+        ...input.model !== void 0 ? { companionModel: input.model } : {},
+        ...input.effort !== void 0 ? { companionEffort: input.effort } : {}
       });
       if (!conv) throw new TRPCError4({ code: "NOT_FOUND", message: "Conversation not found" });
       if (!input.enabled) stopCompanion(conv);
@@ -7353,6 +7413,15 @@ var chatRouter = router({
       return [];
     }
   }),
+  /**
+   * Les modèles proposés pour un runner CLI : alias fixes pour Claude Code,
+   * `model/list` de l'app-server pour Codex, sur l'agent visé (celui par
+   * défaut sinon). Liste vide si Codex ne répond pas.
+   */
+  listCliModels: protectedProcedure.input(z9.object({
+    runner: z9.enum(["claude-code", "codex"]),
+    agentId: Id128Schema.optional()
+  })).query(async ({ input }) => ({ models: await listCliModels(input.runner, input.agentId) })),
   checkCliAvailability: protectedProcedure.input(z9.object({ agentId: Id128Schema.optional() }).optional()).query(async ({ input }) => {
     if (input?.agentId) {
       try {
@@ -8059,7 +8128,8 @@ Context:
       }
       const transcriptActivityAt = getLastTranscriptActivity(input.sessionId);
       const lastActivityAt = lastChunkAt && transcriptActivityAt ? Math.max(lastChunkAt, transcriptActivityAt) : lastChunkAt ?? transcriptActivityAt;
-      return { running, lastActivityAt };
+      const idleMs = lastActivityAt === null ? null : Math.max(0, Date.now() - lastActivityAt);
+      return { running, lastActivityAt, idleMs };
     }),
     /**
      * Convert the on-disk Claude transcript into Runeya Message[] and persist
@@ -8215,4 +8285,4 @@ export {
   startCliSession,
   chatRouter
 };
-//# sourceMappingURL=chunk-P73PTVII.js.map
+//# sourceMappingURL=chunk-ONVAH65J.js.map