@agent-native/dispatch 0.8.6 → 0.8.7

package/dist/server/lib/app-creation-store.js

@@ -17,6 +17,7 @@ const WORKSPACE_APPS_MANIFEST_FILE = "workspace-apps.json";
 const WORKSPACE_APPS_GATEWAY_PATH = "/_workspace/apps";
 const WORKSPACE_APPS_GATEWAY_TIMEOUT_MS = 1_000;
 const MAX_PENDING_APPS = 50;
+const PENDING_WORKSPACE_APP_TTL_MS = 7 * 24 * 60 * 60 * 1_000;
 const AGENT_CARD_PATH = "/.well-known/agent-card.json";
 const AGENT_CARD_FETCH_TIMEOUT_MS = 1_500;
 const DEFAULT_WORKSPACE_APP_AUDIENCE = "internal";
@@ -88,6 +89,43 @@ function workspaceAppMetadataSettingsKey() {
         return `${WORKSPACE_APP_METADATA_SETTINGS_KEY}:org:${orgId}`;
     return `${WORKSPACE_APP_METADATA_SETTINGS_KEY}:user:${currentOwnerEmail()}`;
 }
+function cleanOptionalString(value) {
+    return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function normalizeContextPart(value) {
+    return value.trim().replace(/\s+/g, " ");
+}
+function pendingWorkspaceAppContext() {
+    const branch = cleanOptionalString(process.env.BRANCH) ??
+        cleanOptionalString(process.env.HEAD) ??
+        cleanOptionalString(process.env.VERCEL_GIT_COMMIT_REF) ??
+        cleanOptionalString(process.env.CF_PAGES_BRANCH) ??
+        cleanOptionalString(process.env.RENDER_GIT_BRANCH) ??
+        cleanOptionalString(process.env.FLY_BRANCH);
+    if (branch) {
+        const normalized = normalizeContextPart(branch);
+        return { id: `branch:${normalized}`, label: `Branch: ${normalized}` };
+    }
+    const origin = cleanOptionalString(process.env.DEPLOY_PRIME_URL) ??
+        cleanOptionalString(process.env.DEPLOY_URL) ??
+        cleanOptionalString(process.env.URL) ??
+        cleanOptionalString(process.env.APP_URL) ??
+        cleanOptionalString(process.env.BETTER_AUTH_URL) ??
+        cleanOptionalString(process.env.WORKSPACE_GATEWAY_URL);
+    if (!origin)
+        return null;
+    try {
+        const parsed = new URL(origin);
+        return {
+            id: `origin:${parsed.origin}`,
+            label: parsed.hostname,
+        };
+    }
+    catch {
+        const normalized = normalizeContextPart(origin);
+        return { id: `origin:${normalized}`, label: normalized };
+    }
+}
 async function readSettingsRecord() {
     const raw = await getSetting(scopedSettingsKey()).catch(() => null);
     return raw && typeof raw === "object" && !Array.isArray(raw)
@@ -321,6 +359,49 @@ function parseWorkspaceAppsManifest(parsed) {
         .sort(sortWorkspaceApps);
     return apps.length ? apps : null;
 }
+function parseDateMs(value) {
+    if (!value)
+        return null;
+    const ms = Date.parse(value);
+    return Number.isFinite(ms) ? ms : null;
+}
+function pendingWorkspaceAppExpiresAt(createdAt) {
+    const createdMs = parseDateMs(createdAt) ?? Date.now();
+    return new Date(createdMs + PENDING_WORKSPACE_APP_TTL_MS).toISOString();
+}
+function isPendingWorkspaceAppExpired(app) {
+    const expiresMs = parseDateMs(app.expiresAt) ??
+        (parseDateMs(app.createdAt) ?? Date.now()) + PENDING_WORKSPACE_APP_TTL_MS;
+    return expiresMs <= Date.now();
+}
+function pendingWorkspaceAppMatchesCurrentContext(app) {
+    if (isPendingWorkspaceAppExpired(app))
+        return false;
+    const currentContext = pendingWorkspaceAppContext();
+    if (!app.contextId)
+        return true;
+    return app.contextId === currentContext?.id;
+}
+function pendingWorkspaceAppContextRank(app) {
+    const currentContext = pendingWorkspaceAppContext();
+    if (app.contextId && app.contextId === currentContext?.id)
+        return 2;
+    if (!app.contextId)
+        return 1;
+    return 0;
+}
+function dedupePendingWorkspaceAppsForCurrentContext(apps) {
+    const byId = new Map();
+    for (const app of apps) {
+        const existing = byId.get(app.id);
+        if (!existing ||
+            pendingWorkspaceAppContextRank(app) >
+                pendingWorkspaceAppContextRank(existing)) {
+            byId.set(app.id, app);
+        }
+    }
+    return Array.from(byId.values());
+}
 function sortWorkspaceApps(a, b) {
     if (a.id === "dispatch")
         return -1;
@@ -345,6 +426,7 @@ function parsePendingWorkspaceApps(value) {
         if (!id || !pathValue.startsWith("/"))
             return null;
         const now = new Date().toISOString();
+        const createdAt = cleanOptionalString(record.createdAt) ?? now;
         return {
             id,
             name: typeof record.name === "string" && record.name.trim()
@@ -363,15 +445,17 @@ function parsePendingWorkspaceApps(value) {
             projectId: typeof record.projectId === "string" && record.projectId.trim()
                 ? record.projectId.trim()
                 : null,
+            contextId: cleanOptionalString(record.contextId),
+            contextLabel: cleanOptionalString(record.contextLabel),
             ...(record.audience === undefined
                 ? {}
                 : { audience: normalizeWorkspaceAppAudience(record.audience) }),
-            createdAt: typeof record.createdAt === "string" && record.createdAt.trim()
-                ? record.createdAt.trim()
-                : now,
+            createdAt,
             updatedAt: typeof record.updatedAt === "string" && record.updatedAt.trim()
                 ? record.updatedAt.trim()
                 : now,
+            expiresAt: cleanOptionalString(record.expiresAt) ??
+                pendingWorkspaceAppExpiresAt(createdAt),
         };
     })
         .filter((app) => !!app)
@@ -431,7 +515,7 @@ export async function removePendingWorkspaceApp(input) {
         throw new Error("appId is required");
     const raw = await readSettingsRecord();
     const pending = parsePendingWorkspaceApps(raw.pendingApps);
-    const next = pending.filter((app) => app.id !== appId);
+    const next = pending.filter((app) => app.id !== appId || !pendingWorkspaceAppMatchesCurrentContext(app));
     const removed = next.length !== pending.length;
     if (!removed)
         return { removed: false };
@@ -456,7 +540,7 @@ function pendingAppToSummary(app) {
         publicPaths: [],
         protectedPaths: [],
         status: "pending",
-        statusLabel: "Building in Builder",
+        statusLabel: "Pending Builder branch",
         builderUrl: app.builderUrl,
         branchName: app.branchName,
         createdAt: app.createdAt,
@@ -464,9 +548,9 @@ function pendingAppToSummary(app) {
 }
 async function appendPendingWorkspaceApps(apps) {
     const readyIds = new Set(apps.map((app) => app.id));
-    const pendingApps = (await listPendingWorkspaceApps())
-        .filter((app) => !readyIds.has(app.id))
-        .map(pendingAppToSummary);
+    const pendingApps = dedupePendingWorkspaceAppsForCurrentContext((await listPendingWorkspaceApps())
+        .filter(pendingWorkspaceAppMatchesCurrentContext)
+        .filter((app) => !readyIds.has(app.id))).map(pendingAppToSummary);
     return [...apps, ...pendingApps].sort(sortWorkspaceApps);
 }
 function agentCardUrlForApp(appUrl) {
@@ -562,9 +646,15 @@ async function maybeIncludeAgentCards(apps, options) {
 }
 async function recordPendingWorkspaceApp(input) {
     const now = new Date().toISOString();
+    const context = pendingWorkspaceAppContext();
     const raw = await readSettingsRecord();
     const pendingApps = parsePendingWorkspaceApps(raw.pendingApps);
-    const existing = pendingApps.find((app) => app.id === input.appId);
+    const contextId = context?.id ?? null;
+    const samePendingEntry = (app) => app.id === input.appId &&
+        (app.contextId === contextId || (!!contextId && !app.contextId));
+    const existing = pendingApps
+        .filter((app) => !isPendingWorkspaceAppExpired(app))
+        .find(samePendingEntry);
     const next = {
         id: input.appId,
         name: titleCase(input.appId),
@@ -574,14 +664,17 @@ async function recordPendingWorkspaceApp(input) {
         builderUrl: input.builderUrl?.trim() || null,
         branchName: input.branchName?.trim() || null,
         projectId: input.projectId,
+        contextId: context?.id ?? null,
+        contextLabel: context?.label ?? null,
         createdAt: existing?.createdAt || now,
         updatedAt: now,
+        expiresAt: pendingWorkspaceAppExpiresAt(existing?.createdAt || now),
     };
     await putSetting(scopedSettingsKey(), {
         ...raw,
         pendingApps: [
             next,
-            ...pendingApps.filter((app) => app.id !== input.appId),
+            ...pendingApps.filter((app) => !samePendingEntry(app)),
         ].slice(0, MAX_PENDING_APPS),
     });
     await writeWorkspaceAppMetadataOverride({
@@ -600,6 +693,7 @@ async function recordPendingWorkspaceApp(input) {
             builderBranchUrlConfigured: !!next.builderUrl,
             branchName: next.branchName,
             projectIdConfigured: !!next.projectId,
+            contextLabel: next.contextLabel,
         },
     });
 }