@runeya/runeya 2.0.5 → 2.0.7

package/{dist-6LF3EWHR.js → dist-TZCPKLE5.js}

@@ -778,6 +778,33 @@ var EnvironmentResolver = class {
     }
     return { ctx, secretKeys: parentSecretKeys, keySources: parentKeySources };
   }
+  /**
+   * For service-scoped envs, compute effective parentIds by also including
+   * the service-scoped envs of ancestor global environments.
+   *
+   * Example: "Server (test)" has parentIds=[test-global]. test-global has
+   * parentIds=[Local-global]. This method adds "Server (Local)" to the
+   * effective parents so service-specific variables from ancestor envs
+   * are inherited correctly.
+   */
+  async getEffectiveParentIds(environment) {
+    if (environment.scope !== "service" || !environment.reference || !environment.activateOn) {
+      return environment.parentIds;
+    }
+    const additionalIds = [];
+    for (const parentId of environment.parentIds) {
+      const parentEnv = await environmentStore.get(parentId);
+      if (!parentEnv || parentEnv.scope !== "global") continue;
+      for (const grandparentGlobalId of parentEnv.parentIds) {
+        const ancestorServiceEnv = await environmentStore.findServiceEnvironment(environment.reference, grandparentGlobalId);
+        if (ancestorServiceEnv && !environment.parentIds.includes(ancestorServiceEnv.id)) {
+          additionalIds.push(ancestorServiceEnv.id);
+        }
+      }
+    }
+    if (additionalIds.length === 0) return environment.parentIds;
+    return [...environment.parentIds, ...additionalIds];
+  }
   async resolveDag(environmentId, visited) {
     if (visited.has(environmentId)) {
       throw new Error(`Circular dependency detected in environment inheritance for ${environmentId}`);
@@ -787,8 +814,9 @@ var EnvironmentResolver = class {
       throw new Error(`Environment "${environmentId}" not found`);
     }
     visited.add(environmentId);
+    const effectiveParentIds = await this.getEffectiveParentIds(environment);
     const parentResults = [];
-    for (const parentId of environment.parentIds) {
+    for (const parentId of effectiveParentIds) {
       const parentVisited = new Set(visited);
       const parentResult = await this.resolveDag(parentId, parentVisited);
       parentResults.push(parentResult);
@@ -2041,13 +2069,20 @@ var environmentRouter = router({
       for (const serviceId of project.serviceIds) {
         const service = await serviceStore.get(serviceId);
         if (!service) continue;
+        const parentServiceEnvIds = [];
+        for (const parentGlobalId of env2.parentIds) {
+          const parentServiceEnv = await environmentStore.findServiceEnvironment(serviceId, parentGlobalId);
+          if (parentServiceEnv) {
+            parentServiceEnvIds.push(parentServiceEnv.id);
+          }
+        }
         const svcEnv = await environmentStore.create({
           projectId: input.projectId,
           name: `${service.name} (${env2.name})`,
           scope: "service",
           reference: serviceId,
           activateOn: env2.id,
-          parentIds: [env2.id],
+          parentIds: [env2.id, ...parentServiceEnvIds],
           variables: {}
         });
         await projectStore.addEnvironment(input.projectId, svcEnv.id);
@@ -10889,21 +10924,68 @@ var PullEnvError = class extends Error {
     this.name = "PullEnvError";
   }
 };
-async function pullEnv(opts) {
+async function promptPassword() {
+  process.stderr.write("Master password: ");
+  return new Promise((resolve5) => {
+    const stdin = process.stdin;
+    const wasRaw = stdin.isRaw;
+    if (stdin.isTTY) stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding("utf-8");
+    let input = "";
+    const onData = (ch) => {
+      if (ch === "\r" || ch === "\n") {
+        if (stdin.isTTY) stdin.setRawMode(wasRaw ?? false);
+        stdin.pause();
+        stdin.removeListener("data", onData);
+        process.stderr.write("\n");
+        resolve5(input);
+      } else if (ch === "") {
+        process.exit(1);
+      } else if (ch === "\x7F" || ch === "\b") {
+        input = input.slice(0, -1);
+      } else {
+        input += ch;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
+async function unlockIfNeeded() {
   await ensureEncryptionKey();
+  if (hasEncryptionKey()) return;
+  if (await loadFromEnv()) return;
+  if (!await hasEncryptedKeyFile(env.DATA_DIR)) {
+    return;
+  }
+  const masterPassword = process.env["RUNEYA_MASTER_PASSWORD"] || await promptPassword();
+  if (!masterPassword) {
+    throw new PullEnvError("Master password required to decrypt data", 1);
+  }
+  try {
+    const encKey = await readEncryptedKey(env.DATA_DIR, masterPassword);
+    setEncryptionKeyInMemory(encKey);
+  } catch {
+    throw new PullEnvError("Master password incorrect", 1);
+  }
+}
+async function pullEnv(opts) {
+  await unlockIfNeeded();
   const services = await serviceStore.list();
   const service = services.find(
     (s) => s.id === opts.service || s.name === opts.service
   );
   if (!service) {
-    throw new PullEnvError(`service "${opts.service}" not found`, 1);
+    const available = services.map((s) => s.name).join(", ");
+    throw new PullEnvError(`service "${opts.service}" not found. Available: ${available || "(none)"}`, 1);
   }
   const globalEnvs = await environmentStore.listAllGlobal();
   const globalEnv = globalEnvs.find(
     (e) => e.id === opts.environment || e.name === opts.environment
   );
   if (!globalEnv) {
-    throw new PullEnvError(`environment "${opts.environment}" not found`, 1);
+    const available = globalEnvs.map((e) => e.name).join(", ");
+    throw new PullEnvError(`environment "${opts.environment}" not found. Available: ${available || "(none)"}`, 1);
   }
   const { env: env2 } = await environmentResolver.resolveForService({
     serviceId: service.id,
@@ -10981,4 +11063,4 @@ export {
   createLocalServer,
   pullEnv
 };
-//# sourceMappingURL=dist-6LF3EWHR.js.map
+//# sourceMappingURL=dist-TZCPKLE5.js.map