@wtfalch/foundry 0.76.0 → 0.76.1

package/dist/plan/desktop-auth.d.ts

@@ -13,6 +13,17 @@ export declare const DESKTOP_AUTH_HOME = "desktop_auth";
 export declare const DESKTOP_AUTH_REVISION_SCOPE_KEY = "coolify_desktop_auth_revision";
 /** The Agora origin the app was last written for (CLAUDE.md rule 3: the applied hostname is a scope id). */
 export declare const DESKTOP_AUTH_ORIGIN_SCOPE_KEY = "coolify_desktop_auth_origin";
+/**
+ * The org's one shared Postgres server ({@link ORG_POSTGRES_SERVER_SCOPE_KEY}) that desktop-auth's
+ * `MESSAGING_DATABASE_URL`/`MESSAGING_DATABASE_URL_OWNER` were last written for. Those two env values
+ * are built from the server's live `internal_db_url` at apply time (`executor.ts`'s `serverHome`), so a
+ * server that is re-provisioned under a new Coolify resource is always picked up correctly *once this
+ * step actually runs* -- but {@link DESKTOP_AUTH_REVISION_SCOPE_KEY} hashes only `desktopAuthEnv`'s
+ * fields, which never include the database host. Without this scope key a server change that leaves
+ * every other input (issuer, client id, org id, project ids) unchanged never replans the step at all, and
+ * the app keeps restarting against a host that no longer exists (foundry#1112).
+ */
+export declare const DESKTOP_AUTH_DB_SERVER_SCOPE_KEY = "coolify_desktop_auth_db_server";
 /** The callback URI last put on Agora's client, or `unsupported:<uri>` when the providers client cannot. */
 export declare const DESKTOP_AUTH_REDIRECT_SCOPE_KEY = "coolify_desktop_auth_redirect";
 /** Recorded once the readiness probe through Agora answered. */
@@ -43,10 +54,12 @@ export declare function desktopAuthEnv(inputs: DesktopAuthInputs, runtimeRole: s
 export declare function desktopAuthRevision(env: Readonly<Record<string, string>>): string;
 /**
  * The `coolify:desktop-auth` step. Planned when the app is not recorded, when the env it was written for
- * differs (a rename moves the origin), when it never ran healthy, when the callback URI is not on Agora's
- * client, and when Agora carries the upstream but the readiness probe never answered. Not planned while
- * Agora is blocked (its own line says why) or while the `desktop_auth` home cannot exist yet (blocked).
- * `homePlanned` is true when the databases step in this plan creates the home.
+ * differs (a rename moves the origin), when the org's Postgres server has changed since the env was last
+ * written (foundry#1112: the database host is not part of that revision, since it is built from a live
+ * Coolify read the plan itself cannot make), when it never ran healthy, when the callback URI is not on
+ * Agora's client, and when Agora carries the upstream but the readiness probe never answered. Not planned
+ * while Agora is blocked (its own line says why) or while the `desktop_auth` home cannot exist yet
+ * (blocked). `homePlanned` is true when the databases step in this plan creates the home.
  */
 export declare function planDesktopAuth(org: DeclaredOrg, recorded: Readonly<Record<string, string>>, input: {
     host: AgoraHostValues | null;

package/dist/plan/desktop-auth.js

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { ORG_SERVICE_SCHEMAS, orgServiceDatabase } from '../org.js';
+import { ORG_POSTGRES_SERVER_SCOPE_KEY, ORG_SERVICE_SCHEMAS, orgServiceDatabase, } from '../org.js';
 import { AGORA_CLIENT_ID_SCOPE_KEY, DESKTOP_AUTH_APP_SCOPE_KEY, DESKTOP_AUTH_DEPLOYED_SCOPE_KEY, DESKTOP_AUTH_PORT, ZITADEL_ORG_SCOPE_KEY, agoraHostnameFor, desktopAuthInternalName, desktopAuthUpstream, withRecordedMessagingProject, } from './agora.js';
 import { ZITADEL_FILES_PROJECT_SCOPE_KEY } from './core-files.js';
 export { DESKTOP_AUTH_APP_SCOPE_KEY, DESKTOP_AUTH_DEPLOYED_SCOPE_KEY, DESKTOP_AUTH_PORT, desktopAuthInternalName, desktopAuthUpstream, };
@@ -14,6 +14,17 @@ export const DESKTOP_AUTH_HOME = 'desktop_auth';
 export const DESKTOP_AUTH_REVISION_SCOPE_KEY = 'coolify_desktop_auth_revision';
 /** The Agora origin the app was last written for (CLAUDE.md rule 3: the applied hostname is a scope id). */
 export const DESKTOP_AUTH_ORIGIN_SCOPE_KEY = 'coolify_desktop_auth_origin';
+/**
+ * The org's one shared Postgres server ({@link ORG_POSTGRES_SERVER_SCOPE_KEY}) that desktop-auth's
+ * `MESSAGING_DATABASE_URL`/`MESSAGING_DATABASE_URL_OWNER` were last written for. Those two env values
+ * are built from the server's live `internal_db_url` at apply time (`executor.ts`'s `serverHome`), so a
+ * server that is re-provisioned under a new Coolify resource is always picked up correctly *once this
+ * step actually runs* -- but {@link DESKTOP_AUTH_REVISION_SCOPE_KEY} hashes only `desktopAuthEnv`'s
+ * fields, which never include the database host. Without this scope key a server change that leaves
+ * every other input (issuer, client id, org id, project ids) unchanged never replans the step at all, and
+ * the app keeps restarting against a host that no longer exists (foundry#1112).
+ */
+export const DESKTOP_AUTH_DB_SERVER_SCOPE_KEY = 'coolify_desktop_auth_db_server';
 /** The callback URI last put on Agora's client, or `unsupported:<uri>` when the providers client cannot. */
 export const DESKTOP_AUTH_REDIRECT_SCOPE_KEY = 'coolify_desktop_auth_redirect';
 /** Recorded once the readiness probe through Agora answered. */
@@ -85,10 +96,12 @@ function runtimeRoleFor(org) {
 }
 /**
  * The `coolify:desktop-auth` step. Planned when the app is not recorded, when the env it was written for
- * differs (a rename moves the origin), when it never ran healthy, when the callback URI is not on Agora's
- * client, and when Agora carries the upstream but the readiness probe never answered. Not planned while
- * Agora is blocked (its own line says why) or while the `desktop_auth` home cannot exist yet (blocked).
- * `homePlanned` is true when the databases step in this plan creates the home.
+ * differs (a rename moves the origin), when the org's Postgres server has changed since the env was last
+ * written (foundry#1112: the database host is not part of that revision, since it is built from a live
+ * Coolify read the plan itself cannot make), when it never ran healthy, when the callback URI is not on
+ * Agora's client, and when Agora carries the upstream but the readiness probe never answered. Not planned
+ * while Agora is blocked (its own line says why) or while the `desktop_auth` home cannot exist yet
+ * (blocked). `homePlanned` is true when the databases step in this plan creates the home.
  */
 export function planDesktopAuth(org, recorded, input) {
     if (!input.host)
@@ -114,6 +127,10 @@ export function planDesktopAuth(org, recorded, input) {
     else {
         if (revision && recorded[DESKTOP_AUTH_REVISION_SCOPE_KEY] !== revision)
             reasons.push('env');
+        const dbServer = recorded[ORG_POSTGRES_SERVER_SCOPE_KEY];
+        if (dbServer && recorded[DESKTOP_AUTH_DB_SERVER_SCOPE_KEY] !== dbServer) {
+            reasons.push('database host changed');
+        }
         if (!recorded[DESKTOP_AUTH_DEPLOYED_SCOPE_KEY])
             reasons.push('never ran healthy');
         if (redirect !== callback && !blocked)

package/dist/plan/executor.js

@@ -32,7 +32,7 @@ import { LOGIN_COOKIE_DOMAIN_SCOPE_KEY } from './cookie-domain.js';
 import { previewsOn } from './coolify-previews.js';
 import { CORE_FILES_COLLECTION_NAME, FILES_CORE_COLLECTION_SCOPE_KEY, ZITADEL_FILES_PROJECT_SCOPE_KEY, } from './core-files.js';
 import { waitForDeploymentFinished, waitForHealthyVersion, waitForNewDeployment, } from './deploy-health.js';
-import { DESKTOP_AUTH_APP_SCOPE_KEY, DESKTOP_AUTH_DEPLOYED_SCOPE_KEY, DESKTOP_AUTH_DOCKERFILE, DESKTOP_AUTH_HOME, DESKTOP_AUTH_ORIGIN_SCOPE_KEY, DESKTOP_AUTH_READY_PATH, DESKTOP_AUTH_READY_SCOPE_KEY, DESKTOP_AUTH_REDIRECT_SCOPE_KEY, DESKTOP_AUTH_REVISION_SCOPE_KEY, desktopAuthCallbackUri, desktopAuthEnv, desktopAuthInputs, desktopAuthRedirectUnsupported, desktopAuthRevision, } from './desktop-auth.js';
+import { DESKTOP_AUTH_APP_SCOPE_KEY, DESKTOP_AUTH_DB_SERVER_SCOPE_KEY, DESKTOP_AUTH_DEPLOYED_SCOPE_KEY, DESKTOP_AUTH_DOCKERFILE, DESKTOP_AUTH_HOME, DESKTOP_AUTH_ORIGIN_SCOPE_KEY, DESKTOP_AUTH_READY_PATH, DESKTOP_AUTH_READY_SCOPE_KEY, DESKTOP_AUTH_REDIRECT_SCOPE_KEY, DESKTOP_AUTH_REVISION_SCOPE_KEY, desktopAuthCallbackUri, desktopAuthEnv, desktopAuthInputs, desktopAuthRedirectUnsupported, desktopAuthRevision, } from './desktop-auth.js';
 import { desktopCallbackUri, signInCallbackAppliedValue, signInRedirectUris, unionRedirectUris, zitadelAppDesktopCallbackAppliedScopeKey, } from './desktop-callback.js';
 import { PLATFORM_NETWORK, companyNetworkName, ensureDestination, findDestination, onPlatformNetwork, placed, placedByScope, placedOnPlatform, } from './destinations.js';
 import { DEFAULT_AI_LIMIT_MICROS } from './diff.js';
@@ -7747,6 +7747,12 @@ export class FoundryStepExecutor {
         await this.addDesktopAuthCallback(org, context, desktopAuthCallbackUri(inputs.origin));
         context.recordScopeId(DESKTOP_AUTH_ORIGIN_SCOPE_KEY, inputs.origin);
         context.recordScopeId(DESKTOP_AUTH_REVISION_SCOPE_KEY, desktopAuthRevision(env));
+        // foundry#1112: the database host itself is not part of `env`'s revision (it comes from a live
+        // Coolify read, not from `desktopAuthEnv`'s inputs), so the server this env was built against is
+        // tracked here instead -- a later change replans this step even when nothing else drifted.
+        const dbServerId = recorded[ORG_POSTGRES_SERVER_SCOPE_KEY];
+        if (dbServerId)
+            context.recordScopeId(DESKTOP_AUTH_DB_SERVER_SCOPE_KEY, dbServerId);
         return { resourceId: app.appId };
     }
     /** Whether the org's running Agora carries `AGORA_DESKTOP_AUTH_UPSTREAM`, read from its live env. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.76.0",
+  "version": "0.76.1",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",