@hs-x/cli 0.4.13 → 0.4.14

package/dist/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAI/C,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,iBAAiB,CAAC;AAwD1D,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAm9BzC,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,CA0ErB;AA+yFD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqJlB,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAI/C,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,iBAAiB,CAAC;AA8D1D,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AA09BzC,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CAC9B,GAAG,OAAO,CAAC,SAAS,CAAC,CA0ErB;AA2vFD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqJlB,CAAC"}

package/dist/commands/dev.js

@@ -17,9 +17,11 @@ import { CLI_VERSION } from '../constants.js';
 import { controlPlaneAuthHeaders } from '../control-plane-fetch.js';
 import { describeHubSpotDevTestingChoice, describeHubSpotDevTestingPlanReason, planHubSpotDevTestingAccount, selectHubSpotDirectDevAccounts, } from '../dev/account-selection.js';
 import { findHubSpotDevApplication, isHubSpotMarketplaceApp, listHubSpotDevComponentCandidates, resolveHubSpotDevComponentSelectors, resolveHubSpotDevSessionApp, } from '../dev/component-selection.js';
+import { HUBSPOT_LOGS_POLL_INTERVAL_MS, startHubSpotLogLane, } from '../dev/hubspot-log-lane.js';
 import { resolveHubSpotLocalProxyMode } from '../dev/local-proxy.js';
 import { createManagedDevEventWriter, createManagedDevSession, markManagedDevSessionReady, markManagedDevSessionState, prepareManagedDevSessionRestart, publicManagedDevSession, readManagedDevEvents, readManagedDevSession, reconcileManagedDevSession, setManagedDevSessionPid, stopManagedDevSessionProcess, waitForManagedDevSessionOwner, } from '../dev/managed-session.js';
 import { findListeningProcess, isHubSpotDevPortConflict, stopProcessCommand, terminateProcessGracefully, } from '../dev/port-process.js';
+import { createDevStartupProgress } from '../dev/startup-progress.js';
 import { executeCliHttp } from '../effect-http.js';
 import { discoverHubSpotAccounts, exchangePak } from '../hubspot-auth.js';
 import { detectLocalProjectMode, findContainingProjectRoot, validateHubSpotProject, } from '../hubspot-project.js';
@@ -502,10 +504,12 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
                 const check = resolveHubSpotDevSessionApp(pickerCandidates, selection);
                 return check.ok ? undefined : check.message;
             },
+            columns: ['Name', 'Type', 'Objects', 'Location', 'UID'],
             options: pickerCandidates.map((candidate) => ({
                 value: candidate.uid,
                 label: candidate.label,
                 description: candidate.description,
+                ...(candidate.cells ? { cells: candidate.cells } : {}),
             })),
         });
         if (picked === undefined)
@@ -554,6 +558,7 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
             }
         }
     }
+    const startupProgress = json ? undefined : createDevStartupProgress(reporter);
     let directDevLogStream;
     if (!json) {
         const hsxLogPortValue = resolveFlag(argv, '--hsx-log-port') ?? '9099';
@@ -579,6 +584,7 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
             return { exitCode: 2 };
         }
         const managedSessionId = resolveFlag(argv, '--managed-session');
+        startupProgress?.phase('Starting local log relay');
         directDevLogStream = await startHsxDevLogStream({
             port: hsxLogPort,
             root,
@@ -592,6 +598,7 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
     const startDirectSession = () => startDevSession({
         projectAccountId: projectAccount.portalId,
         testingAccountId: testingAccount.portalId,
+        ...(startupProgress ? { onStartupProgress: startupProgress.phase } : {}),
         projectDir: root,
         ...(selectedNodeUids ? { selectedNodeUids } : {}),
         ...(profile ? { profile } : {}),
@@ -657,6 +664,7 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
         if (isHubSpotDevPortConflict(initialCause)) {
             const recovery = await recoverHubSpotDevPort({ argv, json, reporter });
             if (recovery.kind === 'exit') {
+                startupProgress?.finish(true);
                 try {
                     await directDevLogStream?.cleanup();
                 }
@@ -676,6 +684,7 @@ async function hubSpotDirectDevCommand({ argv, root, json, }) {
             }
         }
     }
+    startupProgress?.finish(!session);
     if (!session) {
         if (directDevLogStream) {
             try {
@@ -2282,9 +2291,6 @@ function managedDevFollowReadFilter(filter) {
 function delayMs(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-const HUBSPOT_LOGS_POLL_INTERVAL_MS = 30_000;
-/** First poll reaches this far back so the lane shows recent activity at once. */
-const HUBSPOT_LOGS_CATCH_UP_MS = 2 * 60_000;
 async function startHsxDevLogStream(input) {
     try {
         const [{ createDevEventBus }, { startDevLogServer }, { startDevStreamRenderer }] = await Promise.all([
@@ -2307,68 +2313,22 @@ async function startHsxDevLogStream(input) {
         const unsubscribeManagedEvents = managedEventWriter
             ? bus.subscribe((event) => managedEventWriter.log(event))
             : undefined;
-        // HubSpot-side lane: renders/proxy failures that never reach our Worker
-        // only exist in HubSpot's app logs — poll them into the same stream.
-        // Missing binding/credentials just means the lane stays off; `hs-x dev`
-        // must work without HubSpot credentials.
-        let hubspotPoller;
-        let hubspotLane = {
-            active: false,
-            reason: 'HubSpot app logs could not be set up.',
-        };
-        try {
-            const [{ resolveHubSpotLogsSource }, { startHubSpotLogsPoller }] = await Promise.all([
-                import('../hubspot-app-logs.js'),
-                import('../dev/hubspot-logs-poller.js'),
-            ]);
-            const account = input.hubspotAccount;
-            const resolution = await resolveHubSpotLogsSource({
-                cwd: input.root,
-                ...(account?.personalAccessKey
-                    ? {
-                        credentials: {
-                            developerAccountId: account.portalId,
-                            personalAccessKey: account.personalAccessKey,
-                        },
-                    }
-                    : {}),
-            });
-            if (resolution.ok) {
-                hubspotPoller = startHubSpotLogsPoller({
-                    bus,
-                    source: resolution.source,
-                    intervalMs: HUBSPOT_LOGS_POLL_INTERVAL_MS,
-                    catchUpMs: HUBSPOT_LOGS_CATCH_UP_MS,
-                });
-                // Poll once now so the lane proves itself (or its first error) within
-                // seconds of startup instead of one interval later.
-                void hubspotPoller.poll();
-                hubspotLane = {
-                    active: true,
-                    appId: resolution.source.appId,
-                    developerAccountId: resolution.source.developerAccountId,
-                };
-            }
-            else {
-                hubspotLane = { active: false, reason: resolution.reason };
-            }
-        }
-        catch (cause) {
-            // The HubSpot lane is additive; never fail the dev stream over it.
-            hubspotLane = {
-                active: false,
-                reason: cause instanceof Error ? cause.message : String(cause),
-            };
-        }
+        const hubspotLane = startHubSpotLogLane({
+            root: input.root,
+            bus,
+            account: input.hubspotAccount,
+        });
         return {
             url: server.url,
             authToken,
             renderer,
             bus,
-            hubspotLane,
+            get hubspotLane() {
+                return hubspotLane.state;
+            },
             relay,
             async cleanup() {
-                hubspotPoller?.stop();
+                hubspotLane.stop();
                 unsubscribeManagedEvents?.();
                 renderer.stop();
                 await Promise.all([server.close(), managedEventWriter?.close()]);
@@ -3218,6 +3178,8 @@ function hubspotLogsLaneRow(lane) {
             status: 'ok',
         };
     }
+    if (lane.pending)
+        return { key: 'HubSpot app logs', value: 'connecting', detail: lane.reason };
     return { key: 'HubSpot app logs', value: 'off', detail: lane.reason, status: 'warn' };
 }
 function describeTestingChoiceForRow(choice) {