weaver-work-cli 0.1.1 → 0.1.4

package/dist/shortcuts/invoice/host.js

@@ -2,6 +2,7 @@ import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 import { requireE10Session } from '../../internal/e10/context.js';
 import { getActiveProfile } from '../../internal/e10/auth/session.js';
+import { createE10RequestRuntime } from '../../internal/e10/request-runtime.js';
 import { InvoiceCliError, invoiceAuthError, invoiceNetworkError, invoiceValidationError, } from './errors.js';
 const MAX_DOWNLOAD_BYTES = 50 * 1024 * 1024;
 const TOKEN_SERVICE = 'cn.weaver.weaver-work-cli.invoice-token';
@@ -17,38 +18,6 @@ function assertPath(requestPath) {
         throw invoiceValidationError('path_not_allowed', '业票通只能调用 /api/ 路径');
     }
 }
-function withQuery(baseUrl, requestPath, query = {}) {
-    const url = new URL(`${baseUrl}${requestPath}`);
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        if (Array.isArray(value)) {
-            for (const item of value)
-                url.searchParams.append(key, String(item));
-        }
-        else {
-            url.searchParams.set(key, String(value));
-        }
-    }
-    return url;
-}
-async function fetchWithTimeout(url, options, timeoutMs) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    try {
-        return await fetch(url, { ...options, signal: controller.signal });
-    }
-    catch (error) {
-        if (error instanceof Error && error.name === 'AbortError') {
-            throw invoiceNetworkError('timeout', `请求超时（${timeoutMs}ms）`, { retryable: false });
-        }
-        const message = error instanceof Error ? error.message : String(error);
-        throw invoiceNetworkError('transport', `请求失败：${message}`, { retryable: true });
-    }
-    finally {
-        clearTimeout(timer);
-    }
-}
 function responseRoot(value) {
     return value?.res_base || value?.data?.res_base || value;
 }
@@ -121,17 +90,8 @@ function inferProfile(ctx) {
     const options = ctx.getGlobalOptions();
     return options.profile || getActiveProfile();
 }
-function requestHeaders(session, invoiceToken) {
-    const headers = {
-        Accept: 'application/json, text/plain, */*',
-        Cookie: session.cookieHeader(),
-        eteamsid: session.eteamsId,
-        'User-Agent': session.uaHeader(),
-        Origin: session.getBaseUrl(),
-    };
-    if (invoiceToken)
-        headers.token = invoiceToken;
-    return headers;
+function trustedInvoiceHeaders(invoiceToken) {
+    return invoiceToken ? { token: invoiceToken } : {};
 }
 export function createInvoiceHost(ctx, dependencies = {}) {
     let e10Session = null;
@@ -196,6 +156,12 @@ export function createInvoiceHost(ctx, dependencies = {}) {
         invoiceToken = null;
         await tokenStore?.clear().catch(() => false);
     }
+    async function runtime() {
+        return createE10RequestRuntime(ctx, await ensureSession(), {
+            interceptors: dependencies.interceptors,
+            fetch: dependencies.fetch,
+        });
+    }
     function businessError(value) {
         const code = responseCode(value);
         return new InvoiceCliError('api', 'business_error', responseMessage(value), {
@@ -212,32 +178,28 @@ export function createInvoiceHost(ctx, dependencies = {}) {
             await clearCachedInvoiceToken();
             if (canRetry)
                 return retry();
-            throw invoiceAuthError('invoice_session_expired', '发票业务登录态已失效，已清理本地发票 Token；请重新运行 weaver-work-cli auth login --base-url <域名> 后再试', { ret: code });
+            throw invoiceAuthError('invoice_session_expired', '发票业务登录态已失效，已清理本地发票 Token；请重新运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 后再试', { ret: code });
         }
         throw businessError(value);
     }
     async function invoiceRequest(request, canRetryExpiredToken = true) {
-        const { method = 'POST', path, query, body, needsInvoiceToken = true, timeoutMs = 30_000, } = request;
+        const { method = 'POST', path, query, body, operation, needsInvoiceToken = true, timeoutMs = 30_000, } = request;
         assertPath(path);
         const token = await ensureContext(needsInvoiceToken, timeoutMs, path);
-        const session = await ensureSession();
-        const url = withQuery(session.getBaseUrl(), path, query);
-        const headers = requestHeaders(session, token);
-        const init = { method, headers, redirect: 'manual' };
-        if (body !== undefined) {
-            headers['Content-Type'] = 'application/json;charset=UTF-8';
-            init.body = JSON.stringify(body);
-        }
-        const response = await fetchWithTimeout(url, init, timeoutMs);
-        const text = await response.text();
+        const response = await (await runtime()).requestJson({
+            module: 'invoice',
+            operation,
+            method,
+            path,
+            query,
+            body,
+            timeoutMs,
+            trustedHeaders: trustedInvoiceHeaders(token),
+        });
         if (response.status === 401 || response.status === 302) {
-            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> 完成登录', { httpStatus: response.status });
-        }
-        let value = {};
-        try {
-            value = text ? JSON.parse(text) : {};
+            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 完成登录', { httpStatus: response.status });
         }
-        catch {
+        if (response.parseError) {
             if (response.status < 200 || response.status >= 300) {
                 throw new InvoiceCliError('api', 'http_error', `泛微接口 HTTP ${response.status}`, {
                     code: response.status,
@@ -250,20 +212,28 @@ export function createInvoiceHost(ctx, dependencies = {}) {
         if (response.status < 200 || response.status >= 300) {
             throw new InvoiceCliError('api', 'http_error', `泛微接口 HTTP ${response.status}`, {
                 code: response.status,
-                details: { status: response.status, message: responseMessage(value) },
+                details: { status: response.status, message: responseMessage(response.value) },
                 exitCode: 1,
             });
         }
+        let value = response.value;
+        if (request.rewriteJsonText && response.text) {
+            try {
+                value = JSON.parse(request.rewriteJsonText(response.text));
+            }
+            catch {
+                value = response.value;
+            }
+        }
         return handleBusinessResponse(value, () => invoiceRequest(request, false), canRetryExpiredToken && Boolean(token));
     }
     async function invoiceMultipartRequest(request, canRetryExpiredToken = true) {
-        const { method = 'POST', path, query, fields = {}, file, needsInvoiceToken = true, timeoutMs = 30_000, } = request;
-        if (!file && !fields.url) {
-            throw invoiceValidationError('input_invalid', 'multipart 请求需要文件或 URL');
+        const { method = 'POST', path, query, fields = {}, file, operation, needsInvoiceToken = true, timeoutMs = 30_000, } = request;
+        if (!file && !Object.values(fields).some((value) => value !== undefined && value !== null && value !== '')) {
+            throw invoiceValidationError('input_invalid', 'multipart 请求需要文件、URL 或表单字段');
         }
         assertPath(path);
         const token = await ensureContext(needsInvoiceToken, timeoutMs, path);
-        const session = await ensureSession();
         const form = new FormData();
         for (const [key, value] of Object.entries(fields)) {
             if (value === undefined || value === null)
@@ -274,53 +244,87 @@ export function createInvoiceHost(ctx, dependencies = {}) {
             const content = await readFile(file.path);
             form.append('file', new Blob([content], { type: file.mimeType || 'application/octet-stream' }), file.name);
         }
-        const response = await fetchWithTimeout(withQuery(session.getBaseUrl(), path, query), {
+        const response = await (await runtime()).requestJson({
+            module: 'invoice',
+            operation,
             method,
-            headers: requestHeaders(session, token),
-            body: form,
-            redirect: 'manual',
-        }, timeoutMs);
-        const text = await response.text();
+            path,
+            query,
+            formData: form,
+            timeoutMs,
+            trustedHeaders: trustedInvoiceHeaders(token),
+        });
         if (response.status === 401 || response.status === 302) {
-            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> 完成登录', { httpStatus: response.status });
+            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 完成登录', { httpStatus: response.status });
+        }
+        if (response.parseError) {
+            throw invoiceNetworkError('protocol', `接口返回不是合法 JSON（HTTP ${response.status}）`, { retryable: false });
+        }
+        if (response.status < 200 || response.status >= 300) {
+            throw new InvoiceCliError('api', 'http_error', `泛微接口 HTTP ${response.status}`, {
+                code: response.status,
+                details: { status: response.status, message: responseMessage(response.value) },
+                exitCode: 1,
+            });
+        }
+        return handleBusinessResponse(response.value, () => invoiceMultipartRequest(request, false), canRetryExpiredToken && Boolean(token));
+    }
+    async function invoiceFormRequest(request, canRetryExpiredToken = true) {
+        const { method = 'POST', path, query, fields = {}, operation, needsInvoiceToken = true, timeoutMs = 30_000, } = request;
+        assertPath(path);
+        const token = await ensureContext(needsInvoiceToken, timeoutMs, path);
+        const form = new URLSearchParams();
+        for (const [key, value] of Object.entries(fields)) {
+            if (value === undefined || value === null)
+                continue;
+            form.set(key, typeof value === 'string' ? value : JSON.stringify(value));
         }
-        let value = {};
-        try {
-            value = text ? JSON.parse(text) : {};
+        const response = await (await runtime()).requestJson({
+            module: 'invoice',
+            operation,
+            method,
+            path,
+            query,
+            form,
+            timeoutMs,
+            trustedHeaders: trustedInvoiceHeaders(token),
+        });
+        if (response.status === 401 || response.status === 302) {
+            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 完成登录', { httpStatus: response.status });
         }
-        catch {
+        if (response.parseError) {
             throw invoiceNetworkError('protocol', `接口返回不是合法 JSON（HTTP ${response.status}）`, { retryable: false });
         }
         if (response.status < 200 || response.status >= 300) {
             throw new InvoiceCliError('api', 'http_error', `泛微接口 HTTP ${response.status}`, {
                 code: response.status,
-                details: { status: response.status, message: responseMessage(value) },
+                details: { status: response.status, message: responseMessage(response.value) },
                 exitCode: 1,
             });
         }
-        return handleBusinessResponse(value, () => invoiceMultipartRequest(request, false), canRetryExpiredToken && Boolean(token));
+        return handleBusinessResponse(response.value, () => invoiceFormRequest(request, false), canRetryExpiredToken && Boolean(token));
     }
-    async function invoiceDownload({ id, fid, needLog = false, timeoutMs = 30_000 }, canRetryExpiredToken = true) {
+    async function invoiceDownload({ id, fid, needLog = false, operation, timeoutMs = 30_000 }, canRetryExpiredToken = true) {
         const token = await ensureContext(true, timeoutMs, '/api/inc/file/download');
-        const session = await ensureSession();
-        const url = withQuery(session.getBaseUrl(), '/api/inc/file/download', { id, fid, needLog });
-        const response = await fetchWithTimeout(url, {
+        const response = await (await runtime()).requestBinary({
+            module: 'invoice',
+            operation,
             method: 'GET',
-            headers: {
-                ...requestHeaders(session, token),
-                Accept: 'application/octet-stream, application/pdf, */*',
-            },
-            redirect: 'manual',
-        }, timeoutMs);
+            path: '/api/inc/file/download',
+            query: { id, fid, needLog },
+            headers: { Accept: 'application/octet-stream, application/pdf, */*' },
+            timeoutMs,
+            trustedHeaders: trustedInvoiceHeaders(token),
+        });
         if (response.status === 401 || response.status === 302) {
-            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> 完成登录', { httpStatus: response.status });
+            throw invoiceAuthError('session_expired', 'E10 登录态已失效，请先向用户确认 E10 登录域名，再运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 完成登录', { httpStatus: response.status });
         }
-        const contentType = response.headers.get('content-type') || 'application/octet-stream';
+        const contentType = response.contentType;
         const declaredLength = Number(response.headers.get('content-length'));
         if (Number.isFinite(declaredLength) && declaredLength > MAX_DOWNLOAD_BYTES) {
             throw invoiceNetworkError('response_too_large', `下载文件超过 ${MAX_DOWNLOAD_BYTES} 字节限制`, { retryable: false });
         }
-        const content = Buffer.from(await response.arrayBuffer());
+        const content = response.content;
         const looksLikeJson = /^[\s\r\n]*[\[{]/u.test(content.subarray(0, 64).toString('utf8'));
         if (response.status < 200 || response.status >= 300 || contentType.includes('json') || looksLikeJson) {
             let value = {};
@@ -333,8 +337,8 @@ export function createInvoiceHost(ctx, dependencies = {}) {
             if (isInvoiceSessionExpired(value)) {
                 await clearCachedInvoiceToken();
                 if (canRetryExpiredToken && token)
-                    return invoiceDownload({ id, fid, needLog, timeoutMs }, false);
-                throw invoiceAuthError('invoice_session_expired', '发票业务登录态已失效，已清理本地发票 Token；请重新运行 weaver-work-cli auth login --base-url <域名> 后再试', { ret: responseCode(value), status: response.status });
+                    return invoiceDownload({ id, fid, needLog, operation, timeoutMs }, false);
+                throw invoiceAuthError('invoice_session_expired', '发票业务登录态已失效，已清理本地发票 Token；请重新运行 weaver-work-cli auth login --base-url <域名> --agent_type <当前智能体名称> 后再试', { ret: responseCode(value), status: response.status });
             }
             throw new InvoiceCliError('api', 'download_failed', responseMessage(value) || `下载失败（HTTP ${response.status}）`, {
                 code: response.status,
@@ -353,6 +357,7 @@ export function createInvoiceHost(ctx, dependencies = {}) {
     return {
         invoiceRequest,
         invoiceMultipartRequest,
+        invoiceFormRequest,
         invoiceDownload,
         getSession,
         invalidateToken() {

package/dist/shortcuts/invoice/index.js

@@ -15,9 +15,15 @@ async function readStdin() {
     }
     return Buffer.concat(chunks).toString('utf8');
 }
-async function inputFrom(options, extra = {}) {
+export async function inputFrom(options, extra = {}) {
     const opts = asOptions(options);
     let input = {};
+    if (opts.input && opts.inputJson) {
+        throw invoiceValidationError('input_conflict', '不能同时传 --input 和 --input-json');
+    }
+    if (opts.inputJson) {
+        input = parseJsonInput(String(opts.inputJson), '--input-json');
+    }
     if (opts.input) {
         let raw;
         try {
@@ -26,28 +32,42 @@ async function inputFrom(options, extra = {}) {
         catch {
             throw invoiceValidationError('input_unreadable', `无法读取 --input：${String(opts.input)}`);
         }
-        try {
-            const parsed = JSON.parse(raw);
-            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-                throw new Error('input must be an object');
-            }
-            input = parsed;
-        }
-        catch {
-            throw invoiceValidationError('input_invalid', '--input 不是合法 JSON 对象');
-        }
+        input = parseJsonInput(raw, '--input');
     }
     return {
         ...input,
         ...Object.fromEntries(Object.entries(extra).filter(([, value]) => value !== undefined && value !== '')),
     };
 }
+function parseJsonInput(raw, label) {
+    try {
+        const parsed = JSON.parse(raw.replace(/^\uFEFF/u, ''));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            throw new Error('input must be an object');
+        }
+        return parsed;
+    }
+    catch {
+        throw invoiceValidationError('input_invalid', `${label} 不是合法 JSON 对象`);
+    }
+}
+function withJsonInputOptions(command) {
+    command
+        .option('--input <path>', 'JSON input file, or - for stdin')
+        .option('--input-json <json>', 'inline JSON input object');
+    return command;
+}
 function intOption(value) {
     if (value === undefined || value === null || value === '')
         return undefined;
     const parsed = Number(value);
     return Number.isInteger(parsed) ? parsed : undefined;
 }
+function stringOption(value) {
+    if (value === undefined || value === null || value === '')
+        return undefined;
+    return String(value);
+}
 function successEnvelope(operation, result) {
     return {
         schemaVersion: 1,
@@ -91,51 +111,47 @@ export const invoiceShortcut = {
             .action(action((ctx) => {
             ctx.output.write(invoiceManifest, { json: true });
         }));
-        invoice.command('run')
+        withJsonInputOptions(invoice.command('run')
             .description('Run an invoice operation with JSON input')
-            .argument('<operation>', 'operation name, e.g. invoice.list')
-            .option('--input <path>', 'JSON input file, or - for stdin')
+            .argument('<operation>', 'operation name, e.g. invoice.list'))
             .action(action(async (ctx, operation, options) => {
             await executeAndPrint(ctx, String(operation), await inputFrom(options));
         }));
-        invoice.command('list')
+        withJsonInputOptions(invoice.command('list')
             .description('List personal invoice folder entries')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--content <keyword>', 'keyword search')
             .option('--page-size <size>', 'page size')
             .option('--start-pos <offset>', 'start position')
-            .option('--sreim <status>', 'reimbursement status: 0 all, 1 in reimbursement, 2 reimbursed, 3 unreimbursed, 4 non-reimbursable')
+            .option('--sreim <status>', 'reimbursement status: 0 all, 1 in reimbursement, 2 reimbursed, 3 unreimbursed, 4 non-reimbursable'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.list', await inputFrom(options, {
                 content: opts.content,
                 page_size: intOption(opts.pageSize),
                 start_pos: intOption(opts.startPos),
-                sreim: intOption(opts.sreim),
+                sreim: stringOption(opts.sreim),
             }));
         }));
         const enterprise = invoice.command('enterprise').description('Enterprise invoice folder commands');
-        enterprise.command('list')
+        withJsonInputOptions(enterprise.command('list')
             .description('List enterprise invoice folder entries')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--content <keyword>', 'keyword search')
             .option('--page-size <size>', 'page size')
             .option('--start-pos <offset>', 'start position')
-            .option('--sreim <status>', 'reimbursement status: 0 all, 1 in reimbursement, 2 reimbursed, 3 unreimbursed, 4 non-reimbursable')
+            .option('--sreim <status>', 'reimbursement status: 0 all, 1 in reimbursement, 2 reimbursed, 3 unreimbursed, 4 non-reimbursable'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.enterprise.list', await inputFrom(options, {
                 content: opts.content,
                 page_size: intOption(opts.pageSize),
                 start_pos: intOption(opts.startPos),
-                sreim: intOption(opts.sreim),
+                sreim: stringOption(opts.sreim),
             }));
         }));
-        invoice.command('get')
+        withJsonInputOptions(invoice.command('get')
             .description('Get invoice detail by fid or number')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--fid <fid>', 'invoice fid')
-            .option('--number <number>', 'invoice number')
+            .option('--number <number>', 'invoice number'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.get', await inputFrom(options, {
@@ -143,11 +159,10 @@ export const invoiceShortcut = {
                 number: opts.number,
             }));
         }));
-        invoice.command('upload')
+        withJsonInputOptions(invoice.command('upload')
             .description('Upload an invoice file for OCR')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--file <path>', 'local invoice file')
-            .option('--url <url>', 'server-accessible file URL')
+            .option('--url <url>', 'server-accessible file URL'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.upload', await inputFrom(options, {
@@ -156,11 +171,10 @@ export const invoiceShortcut = {
             }));
         }));
         const ocr = invoice.command('ocr').description('Invoice OCR commands');
-        ocr.command('preview')
+        withJsonInputOptions(ocr.command('preview')
             .description('Preview OCR result without saving an invoice')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--file <path>', 'local invoice file')
-            .option('--url <url>', 'server-accessible file URL')
+            .option('--url <url>', 'server-accessible file URL'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.ocr.preview', await inputFrom(options, {
@@ -169,11 +183,10 @@ export const invoiceShortcut = {
             }));
         }));
         const validate = invoice.command('validate').description('Invoice validation commands');
-        validate.command('preview')
+        withJsonInputOptions(validate.command('preview')
             .description('Validate an existing invoice without saving validation result')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--fid <fid>', 'invoice fid')
-            .option('--scope <scope>', 'personal or enterprise')
+            .option('--scope <scope>', 'personal or enterprise'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.validate.preview', await inputFrom(options, {
@@ -182,14 +195,13 @@ export const invoiceShortcut = {
             }));
         }));
         const importCommand = invoice.command('import').description('Invoice file import commands');
-        importCommand.command('prepare')
+        withJsonInputOptions(importCommand.command('prepare')
             .description('Prepare a confirmed invoice file import')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--file <path>', 'local invoice file')
             .option('--validate', 'request validation before import')
             .option('--no-validate', 'skip validation before import')
             .option('--sync-to-oa', 'sync imported invoice to OA where supported')
-            .option('--no-sync-to-oa', 'do not sync imported invoice to OA where supported')
+            .option('--no-sync-to-oa', 'do not sync imported invoice to OA where supported'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.import.prepare', await inputFrom(options, {
@@ -198,12 +210,11 @@ export const invoiceShortcut = {
                 syncToOa: typeof opts.syncToOa === 'boolean' ? opts.syncToOa : undefined,
             }));
         }));
-        importCommand.command('apply')
+        withJsonInputOptions(importCommand.command('apply')
             .description('Apply a prepared invoice file import')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--file <path>', 'local invoice file')
             .option('--continuation <token>', 'continuation token from prepare')
-            .option('--yes', 'confirm the write operation')
+            .option('--yes', 'confirm the write operation'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.import.apply', await inputFrom(options, {
@@ -213,19 +224,17 @@ export const invoiceShortcut = {
             }));
         }));
         const add = invoice.command('add').description('Manual invoice add commands');
-        add.command('prepare')
+        withJsonInputOptions(add.command('prepare')
             .description('Prepare a confirmed manual invoice add')
-            .option('--input <path>', 'JSON input file, or - for stdin')
-            .option('--scope <scope>', 'personal or enterprise')
+            .option('--scope <scope>', 'personal or enterprise'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.add.prepare', await inputFrom(options, { scope: opts.scope }));
         }));
-        add.command('apply')
+        withJsonInputOptions(add.command('apply')
             .description('Apply a prepared manual invoice add')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--continuation <token>', 'continuation token from prepare')
-            .option('--yes', 'confirm the write operation')
+            .option('--yes', 'confirm the write operation'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.add.apply', await inputFrom(options, {
@@ -234,11 +243,10 @@ export const invoiceShortcut = {
             }));
         }));
         const update = invoice.command('update').description('Invoice update commands');
-        update.command('prepare')
+        withJsonInputOptions(update.command('prepare')
             .description('Prepare an invoice update')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--fid <fid>', 'invoice fid')
-            .option('--scope <scope>', 'personal or enterprise')
+            .option('--scope <scope>', 'personal or enterprise'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.update.prepare', await inputFrom(options, {
@@ -246,11 +254,10 @@ export const invoiceShortcut = {
                 scope: opts.scope,
             }));
         }));
-        update.command('apply')
+        withJsonInputOptions(update.command('apply')
             .description('Apply a prepared invoice update')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--continuation <token>', 'continuation token from prepare')
-            .option('--yes', 'confirm the write operation')
+            .option('--yes', 'confirm the write operation'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.update.apply', await inputFrom(options, {
@@ -258,12 +265,11 @@ export const invoiceShortcut = {
                 confirm: opts.yes === true ? true : undefined,
             }));
         }));
-        invoice.command('download')
+        withJsonInputOptions(invoice.command('download')
             .description('Download an invoice attachment after verifying ownership')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--fid <fid>', 'invoice fid')
             .option('--file-id <id>', 'invoice file id')
-            .option('--output <path>', 'output file path')
+            .option('--output <path>', 'output file path'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.download', await inputFrom(options, {
@@ -273,11 +279,10 @@ export const invoiceShortcut = {
             }));
         }));
         const del = invoice.command('delete').description('Invoice delete commands');
-        del.command('prepare')
+        withJsonInputOptions(del.command('prepare')
             .description('Prepare an invoice soft delete')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--fid <fid>', 'invoice fid')
-            .option('--scope <scope>', 'personal or enterprise')
+            .option('--scope <scope>', 'personal or enterprise'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.delete.prepare', await inputFrom(options, {
@@ -285,11 +290,10 @@ export const invoiceShortcut = {
                 scope: opts.scope,
             }));
         }));
-        del.command('apply')
+        withJsonInputOptions(del.command('apply')
             .description('Apply a prepared invoice soft delete')
-            .option('--input <path>', 'JSON input file, or - for stdin')
             .option('--continuation <token>', 'continuation token from prepare')
-            .option('--yes', 'confirm the write operation')
+            .option('--yes', 'confirm the write operation'))
             .action(action(async (ctx, options) => {
             const opts = asOptions(options);
             await executeAndPrint(ctx, 'invoice.delete.apply', await inputFrom(options, {