@wtfalch/foundry 0.26.1 → 0.26.3

package/dist/plan/agora.d.ts

@@ -128,6 +128,13 @@ export declare const AGORA_APP_PORTS_EXPOSES = "8080";
  * so Agora is never given an address that does not resolve yet.
  */
 export declare const CALLS_SERVICE_NAME_SCOPE_KEY = "coolify_calls_service_internal_name";
+/**
+ * Recorded by the executor once the calls service has been deployed and
+ * healthy. `createGithubAppApplication` never deploys a new app, so without
+ * it `planCallsService` finds every marker and plans nothing (same shape as
+ * {@link AGORA_DEPLOYED_SCOPE_KEY}).
+ */
+export declare const CALLS_SERVICE_DEPLOYED_SCOPE_KEY = "coolify_calls_service_deployed";
 /**
  * The calls service app's fixed internal name: the executor gives the app
  * this `custom_internal_name`, so Agora reaches it as

package/dist/plan/agora.js

@@ -136,6 +136,13 @@ export const AGORA_APP_PORTS_EXPOSES = '8080';
  * so Agora is never given an address that does not resolve yet.
  */
 export const CALLS_SERVICE_NAME_SCOPE_KEY = 'coolify_calls_service_internal_name';
+/**
+ * Recorded by the executor once the calls service has been deployed and
+ * healthy. `createGithubAppApplication` never deploys a new app, so without
+ * it `planCallsService` finds every marker and plans nothing (same shape as
+ * {@link AGORA_DEPLOYED_SCOPE_KEY}).
+ */
+export const CALLS_SERVICE_DEPLOYED_SCOPE_KEY = 'coolify_calls_service_deployed';
 /**
  * The calls service app's fixed internal name: the executor gives the app
  * this `custom_internal_name`, so Agora reaches it as

package/dist/plan/diff.js

@@ -1,6 +1,6 @@
 import { VERSIONS, floatingTagBlocked } from '../bootstrap/versions.js';
 import { APP_ENTRY_KEY, ownerMailboxRecorded, ownerMailboxes } from '../org.js';
-import { AGORA_ACTIVATED_ENV_SCOPE_KEY, AGORA_APP_PORTS_EXPOSES, CALLS_INTROSPECTION_SCOPE_KEY, CALLS_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CHAT_INTROSPECTION_SCOPE_KEY, NO_AGORA_HOST_VALUES, ZITADEL_ORG_SCOPE_KEY, agoraEnvDrift, agoraEnvRevision, agoraHostMissing, agoraHostnameFor, callsServiceHasName, callsServiceHasTokenEnv, callsTokenEnvMovedMessage, callsTokenHostFrom, desiredAgoraEnv, withRecordedMessagingProject, } from './agora.js';
+import { AGORA_ACTIVATED_ENV_SCOPE_KEY, AGORA_APP_PORTS_EXPOSES, CALLS_INTROSPECTION_SCOPE_KEY, CALLS_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CALLS_SERVICE_DEPLOYED_SCOPE_KEY, CHAT_INTROSPECTION_SCOPE_KEY, NO_AGORA_HOST_VALUES, ZITADEL_ORG_SCOPE_KEY, agoraEnvDrift, agoraEnvRevision, agoraHostMissing, agoraHostnameFor, callsServiceHasName, callsServiceHasTokenEnv, callsTokenEnvMovedMessage, callsTokenHostFrom, desiredAgoraEnv, withRecordedMessagingProject, } from './agora.js';
 import { BOULE_BROKER_ENTRY_KEY, bouleEnvDrift, desiredBouleEnv, wantedBouleBrokerEntry, } from './boule.js';
 import { brokerEntryAppliedScopeKey, brokerEntryWarningsScopeKey, entryAuthEnv, entryAuthEnvAppliedScopeKey, wantedBrokerEntry, } from './broker-entries.js';
 import { chatInternalNames } from './chat-matrix.js';
@@ -1350,11 +1350,12 @@ function planCallsService(org, byKey, claimed, callsReady, recordedIds, callsBlo
     const missingName = !callsServiceHasName(org, recordedIds);
     const missingTokenEnv = !callsServiceHasTokenEnv(tokenHost, recordedIds);
     const missingDbSplit = !recordedIds[serviceDbEnvAppliedScopeKey('calls-service')];
+    const missingDeploy = !recordedIds[CALLS_SERVICE_DEPLOYED_SCOPE_KEY];
     if (org.calls.enabled &&
         callsReady &&
         !callsBlocked &&
         byKey.has(key) &&
-        (missingName || missingTokenEnv || missingDbSplit)) {
+        (missingName || missingTokenEnv || missingDbSplit || missingDeploy)) {
         return {
             step: withHost({
                 action: {
@@ -1368,7 +1369,9 @@ function planCallsService(org, byKey, claimed, callsReady, recordedIds, callsBlo
                         ? `set the calls service's internal name for ${org.slug}`
                         : missingTokenEnv
                             ? `set the calls service's ZITADEL token env for ${org.slug}`
-                            : `give the calls service's owner and runtime database URLs for ${org.slug} and redeploy it (#239, #456)`,
+                            : missingDbSplit
+                                ? `give the calls service's owner and runtime database URLs for ${org.slug} and redeploy it (#239, #456)`
+                                : `deploy the calls service for ${org.slug}`,
                     destroys: false,
                     migrates: false,
                 },

package/dist/plan/executor.d.ts

@@ -135,7 +135,6 @@ export interface CoolifyPort {
         name: string;
         postgres_db: string;
         postgres_user: string;
-        postgres_initdb_args?: string;
     }): Promise<{
         uuid: string;
         internal_db_url: string;
@@ -2220,6 +2219,14 @@ export declare class FoundryStepExecutor implements StepExecutor, StepDestroyer
      * `system:kind:key` slot of its own for the same reason.
      */
     private ensureCallsDatabase;
+    /**
+     * Sets `POSTGRES_INITDB_ARGS` on a Postgres database, once: the official
+     * image's entrypoint passes it to `initdb`, which Coolify's own
+     * `postgres_initdb_args` field never does ({@link CALLS_SYNAPSE_DB_INITDB_ARGS}).
+     * `/databases/{uuid}/envs` is not a typed port method yet, so this goes
+     * through `raw`. Nothing here is a secret.
+     */
+    private ensureDatabaseInitdbArgs;
     /**
      * Reads back {@link CALLS_SECRET_ENV_KEYS} from the MAS app's own envs
      * before minting fresh ones -- this stack's only memory across a re-run

package/dist/plan/executor.js

@@ -2,7 +2,7 @@ import { randomBytes } from 'node:crypto';
 import { URL } from 'node:url';
 import { CALLS_SFU_PRIVATE_URL, CALLS_SFU_PUBLIC_URL } from '../calls-sfu.js';
 import { APP_ENTRY_KEY, appEntry, filesCollectionEnvName, ownerMailboxRecorded, ownerMailboxes, sharedSecretRef, } from '../org.js';
-import { AGORA_ACTIVATED_ENV_SCOPE_KEY, AGORA_APP_PORTS_EXPOSES, AGORA_CLIENT_ID_SCOPE_KEY, AGORA_DEPLOYED_SCOPE_KEY, APP_CLIENT_ID_SCOPE_KEY, CALLS_INTROSPECTION_SCOPE_KEY, CALLS_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CALLS_SERVICE_NAME_SCOPE_KEY, CALLS_SERVICE_PORT, CALLS_SERVICE_TOKEN_ENV_SCOPE_KEY, CHAT_INTROSPECTION_SCOPE_KEY, CHAT_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CHAT_SERVICE_URL_SCOPE_KEY, CMS_CLIENT_ID_SCOPE_KEY, ENTRY_CLIENT_ID_SCOPE_PREFIX, ZITADEL_MESSAGING_PROJECT_SCOPE_KEY, ZITADEL_ORG_SCOPE_KEY, agoraEnvDrift, agoraEnvRevision, agoraHostnameFor, callsIntrospectionAppName, callsServiceHasName, callsServiceInternalName, callsTokenEnvMarker, callsTokenEnvMovedMessage, chatIntrospectionAppName, desiredAgoraEnv, entryClientIdScopeKey, } from './agora.js';
+import { AGORA_ACTIVATED_ENV_SCOPE_KEY, AGORA_APP_PORTS_EXPOSES, AGORA_CLIENT_ID_SCOPE_KEY, AGORA_DEPLOYED_SCOPE_KEY, APP_CLIENT_ID_SCOPE_KEY, CALLS_INTROSPECTION_SCOPE_KEY, CALLS_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CALLS_SERVICE_DEPLOYED_SCOPE_KEY, CALLS_SERVICE_NAME_SCOPE_KEY, CALLS_SERVICE_PORT, CALLS_SERVICE_TOKEN_ENV_SCOPE_KEY, CHAT_INTROSPECTION_SCOPE_KEY, CHAT_INTROSPECTION_UNDELIVERED_SCOPE_KEY, CHAT_SERVICE_URL_SCOPE_KEY, CMS_CLIENT_ID_SCOPE_KEY, ENTRY_CLIENT_ID_SCOPE_PREFIX, ZITADEL_MESSAGING_PROJECT_SCOPE_KEY, ZITADEL_ORG_SCOPE_KEY, agoraEnvDrift, agoraEnvRevision, agoraHostnameFor, callsIntrospectionAppName, callsServiceHasName, callsServiceInternalName, callsTokenEnvMarker, callsTokenEnvMovedMessage, chatIntrospectionAppName, desiredAgoraEnv, entryClientIdScopeKey, } from './agora.js';
 import { BOULE_BROKER_ENTRY_KEY, BOULE_CLIENT_ID_SCOPE_KEY, BOULE_DATABASE_SCOPE_KEY, BOULE_DEPLOYED_SCOPE_KEY, bouleEnvDrift, bouleHostnameFor, desiredBouleEnv, wantedBouleBrokerEntry, } from './boule.js';
 import { brokerEntryAppliedScopeKey, brokerEntryWarningsScopeKey, entryAuthEnv, entryAuthEnvAppliedScopeKey, wantedBrokerEntry, writeBrokerEntry, } from './broker-entries.js';
 import { MAS_IMAGE, MAS_TAG, SYNAPSE_IMAGE, SYNAPSE_TAG, callsMasConfigYaml, callsServerName, callsSynapseHomeserverYaml, mintCallsMatrixSecrets, parseCallsDbUrl, } from './calls-matrix.js';
@@ -567,21 +567,17 @@ const CALLS_MAS_DB_SCOPE_KEY = 'coolify_calls_mas_database';
  * Synapse refuses to start against a database whose `LC_COLLATE`/`LC_CTYPE`
  * is not `C` (https://element-hq.github.io/synapse/latest/postgres.html);
  * Coolify's official postgres image otherwise creates one with `en_US.utf8`.
- * `createPostgresDatabase` forwards this to Coolify's own
- * `postgres_initdb_args` field -- but Coolify stores that field and reads it
- * back unchanged without ever handing it to `initdb`: its Postgres start
- * action builds the container's env from `postgres_user`/`postgres_password`/
- * `postgres_db` and runtime envs only
- * (https://github.com/coollabsio/coolify/blob/main/app/Actions/Database/StartPostgresql.php).
- * A database created this way still comes up `en_US.utf8` and crash-loops
- * every Synapse app that reads it; live evidence and the real fix (not yet
- * chosen) are tracked in #494. This constant and the field it feeds stay in
- * place, inert, until that lands -- collation cannot be migrated onto an
- * existing database under any of the candidate fixes either. MAS has no
- * such requirement, so this is passed for the Synapse database only. Not
- * using Synapse's own `allow_unsafe_locale` escape hatch regardless of
- * which fix lands: that trades a loud startup refusal for silent index
- * corruption after a future glibc upgrade.
+ * Coolify's `postgres_initdb_args` field is stored and never handed to
+ * `initdb` (its Postgres start action builds the container's env from
+ * `postgres_user`/`postgres_password`/`postgres_db` and runtime envs only,
+ * https://github.com/coollabsio/coolify/blob/main/app/Actions/Database/StartPostgresql.php),
+ * so foundry no longer sends it (#494). The official `postgres` image's
+ * entrypoint does read the `POSTGRES_INITDB_ARGS` env: `ensureCallsDatabase`
+ * sets it on the Synapse database before that database first starts. It
+ * cannot change a database whose data directory `initdb` already made; MAS
+ * has no such requirement, so the env goes on the Synapse database only. Not
+ * using Synapse's own `allow_unsafe_locale` escape hatch: that trades a loud
+ * startup refusal for silent index corruption after a future glibc upgrade.
  */
 const CALLS_SYNAPSE_DB_INITDB_ARGS = '--locale=C --encoding=UTF8';
 /**
@@ -3298,13 +3294,23 @@ export class FoundryStepExecutor {
      * database, whose {@link CALLS_SERVICE_DB_SCOPE_KEY} has no
      * `system:kind:key` slot of its own for the same reason.
      */
-    async ensureCallsDatabase(org, context, projectUuid, environment, name, postgresDb, scopeKey, postgresInitdbArgs) {
+    async ensureCallsDatabase(org, context, projectUuid, environment, name, postgresDb, scopeKey, initdbArgs) {
+        // A database found by id or name may be one a failed run created and never
+        // started (its env call threw), so the env is checked on every path. It
+        // only takes effect before the first start; the callers start it later
+        // (`getDatabaseStarted`).
         const existing = context.recordedIds()[scopeKey];
-        if (existing)
+        if (existing) {
+            if (initdbArgs)
+                await this.ensureDatabaseInitdbArgs(existing, initdbArgs);
             return existing;
+        }
         const found = (await this.ports.coolify.listDatabases()).find((d) => d.name === name && d.environment_id === environment.id);
-        if (found)
+        if (found) {
+            if (initdbArgs)
+                await this.ensureDatabaseInitdbArgs(found.uuid, initdbArgs);
             return found.uuid;
+        }
         const server = await this.resolveServer(org, context);
         const created = await this.ports.coolify.createPostgresDatabase({
             project_uuid: projectUuid,
@@ -3314,10 +3320,27 @@ export class FoundryStepExecutor {
             name,
             postgres_db: postgresDb,
             postgres_user: postgresDb,
-            ...(postgresInitdbArgs ? { postgres_initdb_args: postgresInitdbArgs } : {}),
         });
+        if (initdbArgs)
+            await this.ensureDatabaseInitdbArgs(created.uuid, initdbArgs);
         return created.uuid;
     }
+    /**
+     * Sets `POSTGRES_INITDB_ARGS` on a Postgres database, once: the official
+     * image's entrypoint passes it to `initdb`, which Coolify's own
+     * `postgres_initdb_args` field never does ({@link CALLS_SYNAPSE_DB_INITDB_ARGS}).
+     * `/databases/{uuid}/envs` is not a typed port method yet, so this goes
+     * through `raw`. Nothing here is a secret.
+     */
+    async ensureDatabaseInitdbArgs(dbId, args) {
+        const envs = (await this.ports.coolify.raw('GET', `/databases/${dbId}/envs`));
+        if (envs.some((e) => e.key === 'POSTGRES_INITDB_ARGS'))
+            return;
+        await this.ports.coolify.raw('POST', `/databases/${dbId}/envs`, {
+            key: 'POSTGRES_INITDB_ARGS',
+            value: args,
+        });
+    }
     /**
      * Reads back {@link CALLS_SECRET_ENV_KEYS} from the MAS app's own envs
      * before minting fresh ones -- this stack's only memory across a re-run
@@ -3788,6 +3811,7 @@ export class FoundryStepExecutor {
             name,
             domains: coolifyTunnelDomains([callsHostnameFor(org)]),
             dockerfile_location: CALLS_SERVICE_DOCKERFILE,
+            ports_exposes: CALLS_SERVICE_PORT,
         }));
         // A fixed internal name, like Synapse and MAS above, so the org's Agora
         // reaches this app as `http://<name>:8080` (`agora.ts`'s `AGORA_CALLS_UPSTREAM`).
@@ -3797,7 +3821,13 @@ export class FoundryStepExecutor {
         // tells `desiredAgoraEnv` that the name and the env are both in place.
         // No Coolify health check on the calls service (#543 review): its image
         // is node:24-alpine with no curl, which Coolify's container check runs.
-        await this.ports.coolify.updateApplication(app.appId, { custom_internal_name: name });
+        // A found app may predate `ports_exposes` on create; patch a differing one.
+        const portDiffers = app.existed &&
+            (await this.ports.coolify.getApplication(app.appId)).ports_exposes !== CALLS_SERVICE_PORT;
+        await this.ports.coolify.updateApplication(app.appId, {
+            custom_internal_name: name,
+            ...(portDiffers ? { ports_exposes: CALLS_SERVICE_PORT } : {}),
+        });
         // Every app foundry deploys keeps its own logs (#75), reused as-is here.
         await this.ensureLogVolume(app.appId, org, app.existed);
         const bindingSecret = await this.ensureCallsBindingSecret(app.appId);
@@ -3863,12 +3893,18 @@ export class FoundryStepExecutor {
         // here would bring back a container built before that migrate step
         // existed, still pointed at a role nothing has created.
         const givesTokenEnv = token !== null && context.recordedIds()[CALLS_SERVICE_TOKEN_ENV_SCOPE_KEY] !== tokenMarker;
-        if (app.existed && dbSplitNeedsRefresh) {
+        // A new app is never deployed by Coolify (`instant_deploy` defaults to
+        // false), so a missing deployed marker or a port fix deploys too. One
+        // deploy covers all three cases and the restart below never follows it.
+        if ((app.existed && dbSplitNeedsRefresh) ||
+            !context.recordedIds()[CALLS_SERVICE_DEPLOYED_SCOPE_KEY] ||
+            portDiffers) {
             // #543: every deploy waits for health -- the calls service's own
             // public hostname and `/healthz`, the same path the quartet above
             // just set on the app.
             const runtime = this.ports.runtime ?? {};
             await waitForNewDeployment(this.ports.coolify, app.appId, publicHealthCheck(org, context.recordedIds(), callsHostnameFor(org), CALLS_HEALTH_CHECK_PATH), runtime, runtime.sleep ?? defaultSleep, 'coolify:calls-service', `${org.slug}'s calls service stays at its previous deploy`);
+            context.recordScopeId(CALLS_SERVICE_DEPLOYED_SCOPE_KEY, '1');
         }
         else if (app.existed && (!callsServiceHasName(org, context.recordedIds()) || givesTokenEnv)) {
             await this.ports.coolify.restart(app.appId);

package/package.json

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