@treeseed/sdk 0.10.28 → 0.12.4

package/dist/reconcile/contracts.d.ts

@@ -1,9 +1,9 @@
-import type { TreeseedDeployConfig } from '../platform/contracts.ts';
+import type { TreeseedDeployConfig } from '../platform/contracts.js';
 export type TreeseedReconcileProviderId = string;
-export type TreeseedReconcileActionKind = 'noop' | 'create' | 'update' | 'reuse' | 'drift_correct' | 'destroy';
+export type TreeseedReconcileActionKind = 'noop' | 'create' | 'update' | 'replace' | 'delete' | 'adopt' | 'rename' | 'reattach' | 'retain' | 'taint' | 'blocked';
 export type TreeseedReconcileStatusKind = 'pending' | 'ready' | 'drifted' | 'error';
 export type TreeseedReconcileVerificationSource = 'cli' | 'api' | 'sdk' | 'derived';
-export type TreeseedReconcileUnitType = 'web-ui' | 'api-runtime' | 'market-operations-runner-runtime' | 'workday-manager-runtime' | 'worker-runner-runtime' | 'edge-worker' | 'content-store' | 'queue' | 'database' | 'kv-form-guard' | 'turnstile-widget' | 'pages-project' | 'custom-domain:web' | 'custom-domain:api' | 'dns-record' | 'railway-service:api' | 'railway-service:market-operations-runner' | 'railway-service:workday-manager' | 'railway-service:worker-runner';
+export type TreeseedReconcileUnitType = 'web-ui' | 'api-runtime' | 'operations-runner-runtime' | 'workday-manager-runtime' | 'worker-runner-runtime' | 'edge-worker' | 'content-store' | 'queue' | 'database' | 'kv-form-guard' | 'turnstile-widget' | 'pages-project' | 'custom-domain:web' | 'custom-domain:api' | 'dns-record' | 'railway-service:api' | 'railway-service:operations-runner' | 'railway-service:workday-manager' | 'railway-service:worker-runner' | 'package-manifest' | 'template-manifest' | 'package-workflow' | 'package-image' | 'github-environment' | 'github-secret-binding' | 'github-variable-binding' | 'github-workflow-dispatch' | 'docker-image-build' | 'local-docker-compose' | 'local-treedx' | 'local-content-materialization' | 'local-process' | 'capacity-provider' | 'branch-preview' | 'branch-preview-cleanup' | 'workflow-gate' | 'save-gate:local-verify' | 'save-gate:promotion-readiness' | 'save-gate:hosted-verify' | 'release-gate:verify' | 'release-gate:template-verify' | 'release-gate:template-release-record' | 'release-gate:npm-publish' | 'release-gate:image-publish' | 'release-gate:hosted-reconcile' | 'release-gate:live-verify' | 'release-gate:candidate-record' | 'release-gate:production-record';
 export type TreeseedReconcileTarget = {
     kind: 'persistent';
     scope: 'local' | 'staging' | 'prod';
@@ -32,6 +32,19 @@ export interface TreeseedDesiredUnit {
     secrets: Record<string, string | null | undefined>;
     metadata: Record<string, unknown>;
 }
+export interface TreeseedReconcileSelector {
+    environment?: 'local' | 'staging' | 'prod';
+    host?: string[];
+    packageId?: string[];
+    appId?: string[];
+    serviceId?: string[];
+    serviceType?: string[];
+    placement?: string[];
+    resourceKind?: string[];
+    unitId?: string[];
+    unitType?: TreeseedReconcileUnitType[];
+    provider?: string[];
+}
 export interface TreeseedObservedUnitState {
     exists: boolean;
     status: TreeseedReconcileStatusKind;
@@ -115,6 +128,7 @@ export interface TreeseedReconcileRunContext {
     target: TreeseedReconcileTarget;
     deployConfig: TreeseedDeployConfig;
     launchEnv: NodeJS.ProcessEnv;
+    dryRun?: boolean;
     write?: (line: string) => void;
     session: Map<string, unknown>;
 }
@@ -129,11 +143,11 @@ export interface TreeseedReconcileAdapter {
     supports(unitType: TreeseedReconcileUnitType, providerId: TreeseedReconcileProviderId): boolean;
     validate?(input: TreeseedReconcileAdapterInput): Promise<void> | void;
     requiredPostconditions?(input: TreeseedReconcileAdapterInput): Promise<TreeseedUnitPostcondition[]> | TreeseedUnitPostcondition[];
-    observe(input: TreeseedReconcileAdapterInput): Promise<TreeseedObservedUnitState> | TreeseedObservedUnitState;
-    plan(input: TreeseedReconcileAdapterInput & {
+    refresh(input: TreeseedReconcileAdapterInput): Promise<TreeseedObservedUnitState> | TreeseedObservedUnitState;
+    diff(input: TreeseedReconcileAdapterInput & {
         observed: TreeseedObservedUnitState;
     }): Promise<TreeseedUnitDiff> | TreeseedUnitDiff;
-    reconcile(input: TreeseedReconcileAdapterInput & {
+    apply(input: TreeseedReconcileAdapterInput & {
         observed: TreeseedObservedUnitState;
         diff: TreeseedUnitDiff;
     }): Promise<TreeseedReconcileResult> | TreeseedReconcileResult;
@@ -146,6 +160,9 @@ export interface TreeseedReconcileAdapter {
     destroy?(input: TreeseedReconcileAdapterInput & {
         observed: TreeseedObservedUnitState;
     }): Promise<TreeseedReconcileResult> | TreeseedReconcileResult;
+    importOrAdopt?(input: TreeseedReconcileAdapterInput & {
+        observed: TreeseedObservedUnitState;
+    }): Promise<TreeseedReconcileResult> | TreeseedReconcileResult;
 }
 export interface TreeseedReconcileStateRecord {
     version: 1;

package/dist/reconcile/desired-state.d.ts

@@ -1,199 +1,9 @@
-import type { TreeseedDesiredUnit, TreeseedReconcileTarget } from './contracts.ts';
+import type { TreeseedDesiredUnit, TreeseedReconcileTarget } from './contracts.js';
 export declare function deriveTreeseedDesiredUnits({ tenantRoot, target, }: {
     tenantRoot: string;
     target: TreeseedReconcileTarget;
 }): {
-    deployConfig: {
-        name: string;
-        slug: string;
-        siteUrl: string;
-        contactEmail: string;
-        hosting: {
-            kind: string;
-            registration: any;
-            marketBaseUrl: any;
-            teamId: any;
-            projectId: any;
-        };
-        hub: {
-            mode: string;
-        };
-        runtime: {
-            mode: string;
-            registration: any;
-            marketBaseUrl: any;
-            teamId: any;
-            projectId: any;
-        };
-        cloudflare: {
-            accountId: string;
-            zoneId: string | undefined;
-            workerName: string | undefined;
-            queueName: string | undefined;
-            dlqName: string | undefined;
-            d1Binding: string | undefined;
-            queueBinding: string | undefined;
-            pages: {
-                projectName: string | undefined;
-                previewProjectName: string | undefined;
-                productionBranch: string;
-                stagingBranch: string;
-                buildOutputDir: string | undefined;
-            } | undefined;
-            r2: {
-                binding: string | undefined;
-                bucketName: string | undefined;
-                publicBaseUrl: string | undefined;
-                manifestKeyTemplate: string;
-                previewRootTemplate: string;
-                previewTtlHours: number;
-            } | undefined;
-        };
-        plugins: {
-            package: string;
-            enabled: boolean;
-        }[] | {
-            package: string;
-            enabled: boolean | undefined;
-            config: any;
-        }[];
-        providers: {
-            forms: string;
-            agents: {
-                execution: string;
-                mutation: string;
-                repository: string;
-                verification: string;
-                notification: string;
-                research: string;
-            };
-            deploy: string;
-            dns: string;
-            content: {
-                runtime: string;
-                publish: string;
-                docs: string;
-                serving: any;
-            };
-            site: string;
-        };
-        surfaces: {
-            [k: string]: {
-                enabled: boolean | undefined;
-                provider: string | undefined;
-                rootDir: string | undefined;
-                publicBaseUrl: string | undefined;
-                localBaseUrl: string | undefined;
-                local: {
-                    runtime: string | undefined;
-                } | undefined;
-                environments: {
-                    local: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                    staging: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                    prod: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                } | undefined;
-                cache: {
-                    sourcePages: {
-                        browserTtlSeconds: number | undefined;
-                        edgeTtlSeconds: number | undefined;
-                        staleWhileRevalidateSeconds: number | undefined;
-                        staleIfErrorSeconds: number | undefined;
-                    } | {
-                        paths: any[];
-                    } | undefined;
-                    contentPages: {
-                        browserTtlSeconds: number | undefined;
-                        edgeTtlSeconds: number | undefined;
-                        staleWhileRevalidateSeconds: number | undefined;
-                        staleIfErrorSeconds: number | undefined;
-                    } | {
-                        paths: any[];
-                    } | undefined;
-                    r2PublishedObjects: {
-                        browserTtlSeconds: number | undefined;
-                        edgeTtlSeconds: number | undefined;
-                        staleWhileRevalidateSeconds: number | undefined;
-                        staleIfErrorSeconds: number | undefined;
-                    } | {
-                        paths: any[];
-                    } | undefined;
-                } | undefined;
-            } | undefined;
-        } | undefined;
-        services: {
-            [k: string]: {
-                enabled: boolean | undefined;
-                provider: string | undefined;
-                rootDir: string | undefined;
-                publicBaseUrl: string | undefined;
-                local: {
-                    runtime: string | undefined;
-                } | undefined;
-                cloudflare: {
-                    workerName: string | undefined;
-                };
-                railway: {
-                    projectId: string | undefined;
-                    projectName: string | undefined;
-                    serviceId: string | undefined;
-                    serviceName: string | undefined;
-                    resourceType: string | undefined;
-                    environmentVariable: string | undefined;
-                    serviceTargets: any;
-                    rootDir: string | undefined;
-                    buildCommand: string | undefined;
-                    startCommand: string | undefined;
-                    healthcheckPath: string | undefined;
-                    healthcheckTimeoutSeconds: number | undefined;
-                    healthcheckIntervalSeconds: number | undefined;
-                    restartPolicy: string | undefined;
-                    runtimeMode: string | undefined;
-                    volumeMountPath: string | undefined;
-                    runnerPool: {
-                        bootstrapCount: number | undefined;
-                        maxRunners: number | undefined;
-                        volumeMountPath: string | undefined;
-                    } | undefined;
-                    schedule: any;
-                };
-                environments: {
-                    local: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                    staging: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                    prod: {
-                        baseUrl: string | undefined;
-                        domain: string | undefined;
-                        railwayEnvironment: string | undefined;
-                    };
-                };
-            } | undefined;
-        } | undefined;
-        smtp: {
-            enabled: boolean | undefined;
-        };
-        turnstile: {
-            enabled: boolean;
-        };
-    };
+    deployConfig: import("../platform/contracts.js").TreeseedDeployConfig;
     legacyState: any;
     units: TreeseedDesiredUnit[];
 };

package/dist/reconcile/desired-state.js

@@ -1,4 +1,4 @@
-import { loadCliDeployConfig } from "../operations/services/runtime-tools.js";
+import { loadTreeseedPlatformConfig } from "../platform/config.js";
 import {
   loadDeployState,
   resolveConfiguredSurfaceDomain,
@@ -11,8 +11,8 @@ function railwayConcreteUnitTypeForServiceKey(serviceKey) {
   switch (serviceKey) {
     case "api":
       return "railway-service:api";
-    case "marketOperationsRunner":
-      return "railway-service:market-operations-runner";
+    case "operationsRunner":
+      return "railway-service:operations-runner";
     case "workdayManager":
       return "railway-service:workday-manager";
     case "workerRunner":
@@ -21,11 +21,14 @@ function railwayConcreteUnitTypeForServiceKey(serviceKey) {
       return "railway-service:api";
   }
 }
+function isPublicTreeDxNodeServiceKey(serviceKey) {
+  return serviceKey.startsWith("public-treedx-node-");
+}
 function deriveTreeseedDesiredUnits({
   tenantRoot,
   target
 }) {
-  const deployConfig = loadCliDeployConfig(tenantRoot);
+  const deployConfig = loadTreeseedPlatformConfig({ tenantRoot, environment: target.kind === "persistent" ? target.scope : "staging", env: process.env }).deployConfig;
   const legacyState = loadDeployState(tenantRoot, deployConfig, { target });
   const identity = legacyState.identity ?? resolveTreeseedResourceIdentity(deployConfig, target);
   const units = [];
@@ -33,22 +36,6 @@ function deriveTreeseedDesiredUnits({
     units.push(unit);
     return unit.unitId;
   };
-  const queueId = add({
-    unitId: createTreeseedReconcileUnitId("queue", legacyState.queues.agentWork.name),
-    unitType: "queue",
-    provider: "cloudflare",
-    identity,
-    target,
-    logicalName: legacyState.queues.agentWork.name,
-    dependencies: [],
-    spec: {
-      name: legacyState.queues.agentWork.name,
-      dlqName: legacyState.queues.agentWork.dlqName,
-      binding: legacyState.queues.agentWork.binding
-    },
-    secrets: {},
-    metadata: { bootstrapSystem: "data" }
-  });
   const databaseId = add({
     unitId: createTreeseedReconcileUnitId("database", legacyState.d1Databases.SITE_DATA_DB.databaseName),
     unitType: "database",
@@ -134,7 +121,7 @@ function deriveTreeseedDesiredUnits({
     identity,
     target,
     logicalName: legacyState.workerName,
-    dependencies: [queueId, databaseId, formGuardKvId, ...turnstileWidgetId ? [turnstileWidgetId] : [], contentStoreId, pagesProjectId],
+    dependencies: [databaseId, formGuardKvId, ...turnstileWidgetId ? [turnstileWidgetId] : [], contentStoreId, pagesProjectId],
     spec: {
       workerName: legacyState.workerName
     },
@@ -204,28 +191,32 @@ function deriveTreeseedDesiredUnits({
   const scope = target.kind === "persistent" ? target.scope : "staging";
   for (const configuredService of configuredRailwayServices(tenantRoot, scope)) {
     const serviceKey = configuredService.key;
-    const service = deployConfig.services?.[serviceKey];
+    const service = configuredService.serviceConfig ?? deployConfig.services?.[serviceKey];
     const serviceState = legacyState.services?.[serviceKey];
-    if (!service || service.enabled === false || service.provider !== "railway") {
+    if (isPublicTreeDxNodeServiceKey(serviceKey)) {
+    } else if (!service || service.enabled === false || service.provider !== "railway") {
       continue;
     }
     const concreteType = railwayConcreteUnitTypeForServiceKey(serviceKey);
-    const serviceBootstrapSystem = serviceKey === "api" ? "api" : "agents";
+    const serviceBootstrapSystem = serviceKey === "api" || serviceKey === "operationsRunner" || isPublicTreeDxNodeServiceKey(serviceKey) ? "api" : "agents";
+    const desiredServiceName = configuredService.serviceName ?? serviceState?.serviceName ?? serviceKey;
+    const desiredProjectName = configuredService.projectName ?? serviceState?.projectName;
+    const persistedServiceMatchesDesired = (!serviceState?.serviceName || serviceState.serviceName === desiredServiceName) && (!serviceState?.projectName || serviceState.projectName === desiredProjectName);
     const concreteId = add({
-      unitId: createTreeseedReconcileUnitId(concreteType, serviceState?.serviceName ?? configuredService.serviceName ?? serviceKey),
+      unitId: createTreeseedReconcileUnitId(concreteType, desiredServiceName),
       unitType: concreteType,
       provider: "railway",
       identity,
       target,
-      logicalName: serviceState?.serviceName ?? configuredService.serviceName ?? serviceKey,
+      logicalName: desiredServiceName,
       dependencies: [],
       spec: {
-        projectId: serviceState?.projectId ?? configuredService.projectId,
-        projectName: serviceState?.projectName ?? configuredService.projectName,
-        serviceId: serviceState?.serviceId ?? configuredService.serviceId,
-        serviceName: serviceState?.serviceName ?? configuredService.serviceName,
-        rootDir: serviceState?.rootDir ?? configuredService.rootDir,
-        environment: normalizeRailwayEnvironmentName(serviceState?.environment ?? configuredService.railwayEnvironment),
+        projectId: persistedServiceMatchesDesired ? serviceState?.projectId ?? configuredService.projectId : configuredService.projectId,
+        projectName: desiredProjectName,
+        serviceId: persistedServiceMatchesDesired ? serviceState?.serviceId ?? configuredService.serviceId : configuredService.serviceId,
+        serviceName: desiredServiceName,
+        rootDir: configuredService.rootDir ?? serviceState?.rootDir,
+        environment: normalizeRailwayEnvironmentName(configuredService.railwayEnvironment ?? serviceState?.environment),
         buildCommand: configuredService.buildCommand,
         startCommand: configuredService.startCommand,
         healthcheckPath: configuredService.healthcheckPath,
@@ -256,9 +247,9 @@ function deriveTreeseedDesiredUnits({
       dependencies: [concreteId],
       spec: {
         domain: apiDomain,
-        serviceName: serviceState?.serviceName ?? configuredService.serviceName,
-        projectName: serviceState?.projectName ?? configuredService.projectName,
-        environment: normalizeRailwayEnvironmentName(serviceState?.environment ?? configuredService.railwayEnvironment)
+        serviceName: desiredServiceName,
+        projectName: desiredProjectName,
+        environment: normalizeRailwayEnvironmentName(configuredService.railwayEnvironment ?? serviceState?.environment)
       },
       secrets: {},
       metadata: { surface: "api", serviceKey, bootstrapSystem: "api" }
@@ -284,14 +275,14 @@ function deriveTreeseedDesiredUnits({
       switch (serviceKey) {
         case "api":
           return "api-runtime";
-        case "marketOperationsRunner":
-          return "market-operations-runner-runtime";
+        case "operationsRunner":
+          return "operations-runner-runtime";
         case "workdayManager":
           return "workday-manager-runtime";
         case "workerRunner":
           return "worker-runner-runtime";
         default:
-          return "api-runtime";
+          return isPublicTreeDxNodeServiceKey(serviceKey) ? "api-runtime" : "api-runtime";
       }
     })();
     add({