@hs-x/cli 0.3.6 → 0.4.0

package/dist/commands/control-plane-read.js

@@ -1,6 +1,7 @@
 import * as Command from '@effect/cli/Command';
 import * as Options from '@effect/cli/Options';
 import { HttpClientRequest, Schema, schemas } from '@hs-x/types';
+import { fnv1a32 } from '@hs-x/types/fnv1a';
 import { Config, Effect, Option } from 'effect';
 import { isLinked } from '../account-store.js';
 import { auditExplorer, filterAuditRows, promptAuditTimeRange, renderAuditDetail, } from '../audit-interactive.js';
@@ -9,7 +10,9 @@ import { CliError, cliError, exitWith } from '../cli-error.js';
 import { accountIdOption, controlPlaneUrlOption, jsonOption, projectIdOption, runHandler, userIdOption, } from '../cli/kit.js';
 import { DEFAULT_CONTROL_PLANE_URL } from '../config.js';
 import { executeCliHttpEffect } from '../effect-http.js';
-import { fetchHubSpotLogsPayload, mergeLogRows, parseHubSpotLogSystemTypes, resolveHubSpotLogsSource, } from '../hubspot-app-logs.js';
+import { fetchHubSpotLogsPayload, mergeLogRows, parseHubSpotLogSystemTypes, resolveDirectHubSpotLogsContext, resolveHubSpotLogsSource, } from '../hubspot-app-logs.js';
+import { DirectHubSpotAccountResolutionError, } from '../hubspot-developer-client.js';
+import { detectLocalProjectMode } from '../hubspot-project.js';
 import { promptInteractiveLogsSelection } from '../logs-interactive.js';
 import { readProjectBinding } from '../project-binding.js';
 import { ProjectPickerCancelled, discoverProjects, resolveProjectSelection, } from '../project-picker.js';
@@ -203,21 +206,13 @@ function stableLogRowKey(row) {
 function orderLogRowsAscending(rows) {
     return [...rows].sort((a, b) => (readString(a, 'timestamp') ?? '').localeCompare(readString(b, 'timestamp') ?? ''));
 }
-function hashString(value) {
-    let hash = 2166136261;
-    for (let index = 0; index < value.length; index += 1) {
-        hash ^= value.charCodeAt(index);
-        hash = Math.imul(hash, 16777619);
-    }
-    return hash >>> 0;
-}
 function applyLogFilters(rows, filters, sampleRate) {
     return rows.filter((row) => {
         if (!filters.every((filter) => compareLogFilter(row, filter)))
             return false;
         if (sampleRate === undefined || sampleRate >= 1)
             return true;
-        return hashString(stableLogRowKey(row)) / 0xffffffff <= sampleRate;
+        return fnv1a32(stableLogRowKey(row)) / 0xffffffff <= sampleRate;
     });
 }
 function asLogsPayload(body) {
@@ -1075,6 +1070,15 @@ const logsOptions = {
     appId: Options.text('app-id').pipe(Options.optional),
     type: Options.text('type').pipe(Options.repeated),
     errorsOnly: Options.boolean('errors-only').pipe(Options.withDefault(false)),
+    functionName: Options.text('function').pipe(Options.optional),
+    latest: Options.boolean('latest').pipe(Options.withAlias('l'), Options.withDefault(false)),
+    compact: Options.boolean('compact').pipe(Options.withDefault(false)),
+};
+const projectLogsOptions = {
+    ...logsOptions,
+    account: Options.text('account').pipe(Options.withAlias('a'), Options.optional),
+    config: Options.text('config').pipe(Options.withAlias('c'), Options.optional),
+    useEnv: Options.boolean('use-env').pipe(Options.withDefault(false)),
 };
 const LOG_SELECTOR_FLAGS = [
     '--source',
@@ -1092,6 +1096,10 @@ const LOG_SELECTOR_FLAGS = [
     '--follow',
     '--tail',
     '--errors-only',
+    '--function',
+    '--latest',
+    '-l',
+    '--compact',
 ];
 function hasExplicitLogSelector(argv = process.argv.slice(2)) {
     return argv.some((arg) => LOG_SELECTOR_FLAGS.some((flag) => arg === flag || arg.startsWith(`${flag}=`)));
@@ -1117,6 +1125,55 @@ function parseLogSource(value) {
     return { ok: false, message: `Invalid --source "${value}". Use all, workers, or hubspot.` };
 }
 export const logsCmd = Command.make('logs', logsOptions, (opts) => runHandler('logs', { json: opts.json }, logsBody(opts)));
+export const projectLogsCmd = Command.make('logs', projectLogsOptions, (opts) => runHandler('project logs', { json: opts.json }, logsBody(opts, {
+    commandName: 'project logs',
+    directHubSpotArgv: projectLogsAccountArgv(opts),
+})));
+function projectLogsAccountArgv(opts) {
+    const argv = ['project', 'logs'];
+    const account = Option.getOrUndefined(opts.account);
+    const config = Option.getOrUndefined(opts.config);
+    if (account)
+        argv.push('--account', account);
+    if (config)
+        argv.push('--config', config);
+    if (opts.useEnv)
+        argv.push('--use-env');
+    return argv;
+}
+function directHubSpotLogsError(cause) {
+    if (cause instanceof CliError)
+        return cause;
+    if (cause instanceof DirectHubSpotAccountResolutionError) {
+        return new CliError({
+            code: cause.code,
+            message: cause.message,
+            context: { hint: cause.hint },
+            exitCode: 1,
+        });
+    }
+    return new CliError({
+        code: 'HSX_E_LOGS_UNAVAILABLE',
+        message: cause instanceof Error ? cause.message : String(cause),
+        exitCode: 1,
+    });
+}
+function directHubSpotAccountRows(account) {
+    const label = account.name ? `${account.name} (${account.id})` : account.id;
+    return [
+        {
+            key: 'hubspot-account',
+            value: label,
+            detail: `source=${account.source} selectedBy=${account.selectedBy} authReady=${String(account.authReady)}`,
+        },
+        ...(account.configSource
+            ? [{ key: 'hubspot-config', value: account.configSource }]
+            : []),
+        ...(account.defaultSource
+            ? [{ key: 'hubspot-default', value: account.defaultSource }]
+            : []),
+    ];
+}
 function resolveAccountId(opts, localAccountId) {
     return Effect.gen(function* () {
         const explicit = yield* resolveFromOptionOrEnv(opts.accountId, 'HSX_ACCOUNT_ID');
@@ -1148,14 +1205,18 @@ function withWorkersErrorHint(error) {
 }
 function logsBody(opts, context = {}) {
     return Effect.gen(function* () {
+        const commandName = context.commandName ?? 'logs';
         const cwd = yield* Cwd;
+        const projectMode = yield* Effect.promise(() => detectLocalProjectMode(cwd));
+        const directHubSpotProject = projectMode === 'hubspot-direct';
         const localProjectBinding = yield* Effect.promise(() => readProjectBinding(cwd));
-        const requestedSource = parseLogSource(Option.getOrUndefined(opts.source));
+        const requestedSourceValue = Option.getOrUndefined(opts.source) ?? (directHubSpotProject ? 'hubspot' : undefined);
+        const requestedSource = parseLogSource(requestedSourceValue);
         const shouldResolveWorkersProject = requestedSource.ok && requestedSource.wantWorkers;
         const projectSelection = shouldResolveWorkersProject
             ? (context.projectSelection ??
                 (yield* resolveOperationProjectForRead(opts, {
-                    command: 'logs',
+                    command: commandName,
                     message: 'Which project do you want logs for?',
                     emptyMessage: 'No projects yet. Run `hs-x deploy` from a project to create one.',
                 })))
@@ -1163,20 +1224,23 @@ function logsBody(opts, context = {}) {
         const currentProjectId = projectSelection?.projectId ??
             (yield* resolveProjectId(opts)) ??
             localProjectBinding?.projectId;
-        const accountId = projectSelection?.accountId ??
-            (yield* resolveAccountId(opts, localProjectBinding?.accountId));
+        const accountId = directHubSpotProject
+            ? undefined
+            : (projectSelection?.accountId ??
+                (yield* resolveAccountId(opts, localProjectBinding?.accountId)));
         const controlPlaneUrl = yield* resolveControlPlaneUrl(opts.controlPlaneUrl);
         const userId = yield* resolveUserId(opts);
         const shouldPrompt = !opts.json &&
             isInteractive() &&
+            !directHubSpotProject &&
             (context.forceInteractiveSetup === true || !hasExplicitLogSelector());
         let interactiveSelection = undefined;
         if (shouldPrompt) {
             if (!accountId) {
-                return yield* failBespoke(false, 'logs', 'Logs require an HS-X account: run `hs-x login`, or pass --account-id / HSX_ACCOUNT_ID.');
+                return yield* failBespoke(false, commandName, 'Logs require an HS-X account: run `hs-x login`, or pass --account-id / HSX_ACCOUNT_ID.');
             }
             if (!currentProjectId) {
-                return yield* failBespoke(false, 'logs', `Logs need a project: ${PROJECT_ID_HINT}.`);
+                return yield* failBespoke(false, commandName, `Logs need a project: ${PROJECT_ID_HINT}.`);
             }
             interactiveSelection = yield* Effect.promise(() => promptInteractiveLogsSelection({
                 projects: projectSelection?.projects ?? [],
@@ -1190,46 +1254,67 @@ function logsBody(opts, context = {}) {
             }
         }
         const projectId = interactiveSelection?.projectId ?? currentProjectId;
-        const parsedFilters = parseLogFilters(opts.filter);
+        const functionName = Option.getOrUndefined(opts.functionName);
+        const parsedFilters = parseLogFilters([
+            ...opts.filter,
+            ...(functionName ? [`target=${functionName}`] : []),
+        ]);
         if (!parsedFilters.ok) {
-            return yield* failBespoke(opts.json, 'logs', parsedFilters.message);
+            return yield* failBespoke(opts.json, commandName, parsedFilters.message);
         }
         const parsedSample = parseSampleRate(Option.getOrUndefined(opts.sample));
         if (!parsedSample.ok) {
-            return yield* failBespoke(opts.json, 'logs', parsedSample.message);
+            return yield* failBespoke(opts.json, commandName, parsedSample.message);
         }
         const follow = interactiveSelection?.follow ?? opts.follow;
         const errorsOnly = interactiveSelection?.errorsOnly ?? opts.errorsOnly;
+        const requestedTypes = functionName ? [...opts.type, 'serverless'] : opts.type;
         const parsedSystemTypes = interactiveSelection?.systemTypes
             ? { ok: true, systemTypes: interactiveSelection.systemTypes }
-            : parseHubSpotLogSystemTypes(opts.type);
+            : parseHubSpotLogSystemTypes(requestedTypes);
         if (!parsedSystemTypes.ok) {
-            return yield* failBespoke(opts.json, 'logs', parsedSystemTypes.message);
+            return yield* failBespoke(opts.json, commandName, parsedSystemTypes.message);
         }
         if (follow && opts.json) {
-            return yield* failBespoke(opts.json, 'logs', '`hs-x logs --follow`/`--tail` streams terminal output. Omit --json for follow mode.');
+            return yield* failBespoke(opts.json, commandName, '`hs-x logs --follow`/`--tail` streams terminal output. Omit --json for follow mode.');
         }
-        const sourceChoice = parseLogSource(interactiveSelection?.source ?? Option.getOrUndefined(opts.source));
+        const sourceChoice = parseLogSource(interactiveSelection?.source ?? requestedSourceValue);
         if (!sourceChoice.ok) {
-            return yield* failBespoke(opts.json, 'logs', sourceChoice.message);
+            return yield* failBespoke(opts.json, commandName, sourceChoice.message);
         }
         const { wantWorkers, wantHubspot } = sourceChoice;
         // The two sources resolve independently: Workers Logs need an HS-X account
         // and project id (the control plane mediates the read); HubSpot app logs
-        // need only the local `.hs-x/hubspot.json` binding plus PAK credentials.
+        // need an app identity plus a credential-bound HubSpot developer client.
+        // `project logs` resolves that client and its render-safe account together;
+        // legacy `hs-x logs` keeps its existing local binding/config behavior.
         // A missing prerequisite is fatal only when it leaves no source at all.
         const explicitAppId = Option.getOrUndefined(opts.appId);
         const selectedDifferentProject = projectSelection?.projects !== undefined && localProjectBinding?.projectId !== projectId;
+        const hubspotSelectionBlocked = selectedDifferentProject && explicitAppId === undefined
+            ? 'the selected project is not the project in the current directory; pass --app-id to include its HubSpot app logs'
+            : undefined;
+        const directHubSpotLogs = wantHubspot && !hubspotSelectionBlocked && context.directHubSpotArgv
+            ? yield* Effect.tryPromise({
+                try: () => resolveDirectHubSpotLogsContext({
+                    argv: context.directHubSpotArgv ?? [],
+                    cwd,
+                    ...(explicitAppId !== undefined ? { appId: explicitAppId } : {}),
+                }),
+                catch: directHubSpotLogsError,
+            })
+            : undefined;
         const hubspotResolution = wantHubspot
-            ? selectedDifferentProject && explicitAppId === undefined
+            ? hubspotSelectionBlocked
                 ? {
                     ok: false,
-                    reason: 'the selected project is not the project in the current directory; pass --app-id to include its HubSpot app logs',
+                    reason: hubspotSelectionBlocked,
                 }
-                : yield* Effect.promise(() => resolveHubSpotLogsSource({
-                    cwd,
-                    ...(explicitAppId !== undefined ? { appId: explicitAppId } : {}),
-                }))
+                : (directHubSpotLogs?.resolution ??
+                    (yield* Effect.promise(() => resolveHubSpotLogsSource({
+                        cwd,
+                        ...(explicitAppId !== undefined ? { appId: explicitAppId } : {}),
+                    }))))
             : undefined;
         const hubspotSource = hubspotResolution?.ok
             ? hubspotResolution.source
@@ -1245,15 +1330,15 @@ function logsBody(opts, context = {}) {
         const workersActive = workersReason === undefined;
         if (!workersActive && !hubspotSource) {
             if (wantWorkers && !accountId) {
-                return yield* failBespoke(opts.json, 'logs', 'Logs require an HS-X account: run `hs-x login`, or pass --account-id / HSX_ACCOUNT_ID.');
+                return yield* failBespoke(opts.json, commandName, 'Logs require an HS-X account: run `hs-x login`, or pass --account-id / HSX_ACCOUNT_ID.');
             }
             if (wantWorkers && !projectId) {
-                return yield* failBespoke(opts.json, 'logs', `Logs need a project: ${PROJECT_ID_HINT}.`);
+                return yield* failBespoke(opts.json, commandName, `Logs need a project: ${PROJECT_ID_HINT}.`);
             }
-            return yield* failBespoke(opts.json, 'logs', `HubSpot app logs unavailable: ${hubspotReason ?? 'unknown'}.`);
+            return yield* failBespoke(opts.json, commandName, `HubSpot app logs unavailable: ${hubspotReason ?? 'unknown'}.`);
         }
         const trace = Option.getOrUndefined(opts.trace);
-        const limit = clampInt(opts.limit, 1, 200);
+        const limit = clampInt(opts.latest ? 1 : opts.limit, 1, 200);
         const sinceMinutes = clampInt(interactiveSelection?.sinceMinutes ?? opts.sinceMinutes, 1, 7 * 24 * 60);
         const intervalSeconds = clampInt(opts.intervalSeconds, 1, 60);
         const view = trace ? 'trace' : opts.raw ? 'tail' : 'invocations';
@@ -1279,7 +1364,7 @@ function logsBody(opts, context = {}) {
             if (!response.ok) {
                 const message = responseMessage(body, response.status, 'Control-plane logs read failed');
                 if (strictWorkers) {
-                    yield* failBespoke(opts.json, 'logs', message);
+                    yield* failBespoke(opts.json, commandName, message);
                     return { rows: [] };
                 }
                 return { rows: [], error: message };
@@ -1294,6 +1379,7 @@ function logsBody(opts, context = {}) {
                 systemTypes: parsedSystemTypes.systemTypes,
                 errorsOnly,
                 ...(trace ? { trace } : {}),
+                ...(directHubSpotLogs ? { client: directHubSpotLogs.client } : {}),
             }).catch((cause) => ({
                 rows: [],
                 error: cause instanceof Error ? cause.message : String(cause),
@@ -1339,10 +1425,11 @@ function logsBody(opts, context = {}) {
                 : 'workers-logs';
         const result = {
             ok: !payload.fatalError,
-            command: 'logs',
+            command: commandName,
             mode,
             view,
             ...(accountId ? { accountId } : {}),
+            ...(directHubSpotLogs ? { account: directHubSpotLogs.account } : {}),
             ...(projectId ? { projectId } : {}),
             sinceMinutes,
             limit,
@@ -1397,6 +1484,9 @@ function logsBody(opts, context = {}) {
         if (follow) {
             const seen = new Set();
             yield* reporter.header(trace ? `${headerLabel} invocation ${trace}` : `${headerLabel} live`);
+            if (directHubSpotLogs) {
+                yield* reporter.rows(directHubSpotAccountRows(directHubSpotLogs.account));
+            }
             const printNewRows = (rows) => Effect.gen(function* () {
                 const fresh = orderLogRowsAscending(rows.filter((row) => {
                     const key = stableLogRowKey(row);
@@ -1432,6 +1522,9 @@ function logsBody(opts, context = {}) {
             return;
         }
         yield* reporter.header(trace ? `${headerLabel} invocation ${trace}` : headerLabel);
+        if (directHubSpotLogs) {
+            yield* reporter.rows(directHubSpotAccountRows(directHubSpotLogs.account));
+        }
         yield* emitLogRows(reporter, payload.rows, view, showOrigin);
         yield* reportPartialFailures;
         if (payload.fatalError) {
@@ -1474,6 +1567,9 @@ export function logsBodyForCheckpoint(opts, selection, checkpoint, failure) {
         appId: Option.none(),
         type: [],
         errorsOnly: true,
+        functionName: Option.none(),
+        latest: false,
+        compact: false,
     }, { projectSelection: selection });
 }
 /** In-process command bodies used by the human status drill-down. */
@@ -1493,6 +1589,9 @@ export function logsBodyForStatus(opts, selection) {
         appId: Option.none(),
         type: [],
         errorsOnly: false,
+        functionName: Option.none(),
+        latest: false,
+        compact: false,
     }, { projectSelection: selection, forceInteractiveSetup: true });
 }
 export function routesBodyForStatus(opts, selection) {