@runeya/runeya 2.0.72 → 2.0.74

package/index.js

@@ -274,7 +274,7 @@ async function main() {
   ensureNodeBinOnPath();
   await ensureUserBinsOnPath();
   if (!isPullEnv) stampConsole();
-  const { createLocalServer, pullEnv, PullEnvError, registerInstance } = await import("./src-53OQNM27.js");
+  const { createLocalServer, pullEnv, PullEnvError, registerInstance } = await import("./src-YG67XURV.js");
   if (isPullEnv) {
     if (!serviceArg) {
       console.error("Error: --service (-s) is required with --pull-env");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runeya/runeya",
-  "version": "2.0.72",
+  "version": "2.0.74",
   "type": "module",
   "bin": {
     "runeya": "./index.js"

package/{src-53OQNM27.js → src-YG67XURV.js}

@@ -36,6 +36,7 @@ import {
   clearEncryptionKey,
   clearPendingLegacyKey,
   clearVaultLock,
+  crossServiceValues,
   decryptValue,
   decryptValueWith,
   decryptVariableSlots,
@@ -55,9 +56,11 @@ import {
   hasChangedSinceRead,
   hasEncryptionKey,
   hasPendingLegacyKey,
+  interpolateBuiltinsInEnv,
   isCiMode,
   isEncryptedValue,
   isVaultLocked,
+  isWildcardHost,
   keyRoot,
   keyedFilePath,
   killInstance,
@@ -89,7 +92,10 @@ import {
   rootOfProjectAmong,
   rootOfProjectRef,
   scheduleSelfRestart,
+  servicePortValues,
+  serviceSlug,
   serviceStore,
+  serviceUrlValues,
   setEncryptionKey,
   setEncryptionKeyInMemory,
   setPendingLegacyKey,
@@ -102,8 +108,9 @@ import {
   vaultFor,
   vaultIdOfRoot,
   wasRead,
+  withDeprecatedAliases,
   writeEntity
-} from "./chunk-HPYBAUAH.js";
+} from "./chunk-JRXAQNAC.js";
 
 // ../server/src/create-server.ts
 import express from "express";
@@ -1425,10 +1432,15 @@ function interpolateValue(raw, envContext) {
 }
 function resolveVariable(variable, envContext) {
   const slot = variable.value;
-  const interpolated = interpolateValue(slot.value, envContext);
-  const finalValue = slot.pre + interpolated + slot.post;
+  const finalValue = interpolateValue(slot.pre, envContext) + interpolateValue(slot.value, envContext) + interpolateValue(slot.post, envContext);
   return { value: finalValue, isSecret: slot.isSecret };
 }
+function slotReferenceText(variable) {
+  const slot = variable.value;
+  return `${slot.pre}
+${slot.value}
+${slot.post}`;
+}
 var EnvironmentResolver = class {
   async resolveForService(ctx) {
     if (!ctx.activeEnvironmentId) {
@@ -1579,7 +1591,7 @@ var EnvironmentResolver = class {
       changed = false;
       for (const variable of Object.values(variables)) {
         if (secretKeys.has(variable.key)) continue;
-        if (this.interpolatesSecretKey(variable.value.value, secretKeys)) {
+        if (this.interpolatesSecretKey(slotReferenceText(variable), secretKeys)) {
           secretKeys.add(variable.key);
           changed = true;
         }
@@ -2557,6 +2569,39 @@ var SettingsManager = class {
 };
 var settingsManager = new SettingsManager();
 
+// ../server/src/services/service-builtins.ts
+function buildServerBuiltins(input) {
+  const { service, siblings, projectName, environmentName, agentName, host } = input;
+  const urlHost = isWildcardHost(host) ? "{{agent.HOST_LAN}}" : host;
+  const values = {
+    "service.NAME": service.name,
+    "service.ID": service.id,
+    "runeya.HOST": host,
+    ...servicePortValues(service.ports),
+    ...serviceUrlValues(service, urlHost)
+  };
+  if (service.url) values["service.BASE_URL"] = service.url;
+  if (projectName !== void 0) values["project.NAME"] = projectName;
+  if (environmentName !== void 0) values["runeya.ENV_NAME"] = environmentName;
+  if (agentName !== void 0) values["agent.NAME"] = agentName;
+  const slugCounts = /* @__PURE__ */ new Map();
+  for (const sibling of siblings) {
+    const slug = serviceSlug(sibling.name);
+    if (slug) slugCounts.set(slug, (slugCounts.get(slug) ?? 0) + 1);
+  }
+  for (const sibling of siblings) {
+    if ((slugCounts.get(serviceSlug(sibling.name)) ?? 0) !== 1) continue;
+    Object.assign(values, crossServiceValues({
+      name: sibling.name,
+      id: sibling.id,
+      ports: sibling.ports,
+      localUrls: sibling.localUrls,
+      url: sibling.url
+    }, urlHost));
+  }
+  return withDeprecatedAliases(values);
+}
+
 // ../server/src/trpc/routers/service.ts
 import { isAbsolute as isAbsolute3 } from "path";
 
@@ -3075,20 +3120,23 @@ async function resolveServiceVariables(service) {
       serviceId: service.id,
       activeEnvironmentId: project.activeEnvironmentId
     });
-    const serviceBuiltins = {
-      HOST: env.HOST,
-      HOST_LAN: "0.0.0.0"
-    };
-    const interpolatedEnv = {};
-    for (const [key, value] of Object.entries(resolved.env)) {
-      interpolatedEnv[key] = value.replace(
-        /\{\{service\.([^}]+)\}\}/g,
-        (match, k) => serviceBuiltins[k] !== void 0 ? serviceBuiltins[k] : match
-      );
-    }
+    const [environment, agentId, siblings] = await Promise.all([
+      environmentStore.get(project.activeEnvironmentId),
+      resolveEffectiveAgentId(service),
+      Promise.all(project.serviceIds.filter((id) => id !== service.id).map((id) => serviceStore.get(id)))
+    ]);
+    const agent = agentId ? await agentStore.get(agentId) : null;
+    const builtins = buildServerBuiltins({
+      service,
+      siblings: siblings.filter((sibling) => sibling !== null),
+      projectName: project.name,
+      environmentName: environment?.name,
+      agentName: agent?.name,
+      host: env.HOST
+    });
     resolvedService = {
       ...resolvedService,
-      env: interpolatedEnv,
+      env: interpolateBuiltinsInEnv(resolved.env, builtins),
       envSecrets: [...resolved.envSecrets]
     };
   } catch (err) {
@@ -7359,6 +7407,9 @@ async function resolveImagesToBase64(images, contextId) {
   return results.filter((r) => r !== null);
 }
 
+// ../server/src/services/kanban-commands.ts
+import { randomUUID as randomUUID5 } from "crypto";
+
 // ../server/src/trpc/routers/cloud-auth.ts
 import { z as z16 } from "zod";
 import { hostname } from "os";
@@ -7522,12 +7573,12 @@ async function callCloud(path, init = {}) {
     const res = await cloudFetch2(`/api/auth${path}`, init);
     if (!res.ok) {
       console.error("[kanban-store] cloud call failed: %s %s", res.status, path);
-      return { ok: false, data: null, reason: planGateMessage(res.status, path) };
+      return { ok: false, data: null, reason: planGateMessage(res.status, path), status: res.status };
     }
-    return { ok: true, data: await res.json(), reason: null };
+    return { ok: true, data: await res.json(), reason: null, status: res.status };
   } catch (err) {
     console.error("[kanban-store] cloud call errored:", err);
-    return { ok: false, data: null, reason: `Appel au cloud impossible : ${err.message}` };
+    return { ok: false, data: null, reason: `Appel au cloud impossible : ${err.message}`, status: null };
   }
 }
 function must(res) {
@@ -7618,7 +7669,7 @@ var KanbanStore = class {
       method: "POST",
       body: { boardId, ...input }
     });
-    return res.data?.card ?? null;
+    return { card: res.data?.card ?? null, unsupported: res.status === 404 };
   }
   /** Déplacer une carte, sans réécrire le tableau. */
   async moveCard(boardId, cardId, toColumnId) {
@@ -7727,12 +7778,7 @@ async function executeKanbanCommands(boardId, cardId, commands, conversationId)
       const ok = await kanbanStore.addComment(board.id, cardId, cmd.comment, conversationId);
       if (!ok) console.warn(`[kanban-commands] add_comment failed: card=${cardId}`);
     } else if (cmd.type === "add_card" && cmd.columnTitle && cmd.cardTitle) {
-      const card = await kanbanStore.addCard(board.id, {
-        column: cmd.columnTitle,
-        title: cmd.cardTitle,
-        markdown: cmd.cardContent
-      });
-      if (!card) console.warn(`[kanban-commands] add_card failed: column="${cmd.columnTitle}"`);
+      await addCardOrFallback(board, cmd.columnTitle, cmd.cardTitle, cmd.cardContent);
     }
   }
 }
@@ -7742,15 +7788,39 @@ async function executeKanbanBoardCommands(boardId, commands) {
   if (!board) return;
   for (const cmd of commands) {
     if (cmd.type === "add_card" && cmd.columnTitle && cmd.cardTitle) {
-      const card = await kanbanStore.addCard(board.id, {
-        column: cmd.columnTitle,
-        title: cmd.cardTitle,
-        markdown: cmd.cardContent
-      });
-      if (!card) console.warn(`[kanban-commands] add_card failed: column="${cmd.columnTitle}"`);
+      await addCardOrFallback(board, cmd.columnTitle, cmd.cardTitle, cmd.cardContent);
     }
   }
 }
+async function addCardOrFallback(board, columnTitle, cardTitle, cardContent) {
+  const { card, unsupported } = await kanbanStore.addCard(board.id, {
+    column: columnTitle,
+    title: cardTitle,
+    markdown: cardContent
+  });
+  if (card) return;
+  if (!unsupported) {
+    console.warn(`[kanban-commands] add_card failed: column="${columnTitle}"`);
+    return;
+  }
+  console.warn("[kanban-commands] cloud sans /kanban/card/add \u2014 repli sur la sauvegarde du tableau");
+  const col = board.columns.find((c) => c.title.toLowerCase() === columnTitle.toLowerCase());
+  if (!col) return;
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  col.cards.push({
+    id: randomUUID5(),
+    title: cardTitle,
+    markdown: cardContent ?? "",
+    images: [],
+    attachments: [],
+    assignees: [],
+    order: col.cards.reduce((max, c) => Math.max(max, c.order + 1), 0),
+    history: [{ type: "created", timestamp: now, detail: `AI \u2014 In column "${col.title}"` }],
+    createdAt: now,
+    updatedAt: now
+  });
+  await kanbanStore.update({ id: board.id, columns: board.columns });
+}
 function formatSize(bytes) {
   if (bytes < 1024) return `${bytes} o`;
   if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} Ko`;
@@ -7975,7 +8045,7 @@ Ne jamais omettre ce tag. Il doit \xEAtre la toute derni\xE8re ligne de ta r\xE9
 `.trim();
 
 // ../server/src/services/ai-runners/claude-pty-runner.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 
 // ../server/src/services/ai-runners/claude-pty-tail.ts
 import { open } from "fs/promises";
@@ -8099,7 +8169,7 @@ function tailTranscript(opts) {
 
 // ../server/src/services/ai-runners/claude-pty-runner.ts
 async function getAgentManager() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-YDLSYZE3.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-L35E7FWI.js");
   return agentManager2;
 }
 function buildPtyArgs(params, sessionId, opts) {
@@ -8169,7 +8239,7 @@ function dispatchEntry(entry, state, cbs) {
 async function runClaudeViaPty(params) {
   const { agentId, signal, skipTokenInstructions } = params;
   if (!agentId) throw new Error("runClaudeViaPty requires an agentId");
-  const sessionId = params.sessionId && params.sessionId.length > 0 ? params.sessionId : randomUUID5();
+  const sessionId = params.sessionId && params.sessionId.length > 0 ? params.sessionId : randomUUID6();
   const args = buildPtyArgs(params, sessionId, { excludeMcp: true });
   const agentMgr = await getAgentManager();
   const displayArgs = args.map((a) => {
@@ -8840,7 +8910,7 @@ async function shutdownCodexAppServer() {
   }
 }
 async function getAgentManager2() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-YDLSYZE3.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-L35E7FWI.js");
   return agentManager2;
 }
 function parseRuneyaCurlCommand(command) {
@@ -10945,7 +11015,7 @@ Rules:
 });
 
 // ../server/src/trpc/routers/scenario.ts
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 import { TRPCError as TRPCError16 } from "@trpc/server";
 import { z as z19 } from "zod";
 
@@ -11062,7 +11132,7 @@ async function* streamWithActiveProvider(opts) {
 
 // ../server/src/services/scenario-runner.ts
 import { mkdir as mkdir16 } from "fs/promises";
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 import { join as join19 } from "path";
 
 // ../server/src/services/scenario-presets.ts
@@ -11404,7 +11474,7 @@ function applyHireDirectivesFromOutput(manager, scenario, output) {
   }
   const hired = [];
   for (const payload of hireDirectives) {
-    const id = `hire-${randomUUID6().slice(0, 8)}`;
+    const id = `hire-${randomUUID7().slice(0, 8)}`;
     const position = computeHirePosition(manager, scenario.nodes);
     ensureGroupCanContainNode(scenario, manager.groupId ?? null, position);
     const node = {
@@ -12572,7 +12642,7 @@ var scenarioRouter = router({
   })).mutation(({ input }) => {
     const now = Date.now();
     return createOrBadRequest(async () => scenarioStore.create({
-      id: randomUUID7(),
+      id: randomUUID8(),
       name: input.name,
       icon: input.icon,
       description: input.description,
@@ -12724,7 +12794,7 @@ var scenarioRouter = router({
 });
 
 // ../server/src/trpc/routers/debug.ts
-import { randomUUID as randomUUID8 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 import { TRPCError as TRPCError17 } from "@trpc/server";
 import { z as z20 } from "zod";
 var MAX_BUFFER3 = 300;
@@ -12787,7 +12857,7 @@ var debugRouter = router({
     intervalMs: z20.number().int().min(100).max(5e3).optional(),
     maxTicks: z20.number().int().min(1).max(1e4).optional()
   }).optional()).mutation(({ input }) => {
-    const jobId = randomUUID8();
+    const jobId = randomUUID9();
     const intervalMs = input?.intervalMs ?? 400;
     const maxTicks = input?.maxTicks ?? 500;
     const job = {
@@ -13007,7 +13077,7 @@ var diagnosticsRouter = router({
 import { z as z22 } from "zod";
 
 // ../server/src/services/kanban-queue.ts
-import { randomUUID as randomUUID9 } from "crypto";
+import { randomUUID as randomUUID10 } from "crypto";
 import { EventEmitter as EventEmitter5 } from "events";
 var KanbanQueueService = class extends EventEmitter5 {
   items = [];
@@ -13035,7 +13105,7 @@ var KanbanQueueService = class extends EventEmitter5 {
       return { id: alreadyRunning.id, addedAt: alreadyRunning.startedAt, ...item };
     }
     const queueItem = {
-      id: randomUUID9(),
+      id: randomUUID10(),
       ...item,
       addedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -14037,7 +14107,7 @@ async function reconcileOrgCanary(orgId) {
 }
 
 // ../server/src/services/cloud-sync-bridge.ts
-import { randomUUID as randomUUID10 } from "crypto";
+import { randomUUID as randomUUID11 } from "crypto";
 import { mkdir as mkdir20, rm as rm5 } from "fs/promises";
 import * as Y from "yjs";
 
@@ -14151,7 +14221,7 @@ var OrgSyncConnection = class {
   projects = getCollection(this.doc, "projects");
   services = getCollection(this.doc, "services");
   environments = getCollection(this.doc, "environments");
-  conn = randomUUID10();
+  conn = randomUUID11();
   link;
   stopped = false;
   initializing = true;
@@ -15612,7 +15682,7 @@ async function migrateSettingsIntoVaults() {
 // ../server/src/migrations/migrate-from-legacy.ts
 import { createRequire as createRequire2 } from "module";
 import { randomBytes as randomBytes6, createCipheriv as createCipheriv3, createDecipheriv as createDecipheriv3 } from "crypto";
-import { randomUUID as randomUUID11 } from "crypto";
+import { randomUUID as randomUUID12 } from "crypto";
 import {
   readFile as readFile21,
   writeFile as writeFile20,
@@ -15822,11 +15892,11 @@ async function runLegacyMigration(dataDir) {
     const data = await readEncrypted(join28(parsersDir, file));
     if (data?.id) legacyParsers.push(data);
   }
-  const projectMonoId = randomUUID11();
+  const projectMonoId = randomUUID12();
   const envIdMap = {};
   const labelToKey = {};
   for (const [name, legacyEnv] of Object.entries(legacyEnvs)) {
-    envIdMap[name] = randomUUID11();
+    envIdMap[name] = randomUUID12();
     if (legacyEnv?.label) labelToKey[legacyEnv.label] = name;
   }
   const runeEnvs = [];
@@ -15851,7 +15921,7 @@ async function runLegacyMigration(dataDir) {
         if (hasInvalidInterpolation(value)) continue;
         const cleaned = cleanVarKey(key);
         if (inheritedVars[cleaned] === value) continue;
-        const varId = randomUUID11();
+        const varId = randomUUID12();
         variables[varId] = makeVariable(cleaned, value);
         varIdLookup.set(`${envIdMap[name]}:${cleaned}`, varId);
       }
@@ -15872,7 +15942,7 @@ async function runLegacyMigration(dataDir) {
   const serviceIdMap = {};
   const runeServices = [];
   for (const [name, legacy] of Object.entries(legacyServices)) {
-    const id = randomUUID11();
+    const id = randomUUID12();
     serviceIdMap[name] = id;
     const rootPath = legacy.rootPath || "";
     const rootPathCwd = rootPath && rootPath !== "." ? rootPath : "";
@@ -15881,7 +15951,7 @@ async function runLegacyMigration(dataDir) {
       const parts = [cmd.spawnCmd, ...cmd.spawnArgs || []].filter(Boolean);
       if (!parts.length) continue;
       commands.push({
-        id: cmd.id || randomUUID11(),
+        id: cmd.id || randomUUID12(),
         label: "Launch",
         command: parts.join(" "),
         cwd: cmd.spawnOptions?.cwd || "",
@@ -15942,7 +16012,7 @@ async function runLegacyMigration(dataDir) {
       const legacyBootstrapCmds = container.bootstrap?.commands || [];
       if (legacyBootstrapCmds.length > 0) {
         dockerConfig.bootstrapCommands = legacyBootstrapCmds.filter((bs) => bs.cmd || bs.entrypoint).map((bs, idx) => ({
-          id: bs.id || randomUUID11(),
+          id: bs.id || randomUUID12(),
           label: bs.label || `Bootstrap ${idx + 1}`,
           command: bs.cmd || "",
           ...bs.entrypoint ? { entrypoint: bs.entrypoint } : {},
@@ -15990,7 +16060,7 @@ async function runLegacyMigration(dataDir) {
       cwd: serviceCwd,
       runner: dockerConfig ? "docker" : "native",
       shortcuts: (legacy.shortcuts || []).filter((s) => s.spawnCmd || s.label).map((s) => ({
-        id: s.id || randomUUID11(),
+        id: s.id || randomUUID12(),
         label: s.label || s.spawnCmd || "",
         command: [s.spawnCmd, ...s.spawnArgs || []].filter(Boolean).join(" "),
         ...s.spawnOptions?.cwd ? { cwd: s.spawnOptions.cwd } : {}
@@ -16030,7 +16100,7 @@ async function runLegacyMigration(dataDir) {
       );
       if (!svcScopedEnv) {
         svcScopedEnv = {
-          id: randomUUID11(),
+          id: randomUUID12(),
           projectId: projectMonoId,
           name: `${service?.name || name} (${globalEnv.name})`,
           scope: "service",
@@ -16054,7 +16124,7 @@ async function runLegacyMigration(dataDir) {
         const varPost = typeof varData === "object" ? String(varData.suffix ?? "") : "";
         if (!varKey || existingKeys.has(cleanVarKey(varKey))) continue;
         const cleaned = cleanVarKey(varKey);
-        const varId = randomUUID11();
+        const varId = randomUUID12();
         svcScopedEnv.variables[varId] = makeVariable(cleaned, varValue, varPre, varPost);
         existingKeys.add(cleaned);
       }
@@ -16074,7 +16144,7 @@ async function runLegacyMigration(dataDir) {
       );
       if (!svcScopedEnv) {
         svcScopedEnv = {
-          id: randomUUID11(),
+          id: randomUUID12(),
           projectId: projectMonoId,
           name: `${service?.name || serviceName} (${globalEnv.name})`,
           scope: "service",
@@ -16095,7 +16165,7 @@ async function runLegacyMigration(dataDir) {
         const baseEntry = Object.entries(svcScopedEnv.variables).find(([, v]) => v.key === cleaned);
         let varId = baseEntry?.[0];
         if (!varId) {
-          varId = randomUUID11();
+          varId = randomUUID12();
           svcScopedEnv.variables[varId] = {
             key: cleaned,
             value: { value: "", pre: "", post: "", isSecret: false, injectIntoAi: false }
@@ -16125,13 +16195,13 @@ async function runLegacyMigration(dataDir) {
             flatOverrides[varId] = makeVariable(cleaned, value);
           }
         } else {
-          flatOverrides[randomUUID11()] = makeVariable(cleaned, value);
+          flatOverrides[randomUUID12()] = makeVariable(cleaned, value);
         }
       } else {
         const cleaned = cleanVarKey(key);
         const existingVarId = Object.entries(env2.variables).find(([, v]) => v.key === cleaned)?.[0];
         if (!existingVarId) {
-          const varId = randomUUID11();
+          const varId = randomUUID12();
           env2.variables[varId] = makeVariable(cleaned, value);
           varIdLookup.set(`${envId}:${cleaned}`, varId);
         }
@@ -16315,7 +16385,7 @@ async function runOverrideOnlyMigration(dataDir) {
         if (isSameAsBase(value, baseVar)) continue;
         flatOverrides[varId] = makeVariable(cleaned, value);
       } else {
-        flatOverrides[randomUUID11()] = makeVariable(cleaned, value);
+        flatOverrides[randomUUID12()] = makeVariable(cleaned, value);
       }
     }
   }
@@ -16352,7 +16422,7 @@ async function runOverrideOnlyMigration(dataDir) {
       );
       if (!svcScopedEnv) {
         svcScopedEnv = {
-          id: randomUUID11(),
+          id: randomUUID12(),
           projectId: globalEnv["projectId"],
           name: `${service?.["name"] || serviceName} (${globalEnv["name"]})`,
           scope: "service",
@@ -16374,7 +16444,7 @@ async function runOverrideOnlyMigration(dataDir) {
         const baseEntry = Object.entries(svcScopedEnv["variables"]).find(([, v]) => v.key === cleaned);
         let varId = baseEntry?.[0];
         if (!varId) {
-          varId = randomUUID11();
+          varId = randomUUID12();
           svcScopedEnv["variables"][varId] = {
             key: cleaned,
             value: { value: "", pre: "", post: "", isSecret: false, injectIntoAi: false }
@@ -17691,4 +17761,4 @@ export {
   pullEnv,
   registerInstance
 };
-//# sourceMappingURL=src-53OQNM27.js.map
+//# sourceMappingURL=src-YG67XURV.js.map