@treeseed/sdk 0.6.0 → 0.6.1

package/dist/reconcile/builtin-adapters.js

@@ -155,28 +155,51 @@ function providerCache(input, key, loader, forceRefresh = false) {
   input.context.session.set(key, value);
   return value;
 }
+function normalizeEnvironmentValues(env) {
+  return Object.fromEntries(
+    Object.entries(env ?? {}).filter((entry) => typeof entry[1] === "string").map(([key, value]) => [key, value])
+  );
+}
+function resolveReconcileEnvironmentValues(input, scope) {
+  if (scope === "local") {
+    return resolveTreeseedMachineEnvironmentValues(input.context.tenantRoot, scope);
+  }
+  const values = {
+    ...normalizeEnvironmentValues(process.env),
+    ...normalizeEnvironmentValues(input.context.launchEnv)
+  };
+  const launchRailwayAlias = input.context.launchEnv.RAILWAY_API_KEY;
+  if (!input.context.launchEnv.RAILWAY_API_TOKEN && typeof launchRailwayAlias === "string" && launchRailwayAlias.length > 0) {
+    values.RAILWAY_API_TOKEN = launchRailwayAlias;
+  } else if (!values.RAILWAY_API_TOKEN && values.RAILWAY_API_KEY) {
+    values.RAILWAY_API_TOKEN = values.RAILWAY_API_KEY;
+  }
+  return values;
+}
 function buildCloudflareEnv(input) {
   const scope = scopeFromTarget(toDeployTarget(input.context.target));
-  const machineValues = resolveTreeseedMachineEnvironmentValues(input.context.tenantRoot, scope);
+  const values = resolveReconcileEnvironmentValues(input, scope);
   return {
-    CLOUDFLARE_ACCOUNT_ID: machineValues.CLOUDFLARE_ACCOUNT_ID ?? input.context.launchEnv.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? resolveConfiguredCloudflareAccountId(input.context.deployConfig),
-    CLOUDFLARE_API_TOKEN: machineValues.CLOUDFLARE_API_TOKEN ?? input.context.launchEnv.CLOUDFLARE_API_TOKEN ?? process.env.CLOUDFLARE_API_TOKEN ?? ""
+    CLOUDFLARE_ACCOUNT_ID: values.CLOUDFLARE_ACCOUNT_ID ?? input.context.launchEnv.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? resolveConfiguredCloudflareAccountId(input.context.deployConfig),
+    CLOUDFLARE_API_TOKEN: values.CLOUDFLARE_API_TOKEN ?? input.context.launchEnv.CLOUDFLARE_API_TOKEN ?? process.env.CLOUDFLARE_API_TOKEN ?? ""
   };
 }
 function hasLiveResourceId(value) {
   return typeof value === "string" && value.length > 0 && !value.startsWith("dryrun-") && !value.startsWith("local-") && !value.endsWith("-id") && !value.endsWith("-preview-id");
 }
 function buildRailwayEnv(input, scope) {
-  const machineValues = resolveTreeseedMachineEnvironmentValues(input.context.tenantRoot, scope);
+  const values = resolveReconcileEnvironmentValues(input, scope);
   const token = [
-    machineValues.RAILWAY_API_TOKEN,
+    values.RAILWAY_API_TOKEN,
     input.context.launchEnv.RAILWAY_API_TOKEN,
-    process.env.RAILWAY_API_TOKEN
+    input.context.launchEnv.RAILWAY_API_KEY,
+    process.env.RAILWAY_API_TOKEN,
+    process.env.RAILWAY_API_KEY
   ].find((value) => typeof value === "string" && value.trim().length > 0)?.trim() ?? "";
   return {
     RAILWAY_API_TOKEN: token,
-    TREESEED_RAILWAY_API_URL: machineValues.TREESEED_RAILWAY_API_URL ?? input.context.launchEnv.TREESEED_RAILWAY_API_URL ?? process.env.TREESEED_RAILWAY_API_URL ?? "",
-    TREESEED_RAILWAY_WORKSPACE: machineValues.TREESEED_RAILWAY_WORKSPACE ?? input.context.launchEnv.TREESEED_RAILWAY_WORKSPACE ?? process.env.TREESEED_RAILWAY_WORKSPACE ?? ""
+    TREESEED_RAILWAY_API_URL: values.TREESEED_RAILWAY_API_URL ?? input.context.launchEnv.TREESEED_RAILWAY_API_URL ?? process.env.TREESEED_RAILWAY_API_URL ?? "",
+    TREESEED_RAILWAY_WORKSPACE: values.TREESEED_RAILWAY_WORKSPACE ?? input.context.launchEnv.TREESEED_RAILWAY_WORKSPACE ?? process.env.TREESEED_RAILWAY_WORKSPACE ?? ""
   };
 }
 function findCloudflareQueueByName(input, env, expectedName, { attempts = 6, delayMs = 350 } = {}) {
@@ -434,7 +457,7 @@ ${result.stdout ?? ""}`;
 function collectCloudflareEnvironmentSync(input) {
   const target = toDeployTarget(input.context.target);
   const scope = scopeFromTarget(target);
-  const values = resolveTreeseedMachineEnvironmentValues(input.context.tenantRoot, scope);
+  const values = resolveReconcileEnvironmentValues(input, scope);
   const registry = collectTreeseedEnvironmentContext(input.context.tenantRoot);
   const state = loadDeployState(input.context.tenantRoot, input.context.deployConfig, { target });
   const generatedSecrets = buildSecretMap(input.context.deployConfig, state);
@@ -1463,7 +1486,7 @@ async function observeRailwayUnit(input, { refresh = false } = {}) {
 }
 function collectRailwayEnvironmentSync(input) {
   const scope = input.context.target.kind === "persistent" ? input.context.target.scope : "staging";
-  const values = resolveTreeseedMachineEnvironmentValues(input.context.tenantRoot, scope);
+  const values = resolveReconcileEnvironmentValues(input, scope);
   const registry = collectTreeseedEnvironmentContext(input.context.tenantRoot);
   const state = loadDeployState(input.context.tenantRoot, input.context.deployConfig, { target: toDeployTarget(input.context.target) });
   const secrets = Object.fromEntries(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treeseed/sdk",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Shared Treeseed SDK for content-backed and D1-backed object models.",
   "license": "AGPL-3.0-only",
   "repository": {