@treeseed/sdk 0.10.17 → 0.10.18

package/dist/operations/services/railway-api.d.ts

@@ -288,12 +288,7 @@ export declare function ensureRailwayServiceVolume({ projectId, environmentId, s
     env?: NodeJS.ProcessEnv | Record<string, string | undefined>;
     fetchImpl?: typeof fetch;
 }): Promise<{
-    volume: {
-        instances: RailwayVolumeInstanceSummary[];
-        id: string;
-        name: string;
-        projectId: string | null;
-    } | null;
+    volume: RailwayVolumeSummary | null;
     instance: RailwayVolumeInstanceSummary | null;
     created: boolean;
     updated: boolean;

package/dist/operations/services/railway-api.js

@@ -840,7 +840,13 @@ async function ensureRailwayServiceInstanceConfiguration({
   env = process.env,
   fetchImpl = fetch
 }) {
-  const current = await getRailwayServiceInstance({ serviceId, environmentId, env, fetchImpl });
+  let current = await getRailwayServiceInstance({ serviceId, environmentId, env, fetchImpl });
+  if (!current.id) {
+    for (let attempt = 0; attempt < 8 && !current.id; attempt += 1) {
+      await new Promise((resolve) => setTimeout(resolve, 1500));
+      current = await getRailwayServiceInstance({ serviceId, environmentId, env, fetchImpl });
+    }
+  }
   if (!current.id) {
     return { instance: current, updated: false };
   }
@@ -905,12 +911,21 @@ mutation TreeseedRailwayServiceInstanceUpdateLegacy($serviceId: String!, $enviro
     }
     throw error;
   }
-  const instance = await getRailwayServiceInstance({
+  let instance = await getRailwayServiceInstance({
     serviceId,
     environmentId,
     env,
     fetchImpl
   });
+  for (let attempt = 0; attempt < 5 && serviceInstanceDrifted(instance, desired); attempt += 1) {
+    await new Promise((resolve) => setTimeout(resolve, 1e3));
+    instance = await getRailwayServiceInstance({
+      serviceId,
+      environmentId,
+      env,
+      fetchImpl
+    });
+  }
   return {
     instance: {
       id: instance.id || current.id,
@@ -929,6 +944,9 @@ mutation TreeseedRailwayServiceInstanceUpdateLegacy($serviceId: String!, $enviro
     updated: true
   };
 }
+function serviceInstanceDrifted(current, desired) {
+  return desired.buildCommand !== null && desired.buildCommand !== current.buildCommand || desired.startCommand !== null && desired.startCommand !== current.startCommand || desired.cronSchedule !== null && desired.cronSchedule !== current.cronSchedule || desired.rootDirectory !== null && desired.rootDirectory !== current.rootDirectory || desired.healthcheckPath !== null && desired.healthcheckPath !== current.healthcheckPath || desired.healthcheckTimeoutSeconds !== null && desired.healthcheckTimeoutSeconds !== current.healthcheckTimeoutSeconds || desired.runtimeMode !== null && desired.runtimeMode !== current.runtimeMode;
+}
 async function listRailwayVariables({
   projectId,
   environmentId,
@@ -1193,23 +1211,37 @@ async function ensureRailwayServiceVolume({
     ...candidate,
     instances: candidate.instances.filter(isActiveRailwayVolumeInstance)
   })).filter((candidate) => candidate.instances.length > 0);
-  let volume = activeVolumes.find(
-    (candidate) => candidate.instances.some((instance2) => instance2.serviceId === serviceId && instance2.environmentId === environmentId)
-  ) ?? activeVolumes.find(
+  let volume = findRailwayVolumeForService(volumes, serviceId, environmentId) ?? activeVolumes.find(
     (candidate) => candidate.name === name && candidate.instances.some((instance2) => instance2.environmentId === environmentId)
   ) ?? null;
   let created = false;
   let updated = false;
   const createReplacementVolume = async () => {
-    const replacement = await createRailwayVolume({
-      projectId,
-      environmentId,
-      serviceId,
-      name,
-      mountPath,
-      env,
-      fetchImpl
-    });
+    let replacement;
+    try {
+      replacement = await createRailwayVolume({
+        projectId,
+        environmentId,
+        serviceId,
+        name,
+        mountPath,
+        env,
+        fetchImpl
+      });
+    } catch (error) {
+      if (!looksLikeRailwayVolumeCreateRace(error)) {
+        throw error;
+      }
+      for (let attempt = 0; attempt < 8; attempt += 1) {
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+        const refreshed = await listRailwayVolumes({ projectId, env, fetchImpl });
+        const existing = findRailwayVolumeForService(refreshed, serviceId, environmentId);
+        if (existing) {
+          return existing;
+        }
+      }
+      throw error;
+    }
     created = true;
     return replacement;
   };
@@ -1259,6 +1291,17 @@ async function ensureRailwayServiceVolume({
   }
   return { volume, instance, created, updated };
 }
+function findRailwayVolumeForService(volumes, serviceId, environmentId) {
+  return volumes.find(
+    (candidate) => candidate.instances.some(
+      (instance) => instance.serviceId === serviceId && instance.environmentId === environmentId && isActiveRailwayVolumeInstance(instance)
+    )
+  ) ?? null;
+}
+function looksLikeRailwayVolumeCreateRace(error) {
+  const message = error instanceof Error ? error.message : String(error ?? "");
+  return /would have \d+ volumes attached|can only have one volume|not authorized/iu.test(message);
+}
 async function listRailwayCustomDomains({
   projectId,
   environmentId,

package/dist/operations/services/railway-deploy.d.ts

@@ -144,6 +144,23 @@ export declare function planRailwayServiceLink(service: any, { env }?: {
     args: string[];
     cwd: any;
 };
+export declare function ensureRailwayServiceVolumeWithCliFallback({ tenantRoot, projectId, environmentId, environmentName, serviceId, serviceName, name, mountPath, preferCli, env, }: {
+    tenantRoot: any;
+    projectId: any;
+    environmentId: any;
+    environmentName: any;
+    serviceId: any;
+    serviceName: any;
+    name: any;
+    mountPath: any;
+    preferCli?: boolean | undefined;
+    env?: NodeJS.ProcessEnv | undefined;
+}): Promise<{
+    volume: any;
+    instance: any;
+    created: boolean;
+    updated: boolean;
+}>;
 export declare function deployRailwayService(tenantRoot: any, service: any, { dryRun, write, prefix, env, }?: {
     dryRun?: boolean;
     write?: TreeseedBootstrapWriter;

package/dist/operations/services/railway-deploy.js

@@ -1925,6 +1925,7 @@ export {
   ensureRailwayProjectExists,
   ensureRailwayScheduledJobs,
   ensureRailwayServiceExists,
+  ensureRailwayServiceVolumeWithCliFallback,
   isRailwayTransientFailure,
   isUsableRailwayToken,
   planRailwayServiceDeploy,

package/dist/reconcile/builtin-adapters.js

@@ -32,6 +32,7 @@ import {
   configuredRailwayServices,
   deriveRailwayMarketOperationsRunnerVolumeName,
   ensureRailwayProjectContext,
+  ensureRailwayServiceVolumeWithCliFallback,
   runRailway,
   validateRailwayDeployPrerequisites
 } from "../operations/services/railway-deploy.js";
@@ -42,7 +43,6 @@ import {
   ensureRailwayProject,
   ensureRailwayService,
   ensureRailwayServiceInstanceConfiguration,
-  ensureRailwayServiceVolume,
   getRailwayServiceInstance,
   getRailwayProject,
   listRailwayCustomDomains,
@@ -1568,12 +1568,16 @@ async function syncRailwayEnvironmentForScope(input, { dryRun = false } = {}) {
       });
       if (entry.configuredService.volumeMountPath) {
         const volumeName = entry.configuredService.key === "marketOperationsRunner" ? deriveRailwayMarketOperationsRunnerVolumeName(entry.service.name, entry.environment.name) : `${entry.service.name}-volume`;
-        const volume = await ensureRailwayServiceVolume({
+        const volume = await ensureRailwayServiceVolumeWithCliFallback({
+          tenantRoot: input.context.tenantRoot,
           projectId: entry.project.id,
           environmentId: entry.environment.id,
+          environmentName: entry.environment.name,
           serviceId: entry.service.id,
+          serviceName: entry.service.name,
           name: volumeName,
           mountPath: entry.configuredService.volumeMountPath,
+          preferCli: entry.configuredService.key === "marketOperationsRunner",
           env: topology.env
         });
         if (!volume.instance?.serviceId) {
@@ -1660,7 +1664,7 @@ async function ensureRailwayMarketDatabaseForScope(input, topology) {
       env: topology.env
     });
   }
-  for (let attempt = 0; attempt < 8; attempt += 1) {
+  for (let attempt = 0; attempt < 20; attempt += 1) {
     const existingVolumes = await listRailwayVolumes({
       projectId: firstService.project.id,
       env: topology.env
@@ -1669,18 +1673,10 @@ async function ensureRailwayMarketDatabaseForScope(input, topology) {
       (instance) => instance.serviceId === postgresService.id && instance.environmentId === firstService.environment?.id && instance.mountPath === "/var/lib/postgresql/data"
     ));
     if (attached) {
-      break;
+      return;
     }
-    await new Promise((resolve2) => setTimeout(resolve2, 1500));
+    await new Promise((resolve2) => setTimeout(resolve2, 3e3));
   }
-  await ensureRailwayServiceVolume({
-    projectId: firstService.project.id,
-    environmentId: firstService.environment.id,
-    serviceId: postgresService.id,
-    name: `postgres-${topology.scope === "prod" ? "prod" : topology.scope}-data`,
-    mountPath: "/var/lib/postgresql/data",
-    env: topology.env
-  });
 }
 async function observeRailwayUnit(input, { refresh = false } = {}) {
   let attempt = 0;

package/package.json

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