@empirical-gauzza/cli 1.0.35 → 1.0.37

package/bin/empirical.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 'use strict';
 
@@ -25,6 +25,7 @@ const { showVersion } = require('../lib/help');
 const { isPluginCommand, runPluginCommand } = require('../lib/pluginCommands');
 const { runPolicyCommand } = require('../lib/policyCommands');
 const { runSetupCommand } = require('../lib/setupCommands');
+const { runUsageCommand } = require('../lib/usageCommands');
 const { runBlueprintCommand } = require('../lib/blueprintCommands');
 const { checkNativePluginUpdates } = require('../lib/pluginUpdateCheck');
 
@@ -112,6 +113,11 @@ async function main() {
     return;
   }
 
+  if (args[0] === 'usage') {
+    await runUsageCommand(args.slice(1));
+    return;
+  }
+
   if (args[0] === 'setup') {
     await runSetupCommand(args.slice(1));
     return;

package/lib/auth.js

@@ -361,7 +361,7 @@ function inspectToken(token) {
 // Gathers the same identity/workspace facts `doctor` reports (token presence/type/expiry, plus
 // user + workspace from /api/v1/users/me), formatted for `auth status` / `whoami` as a single
 // JSON object instead of doctor's multi-check report.
-async function gatherAuthStatus() {
+async function gatherAuthStatus({ includeEmpiricalTokens = false } = {}) {
   const token = resolveAccessToken();
   const tokenInfo = inspectToken(token);
 
@@ -385,6 +385,31 @@ async function gatherAuthStatus() {
     }
   }
 
+  // What the CLI itself will scope the next memory command to (env, project binding, or the
+  // global selection), beside the server-reported account workspace above. The two can differ,
+  // and when they do this is the field that explains a "[]" recall. Lazy require: workspaceContext
+  // depends on this module.
+  let cliWorkspace = null;
+  try {
+    const { resolveLocalWorkspaceSelection } = require('./workspaceContext');
+    const local = resolveLocalWorkspaceSelection();
+    if (local) cliWorkspace = { workspaceId: local.workspaceId, label: local.label || null, source: local.source, path: local.path };
+  } catch (_error) {
+    cliWorkspace = null;
+  }
+
+  // `whoami` / `auth status` add one Empirical Tokens line while they are enforced (spec 8.4).
+  // Best effort with a short timeout; doctor does not ask for it.
+  let empiricalTokens = null;
+  if (includeEmpiricalTokens && token && !error) {
+    try {
+      const { fetchBillingMe, empiricalTokensLine } = require('./usageCommands');
+      empiricalTokens = empiricalTokensLine((await fetchBillingMe(3000)).empiricalTokenUsage);
+    } catch (_error) {
+      empiricalTokens = null;
+    }
+  }
+
   return {
     authenticated: Boolean(token) && !error && tokenInfo.expired !== true,
     tokenPresent: tokenInfo.present,
@@ -393,6 +418,9 @@ async function gatherAuthStatus() {
     tokenExpired: tokenInfo.expired,
     user,
     workspaceId,
+    cliWorkspace,
+    // Present only while enforced for this account: a dark account's JSON has no such key.
+    ...(empiricalTokens ? { empiricalTokens } : {}),
     error
   };
 }
@@ -408,7 +436,7 @@ async function runAuthCommand(args) {
   }
 
   if (action === 'status' || action === 'whoami') {
-    const status = await gatherAuthStatus();
+    const status = await gatherAuthStatus({ includeEmpiricalTokens: true });
     log(JSON.stringify(status));
     if (!status.authenticated) {
       process.exitCode = 1;

package/lib/blueprintCommands.js

@@ -3,7 +3,9 @@
 const { httpJson, printApiError } = require('./http');
 const { parseOption } = require('./env');
 const { requireAccessToken, resolveApiBaseUrl, buildApiAuthHeaders } = require('./auth');
-const { warn, log } = require('./ui');
+const { warn, log, createPrompter } = require('./ui');
+const { sanitizeForTerminal } = require('./setupCommands');
+const { confirmCostOrExit, isCostPreview, isInteractiveTerminal } = require('./empiricalTokensFormat');
 
 function apiUrl(pathSuffix) {
   return new URL(`/api/v1/blueprints${pathSuffix}`, resolveApiBaseUrl()).toString();
@@ -61,17 +63,35 @@ async function runClaim(args) {
 async function runInstall(args) {
   const blueprintId = args[0] && !args[0].startsWith('--') ? args[0] : '';
   if (!blueprintId) {
-    warn('Usage: empirical blueprint install <blueprintId> [--version <v>]');
+    warn('Usage: empirical blueprint install <blueprintId> [--version <v>] [--accept-cost]');
     process.exit(1);
   }
   const version = parseOption(args, '--version', '');
+  const acceptCost = args.includes('--accept-cost');
 
   const detail = await callApi('GET', `/${blueprintId}`, undefined);
   if (!detail.owned && detail.priceModel === 'free') {
     await callApi('POST', `/${blueprintId}/claim`, {});
   }
 
-  const installResult = await callApi('POST', `/${blueprintId}/install`, version ? { version } : {});
+  const installBody = { ...(version ? { version } : {}), ...(acceptCost ? { acceptEmpiricalTokenCost: true } : {}) };
+  let installResult = await callApi('POST', `/${blueprintId}/install`, installBody);
+  if (isCostPreview(installResult)) {
+    // A priced blueprint in enforce answers 200 with the cost and starts nothing (no installId yet).
+    // Acceptance is sent only from --accept-cost or an explicit y at a real terminal, never for the person.
+    const prompter = isInteractiveTerminal() ? createPrompter(process.stderr) : null;
+    try {
+      await confirmCostOrExit(installResult, { prompter, warn, sanitize: sanitizeForTerminal });
+    } finally {
+      if (prompter) prompter.close();
+    }
+    installResult = await callApi('POST', `/${blueprintId}/install`, { ...installBody, acceptEmpiricalTokenCost: true });
+  }
+  if (!installResult || !installResult.installId) {
+    // Never poll /installs/undefined: a reply with no install id is not a started install.
+    log(JSON.stringify(installResult, null, 2));
+    return;
+  }
   const finalStatus = await waitForInstall(installResult.installId);
   log(JSON.stringify(finalStatus, null, 2));
 }