@wtfalch/foundry 0.22.2 → 0.22.3

package/dist/plan/diff.js

@@ -9,7 +9,7 @@ import { planFilesKeys } from './entry-files-key.js';
 import { appHostname, entryHostnames, tunnelDnsHostnames, tunnelDomainList } from './hostnames.js';
 import { LOGIN_BINDING_SCOPE_KEY, companyLoginTunnelHost, loginBindingState, loginHostClientIds, loginHostnameFor, pendingRemovalHosts, } from './login-host.js';
 import { MAIL_COPY_COMPLETED_SCOPE_KEY, MAIL_COPY_DONE_SCOPE_KEY, parseMailCopyCompleted, } from './mail-copy.js';
-import { CALLS_MAS_APPLIED_IMAGE_TAG_SCOPE_KEY, CALLS_SYNAPSE_APPLIED_IMAGE_TAG_SCOPE_KEY, ORG_MAIL_APPLIED_APEX_SCOPE_KEY, ORG_MAIL_APPLIED_HOST_SCOPE_KEY, ORG_MAIL_APPLIED_MODE_SCOPE_KEY, ORG_MAIL_APPLIED_USES_DOMAIN_SCOPE_KEY, appEnvAppliedScopeKey, appSettingsOf, appStepKey, appliedAppDomains, appliedAppSettings, dbEnvAppliedScopeKey, resolveAppEnv, serviceDbEnvAppliedScopeKey, versionNotAppliedLine, } from './platform-diff.js';
+import { CALLS_MAS_APPLIED_IMAGE_TAG_SCOPE_KEY, CALLS_SYNAPSE_APPLIED_IMAGE_TAG_SCOPE_KEY, ORG_MAIL_APPLIED_APEX_SCOPE_KEY, ORG_MAIL_APPLIED_HOST_SCOPE_KEY, ORG_MAIL_APPLIED_MODE_SCOPE_KEY, ORG_MAIL_APPLIED_USES_DOMAIN_SCOPE_KEY, appEnvAppliedScopeKey, appFolderDiffers, appSettingsOf, appStepKey, appliedAppDomains, appliedAppSettings, dbEnvAppliedScopeKey, resolveAppEnv, serviceDbEnvAppliedScopeKey, versionNotAppliedLine, } from './platform-diff.js';
 import { DEFAULT_ORG_PLATFORM_READINESS, } from './platform-org.js';
 import { PLATFORM_AUTH_BROKER_MAIL_KEY_REF } from './platform-providers.js';
 import { appLabelsAppliedScopeKey, entryLabelHash, entryLabelSpec } from './proxy-labels.js';
@@ -2229,7 +2229,7 @@ function planApp(org, entryKey, byKey, claimed, recordedIds, plannedSteps, authI
             key: blockedKey('port'),
         });
     }
-    if (want.folder !== have.folder ||
+    if (appFolderDiffers(want, have) ||
         want.autoDeploy !== have.autoDeploy ||
         (want.port !== null && want.port !== have.port)) {
         return {

package/dist/plan/executor.d.ts

@@ -117,8 +117,6 @@ export interface CoolifyPort {
         ports_exposes?: string;
         /** `false` for an internal entry: Coolify makes no domain for it. */
         autogenerate_domain?: boolean;
-        /** The folder a `static` entry serves (`HostingEntry.folder`). */
-        publish_directory?: string;
         /** Whether a push to `git_branch` deploys (`HostingEntry.autoDeploy`). */
         is_auto_deploy_enabled?: boolean;
         /**

package/dist/plan/executor.js

@@ -23,7 +23,7 @@ import { healthCheckSettings } from './health-check-settings.js';
 import { appHostname, coolifyTunnelDomains, entryHostnames, tunnelDnsHostnames, tunnelDomainList, tunnelIngressHostnames, } from './hostnames.js';
 import { LOGIN_BINDING_SCOPE_KEY, LOGIN_HOST_PENDING_REMOVAL_SCOPE_KEY, LOGIN_HOST_SHARED_SCOPE_KEY, customersEntryKeys, loginBindingState, loginHostClientIds, pendingRemovalHosts, pendingRemovalState, } from './login-host.js';
 import { MAIL_COPY_COMPLETED_SCOPE_KEY, MAIL_COPY_DONE_SCOPE_KEY, parseMailCopyCompleted, runMailCopyStep, } from './mail-copy.js';
-import { CALLS_MAS_APPLIED_IMAGE_TAG_SCOPE_KEY, CALLS_SYNAPSE_APPLIED_IMAGE_TAG_SCOPE_KEY, ORG_MAIL_APPLIED_APEX_SCOPE_KEY, ORG_MAIL_APPLIED_HOST_SCOPE_KEY, ORG_MAIL_APPLIED_MODE_SCOPE_KEY, ORG_MAIL_APPLIED_USES_DOMAIN_SCOPE_KEY, appDomainsAppliedScopeKey, appEnvAppliedScopeKey, appNameFor, appSettingsAppliedScopeKey, appSettingsOf, appStepKey, appliedAppDomains, appliedAppSettings, dbEnvAppliedScopeKey, resolveAppEnv, serviceDbEnvAppliedScopeKey, } from './platform-diff.js';
+import { CALLS_MAS_APPLIED_IMAGE_TAG_SCOPE_KEY, CALLS_SYNAPSE_APPLIED_IMAGE_TAG_SCOPE_KEY, ORG_MAIL_APPLIED_APEX_SCOPE_KEY, ORG_MAIL_APPLIED_HOST_SCOPE_KEY, ORG_MAIL_APPLIED_MODE_SCOPE_KEY, ORG_MAIL_APPLIED_USES_DOMAIN_SCOPE_KEY, appDomainsAppliedScopeKey, appEnvAppliedScopeKey, appFolderDiffers, appNameFor, appSettingsAppliedScopeKey, appSettingsOf, appStepKey, appliedAppDomains, appliedAppSettings, dbEnvAppliedScopeKey, resolveAppEnv, serviceDbEnvAppliedScopeKey, } from './platform-diff.js';
 import { AUTH_LOGIN_PORT, PLATFORM_AUTH_BROKER_MAIL_KEY_REF, PLATFORM_AUTH_LOGIN_INTERNAL_NAME, } from './platform-providers.js';
 import { appLabelsAppliedScopeKey, entryLabelHash, entryLabelSpec, entryProxyLabels, sameLabelSets, } from './proxy-labels.js';
 import { entryWorkerAppliedScopeKey, entryWorkerExclusionsScopeKey, entryWorkerRetiredScopeKey, entryWorkerRouteIdScopeKey, entryWorkerRoutePatternScopeKey, entryWorkerRoutePendingScopeKey, entryWorkerRouteZoneScopeKey, entryWorkerUploadedScopeKey, } from './worker.js';
@@ -1789,7 +1789,6 @@ export class FoundryStepExecutor {
         const names = entryHostnames(org, entry);
         const wantDomains = tunnelDomainList(names);
         const isStatic = entry.buildPack === 'static';
-        const folderField = isStatic ? 'publish_directory' : 'base_directory';
         const settingsKey = appSettingsAppliedScopeKey(entry.key);
         const domainsKey = appDomainsAppliedScopeKey(entry.key);
         let haveDomains;
@@ -1833,7 +1832,10 @@ export class FoundryStepExecutor {
                 // A static site is served by Coolify's own web server on port 80.
                 ports_exposes: isStatic ? '80' : entry.port === null ? undefined : String(entry.port),
                 is_auto_deploy_enabled: entry.autoDeploy,
-                [folderField]: entry.folder === null ? undefined : `/${entry.folder}`,
+                // Also the folder a static entry serves: Coolify's static build
+                // copies `base_directory`, and reads `publish_directory` only for a
+                // built app.
+                base_directory: entry.folder === null ? undefined : `/${entry.folder}`,
                 // Only the shared standard app builds from this repo; a bespoke
                 // app's Dockerfile is at its own repo's root.
                 dockerfile_location: entry.repo ? undefined : DEFAULT_APP_DOCKERFILE,
@@ -1848,8 +1850,8 @@ export class FoundryStepExecutor {
         // difference again.
         const want = appSettingsOf(entry);
         const patch = {};
-        if (want.folder !== have.folder)
-            patch[folderField] = want.folder ? `/${want.folder}` : '/';
+        if (appFolderDiffers(want, have))
+            patch.base_directory = want.folder ? `/${want.folder}` : '/';
         if (want.port !== have.port && want.port !== null && !isStatic) {
             patch.ports_exposes = String(want.port);
         }
@@ -1904,7 +1906,6 @@ export class FoundryStepExecutor {
             await this.ports.coolify.updateApplication(appId, patch);
         // The container builds and listens from these only at its next deploy.
         const settingsNeedDeploy = Boolean(patch.base_directory ||
-            patch.publish_directory ||
             patch.ports_exposes ||
             patch.domains !== undefined ||
             patch.custom_internal_name ||

package/dist/plan/platform-diff.d.ts

@@ -482,8 +482,17 @@ export interface AppSettings {
     folder: string | null;
     port: number | null;
     autoDeploy: boolean;
+    /**
+     * Set for a `static` entry whose folder is written as `base_directory`,
+     * the field Coolify's static build serves from. A static marker without it
+     * was written as `publish_directory`, which that build ignores (it served
+     * the repo root), so the app is patched and redeployed once.
+     */
+    staticFolderIn?: 'base_directory';
 }
 export declare function appSettingsOf(entry: HostingEntry): AppSettings;
+/** Whether the app's folder is not yet where Coolify reads it: a changed folder, or a static one written to the old field. */
+export declare function appFolderDiffers(want: AppSettings, have: AppSettings): boolean;
 /** What an app that predates the marker has: Coolify's own defaults, so it plans no change. */
 export declare const DEFAULT_APP_SETTINGS: AppSettings;
 export declare function appSettingsAppliedScopeKey(entryKey: string): string;

package/dist/plan/platform-diff.js

@@ -520,7 +520,17 @@ export function serviceDbEnvAppliedScopeKey(service) {
     return `service_db_env_applied.${service}`;
 }
 export function appSettingsOf(entry) {
-    return { folder: entry.folder, port: entry.port, autoDeploy: entry.autoDeploy };
+    return {
+        folder: entry.folder,
+        port: entry.port,
+        autoDeploy: entry.autoDeploy,
+        ...(entry.buildPack === 'static' ? { staticFolderIn: 'base_directory' } : {}),
+    };
+}
+/** Whether the app's folder is not yet where Coolify reads it: a changed folder, or a static one written to the old field. */
+export function appFolderDiffers(want, have) {
+    return (want.folder !== have.folder ||
+        (want.folder !== null && want.staticFolderIn !== have.staticFolderIn));
 }
 /** What an app that predates the marker has: Coolify's own defaults, so it plans no change. */
 export const DEFAULT_APP_SETTINGS = { folder: null, port: null, autoDeploy: true };

package/package.json

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