@solarains/va-cli 0.1.5 → 0.1.10

package/dist/cli/root-command.js

@@ -7,6 +7,7 @@ const doctor_command_1 = require("../commands/doctor/doctor-command");
 const init_command_1 = require("../commands/init/init-command");
 const intelligence_command_1 = require("../commands/intelligence/intelligence-command");
 const reports_command_1 = require("../commands/reports/reports-command");
+const subscription_command_1 = require("../commands/subscription/subscription-command");
 const update_command_1 = require("../commands/update/update-command");
 const uninstall_command_1 = require("../commands/uninstall/uninstall-command");
 const usage_command_1 = require("../commands/usage/usage-command");
@@ -23,6 +24,7 @@ exports.rootCommand = {
         auth_command_1.authCommand,
         assets_command_1.assetsCommand,
         usage_command_1.usageCommand,
+        subscription_command_1.subscriptionCommand,
         reports_command_1.reportsCommand,
         intelligence_command_1.intelligenceCommand,
         doctor_command_1.doctorCommand,

package/dist/commands/intelligence/query-command.js

@@ -95,10 +95,6 @@ exports.intelligenceQueryCommand = {
                 error.code === 'ASSET_INTELLIGENCE_ACCESS_DENIED') {
                 throw new Error('This account does not currently have paid asset-intelligence access.');
             }
-            if (error instanceof authenticated_api_client_1.CliApiError &&
-                error.code === 'ASSET_INTELLIGENCE_QUOTA_EXCEEDED') {
-                throw new Error('The current intelligence query would exceed the daily paid usage quota.');
-            }
             if (error instanceof authenticated_api_client_1.CliApiError && error.code === 'INVALID_CURSOR') {
                 await stateStore.clear();
                 throw new Error('The saved or provided query cursor is no longer valid. Restart the query without `--next`.');

package/dist/commands/reports/get-command.js

@@ -13,16 +13,10 @@ function resolveAssetId(positionals, optionAssetId) {
     return optionAssetId ?? positionals[0] ?? '';
 }
 function getSelectionMessage(input) {
-    if (input.previousSelectedReportKey === input.requestedReportKey) {
-        return 'This report is already the locked daily selection for the current product day.';
-    }
-    if (!input.previousSelectedReportKey && input.detailSelectedToday) {
-        return 'This read locked the account daily-report selection for the current product day.';
-    }
     if (input.detailSelectedToday) {
-        return 'This report is currently the selected daily report for the current product day.';
+        return 'This report is included in the current product day usage state. Repeat reads today do not consume another unit.';
     }
-    return 'Selection state is available but no new lock was created.';
+    return 'This report did not consume a new daily-report unit.';
 }
 exports.reportsGetCommand = {
     name: 'get',
@@ -38,10 +32,7 @@ exports.reportsGetCommand = {
         const usageSummary = await (0, usage_api_client_1.getUsageSummary)(context);
         try {
             const report = await (0, daily_reports_api_client_1.getDailyReportDetail)(context, assetId, { date });
-            const requestedReportKey = `${report.assetId}:${report.date}`;
             (0, daily_reports_output_1.renderDailyReportDetail)(context.logger, report, getSelectionMessage({
-                previousSelectedReportKey: usageSummary.dailyReport.selectedReportKey,
-                requestedReportKey,
                 detailSelectedToday: report.selectedToday,
             }));
             return 0;
@@ -49,10 +40,7 @@ exports.reportsGetCommand = {
         catch (error) {
             if (error instanceof authenticated_api_client_1.CliApiError &&
                 error.code === 'DAILY_REPORT_SELECTION_LIMIT_REACHED') {
-                const selectedReportKey = usageSummary.dailyReport.selectedReportKey;
-                throw new Error(selectedReportKey
-                    ? `Daily report selection is already locked for ${selectedReportKey}. Free accounts can only keep one report selection per product day.`
-                    : 'Daily report selection is already locked for the current product day.');
+                throw new Error(`Daily report limit reached for the current product day. Remaining quota: ${usageSummary.dailyReport.remainingToday ?? 0}.`);
             }
             if (error instanceof authenticated_api_client_1.CliApiError &&
                 error.code === 'DAILY_REPORT_NOT_FOUND') {

package/dist/commands/reports/list-command.js

@@ -7,7 +7,7 @@ const daily_reports_output_1 = require("../../features/daily-reports/daily-repor
 const usage_api_client_1 = require("../../features/usage/usage-api-client");
 exports.reportsListCommand = {
     name: 'list',
-    summary: 'List normalized daily reports with current selection state.',
+    summary: 'List normalized daily reports with current usage state.',
     usage: 'vaone reports list [--asset-id <id>] [--category <category>] [--date-from <yyyy-mm-dd>] [--date-to <yyyy-mm-dd>] [--limit <n>]',
     async run(context, args) {
         const parsed = (0, argv_1.parseCommandArgs)(args);
@@ -26,7 +26,6 @@ exports.reportsListCommand = {
         ]);
         (0, daily_reports_output_1.renderDailyReportList)(context.logger, reports, {
             statusLabel: usageSummary.dailyReport.statusLabel,
-            selectedReportKey: usageSummary.dailyReport.selectedReportKey,
         });
         return 0;
     },

package/dist/commands/subscription/subscription-command.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.subscriptionCommand = void 0;
+exports.runSubscriptionCommand = runSubscriptionCommand;
+const authenticated_api_client_1 = require("../../features/auth/authenticated-api-client");
+const subscription_api_client_1 = require("../../features/subscription/subscription-api-client");
+const subscription_output_1 = require("../../features/subscription/subscription-output");
+const subscribe_handoff_1 = require("../../features/subscription/subscribe-handoff");
+function isUnauthorizedError(error) {
+    if (error instanceof authenticated_api_client_1.CliApiError && error.status === 401) {
+        return true;
+    }
+    return error instanceof Error && error.message === 'Unauthorized';
+}
+async function runSubscriptionCommand(context, options = {}) {
+    try {
+        const status = await (options.getStatus ?? subscription_api_client_1.getSubscriptionStatus)(context);
+        (options.renderStatus ?? subscription_output_1.renderSubscriptionStatus)(context.logger, status);
+        if (!status.active && status.subscribe) {
+            await (options.handoff ?? subscribe_handoff_1.runSubscribeHandoff)(context.logger, status.subscribe);
+        }
+        return 0;
+    }
+    catch (error) {
+        if (error instanceof authenticated_api_client_1.AuthRequiredError) {
+            throw new Error('Subscription status requires login. Run `vaone auth login` first.');
+        }
+        if (isUnauthorizedError(error)) {
+            throw new Error('Subscription status requires a valid CLI login session.');
+        }
+        throw error;
+    }
+}
+exports.subscriptionCommand = {
+    name: 'subscription',
+    summary: 'Show current subscription status.',
+    usage: 'vaone subscription',
+    async run(context) {
+        return runSubscriptionCommand(context);
+    },
+};

package/dist/features/daily-reports/daily-reports-output.js

@@ -6,12 +6,9 @@ const output_1 = require("../../shared/output");
 function formatAssetName(report) {
     return report.assetNameZh || report.assetNameEn || report.assetId;
 }
-function renderDailyReportList(logger, reports, selectionSummary) {
-    (0, output_1.printSection)(logger, 'Daily report selection');
-    (0, output_1.printKeyValue)(logger, 'Status', selectionSummary.statusLabel);
-    if (selectionSummary.selectedReportKey) {
-        (0, output_1.printKeyValue)(logger, 'Locked report', selectionSummary.selectedReportKey);
-    }
+function renderDailyReportList(logger, reports, usageSummary) {
+    (0, output_1.printSection)(logger, 'Daily report usage');
+    (0, output_1.printKeyValue)(logger, 'Status', usageSummary.statusLabel);
     (0, output_1.printSection)(logger, 'Available reports');
     if (!reports.length) {
         logger.info('No reports matched the current filters.');
@@ -28,12 +25,12 @@ function renderDailyReportList(logger, reports, selectionSummary) {
         (0, output_1.printList)(logger, [report.summary || 'No summary available.']);
     });
 }
-function renderDailyReportDetail(logger, report, selectionMessage) {
+function renderDailyReportDetail(logger, report, usageMessage) {
     (0, output_1.printSection)(logger, 'Daily report');
     (0, output_1.printKeyValue)(logger, 'Asset', `${formatAssetName(report)} (${report.assetId})`);
     (0, output_1.printKeyValue)(logger, 'Date', report.date);
     (0, output_1.printKeyValue)(logger, 'Category', report.category || 'unknown');
-    (0, output_1.printKeyValue)(logger, 'Selection', selectionMessage);
+    (0, output_1.printKeyValue)(logger, 'Usage', usageMessage);
     (0, output_1.printSection)(logger, 'Summary');
     (0, output_1.printList)(logger, [report.summary || 'No summary available.']);
     (0, output_1.printSection)(logger, 'Content');

package/dist/features/init/init-copy.js

@@ -163,11 +163,8 @@ function getInitCopy(locale) {
                 summaryDailyReport(value) {
                     return `日报状态: ${value}`;
                 },
-                summaryLockedReport(value) {
-                    return `锁定日报: ${value}`;
-                },
-                summaryIntelligence(value) {
-                    return `情报额度: ${value}`;
+                summaryDailyReportUsed(value) {
+                    return `今日日报已用: ${value}`;
                 },
                 summaryResetCadence(value) {
                     return `重置周期: ${value}`;
@@ -324,11 +321,8 @@ function getInitCopy(locale) {
             summaryDailyReport(value) {
                 return `Daily report: ${value}`;
             },
-            summaryLockedReport(value) {
-                return `Locked report: ${value}`;
-            },
-            summaryIntelligence(value) {
-                return `Intelligence quota: ${value}`;
+            summaryDailyReportUsed(value) {
+                return `Daily report used today: ${value}`;
             },
             summaryResetCadence(value) {
                 return `Reset cadence: ${value}`;

package/dist/features/init/init-flow.js

@@ -155,8 +155,7 @@ function extractUsageSummary(lines, copy) {
             continue;
         }
         if (line === 'Plan' ||
-            line === 'Daily report' ||
-            line === 'Intelligence quota') {
+            line === 'Daily report') {
             section = line;
             continue;
         }
@@ -173,19 +172,12 @@ function extractUsageSummary(lines, copy) {
         }
         if (section === 'Daily report') {
             const status = extractValue([line], 'Status');
-            const lockedReport = extractValue([line], 'Locked report');
+            const usedToday = extractValue([line], 'Used today');
             if (status) {
                 summary.push(copy.messages.summaryDailyReport(status));
             }
-            if (lockedReport) {
-                summary.push(copy.messages.summaryLockedReport(lockedReport));
-            }
-            continue;
-        }
-        if (section === 'Intelligence quota') {
-            const status = extractValue([line], 'Status');
-            if (status) {
-                summary.push(copy.messages.summaryIntelligence(status));
+            if (usedToday) {
+                summary.push(copy.messages.summaryDailyReportUsed(usedToday));
                 continue;
             }
             const normalized = line.replace(/^- /, '');

package/dist/features/subscription/subscribe-handoff.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSubscribeHandoff = runSubscribeHandoff;
+const promises_1 = require("node:readline/promises");
+const node_process_1 = require("node:process");
+const browser_login_1 = require("../auth/browser-login");
+async function promptToOpenInTerminal(entry) {
+    if (!node_process_1.stdin.isTTY || !node_process_1.stdout.isTTY) {
+        return false;
+    }
+    const rl = (0, promises_1.createInterface)({ input: node_process_1.stdin, output: node_process_1.stdout });
+    try {
+        const answer = await rl.question(`Press Enter to open the subscribe URL in your browser, or type anything else to skip: ${entry.url}\n`);
+        return answer.trim().length === 0;
+    }
+    finally {
+        rl.close();
+    }
+}
+async function runSubscribeHandoff(logger, entry, options = {}) {
+    const shouldOpen = await (options.promptToOpen ?? promptToOpenInTerminal)(entry);
+    if (!shouldOpen) {
+        logger.plain(`Open this URL manually when ready: ${entry.url}`);
+        return;
+    }
+    const opened = await (options.openBrowser ?? browser_login_1.openSystemBrowser)(entry.url);
+    if (opened) {
+        logger.plain('Opened subscribe URL in your default browser.');
+        return;
+    }
+    logger.plain(`Could not open the browser automatically. Open this URL manually: ${entry.url}`);
+}

package/dist/features/subscription/subscription-api-client.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSubscriptionStatus = getSubscriptionStatus;
+const authenticated_api_client_1 = require("../auth/authenticated-api-client");
+async function getSubscriptionStatus(context) {
+    return (0, authenticated_api_client_1.requestAuthenticatedJson)(context, '/v1/subscription/status');
+}

package/dist/features/subscription/subscription-output.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderSubscriptionStatus = renderSubscriptionStatus;
+function renderSubscriptionStatus(logger, status) {
+    logger.plain(`Subscription: ${status.active ? 'active' : 'inactive'}`);
+    logger.plain(`Status: ${status.status}`);
+    if (status.subscribe) {
+        logger.plain(`Subscribe URL: ${status.subscribe.url}`);
+        logger.plain('Next step: Press Enter when prompted to open it in your browser, or copy the URL above.');
+    }
+}

package/dist/features/update/preflight.js

@@ -23,7 +23,7 @@ exports.PREFLIGHT_GUARD_ENV = 'VAONE_SKIP_PREFLIGHT';
 exports.EXPLICIT_UPDATE_REEXEC_ENV = 'VAONE_EXPLICIT_UPDATE_REEXEC';
 exports.EXPLICIT_UPDATE_TARGET_VERSION_ENV = 'VAONE_EXPLICIT_UPDATE_TARGET_VERSION';
 const UPDATE_COPY = {
-    en: {
+    'en': {
         promptTitle(currentVersion, latestVersion) {
             return `A newer VAOne CLI is available (${currentVersion} -> ${latestVersion}).`;
         },
@@ -432,8 +432,7 @@ async function runStartupPreflight(input, deps = {}) {
         return null;
     }
     const deferredBoundary = input.runtimeConfig.updateDeferredUntilVersion;
-    if (deferredBoundary &&
-        !(0, version_1.isVersionNewer)(latestVersion, deferredBoundary)) {
+    if (deferredBoundary && !(0, version_1.isVersionNewer)(latestVersion, deferredBoundary)) {
         await updateStateStore.save(nextState);
         return null;
     }

package/dist/features/usage/usage-output.js

@@ -2,22 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderUsageSummary = renderUsageSummary;
 const output_1 = require("../../shared/output");
-function formatQuotaLine(label, quota) {
-    if (!quota) {
-        return `${label}: not enabled`;
-    }
-    return `${label}: ${quota.used}/${quota.limit} used, ${quota.remaining} remaining`;
-}
-function formatSelectedReportKey(key) {
-    if (!key) {
-        return undefined;
-    }
-    const [assetId, date] = key.split(':');
-    if (!assetId || !date) {
-        return key;
-    }
-    return `${assetId} on ${date}`;
-}
 function renderUsageSummary(logger, summary) {
     (0, output_1.printSection)(logger, 'Plan');
     (0, output_1.printKeyValue)(logger, 'Current plan', summary.plan.name);
@@ -38,15 +22,8 @@ function renderUsageSummary(logger, summary) {
     (0, output_1.printKeyValue)(logger, 'Remaining selections today', summary.dailyReport.remainingToday === null
         ? 'not limited'
         : String(summary.dailyReport.remainingToday));
-    const selectedReport = formatSelectedReportKey(summary.dailyReport.selectedReportKey);
-    if (selectedReport) {
-        (0, output_1.printKeyValue)(logger, 'Locked report', selectedReport);
-    }
-    (0, output_1.printSection)(logger, 'Intelligence quota');
-    (0, output_1.printKeyValue)(logger, 'Status', summary.intelligence.statusLabel);
+    (0, output_1.printKeyValue)(logger, 'Used today', String(summary.dailyReport.usedToday));
     (0, output_1.printList)(logger, [
-        formatQuotaLine('Calls', summary.intelligence.calls),
-        formatQuotaLine('Rows', summary.intelligence.rows),
-        `Reset cadence: ${summary.intelligence.resetCadence} (${summary.intelligence.resetTimezone})`,
+        `Reset cadence: ${summary.dailyReport.resetCadence} (${summary.dailyReport.resetTimezone})`,
     ]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarains/va-cli",
-  "version": "0.1.5",
+  "version": "0.1.10",
   "description": "Bootstrap CLI for the VAOne product.",
   "bin": {
     "vaone": "dist/main.js"

package/skills/visionalpha-operator/SKILL.md

@@ -27,6 +27,7 @@ Use this skill when the user:
 
 - Daily reports: read [references/daily-reports.md](references/daily-reports.md)
 - Usage summary: read [references/usage-summary.md](references/usage-summary.md)
+- Subscription status: read [references/subscription-status.md](references/subscription-status.md)
 - Auth recovery or logout: read [references/auth-recovery.md](references/auth-recovery.md)
 - Asset intelligence query: read [references/asset-intelligence.md](references/asset-intelligence.md)
 - Asset catalog listing: read [references/assets.md](references/assets.md)
@@ -34,5 +35,4 @@ Use this skill when the user:
 ## Unsupported in this version
 
 - Installations or device-slot management: explain that this currently routes through the web portal. Do not invent CLI steps.
-- Billing or subscription actions: explain that this currently routes through the web portal. Do not invent CLI steps.
-
+- Browser checkout execution: keep this on the web portal. Use `vaone subscription` for subscription query plus subscribe-entry handoff, but do not invent payment steps or direct billing API calls.

package/skills/visionalpha-operator/references/daily-reports.md

@@ -26,5 +26,6 @@ Use this reference when the user wants a report list, a specific report, or "tod
 ## Recovery notes
 
 - If the CLI says login is required, run `vaone auth login`.
-- If the CLI reports the daily report selection is already locked, explain that free accounts can keep only one report selection for the current product day.
-
+- If the CLI reports that the daily report limit is reached, explain that free
+  accounts can access one unique report per product day and paid accounts can
+  access one hundred unique reports per product day.

package/skills/visionalpha-operator/references/subscription-status.md

@@ -0,0 +1,37 @@
+# Subscription Status
+
+Use this reference when the user asks whether the current VA or VisionAlpha account has an active subscription.
+
+## Command
+
+- `vaone subscription`
+
+## Workflow
+
+1. Run `vaone subscription`.
+2. Summarize the CLI verdict instead of inventing subscription state.
+3. If the CLI reports an inactive account, surface the subscribe URL shown by the CLI and let the CLI own the Enter-to-open browser prompt.
+
+## Required outcomes
+
+### Authenticated and active
+
+- Tell the user the current account has an active subscription.
+- Keep the answer short and based on the CLI verdict.
+
+### Authenticated and not active
+
+- Tell the user the current account does not have an active subscription.
+- Use the subscribe URL already printed by `vaone subscription`.
+- Let `vaone subscription` handle the explicit browser-open prompt instead of inventing alternate steps.
+
+### Authentication required
+
+- Tell the user to run `vaone auth login` first.
+- Do not ask the user to paste tokens or secrets into chat.
+
+## Phase boundary
+
+- `vaone subscription` now covers both subscription query and subscribe-entry handoff.
+- Checkout execution still remains on the web portal after the CLI opens the canonical subscribe URL.
+- Do not call private HTTP APIs directly from the skill.