1688-cli 0.1.40 → 0.1.42

package/dist/commands/supplier-search.js

@@ -0,0 +1,522 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { dispatch } from '../session/dispatch.js';
+import { emit, info } from '../io/output.js';
+import { CliError } from '../io/errors.js';
+import { withRecovery } from '../session/recovery.js';
+import { clickSearchNextPage } from '../session/search-locators.js';
+import { startSupplierSearchCapture, } from '../session/supplier-search.js';
+import { sleep } from '../session/wait.js';
+import { encodeGbkPercent } from '../util/encoding.js';
+import { errorInfo, parseOptionalNumber, parsePositiveInt, } from './sourcing-utils.js';
+const CAPTURE_PAGE_SIZE = 14;
+const MAX_PAGES = 10;
+export async function execute(ctx, args) {
+    return withRecovery(ctx, { cmd: 'supplier-search', args }, async () => {
+        const queries = normalizeKeywords(args.keywords);
+        const filters = args.filters ?? normalizeSupplierFilters({});
+        const fetchMax = hasActiveSupplierFilters(filters)
+            ? Math.min(Math.max(args.maxPerQuery * 3, CAPTURE_PAGE_SIZE), CAPTURE_PAGE_SIZE * MAX_PAGES)
+            : args.maxPerQuery;
+        const bySupplier = new Map();
+        for (const query of queries) {
+            const suppliers = await fetchSupplierSearch(ctx, query, args.headed === true, fetchMax);
+            suppliers.forEach((supplier, i) => {
+                const key = supplierKey(supplier);
+                if (bySupplier.has(key))
+                    return;
+                bySupplier.set(key, makeSupplierSearchItem(query, i + 1, supplier));
+            });
+        }
+        const totalBeforeFilter = bySupplier.size;
+        const filtered = [...bySupplier.values()]
+            .filter((item) => supplierMatchesFilters(item.supplier, filters))
+            .sort((a, b) => b.score - a.score);
+        const maxTotal = queries.length * args.maxPerQuery;
+        const items = filtered.slice(0, maxTotal);
+        items.forEach((item, i) => {
+            item.globalRank = i + 1;
+        });
+        const enrichTop = Math.min(args.enrichTop ?? 0, items.length);
+        let enrichedCount = 0;
+        if (enrichTop > 0) {
+            const { execute: inspectSupplier } = await import('./supplier-inspect.js');
+            for (const item of items.slice(0, enrichTop)) {
+                const memberId = item.supplier.memberId;
+                if (!memberId) {
+                    item.error = {
+                        code: 'SUPPLIER_MEMBER_ID_MISSING',
+                        message: 'Company search did not expose supplier memberId; inspect enrichment skipped.',
+                    };
+                    continue;
+                }
+                try {
+                    item.inspect = await inspectSupplier(ctx, {
+                        target: memberId,
+                        headed: args.headed,
+                    });
+                    enrichedCount++;
+                }
+                catch (error) {
+                    if (isRunLevelError(error))
+                        throw error;
+                    item.error = errorInfo(error);
+                }
+            }
+        }
+        return {
+            queries,
+            source: {
+                kind: 'company-search',
+                endpoint: 'companySearchBusinessService',
+                offerAggregation: false,
+            },
+            filters,
+            maxPerQuery: args.maxPerQuery,
+            enrichTop,
+            totalBeforeFilter,
+            total: items.length,
+            enrichedCount,
+            items,
+        };
+    }, { headed: args.headed === true, maxRetries: 1 });
+}
+export async function run(opts) {
+    const data = await runSupplierCommand(opts, { defaultEnrich: '0' });
+    await emitSupplierResults(data, opts, 'Supplier search');
+}
+export async function runResearch(opts) {
+    const data = await runSupplierCommand(opts, { defaultEnrich: 'top:10' });
+    await emitSupplierResults(data, opts, 'Supplier research');
+}
+export function buildCompanySearchUrl(keyword) {
+    return `https://s.1688.com/company/company_search.htm?keywords=${encodeGbkPercent(keyword)}`;
+}
+export function normalizeSupplierFilters(input) {
+    const minYears = input.minYears ?? null;
+    if (minYears !== null && minYears < 0) {
+        throw new CliError(2, 'BAD_INPUT', '--min-years must be >= 0.');
+    }
+    const minRepeatRate = normalizeRateFilter(input.minRepeatRate ?? null, '--min-repeat-rate');
+    const minResponseRate = normalizeRateFilter(input.minResponseRate ?? null, '--min-response-rate');
+    return {
+        factoryOnly: input.factoryOnly === true,
+        province: input.province?.trim() || null,
+        city: input.city?.trim() || null,
+        minYears,
+        minRepeatRate,
+        minResponseRate,
+    };
+}
+export function parseSupplierEnrichTop(raw, fallback) {
+    const value = (raw ?? fallback).trim();
+    if (!value || value === '0' || value === 'none')
+        return 0;
+    if (value === 'all')
+        return Number.MAX_SAFE_INTEGER;
+    const normalized = value.startsWith('top:') ? value.slice(4) : value;
+    const n = parseInt(normalized, 10);
+    if (!Number.isFinite(n) || n < 0) {
+        throw new CliError(2, 'BAD_INPUT', `Invalid --enrich: ${raw}. Use top:N, N, all, 0, or none.`);
+    }
+    return Math.min(n, 50);
+}
+export function makeSupplierSearchItem(sourceKeyword, sourceRank, supplier) {
+    const scored = scoreSupplier(supplier);
+    return {
+        sourceKeyword,
+        sourceRank,
+        globalRank: 0,
+        supplier,
+        score: scored.score,
+        scoreBreakdown: scored.scoreBreakdown,
+    };
+}
+export function scoreSupplier(supplier) {
+    const parts = [];
+    const orderCount = supplier.demand.payOrderCount3m ?? supplier.demand.memberBookedCount ?? 0;
+    const demandPoints = orderCount >= 10000
+        ? 25
+        : orderCount >= 1000
+            ? 20
+            : orderCount >= 100
+                ? 15
+                : orderCount >= 10
+                    ? 8
+                    : orderCount > 0
+                        ? 4
+                        : 0;
+    parts.push({
+        name: 'company-search-demand',
+        points: demandPoints,
+        reason: orderCount > 0 ? `${orderCount} orders in 3m` : 'no 3m order signal',
+    });
+    const years = supplier.tp.serviceYears ?? 0;
+    parts.push({
+        name: 'supplier-tenure',
+        points: Math.min(15, years * 3),
+        reason: years > 0 ? `${years} years` : 'no tenure',
+    });
+    const factoryPoints = supplier.factory.superFactory
+        ? 20
+        : supplier.factory.shiliFactory || supplier.factory.factoryInspection
+            ? 15
+            : supplier.factory.isFactory
+                ? 10
+                : supplier.factory.businessInspection || supplier.factory.shiliCompany
+                    ? 8
+                    : 0;
+    parts.push({
+        name: 'factory-trust',
+        points: factoryPoints,
+        reason: supplier.factory.superFactory
+            ? 'super factory'
+            : supplier.factory.factoryTag ?? supplier.factory.factoryLevel ?? 'no factory signal',
+    });
+    const repeatRate = supplier.service.repeatRate ?? 0;
+    const responseRate = supplier.service.wwResponseRate ?? 0;
+    const servicePoints = Math.min(8, Math.round(repeatRate * 10)) +
+        Math.min(7, Math.round(responseRate * 8));
+    parts.push({
+        name: 'service-rates',
+        points: servicePoints,
+        reason: `repeat ${formatRate(repeatRate)}, response ${formatRate(responseRate)}`,
+    });
+    const composite = supplier.service.compositeScore ?? 0;
+    parts.push({
+        name: 'composite-score',
+        points: Math.min(10, Math.round(composite * 2)),
+        reason: composite > 0 ? `score ${composite}` : 'no composite score',
+    });
+    const previewCount = supplier.offersPreview.length;
+    parts.push({
+        name: 'offer-preview-depth',
+        points: Math.min(10, previewCount * 2),
+        reason: `${previewCount} company-search offer previews`,
+    });
+    const score = Math.min(100, Math.round(parts.reduce((sum, p) => sum + p.points, 0)));
+    return { score, scoreBreakdown: parts };
+}
+export function supplierItemsToJsonl(items) {
+    return items.map((item) => JSON.stringify(item)).join('\n') + (items.length ? '\n' : '');
+}
+export function supplierItemsToCsv(items) {
+    const header = [
+        'globalRank',
+        'score',
+        'sourceKeyword',
+        'sourceRank',
+        'companyName',
+        'memberId',
+        'loginId',
+        'shopUrl',
+        'province',
+        'city',
+        'serviceYears',
+        'isFactory',
+        'factoryTag',
+        'repeatRate',
+        'responseRate',
+        'payOrderCount3m',
+        'payAmount3m',
+        'productionService',
+        'previewOfferCount',
+        'inspected',
+        'errorCode',
+    ];
+    const rows = items.map((item) => [
+        item.globalRank,
+        item.score,
+        item.sourceKeyword,
+        item.sourceRank,
+        item.supplier.companyName,
+        item.supplier.memberId ?? '',
+        item.supplier.loginId ?? '',
+        item.supplier.shopUrl ?? '',
+        item.supplier.location.province ?? '',
+        item.supplier.location.city ?? '',
+        item.supplier.tp.serviceYears ?? '',
+        item.supplier.factory.isFactory ? 'true' : 'false',
+        item.supplier.factory.factoryTag ?? '',
+        item.supplier.service.repeatRate ?? '',
+        item.supplier.service.wwResponseRate ?? '',
+        item.supplier.demand.payOrderCount3m ?? '',
+        item.supplier.demand.payAmount3m ?? '',
+        item.supplier.productionService ?? '',
+        item.supplier.offersPreview.length,
+        item.inspect ? 'true' : 'false',
+        item.error?.code ?? '',
+    ]);
+    return [header, ...rows].map((row) => row.map(csvCell).join(',')).join('\n') + '\n';
+}
+async function runSupplierCommand(opts, defaults) {
+    const keywords = normalizeKeywords(opts.keywords);
+    const maxPerQuery = parsePositiveInt(opts.max, '--max', 20, CAPTURE_PAGE_SIZE * MAX_PAGES);
+    const filters = normalizeSupplierFilters({
+        factoryOnly: opts.factoryOnly,
+        province: opts.province,
+        city: opts.city,
+        minYears: parseOptionalNumber(opts.minYears, '--min-years'),
+        minRepeatRate: parseOptionalNumber(opts.minRepeatRate, '--min-repeat-rate'),
+        minResponseRate: parseOptionalNumber(opts.minResponseRate, '--min-response-rate'),
+    });
+    const enrichTop = parseSupplierEnrichTop(opts.enrich, defaults.defaultEnrich);
+    validateExportOpts(opts);
+    return dispatch('supplier-search', { keywords, maxPerQuery, filters, enrichTop, headed: opts.headed }, { headed: opts.headed, profile: opts.profile });
+}
+async function emitSupplierResults(data, opts, title) {
+    if (opts.jsonl || opts.csv) {
+        const format = opts.csv ? 'csv' : 'jsonl';
+        const text = opts.csv ? supplierItemsToCsv(data.items) : supplierItemsToJsonl(data.items);
+        if (opts.output) {
+            const target = path.resolve(opts.output);
+            await fs.writeFile(target, text);
+            emit({
+                human: () => process.stdout.write(`Wrote ${data.items.length} ${format} rows to ${target}\n`),
+                data: { ...data, export: { format, path: target, rows: data.items.length } },
+            });
+        }
+        else {
+            process.stdout.write(text);
+        }
+        return;
+    }
+    emit({
+        human: () => printSupplierResults(data, title),
+        data,
+    });
+}
+async function fetchSupplierSearch(ctx, keyword, headed, maxResults) {
+    const page = await ctx.newPage();
+    const baseUrl = buildCompanySearchUrl(keyword);
+    const pagesWanted = Math.min(Math.max(1, Math.ceil(maxResults / CAPTURE_PAGE_SIZE)), MAX_PAGES);
+    let currentTargetPage = 1;
+    async function warmup(delayMs) {
+        try {
+            await page.goto('https://s.1688.com/', {
+                waitUntil: 'domcontentloaded',
+                timeout: 20000,
+            });
+            await sleep(delayMs);
+        }
+        catch {
+            /* best effort */
+        }
+    }
+    async function navigateTo(targetUrl) {
+        try {
+            await page.goto(targetUrl, {
+                waitUntil: 'domcontentloaded',
+                timeout: 30000,
+            });
+        }
+        catch (error) {
+            throw new CliError(9, 'NETWORK_ERROR', `Failed to load supplier search page: ${error.message}`);
+        }
+    }
+    const isSearchBlocked = () => !headed && /\/punish|x5secdata=|punish\.1688\.com/.test(page.url());
+    info('Warming up s.1688.com supplier search...');
+    await warmup(1500);
+    const allSuppliers = [];
+    const seen = new Set();
+    const capturePageAction = async (action, timeoutMs) => {
+        const capture = startSupplierSearchCapture({
+            page,
+            targetPage: () => currentTargetPage,
+            keep: 'largest',
+        });
+        try {
+            await action();
+            return await capture.wait({
+                timeoutMs,
+                settleMs: 1400,
+                isClosed: () => page.isClosed(),
+                isBlocked: isSearchBlocked,
+            });
+        }
+        finally {
+            capture.dispose();
+        }
+    };
+    class PageAdvanceStopped extends Error {
+    }
+    for (let pageNum = 1; pageNum <= pagesWanted; pageNum++) {
+        currentTargetPage = pageNum;
+        let captureResult;
+        if (pageNum === 1) {
+            captureResult = await capturePageAction(async () => {
+                info(`Searching 1688 suppliers for "${keyword}" from company search...`);
+                if (headed)
+                    info('A Chrome window has opened — solve verification there if needed.');
+                await navigateTo(baseUrl);
+            }, headed ? 180000 : 15000);
+        }
+        else {
+            try {
+                captureResult = await capturePageAction(async () => {
+                    info(`Fetching supplier page ${pageNum}/${pagesWanted}...`);
+                    const advanced = await clickSearchNextPage(page).catch(() => false);
+                    if (!advanced)
+                        throw new PageAdvanceStopped();
+                }, headed ? 180000 : 15000);
+            }
+            catch (error) {
+                if (error instanceof PageAdvanceStopped)
+                    break;
+                throw error;
+            }
+        }
+        if (captureResult.status === 'browser_closed') {
+            throw new CliError(130, 'CANCELED', 'Browser closed.');
+        }
+        if (captureResult.status === 'blocked') {
+            throw riskControlError(headed);
+        }
+        if (captureResult.status !== 'captured' || !captureResult.data) {
+            if (pageNum === 1)
+                return [];
+            break;
+        }
+        let added = 0;
+        for (const supplier of captureResult.data.suppliers) {
+            const key = supplierKey(supplier);
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            allSuppliers.push(supplier);
+            added++;
+        }
+        if (allSuppliers.length >= maxResults)
+            break;
+        if (added === 0)
+            break;
+        if (pageNum < pagesWanted)
+            await sleep(1500 + Math.random() * 2000);
+    }
+    return allSuppliers.slice(0, maxResults);
+}
+function printSupplierResults(data, title) {
+    if (data.items.length === 0) {
+        process.stdout.write(`No supplier results for: ${data.queries.join(', ')}\n`);
+        return;
+    }
+    process.stdout.write(`${title} (${data.items.length}, company-search, enriched=${data.enrichedCount}):\n\n`);
+    for (const item of data.items.slice(0, 30)) {
+        const supplier = item.supplier;
+        const loc = [supplier.location.province, supplier.location.city].filter(Boolean).join('');
+        const years = supplier.tp.serviceYears ? `${supplier.tp.serviceYears}年` : '年限?';
+        const factory = supplier.factory.superFactory
+            ? '超级工厂'
+            : supplier.factory.factoryTag ?? (supplier.factory.isFactory ? '工厂' : '商家');
+        const demand = supplier.demand.payOrderCount3m !== null
+            ? ` · 近3月${supplier.demand.payOrderCount3m}单`
+            : '';
+        process.stdout.write(`${String(item.globalRank).padStart(2, ' ')}. ${item.score.toString().padStart(3, ' ')}  ${supplier.companyName}\n`);
+        process.stdout.write(`    ${loc || '?'} · ${years} · ${factory}${demand} · ${item.sourceKeyword}#${item.sourceRank}\n`);
+        if (supplier.productionService) {
+            process.stdout.write(`    products: ${supplier.productionService}\n`);
+        }
+        if (supplier.memberId || supplier.shopUrl) {
+            process.stdout.write(`    ${supplier.memberId ?? '?'} · ${supplier.shopUrl ?? '?'}\n`);
+        }
+        if (item.inspect) {
+            const inspected = item.inspect.factory.isFactory ? 'factory inspected' : 'supplier inspected';
+            process.stdout.write(`    inspect: ${inspected}, offers ${item.inspect.offers.availableCount ?? '?'}\n`);
+        }
+        if (item.error) {
+            process.stdout.write(`    enrich error: ${item.error.code} ${item.error.message}\n`);
+        }
+    }
+    if (data.items.length > 30) {
+        process.stdout.write(`\n... ${data.items.length - 30} more items in JSON output\n`);
+    }
+}
+function normalizeKeywords(raw) {
+    const out = [...new Set(raw.map((s) => s.trim()).filter(Boolean))];
+    if (out.length === 0) {
+        throw new CliError(2, 'BAD_INPUT', 'At least one keyword is required.');
+    }
+    return out;
+}
+function validateExportOpts(opts) {
+    if (opts.jsonl && opts.csv) {
+        throw new CliError(2, 'BAD_INPUT', 'Use only one of --jsonl or --csv.');
+    }
+    if (opts.output && !opts.jsonl && !opts.csv) {
+        throw new CliError(2, 'BAD_INPUT', '--output requires --jsonl or --csv.');
+    }
+}
+function supplierMatchesFilters(supplier, filters) {
+    if (filters.factoryOnly && !supplier.factory.isFactory)
+        return false;
+    if (filters.province && !includesNormalized(supplier.location.province, filters.province)) {
+        return false;
+    }
+    if (filters.city && !includesNormalized(supplier.location.city, filters.city)) {
+        return false;
+    }
+    if (filters.minYears !== null &&
+        (supplier.tp.serviceYears === null || supplier.tp.serviceYears < filters.minYears)) {
+        return false;
+    }
+    if (filters.minRepeatRate !== null &&
+        (supplier.service.repeatRate === null || supplier.service.repeatRate < filters.minRepeatRate)) {
+        return false;
+    }
+    if (filters.minResponseRate !== null &&
+        (supplier.service.wwResponseRate === null ||
+            supplier.service.wwResponseRate < filters.minResponseRate)) {
+        return false;
+    }
+    return true;
+}
+function hasActiveSupplierFilters(filters) {
+    return (filters.factoryOnly ||
+        filters.province !== null ||
+        filters.city !== null ||
+        filters.minYears !== null ||
+        filters.minRepeatRate !== null ||
+        filters.minResponseRate !== null);
+}
+function normalizeRateFilter(value, flag) {
+    if (value === null)
+        return null;
+    if (value < 0)
+        throw new CliError(2, 'BAD_INPUT', `${flag} must be >= 0.`);
+    return value > 1 ? value / 100 : value;
+}
+function supplierKey(supplier) {
+    return (supplier.memberId ??
+        supplier.loginId ??
+        supplier.shopUrl ??
+        `${supplier.companyName}:${supplier.location.province ?? ''}:${supplier.location.city ?? ''}`);
+}
+function formatRate(value) {
+    return `${Math.round(value * 100)}%`;
+}
+function includesNormalized(value, needle) {
+    if (!value)
+        return false;
+    return value.trim().toLowerCase().includes(needle.trim().toLowerCase());
+}
+function riskControlError(headed) {
+    return new CliError(4, 'RISK_CONTROL', headed
+        ? '1688 supplier company search did not return a company payload after manual verification.'
+        : '1688 risk control or empty company-search payload. Retry once with: 1688 supplier search <keyword> --headed', { recoverHint: headed ? undefined : 'retry_with_headed', retryable: !headed });
+}
+function isRunLevelError(error) {
+    if (!error || typeof error !== 'object')
+        return false;
+    const code = error.code;
+    return (code === 'NOT_LOGGED_IN' ||
+        code === 'RISK_CONTROL' ||
+        code === 'NETWORK_ERROR' ||
+        code === 'CANCELED');
+}
+function csvCell(value) {
+    const s = String(value ?? '');
+    if (/[",\n]/.test(s))
+        return `"${s.replace(/"/g, '""')}"`;
+    return s;
+}
+//# sourceMappingURL=supplier-search.js.map

package/dist/commands/supplier-search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supplier-search.js","sourceRoot":"","sources":["../../src/commands/supplier-search.ts"],"names":[],"mappings":"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"}

package/dist/daemon/client.js

@@ -34,7 +34,7 @@ export async function isDaemonReachable() {
         });
     });
 }
-export async function daemonCall(cmd, args) {
+export async function daemonCall(cmd, args, requestId = makeRequestId()) {
     return new Promise((resolve, reject) => {
         const sock = net.createConnection(socketPath());
         let buf = '';
@@ -59,7 +59,7 @@ export async function daemonCall(cmd, args) {
             reject(e);
         }
         sock.on('connect', () => {
-            const req = { id: makeRequestId(), cmd, args };
+            const req = { id: requestId, cmd, args };
             sock.write(JSON.stringify(req) + '\n');
         });
         sock.on('data', (chunk) => {

package/dist/daemon/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"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"}

package/dist/daemon/protocol.js

@@ -1,4 +1,5 @@
-// Wire protocol for the 1688 daemon. Newline-delimited JSON over a Unix socket.
+// Wire protocol for the 1688 daemon. Newline-delimited JSON over a Unix socket
+// on macOS/Linux or a named pipe on Windows.
 export function makeRequestId() {
     return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }

package/dist/daemon/protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/daemon/protocol.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAyBhF,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/daemon/protocol.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,6CAA6C;AAyB7C,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC"}

package/dist/io/output.js

@@ -17,12 +17,16 @@
 // hook (see `src/cli.ts`).
 let _forceJson = false;
 let _pretty = false;
+let _jsonV2 = false;
+let _cmd = null;
 let _getPath = null;
 let _pickPaths = null;
 const jsonModeFromEnv = !process.stdout.isTTY || process.env.BB1688_JSON === '1';
 export function setOutputFlags(o) {
-    _forceJson = !!o.json;
+    _forceJson = !!o.json || !!o.jsonV2;
+    _jsonV2 = !!o.jsonV2 || process.env.BB1688_JSON_V2 === '1';
     _pretty = !!o.pretty;
+    _cmd = o.cmd ?? null;
     _getPath = o.get ?? null;
     _pickPaths = o.pick
         ? o.pick
@@ -34,10 +38,32 @@ export function setOutputFlags(o) {
 export function isJson() {
     return _forceJson || jsonModeFromEnv;
 }
+export function isJsonV2() {
+    return _jsonV2;
+}
+export function currentCommandName() {
+    return _cmd;
+}
 function stringify(v) {
     return _pretty ? JSON.stringify(v, null, 2) : JSON.stringify(v);
 }
+export function makeEnvelope(input) {
+    const ok = input.error === undefined;
+    return {
+        ok,
+        cmd: input.cmd ?? _cmd,
+        requestId: input.requestId ?? null,
+        durationMs: input.durationMs ?? null,
+        ...(ok ? { data: input.data } : { error: input.error }),
+        ...(input.verification !== undefined ? { verification: input.verification } : {}),
+        ...(input.warnings !== undefined ? { warnings: input.warnings } : {}),
+        ...(input.artifactDir ? { artifactDir: input.artifactDir } : {}),
+    };
+}
 export function emit(opts) {
+    if (_jsonV2 && (_getPath !== null || _pickPaths !== null)) {
+        throw new Error('--json-v2 cannot be combined with --get or --pick yet');
+    }
     if (_getPath !== null) {
         const tokens = parsePath(_getPath);
         const result = resolve(opts.data, tokens);
@@ -59,7 +85,10 @@ export function emit(opts) {
         process.stdout.write(stringify(out) + '\n');
         return;
     }
-    if (isJson()) {
+    if (_jsonV2) {
+        process.stdout.write(stringify(makeEnvelope({ data: opts.data })) + '\n');
+    }
+    else if (isJson()) {
         process.stdout.write(stringify(opts.data) + '\n');
     }
     else {