@runeya/runeya 2.0.73 → 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-MY5W5AYS.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.73",
+  "version": "2.0.74",
   "type": "module",
   "bin": {
     "runeya": "./index.js"

package/{src-MY5W5AYS.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-OTJQEK4D.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) {
@@ -8121,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-LBV3CVHB.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-L35E7FWI.js");
   return agentManager2;
 }
 function buildPtyArgs(params, sessionId, opts) {
@@ -8862,7 +8910,7 @@ async function shutdownCodexAppServer() {
   }
 }
 async function getAgentManager2() {
-  const { agentManager: agentManager2 } = await import("./agent-manager-LBV3CVHB.js");
+  const { agentManager: agentManager2 } = await import("./agent-manager-L35E7FWI.js");
   return agentManager2;
 }
 function parseRuneyaCurlCommand(command) {
@@ -17713,4 +17761,4 @@ export {
   pullEnv,
   registerInstance
 };
-//# sourceMappingURL=src-MY5W5AYS.js.map
+//# sourceMappingURL=src-YG67XURV.js.map