@treeseed/sdk 0.6.24 → 0.6.26

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

@@ -283,6 +283,22 @@ export declare function listD1Databases(tenantRoot: any, env: any): any;
 export declare function listQueues(tenantRoot: any, env: any): any;
 export declare function listR2Buckets(tenantRoot: any, env: any): any;
 export declare function listPagesProjects(tenantRoot: any, env: any): any;
+export declare function buildCloudflarePagesFunctionBindings(state: any): {
+    r2_buckets?: {
+        [x: number]: {
+            name: any;
+        };
+    } | undefined;
+    d1_databases?: {
+        [x: number]: {
+            id: any;
+        };
+    } | undefined;
+    kv_namespaces?: {
+        [k: string]: any;
+    } | undefined;
+};
+export declare function mergeCloudflarePagesDeploymentConfig(config?: {}, bindings?: {}): {};
 export declare function buildProvisioningSummary(deployConfig: any, state: any, target: any): {
     target: any;
     identity: any;
@@ -967,6 +983,9 @@ export declare function verifyProvisionedCloudflareResources(tenantRoot: any, op
         queue: boolean;
         dlq: boolean;
         r2: boolean;
+        pagesFormGuardKvBinding: any;
+        pagesD1Binding: any;
+        pagesR2Binding: any;
         webCache: boolean;
     };
     state: any;

package/dist/operations/services/deploy.js

@@ -878,18 +878,53 @@ function listPagesProjects(tenantRoot, env) {
   });
   return Array.isArray(payload?.result) ? payload.result : [];
 }
-function ensurePagesProjectCompatibility(accountId, projectName, env, currentProject = null) {
+function buildCloudflarePagesFunctionBindings(state) {
+  const kvNamespaces = Object.fromEntries(
+    Object.entries(state.kvNamespaces ?? {}).map(([key, namespace]) => {
+      const binding = namespace?.binding ?? key;
+      const namespaceId = namespace?.id;
+      return binding && namespaceId && !isPlaceholderResourceId(namespaceId) ? [binding, { namespace_id: namespaceId }] : null;
+    }).filter(Boolean)
+  );
+  const database = state.d1Databases?.SITE_DATA_DB;
+  const d1Databases = database?.binding && database?.databaseId && !isPlaceholderResourceId(database.databaseId) ? { [database.binding]: { id: database.databaseId } } : {};
+  const contentBinding = state.content?.r2Binding;
+  const contentBucketName = state.content?.bucketName;
+  const r2Buckets = contentBinding && contentBucketName ? { [contentBinding]: { name: contentBucketName } } : {};
+  return {
+    ...Object.keys(kvNamespaces).length ? { kv_namespaces: kvNamespaces } : {},
+    ...Object.keys(d1Databases).length ? { d1_databases: d1Databases } : {},
+    ...Object.keys(r2Buckets).length ? { r2_buckets: r2Buckets } : {}
+  };
+}
+function mergeCloudflarePagesDeploymentConfig(config = {}, bindings = {}) {
+  return Object.entries(bindings).reduce((merged, [key, value]) => ({
+    ...merged,
+    [key]: {
+      ...merged[key] ?? {},
+      ...value
+    }
+  }), { ...config });
+}
+function ensurePagesProjectCompatibility(accountId, projectName, env, currentProject = null, options = {}) {
   if (!accountId || !projectName) {
     return;
   }
   const projectPath = `/accounts/${encodeURIComponent(accountId)}/pages/projects/${encodeURIComponent(projectName)}`;
   const latestProject = cloudflareApiRequest(projectPath, { env, allowFailure: true })?.result ?? currentProject;
   const currentConfigs = latestProject?.deployment_configs ?? {};
+  const target = options.target;
+  const targetConfigKey = target?.kind === "persistent" && target.scope === "prod" ? "production" : "preview";
+  const bindings = options.state ? buildCloudflarePagesFunctionBindings(options.state) : {};
   const mergeCompatibility = (config = {}) => ({
     ...config,
     compatibility_date: config.compatibility_date ?? DEFAULT_COMPATIBILITY_DATE,
     compatibility_flags: [.../* @__PURE__ */ new Set([...config.compatibility_flags ?? [], ...DEFAULT_COMPATIBILITY_FLAGS])]
   });
+  const mergeTarget = (key, config = {}) => {
+    const compatible = mergeCompatibility(config);
+    return key === targetConfigKey && Object.keys(bindings).length ? mergeCloudflarePagesDeploymentConfig(compatible, bindings) : compatible;
+  };
   cloudflareApiRequest(
     projectPath,
     {
@@ -898,8 +933,8 @@ function ensurePagesProjectCompatibility(accountId, projectName, env, currentPro
       body: {
         deployment_configs: {
           ...currentConfigs,
-          preview: mergeCompatibility(currentConfigs.preview),
-          production: mergeCompatibility(currentConfigs.production)
+          preview: mergeTarget("preview", currentConfigs.preview),
+          production: mergeTarget("production", currentConfigs.production)
         }
       }
     }
@@ -1835,7 +1870,7 @@ function provisionCloudflareResources(tenantRoot, options = {}) {
     const exists = pagesProjects.find((entry) => entry?.name === current.projectName);
     if (exists) {
       current.url = exists.subdomain ? `https://${exists.subdomain}` : current.url ?? `https://${current.projectName}.pages.dev`;
-      ensurePagesProjectCompatibility(env.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? "", current.projectName, env, exists);
+      ensurePagesProjectCompatibility(env.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? "", current.projectName, env, exists, { state, target });
       return;
     }
     if (dryRun) {
@@ -1854,7 +1889,7 @@ function provisionCloudflareResources(tenantRoot, options = {}) {
       capture: true,
       env
     });
-    ensurePagesProjectCompatibility(env.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? "", current.projectName, env);
+    ensurePagesProjectCompatibility(env.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID ?? "", current.projectName, env, null, { state, target });
     current.url = `https://${current.projectName}.pages.dev`;
   };
   ensureKv("FORM_GUARD_KV");
@@ -1931,13 +1966,25 @@ function verifyProvisionedCloudflareResources(tenantRoot, options = {}) {
   const queues = dryRun ? [] : listQueues(tenantRoot, env);
   const buckets = dryRun ? [] : listR2Buckets(tenantRoot, env);
   const pagesProjects = dryRun ? [] : listPagesProjects(tenantRoot, env);
+  const livePages = pagesProjects.find((entry) => entry?.name === state.pages?.projectName);
+  const pagesProject = dryRun || !env.CLOUDFLARE_ACCOUNT_ID || !state.pages?.projectName ? livePages : cloudflareApiRequest(
+    `/accounts/${encodeURIComponent(env.CLOUDFLARE_ACCOUNT_ID)}/pages/projects/${encodeURIComponent(state.pages.projectName)}`,
+    { env, allowFailure: true }
+  )?.result ?? livePages;
+  const pagesConfigKey = target.kind === "persistent" && target.scope === "prod" ? "production" : "preview";
+  const pagesConfig = pagesProject?.deployment_configs?.[pagesConfigKey] ?? {};
+  const pagesBindings = buildCloudflarePagesFunctionBindings(state);
+  const pageBindingConfigured = (configKey, binding, expected) => pagesConfig?.[configKey]?.[binding] && Object.entries(expected).every(([key, value]) => pagesConfig[configKey][binding]?.[key] === value);
   const checks = {
-    pages: Boolean(state.pages?.projectName && pagesProjects.find((entry) => entry?.name === state.pages.projectName)),
+    pages: Boolean(state.pages?.projectName && (livePages || pagesProject?.name === state.pages.projectName)),
     formGuardKv: Boolean(state.kvNamespaces?.FORM_GUARD_KV?.name && kvNamespaces.find((entry) => entry?.title === state.kvNamespaces.FORM_GUARD_KV.name)),
     d1: Boolean(state.d1Databases?.SITE_DATA_DB?.databaseName && d1Databases.find((entry) => entry?.name === state.d1Databases.SITE_DATA_DB.databaseName)),
     queue: Boolean(state.queues?.agentWork?.name && queues.find((entry) => queueName(entry) === state.queues.agentWork.name)),
     dlq: !state.queues?.agentWork?.dlqName || Boolean(queues.find((entry) => queueName(entry) === state.queues.agentWork.dlqName)),
     r2: Boolean(state.content?.bucketName && buckets.find((entry) => entry?.name === state.content.bucketName)),
+    pagesFormGuardKvBinding: !pagesBindings.kv_namespaces?.FORM_GUARD_KV || pageBindingConfigured("kv_namespaces", "FORM_GUARD_KV", pagesBindings.kv_namespaces.FORM_GUARD_KV),
+    pagesD1Binding: !pagesBindings.d1_databases?.SITE_DATA_DB || pageBindingConfigured("d1_databases", "SITE_DATA_DB", pagesBindings.d1_databases.SITE_DATA_DB),
+    pagesR2Binding: !state.content?.r2Binding || !pagesBindings.r2_buckets?.[state.content.r2Binding] || pageBindingConfigured("r2_buckets", state.content.r2Binding, pagesBindings.r2_buckets[state.content.r2Binding]),
     webCache: !shouldManageCloudflareWebCacheRules(deployConfig, target) || state.webCache?.rulesManaged === true
   };
   const ok = dryRun ? true : Object.values(checks).every(Boolean);
@@ -1955,7 +2002,6 @@ function verifyProvisionedCloudflareResources(tenantRoot, options = {}) {
     const liveDlq = queues.find((entry) => queueName(entry) === state.queues.agentWork.dlqName);
     state.queues.agentWork.dlqId = queueId(liveDlq) ?? state.queues.agentWork.dlqId ?? null;
   }
-  const livePages = pagesProjects.find((entry) => entry?.name === state.pages?.projectName);
   if (state.pages) {
     const configuredWebUrl = resolveConfiguredSurfaceBaseUrl(deployConfig, target, "web");
     if (configuredWebUrl) {
@@ -2136,6 +2182,7 @@ function printDestroySummary(result) {
 }
 export {
   assertDeploymentInitialized,
+  buildCloudflarePagesFunctionBindings,
   buildProvisioningSummary,
   buildPublicVars,
   buildSecretMap,
@@ -2160,6 +2207,7 @@ export {
   loadDeployState,
   markDeploymentInitialized,
   markManagedServicesInitialized,
+  mergeCloudflarePagesDeploymentConfig,
   normalizePersistentScope,
   printDeploySummary,
   printDestroySummary,

package/dist/operations/services/release-candidate.js

@@ -9,7 +9,7 @@ import { collectInternalDevReferenceIssues } from "./package-reference-policy.js
 import { collectTreeseedEnvironmentContext, resolveTreeseedMachineEnvironmentValues, validateTreeseedCommandEnvironment } from "./config-runtime.js";
 import { loadDeployState } from "./deploy.js";
 import { loadCliDeployConfig } from "./runtime-tools.js";
-import { run, workspacePackages } from "./workspace-tools.js";
+import { packagesWithScript, run, workspacePackages } from "./workspace-tools.js";
 const RELEASE_CANDIDATE_CACHE_DIR = ".treeseed/workflow/release-candidates";
 const STABLE_SEMVER = /^\d+\.\d+\.\d+$/u;
 const REHEARSAL_IGNORED_SEGMENTS = /* @__PURE__ */ new Set([
@@ -224,6 +224,11 @@ function rehearsalVerifyScript(root) {
   }
   return null;
 }
+function buildRehearsalWorkspacePackageArtifacts(root) {
+  for (const pkg of packagesWithScript("build:dist", root)) {
+    run("npm", ["--prefix", pkg.dir, "run", "build:dist"], { cwd: root, timeoutMs: 3e5 });
+  }
+}
 function runProductionDependencyRehearsal(root, plannedVersions, selectedPackageNames, failures) {
   if (getGitHubAutomationMode() === "stub" || process.env.TREESEED_RELEASE_CANDIDATE_REHEARSAL_MODE === "skip") {
     return "Skipped clean install rehearsal in stub/skip mode.";
@@ -235,7 +240,8 @@ function runProductionDependencyRehearsal(root, plannedVersions, selectedPackage
     tempParent = copied.tempParent;
     applyPlannedStableMetadata(copied.tempRoot, plannedVersions);
     run("npm", ["install", "--package-lock-only", "--ignore-scripts"], { cwd: copied.tempRoot, timeoutMs: 3e5 });
-    run("npm", ["ci"], { cwd: copied.tempRoot, timeoutMs: 6e5 });
+    run("npm", ["ci", "--ignore-scripts"], { cwd: copied.tempRoot, timeoutMs: 6e5 });
+    buildRehearsalWorkspacePackageArtifacts(copied.tempRoot);
     const scriptName = rehearsalVerifyScript(copied.tempRoot);
     if (scriptName) {
       run("npm", ["run", scriptName], { cwd: copied.tempRoot, timeoutMs: 9e5 });

package/dist/reconcile/builtin-adapters.js

@@ -3,6 +3,7 @@ import { relative, resolve } from "node:path";
 import { collectTreeseedEnvironmentContext, resolveTreeseedMachineEnvironmentValues } from "../operations/services/config-runtime.js";
 import {
   buildPublicVars,
+  buildCloudflarePagesFunctionBindings,
   buildProvisioningSummary,
   buildSecretMap,
   cloudflareApiRequest,
@@ -16,6 +17,7 @@ import {
   listPagesProjects,
   listQueues,
   listR2Buckets,
+  mergeCloudflarePagesDeploymentConfig,
   loadDeployState,
   queueId,
   queueName,
@@ -595,7 +597,7 @@ function syncPagesEnvironmentVariablesForTarget(input, { dryRun = false } = {})
   const mergedDeploymentConfigs = {
     ...deploymentConfigs,
     [branchConfigKey]: {
-      ...currentBranchConfig,
+      ...mergeCloudflarePagesDeploymentConfig(currentBranchConfig, buildCloudflarePagesFunctionBindings(state)),
       env_vars: {
         ...currentBranchConfig?.env_vars ?? {},
         ...envVars
@@ -1070,6 +1072,11 @@ function verifyCloudflareUnitOnce(input, postconditions) {
       const branchKey = input.context.target.kind === "persistent" && input.context.target.scope === "prod" ? "production" : "preview";
       const branchConfig = project?.deployment_configs?.[branchKey] ?? {};
       const envVars = branchConfig?.env_vars && typeof branchConfig.env_vars === "object" ? branchConfig.env_vars : {};
+      const pageBindings = buildCloudflarePagesFunctionBindings(state);
+      const pageBindingConfigured = (configKey, binding, expected) => {
+        const observed = branchConfig?.[configKey]?.[binding];
+        return Boolean(observed && Object.entries(expected).every(([key, value]) => observed?.[key] === value));
+      };
       const sync = collectCloudflareEnvironmentSync(input);
       const expectedVars = Object.entries(sync.vars).filter(([, value]) => typeof value === "string" && value.length > 0);
       const checks = [
@@ -1106,6 +1113,33 @@ function verifyCloudflareUnitOnce(input, postconditions) {
           issues: envVars[name] ? [] : [`Pages secret ${name} is missing from the ${branchKey} deployment config.`]
         }));
       }
+      for (const [binding, expected] of Object.entries(pageBindings.kv_namespaces ?? {})) {
+        checks.push(verificationCheck(`pages.kv:${binding}`, `Pages KV binding ${binding} points at the expected namespace`, "api", {
+          exists: Boolean(branchConfig?.kv_namespaces?.[binding]),
+          configured: pageBindingConfigured("kv_namespaces", binding, expected),
+          expected,
+          observed: branchConfig?.kv_namespaces?.[binding] ?? null,
+          issues: pageBindingConfigured("kv_namespaces", binding, expected) ? [] : [`Pages KV binding ${binding} is missing or points at the wrong namespace for ${branchKey}.`]
+        }));
+      }
+      for (const [binding, expected] of Object.entries(pageBindings.d1_databases ?? {})) {
+        checks.push(verificationCheck(`pages.d1:${binding}`, `Pages D1 binding ${binding} points at the expected database`, "api", {
+          exists: Boolean(branchConfig?.d1_databases?.[binding]),
+          configured: pageBindingConfigured("d1_databases", binding, expected),
+          expected,
+          observed: branchConfig?.d1_databases?.[binding] ?? null,
+          issues: pageBindingConfigured("d1_databases", binding, expected) ? [] : [`Pages D1 binding ${binding} is missing or points at the wrong database for ${branchKey}.`]
+        }));
+      }
+      for (const [binding, expected] of Object.entries(pageBindings.r2_buckets ?? {})) {
+        checks.push(verificationCheck(`pages.r2:${binding}`, `Pages R2 binding ${binding} points at the expected bucket`, "api", {
+          exists: Boolean(branchConfig?.r2_buckets?.[binding]),
+          configured: pageBindingConfigured("r2_buckets", binding, expected),
+          expected,
+          observed: branchConfig?.r2_buckets?.[binding] ?? null,
+          issues: pageBindingConfigured("r2_buckets", binding, expected) ? [] : [`Pages R2 binding ${binding} is missing or points at the wrong bucket for ${branchKey}.`]
+        }));
+      }
       return summarizeVerification(input.unit.unitId, checks);
     }
     default:

package/package.json

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