@hs-x/cli 0.4.7 → 0.4.8

package/dist/commands/deploy.js

@@ -27,6 +27,7 @@ import { createControlPlaneTenantProvisioningAuthority, } from '../control-plane
 import { captureDeployRevision } from '../deploy-revision-capture.js';
 import { resolveDeployTargets } from '../deploy-targets.js';
 import { executeCliHttp } from '../effect-http.js';
+import { discoverHubSpotAccounts } from '../hubspot-auth.js';
 import { DirectHubSpotAccountResolutionError, createDeployHubSpotDeveloperClient, resolveDirectHubSpotContext, } from '../hubspot-developer-client.js';
 import { HubSpotProjectArchiveSourceError, fingerprintHubSpotArchiveSource, writeLocalHubSpotProjectArchive, } from '../hubspot-project-archive.js';
 import { deployHubSpotProjectBuild, readHubSpotSubbuildStatuses, waitForHubSpotAutoDeploy, waitForHubSpotBuildStatus, } from '../hubspot-project-lifecycle.js';
@@ -1486,7 +1487,7 @@ export async function deployCommand({ argv, root, json, }) {
             projectId: controlPlanePlan.projectId,
             environment: resolveFlag(argv, '--env') ?? resolveFlag(argv, '--environment') ?? 'production',
         })
-        : (readOptionalHubSpotAppId(resolveFlag(argv, '--hubspot-app-id') ?? process.env.HSX_HUBSPOT_APP_ID) ?? (await readPersistedHubSpotAppId(root, await resolveHubSpotProjectName(argv, root))));
+        : (readOptionalHubSpotAppId(resolveFlag(argv, '--hubspot-app-id') ?? process.env.HSX_HUBSPOT_APP_ID) ?? (await readPersistedHubSpotAppIdForDeploy(argv, root)));
     const uploadFirstOrigin = cloudflareDeployRequested &&
         !cloudflareDryRun &&
         !planOnly &&
@@ -2940,7 +2941,7 @@ async function executeCloudflareWorkerDeploy({ argv, root, worker, index, allowC
     // Resolution: flag → env → the binding persisted by the last successful
     // upload (.hs-x/hubspot.json). Users should never have to replay an app id
     // the CLI already learned (owner directive, run-008).
-    const hubspotAppId = readOptionalHubSpotAppId(resolveFlag(argv, '--hubspot-app-id') ?? process.env.HSX_HUBSPOT_APP_ID) ?? (await readPersistedHubSpotAppId(root, await resolveHubSpotProjectName(argv, root)));
+    const hubspotAppId = readOptionalHubSpotAppId(resolveFlag(argv, '--hubspot-app-id') ?? process.env.HSX_HUBSPOT_APP_ID) ?? (await readPersistedHubSpotAppIdForDeploy(argv, root));
     const installRuntimeBinding = hubspotAppId
         ? controlPlaneUrl
             ? await ensureDeployInstallRuntimeBinding({
@@ -3069,7 +3070,10 @@ async function executeCloudflareWorkerDeploy({ argv, root, worker, index, allowC
         ...(installRuntimeBinding
             ? { installKvNamespaceId: installRuntimeBinding.installKvNamespaceId }
             : {}),
-        ...(controlPlaneUrl ? { checkpointDataset: 'hsx_checkpoint', observability: true } : {}),
+        // Workers Logs is the observability source for both deployment modes.
+        // Checkpoint remains linked-only and is added separately below.
+        observability: true,
+        ...(controlPlaneUrl ? { checkpointDataset: 'hsx_checkpoint' } : {}),
         ...(controlPlaneUrl ? { versionMetadataBinding: 'CF_VERSION_METADATA' } : {}),
         ...(tenantDataPlane
             ? {
@@ -4784,6 +4788,14 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
         throw error;
     }
     const buildState = readStatus(buildStatus) ?? 'UNKNOWN';
+    // Legacy ~/.hscli/config.yml accounts can authenticate and upload without
+    // exposing their developer-account id through the selected account object.
+    // HubSpot's build response is authoritative for that same id; retain it so
+    // the app-auth handoff and later zero-selector log reads do not disappear.
+    const resolvedDeveloperAccountId = resolveHubSpotDeveloperAccountIdFromBuild({
+        developerAccountId,
+        buildStatus,
+    });
     buildStep?.[buildState === 'SUCCESS' ? 'ok' : 'fail'](`${buildState} · ${elapsedSince(buildStartedAt)}`);
     const autoDeployEnabled = readBooleanProperty(buildStatus, 'isAutoDeployEnabled');
     if (uploadOnly || readStatus(buildStatus) !== 'SUCCESS' || autoDeployEnabled) {
@@ -4794,7 +4806,7 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
             await persistHubSpotAppBinding(root, {
                 appId,
                 projectName,
-                developerAccountId,
+                developerAccountId: resolvedDeveloperAccountId,
             });
         // Build SUCCESS does NOT mean the app shipped: HubSpot's auto-deploy can
         // still fail (found live: "Apps are not allowed to have 0 redirect URLs"
@@ -4833,7 +4845,7 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
             archivePath,
             appId,
             appUid,
-            developerAccountId,
+            developerAccountId: resolvedDeveloperAccountId,
             buildId: upload.buildId,
             deployId: undefined,
             buildStatus,
@@ -4875,7 +4887,7 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
         await persistHubSpotAppBinding(root, {
             appId,
             projectName,
-            developerAccountId,
+            developerAccountId: resolvedDeveloperAccountId,
         });
     }
     return {
@@ -4883,7 +4895,7 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
         archivePath,
         appId,
         appUid,
-        developerAccountId,
+        developerAccountId: resolvedDeveloperAccountId,
         buildId: upload.buildId,
         deployId,
         buildStatus,
@@ -4894,12 +4906,27 @@ async function executeHubSpotOnlyUpload({ argv, root, local, persistBinding = tr
     };
 }
 async function optionalHubSpotAppId(client, projectName, appUid) {
-    try {
-        return await client.projects.resolveAppId(appUid === undefined ? { projectName } : { projectName, appUid });
-    }
-    catch {
-        return 0;
+    return resolveHubSpotAppIdWithRetry({
+        resolve: () => client.projects.resolveAppId(appUid === undefined ? { projectName } : { projectName, appUid }),
+    });
+}
+/** @internal Exported for deterministic eventual-consistency regressions. */
+export async function resolveHubSpotAppIdWithRetry(input) {
+    const attempts = Math.max(1, input.attempts ?? 4);
+    const retryDelayMs = Math.max(0, input.retryDelayMs ?? 500);
+    for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        try {
+            const appId = await input.resolve();
+            if (appId > 0)
+                return appId;
+        }
+        catch {
+            // A newly-created app can lag its successful build/deploy metadata.
+        }
+        if (attempt < attempts && retryDelayMs > 0)
+            await sleep(retryDelayMs);
     }
+    return 0;
 }
 async function readHubSpotProjectIntermediateRepresentation(root) {
     const hsproject = await readHubSpotProjectConfig(root);
@@ -5064,8 +5091,32 @@ async function readPersistedHubSpotAppBinding(root, expectedProjectName) {
         return undefined;
     }
 }
-async function readPersistedHubSpotAppId(root, expectedProjectName) {
-    return (await readPersistedHubSpotAppBinding(root, expectedProjectName))?.appId;
+async function readPersistedHubSpotAppId(root, expectedProjectName, expectedDeveloperAccountId) {
+    const binding = await readPersistedHubSpotAppBinding(root, expectedProjectName);
+    if (!binding)
+        return undefined;
+    return hubSpotAppBindingMatchesDeveloperAccount(binding.developerAccountId, expectedDeveloperAccountId)
+        ? binding.appId
+        : undefined;
+}
+/** @internal Exported for deterministic account-switch regressions. */
+export function hubSpotAppBindingMatchesDeveloperAccount(persistedDeveloperAccountId, selectedDeveloperAccountId) {
+    if (!selectedDeveloperAccountId)
+        return true;
+    return persistedDeveloperAccountId === selectedDeveloperAccountId;
+}
+async function resolveHubSpotDeployDeveloperAccountId(argv, root) {
+    const explicit = resolveFlag(argv, '--developer-account-id') ?? process.env.HSX_HUBSPOT_DEVELOPER_ACCOUNT_ID;
+    if (explicit?.trim())
+        return explicit.trim();
+    const configPath = resolveFlag(argv, '--config');
+    const discovered = await discoverHubSpotAccounts(root, configPath ? { configPath } : {});
+    const selected = discovered?.accounts.find((account) => account.isDefault) ??
+        (discovered?.accounts.length === 1 ? discovered.accounts[0] : undefined);
+    return selected ? String(selected.portalId) : undefined;
+}
+async function readPersistedHubSpotAppIdForDeploy(argv, root) {
+    return readPersistedHubSpotAppId(root, await resolveHubSpotProjectName(argv, root), await resolveHubSpotDeployDeveloperAccountId(argv, root));
 }
 /**
  * Resolve the one HubSpot app a linked project already registered. The common
@@ -5076,7 +5127,7 @@ async function readPersistedHubSpotAppId(root, expectedProjectName) {
 async function resolveHubSpotAppIdForDeploy(input) {
     const explicit = readOptionalHubSpotAppId(resolveFlag(input.argv, '--hubspot-app-id') ?? process.env.HSX_HUBSPOT_APP_ID);
     const projectName = await resolveHubSpotProjectName(input.argv, input.root);
-    const persisted = await readPersistedHubSpotAppId(input.root, projectName);
+    const persisted = await readPersistedHubSpotAppIdForDeploy(input.argv, input.root);
     const selected = explicit ?? persisted;
     if (selected || !input.controlPlaneUrl)
         return selected;
@@ -5120,6 +5171,18 @@ async function resolveHubSpotAppAuthUrl(argv, root) {
 function readStatus(value) {
     return isRecord(value) && typeof value.status === 'string' ? value.status : undefined;
 }
+/** @internal Exported for deterministic legacy-account deploy regressions. */
+export function resolveHubSpotDeveloperAccountIdFromBuild(input) {
+    if (input.developerAccountId?.trim())
+        return input.developerAccountId.trim();
+    if (!isRecord(input.buildStatus))
+        return undefined;
+    const portalId = input.buildStatus.portalId;
+    if (typeof portalId === 'number' && Number.isInteger(portalId) && portalId > 0) {
+        return String(portalId);
+    }
+    return typeof portalId === 'string' && portalId.trim().length > 0 ? portalId.trim() : undefined;
+}
 const readSubbuildStatuses = readHubSpotSubbuildStatuses;
 const HUBSPOT_COMPONENT_TERMINAL_STATES = new Set(['SUCCESS', 'FAILURE', 'ERROR', 'CANCELLED']);
 /** Emit each HubSpot component once, when it reaches a terminal build state. */