@wtfalch/foundry 0.9.0 → 0.11.0

package/dist/plan/cloudflared-connector.js

@@ -54,8 +54,15 @@ export async function ensureCloudflaredConnector(input) {
         }
     }
     if (!appId) {
+        if (input.adopted) {
+            throw new Error(`cloudflared connector ${input.appName}: the adopted app was not found`);
+        }
+        const { projectUuid, environment } = input;
+        if (!projectUuid || !environment) {
+            throw new Error(`cloudflared connector ${input.appName}: no project to find or create it in`);
+        }
         const found = await coolify.findApplicationByName(input.appName, {
-            environmentIds: [input.environment.id],
+            environmentIds: [environment.id],
         });
         if (found) {
             const live = await liveStatus(found.uuid);
@@ -64,21 +71,21 @@ export async function ensureCloudflaredConnector(input) {
                 status = live.status;
             }
         }
-    }
-    if (!appId) {
-        const server = await input.resolveServer();
-        const created = await coolify.createDockerfileApplication({
-            project_uuid: input.projectUuid,
-            server_uuid: server.uuid,
-            environment_name: input.environment.name,
-            environment_uuid: input.environment.uuid,
-            dockerfile: cloudflaredDockerfile(),
-            name: input.appName,
-            description: 'cloudflared connector for a Cloudflare tunnel',
-            instant_deploy: false,
-        });
-        appId = created.uuid;
-        justCreated = true;
+        if (!appId) {
+            const server = await input.resolveServer();
+            const created = await coolify.createDockerfileApplication({
+                project_uuid: projectUuid,
+                server_uuid: server.uuid,
+                environment_name: environment.name,
+                environment_uuid: environment.uuid,
+                dockerfile: cloudflaredDockerfile(),
+                name: input.appName,
+                description: 'cloudflared connector for a Cloudflare tunnel',
+                instant_deploy: false,
+            });
+            appId = created.uuid;
+            justCreated = true;
+        }
     }
     if (appId !== input.recordedConnectorAppId)
         await input.recordAppId(appId);
@@ -86,6 +93,7 @@ export async function ensureCloudflaredConnector(input) {
     const tokenChanged = justCreated || (await tunnelTokenDiffers(coolify, appId, token));
     if (tokenChanged) {
         try {
+            await input.beforeTokenWrite?.(token);
             await coolify.bulkUpsertEnvs(appId, [{ key: 'TUNNEL_TOKEN', value: token, literal: true }]);
         }
         catch {

package/dist/plan/diff.d.ts

@@ -1,5 +1,6 @@
 import type { DeclaredOrg, OrgId } from '../org.js';
 import type { Plan, PlanStep, UnmanagedItem, VersionChangeItem } from '../plan.js';
+import type { Adoption } from '../store.js';
 import { type AgoraHostReading } from './agora.js';
 import type { LiveResource } from './live.js';
 import { type OrgPlatformReadiness } from './platform-org.js';
@@ -34,6 +35,19 @@ export interface PlannedStep {
 export interface PlanOrgOptions {
     /** #267: the executor was built with a `loginHostBindings` port. */
     loginHostBindings?: boolean;
+    /**
+     * #311: the host wired an `AdoptionVault` and an `AdoptionStore`, and the
+     * rows it holds. An adopting org plans a `coolify:adopt` step for each
+     * resource with no active snapshot (`isActiveSnapshot`), or, with nothing
+     * wired, reports adoption blocked and plans neither it nor the resource's
+     * own step.
+     */
+    adoption?: {
+        wired: boolean;
+        adopted: readonly Adoption[];
+    };
+    /** F5: the executor was built with a `broker` port. */
+    broker?: boolean;
 }
 export interface PlanDetail {
     orgId: OrgId;