@runeya/runeya 2.0.109 → 2.0.111

package/agent/index.js

@@ -3805,6 +3805,9 @@ function resolveAgentBuiltins(serviceConfig) {
   };
   return withDeprecatedAliases(values);
 }
+function resolveMachineBuiltins(serviceConfig) {
+  return interpolateBuiltinsInEnv(serviceConfig.env ?? {}, resolveAgentBuiltins(serviceConfig));
+}
 var ProcessManager = class extends EventEmitter7 {
   runners = /* @__PURE__ */ new Map();
   consoleLogSource;
@@ -3904,7 +3907,7 @@ var ProcessManager = class extends EventEmitter7 {
     if (proc.serviceConfig.env) {
       proc.serviceConfig = {
         ...proc.serviceConfig,
-        env: interpolateBuiltinsInEnv(proc.serviceConfig.env, resolveAgentBuiltins(proc.serviceConfig))
+        env: resolveMachineBuiltins(proc.serviceConfig)
       };
     }
     const commands = (proc.serviceConfig.commands ?? []).filter((c) => c.command.trim());
@@ -4301,7 +4304,7 @@ var ProcessManager = class extends EventEmitter7 {
     const shortcutName = shortcut.label || shortcut.command;
     this.consoleLogSource.addSystemLog(processId, `[shortcut] Running "${shortcutName}": ${shortcut.command}`, "info");
     const serviceConfig = proc.serviceConfig;
-    const env2 = resolveEnv(serviceConfig.env);
+    const env2 = resolveEnv(resolveMachineBuiltins(serviceConfig));
     const effectiveCwd = anchorCommandCwd(shortcut.cwd, serviceConfig);
     if (this.warnUnresolvedVars(processId, env2, { "shortcut cwd": effectiveCwd })) {
       this.consoleLogSource.addSystemLog(processId, `Cannot run shortcut "${shortcutName}": unresolved variables (see above)`, "error", { id: randomUUID3(), type: "command-fail", header: shortcutName, state: "self" });
@@ -4336,7 +4339,7 @@ var ProcessManager = class extends EventEmitter7 {
     const jsParsers = proc.serviceConfig.resolvedLogParsers ?? [];
     this.consoleLogSource.setJSParsers(processId, jsParsers);
     const serviceConfig = proc.serviceConfig;
-    const env2 = resolveEnv(serviceConfig.env);
+    const env2 = resolveEnv(resolveMachineBuiltins(serviceConfig));
     const effectiveCwd = anchorCommandCwd(cwd, serviceConfig);
     if (this.warnUnresolvedVars(processId, env2, { cwd: effectiveCwd })) {
       this.consoleLogSource.addSystemLog(processId, `Cannot run command: unresolved variables (see above)`, "error", { id: randomUUID3(), type: "command-fail", header: command, state: "self" });