@will-17173/telegram-cli 0.3.0 → 0.4.1

package/dist/cli/secure-input.js

@@ -0,0 +1,408 @@
+import { StringDecoder } from 'node:string_decoder';
+export class CliInterruptedError extends Error {
+    code = 'interrupted';
+    exitCode;
+    signal;
+    constructor(signal = 'SIGINT') {
+        super('Operation interrupted.');
+        this.name = 'CliInterruptedError';
+        this.signal = signal;
+        this.exitCode = signal === 'SIGHUP' ? 129 : signal === 'SIGTERM' ? 143 : 130;
+    }
+}
+export class InteractionRequiredError extends Error {
+    code = 'interaction_required';
+    constructor() {
+        super('Interactive terminal input is required.');
+        this.name = 'InteractionRequiredError';
+    }
+}
+export class InvalidInputError extends Error {
+    code = 'invalid_input';
+    constructor(message) {
+        super(message);
+        this.name = 'InvalidInputError';
+    }
+}
+export class InputBusyError extends Error {
+    code = 'input_busy';
+    constructor() {
+        super('Interactive terminal input is already in use.');
+        this.name = 'InputBusyError';
+    }
+}
+const activeTerminalInputs = new WeakSet();
+const graphemeSegmenter = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+// Match the Ink secret field: ignore printable input beyond 4096 complete graphemes.
+export const MAX_SECRET_INPUT_LENGTH = 4096;
+const MAX_SECRET_INPUT_CODE_POINTS = MAX_SECRET_INPUT_LENGTH * 16;
+const SIGNAL_CLEANUP_GRACE_MS = 100;
+const pendingOutputWrites = new WeakMap();
+const inputsAwaitingLineFeed = new WeakSet();
+const ignoreOutputError = () => undefined;
+export function createInterruptScope() {
+    const controller = new AbortController();
+    const previousExitCode = process.exitCode;
+    let fallback;
+    let assignedExitCode;
+    let disposed = false;
+    const keepAlive = setTimeout(() => undefined, 2_147_483_647);
+    // SIGKILL cannot be observed; for catchable signals, re-raise after a short cooperative cleanup window.
+    // Signal exit-status behavior is Unix-tested; Windows signal delivery is limited by Node and the host console.
+    const handlers = Object.fromEntries(['SIGINT', 'SIGHUP', 'SIGTERM'].map(processSignal => [
+        processSignal,
+        () => {
+            if (controller.signal.aborted || disposed)
+                return;
+            const interruption = new CliInterruptedError(processSignal);
+            assignedExitCode = interruption.exitCode;
+            process.exitCode = interruption.exitCode;
+            clearTimeout(keepAlive);
+            controller.abort(interruption);
+            if (disposed)
+                return;
+            fallback = setTimeout(() => {
+                removeHandlers();
+                process.kill(process.pid, processSignal);
+            }, SIGNAL_CLEANUP_GRACE_MS);
+            fallback.unref();
+        },
+    ]));
+    const removeHandlers = () => {
+        for (const processSignal of Object.keys(handlers)) {
+            process.removeListener(processSignal, handlers[processSignal]);
+        }
+    };
+    for (const processSignal of Object.keys(handlers)) {
+        process.once(processSignal, handlers[processSignal]);
+    }
+    return {
+        signal: controller.signal,
+        dispose: () => {
+            disposed = true;
+            clearTimeout(keepAlive);
+            if (fallback)
+                clearTimeout(fallback);
+            removeHandlers();
+            if (assignedExitCode !== undefined && process.exitCode === assignedExitCode) {
+                process.exitCode = previousExitCode;
+            }
+        },
+    };
+}
+export async function readVisibleInput(prompt, streams = {}) {
+    return readTerminalInput(prompt, streams, false);
+}
+export async function readSecret(prompt, streams = {}) {
+    return readTerminalInput(prompt, streams, true);
+}
+async function readTerminalInput(prompt, streams, hidden) {
+    const input = streams.input ?? process.stdin;
+    const output = streams.output ?? process.stderr;
+    if (input.isTTY !== true || ((hidden || input.isRaw === true) && typeof input.setRawMode !== 'function')) {
+        throw new InteractionRequiredError();
+    }
+    throwIfAborted(streams.signal);
+    if (input.readableEnded || input.destroyed)
+        throw new CliInterruptedError();
+    if (activeTerminalInputs.has(input) || input.listenerCount('data') > 0)
+        throw new InputBusyError();
+    activeTerminalInputs.add(input);
+    try {
+        drainBufferedInput(input);
+        return await readOwnedTerminalInput(prompt, input, output, streams.signal, hidden);
+    }
+    finally {
+        activeTerminalInputs.delete(input);
+    }
+}
+async function readOwnedTerminalInput(prompt, input, output, signal, hidden) {
+    const originalRawMode = input.isRaw === true;
+    const wasFlowing = input.readableFlowing === true;
+    const decoder = new StringDecoder('utf8');
+    let value = '';
+    let settled = false;
+    let rawModeTouched = false;
+    let promptStarted = false;
+    let promptWrite;
+    let operationFailed = false;
+    let escapeState = 'none';
+    let resolveInput;
+    let rejectInput;
+    const result = new Promise((resolve, reject) => {
+        resolveInput = resolve;
+        rejectInput = reject;
+    });
+    const settleValue = (line) => {
+        if (settled)
+            return;
+        settled = true;
+        resolveInput?.(line);
+    };
+    const settleError = (error) => {
+        if (settled)
+            return;
+        settled = true;
+        rejectInput?.(error);
+    };
+    const onData = (chunk) => {
+        if (settled)
+            return;
+        const text = typeof chunk === 'string' ? chunk : decoder.write(chunk);
+        const printable = [];
+        let examinedPrintable = 0;
+        let printableWasTruncated = false;
+        const flushPrintable = () => {
+            if (printable.length === 0 && !printableWasTruncated)
+                return;
+            value = hidden
+                ? appendBoundedPrintable(value, printable, printableWasTruncated)
+                : value + printable.join('');
+            printable.fill('');
+            printable.length = 0;
+            examinedPrintable = 0;
+            printableWasTruncated = false;
+        };
+        for (const character of text) {
+            const code = character.codePointAt(0);
+            if (inputsAwaitingLineFeed.has(input)) {
+                inputsAwaitingLineFeed.delete(input);
+                if (character === '\n')
+                    continue;
+            }
+            if (code === 3) {
+                flushPrintable();
+                settleError(new CliInterruptedError());
+                return;
+            }
+            if (character === '\r' || character === '\n') {
+                flushPrintable();
+                if (character === '\r')
+                    inputsAwaitingLineFeed.add(input);
+                if (hidden && value.length === 0)
+                    settleError(new InvalidInputError('Secret input cannot be empty.'));
+                else
+                    settleValue(value);
+                return;
+            }
+            if (code === 27) {
+                flushPrintable();
+                escapeState = 'start';
+                continue;
+            }
+            if (escapeState === 'start') {
+                escapeState = character === ']'
+                    ? 'osc'
+                    : character === '[' || character === 'O' ? 'sequence' : 'none';
+                continue;
+            }
+            if (escapeState === 'sequence') {
+                if (code != null && code >= 0x40 && code <= 0x7e)
+                    escapeState = 'none';
+                continue;
+            }
+            if (escapeState === 'osc') {
+                if (code === 7)
+                    escapeState = 'none';
+                continue;
+            }
+            if (code === 8 || code === 127) {
+                flushPrintable();
+                value = removeFinalGrapheme(value);
+                continue;
+            }
+            if (code != null && code >= 32 && (code < 127 || code > 159)) {
+                if (!hidden || examinedPrintable < MAX_SECRET_INPUT_CODE_POINTS) {
+                    printable.push(character);
+                    examinedPrintable += 1;
+                }
+                else {
+                    printableWasTruncated = true;
+                }
+            }
+        }
+        flushPrintable();
+    };
+    const onInputError = (error) => settleError(error);
+    const onOutputError = (error) => settleError(error);
+    const onInputUnavailable = () => settleError(new CliInterruptedError());
+    const onAbort = () => settleError(abortReason(signal));
+    signal?.addEventListener('abort', onAbort, { once: true });
+    output.on('error', onOutputError);
+    input.once('error', onInputError);
+    input.once('end', onInputUnavailable);
+    input.once('close', onInputUnavailable);
+    try {
+        if (signal?.aborted)
+            settleError(abortReason(signal));
+        if (input.readableEnded || input.destroyed)
+            settleError(new CliInterruptedError());
+        if (!settled && (hidden || originalRawMode)) {
+            rawModeTouched = true;
+            input.setRawMode(hidden);
+        }
+        if (!settled) {
+            input.on('data', onData);
+            const unexpectedDataListeners = input.listeners('data').filter(listener => listener !== onData);
+            if (unexpectedDataListeners.length > 0)
+                settleError(new InputBusyError());
+        }
+        if (!settled)
+            input.resume();
+        if (!settled) {
+            promptStarted = true;
+            promptWrite = startOutputWrite(output, prompt, settleError);
+        }
+        return await result;
+    }
+    catch (error) {
+        operationFailed = true;
+        throw error;
+    }
+    finally {
+        let cleanupError;
+        const cleanup = (action) => {
+            try {
+                action();
+            }
+            catch (error) {
+                cleanupError ??= error;
+            }
+        };
+        cleanup(() => input.removeListener('data', onData));
+        cleanup(() => input.removeListener('error', onInputError));
+        cleanup(() => input.removeListener('end', onInputUnavailable));
+        cleanup(() => input.removeListener('close', onInputUnavailable));
+        cleanup(() => signal?.removeEventListener('abort', onAbort));
+        cleanup(() => {
+            // A broken writer may keep the token forever, so detach the operation closure before releasing input.
+            promptWrite?.detachErrorHandler();
+            promptWrite = undefined;
+        });
+        cleanup(() => {
+            if (rawModeTouched)
+                input.setRawMode(originalRawMode);
+        });
+        cleanup(() => {
+            if (!wasFlowing)
+                input.pause();
+        });
+        cleanup(() => output.removeListener('error', onOutputError));
+        cleanup(() => {
+            if (promptStarted && hidden)
+                startOutputWrite(output, '\n');
+        });
+        value = '';
+        if (!operationFailed && cleanupError !== undefined)
+            throw cleanupError;
+    }
+}
+function startOutputWrite(output, text, onError = ignoreOutputError) {
+    const state = getOutputWriteState(output);
+    const pendingWrite = { onError };
+    const handle = {
+        detachErrorHandler: () => {
+            pendingWrite.onError = ignoreOutputError;
+        },
+    };
+    state.pending.add(pendingWrite);
+    try {
+        output.write(text, error => {
+            state.pending.delete(pendingWrite);
+            if (error) {
+                state.failed = true;
+                pendingWrite.onError(error);
+                if (state.pending.size === 0)
+                    scheduleOutputStateRelease(output, state);
+            }
+            else if (state.pending.size === 0 && !state.failed) {
+                releaseOutputWriteState(output, state);
+            }
+        });
+    }
+    catch (error) {
+        state.pending.delete(pendingWrite);
+        if (state.pending.size === 0 && !state.failed)
+            releaseOutputWriteState(output, state);
+        throw error instanceof Error ? error : new Error(String(error));
+    }
+    return handle;
+}
+function scheduleOutputStateRelease(output, state) {
+    const immediate = setImmediate(() => {
+        if (state.pending.size === 0)
+            releaseOutputWriteState(output, state);
+    });
+    immediate.unref();
+}
+function getOutputWriteState(output) {
+    const existing = pendingOutputWrites.get(output);
+    if (existing)
+        return existing;
+    const state = {};
+    state.pending = new Set();
+    state.failed = false;
+    state.guard = error => {
+        for (const pendingWrite of state.pending)
+            pendingWrite.onError(error);
+        if (state.pending.size === 0)
+            releaseOutputWriteState(output, state);
+    };
+    state.onClose = () => releaseOutputWriteState(output, state);
+    pendingOutputWrites.set(output, state);
+    output.on('error', state.guard);
+    output.once('close', state.onClose);
+    return state;
+}
+function releaseOutputWriteState(output, state) {
+    if (pendingOutputWrites.get(output) !== state)
+        return;
+    pendingOutputWrites.delete(output);
+    state.pending.clear();
+    output.removeListener('error', state.guard);
+    output.removeListener('close', state.onClose);
+}
+function removeFinalGrapheme(value) {
+    return Array.from(graphemeSegmenter.segment(value), part => part.segment).slice(0, -1).join('');
+}
+function appendBoundedPrintable(value, appended, appendedWasTruncated) {
+    const codePoints = [];
+    let examinedCodePoints = 0;
+    let preprocessingWasTruncated = appendedWasTruncated;
+    inputSources: for (const source of [value, appended]) {
+        for (const character of source) {
+            if (examinedCodePoints === MAX_SECRET_INPUT_CODE_POINTS) {
+                preprocessingWasTruncated = true;
+                break inputSources;
+            }
+            codePoints.push(character);
+            examinedCodePoints += 1;
+        }
+    }
+    const graphemes = Array.from(graphemeSegmenter.segment(codePoints.join('')), part => part.segment);
+    if (preprocessingWasTruncated)
+        graphemes.pop();
+    return graphemes.slice(0, MAX_SECRET_INPUT_LENGTH).join('');
+}
+function drainBufferedInput(input) {
+    while (input.read() !== null) {
+        // Discard bytes entered before this prompt, including remainder from a multiline paste.
+    }
+}
+export function isCliInterruptedError(error) {
+    return error instanceof CliInterruptedError;
+}
+export function isCliInputError(error) {
+    return error instanceof CliInterruptedError
+        || error instanceof InteractionRequiredError
+        || error instanceof InvalidInputError
+        || error instanceof InputBusyError;
+}
+function throwIfAborted(signal) {
+    if (signal?.aborted)
+        throw abortReason(signal);
+}
+function abortReason(signal) {
+    return isCliInputError(signal.reason) ? signal.reason : new CliInterruptedError();
+}
+//# sourceMappingURL=secure-input.js.map

package/dist/cli/secure-input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"secure-input.js","sourceRoot":"","sources":["../../src/cli/secure-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAUnD,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IACnC,IAAI,GAAG,aAAa,CAAA;IACpB,QAAQ,CAAQ;IAChB,MAAM,CAAiB;IAEhC,YAAY,SAA0B,QAAQ;QAC5C,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAC/B,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAA;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;IAC9E,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACxC,IAAI,GAAG,sBAAsB,CAAA;IAEtC;QACE,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAChD,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IACjC,IAAI,GAAG,eAAe,CAAA;IAE/B,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAA;IACjC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,KAAK;IAC9B,IAAI,GAAG,YAAY,CAAA;IAE5B;QACE,KAAK,CAAC,+CAA+C,CAAC,CAAA;QACtD,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAA;IAC9B,CAAC;CACF;AAED,MAAM,oBAAoB,GAAG,IAAI,OAAO,EAAqB,CAAA;AAC7D,MAAM,iBAAiB,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;AACpF,qFAAqF;AACrF,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAA;AAC3C,MAAM,4BAA4B,GAAG,uBAAuB,GAAG,EAAE,CAAA;AACjE,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAWnC,MAAM,mBAAmB,GAAG,IAAI,OAAO,EAAwC,CAAA;AAC/E,MAAM,sBAAsB,GAAG,IAAI,OAAO,EAAqB,CAAA;AAC/D,MAAM,iBAAiB,GAAG,GAAS,EAAE,CAAC,SAAS,CAAA;AAE/C,MAAM,UAAU,oBAAoB;IAClC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAA;IACzC,IAAI,QAAoC,CAAA;IACxC,IAAI,gBAAoC,CAAA;IACxC,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;IAC5D,wGAAwG;IACxG,+GAA+G;IAC/G,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAW,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAClG,aAAa;QACb,GAAG,EAAE;YACH,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,QAAQ;gBAAE,OAAM;YACjD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,aAAa,CAAC,CAAA;YAC3D,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAA;YACxC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAA;YACxC,YAAY,CAAC,SAAS,CAAC,CAAA;YACvB,UAAU,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAC9B,IAAI,QAAQ;gBAAE,OAAM;YACpB,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;gBACzB,cAAc,EAAE,CAAA;gBAChB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;YAC1C,CAAC,EAAE,uBAAuB,CAAC,CAAA;YAC3B,QAAQ,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAC,CAAwC,CAAA;IAC1C,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAsB,EAAE,CAAC;YACvE,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAA;QAChE,CAAC;IACH,CAAC,CAAA;IACD,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAsB,EAAE,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,OAAO,EAAE,GAAG,EAAE;YACZ,QAAQ,GAAG,IAAI,CAAA;YACf,YAAY,CAAC,SAAS,CAAC,CAAA;YACvB,IAAI,QAAQ;gBAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;YACpC,cAAc,EAAE,CAAA;YAChB,IAAI,gBAAgB,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBAC5E,OAAO,CAAC,QAAQ,GAAG,gBAAgB,CAAA;YACrC,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,UAA4F,EAAE;IAE9F,OAAO,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,UAA4F,EAAE;IAE9F,OAAO,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;AACjD,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,OAA2B,EAAE,MAAe;IAC3F,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAA;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAA;IAC/C,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;QACzG,MAAM,IAAI,wBAAwB,EAAE,CAAA;IACtC,CAAC;IACD,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9B,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,SAAS;QAAE,MAAM,IAAI,mBAAmB,EAAE,CAAA;IAC3E,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,cAAc,EAAE,CAAA;IAElG,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC/B,IAAI,CAAC;QACH,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACzB,OAAO,MAAM,sBAAsB,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpF,CAAC;YAAS,CAAC;QACT,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,MAAc,EACd,KAAwB,EACxB,MAA0B,EAC1B,MAA+B,EAC/B,MAAe;IAEf,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,KAAK,IAAI,CAAA;IAC5C,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,KAAK,IAAI,CAAA;IACjD,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IACzC,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,cAAc,GAAG,KAAK,CAAA;IAC1B,IAAI,aAAa,GAAG,KAAK,CAAA;IACzB,IAAI,WAA0C,CAAA;IAC9C,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,IAAI,WAAW,GAA0C,MAAM,CAAA;IAC/D,IAAI,YAAmD,CAAA;IACvD,IAAI,WAAmD,CAAA;IACvD,MAAM,MAAM,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrD,YAAY,GAAG,OAAO,CAAA;QACtB,WAAW,GAAG,MAAM,CAAA;IACtB,CAAC,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,CAAC,IAAY,EAAQ,EAAE;QACzC,IAAI,OAAO;YAAE,OAAM;QACnB,OAAO,GAAG,IAAI,CAAA;QACd,YAAY,EAAE,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,CAAC,KAAc,EAAQ,EAAE;QAC3C,IAAI,OAAO;YAAE,OAAM;QACnB,OAAO,GAAG,IAAI,CAAA;QACd,WAAW,EAAE,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC,CAAA;IACD,MAAM,MAAM,GAAG,CAAC,KAAsB,EAAQ,EAAE;QAC9C,IAAI,OAAO;YAAE,OAAM;QACnB,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACrE,MAAM,SAAS,GAAa,EAAE,CAAA;QAC9B,IAAI,iBAAiB,GAAG,CAAC,CAAA;QACzB,IAAI,qBAAqB,GAAG,KAAK,CAAA;QACjC,MAAM,cAAc,GAAG,GAAS,EAAE;YAChC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,qBAAqB;gBAAE,OAAM;YAC5D,KAAK,GAAG,MAAM;gBACZ,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAAqB,CAAC;gBACjE,CAAC,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC9B,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClB,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;YACpB,iBAAiB,GAAG,CAAC,CAAA;YACrB,qBAAqB,GAAG,KAAK,CAAA;QAC/B,CAAC,CAAA;QACD,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;YACrC,IAAI,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtC,sBAAsB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACpC,IAAI,SAAS,KAAK,IAAI;oBAAE,SAAQ;YAClC,CAAC;YACD,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,cAAc,EAAE,CAAA;gBAChB,WAAW,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAA;gBACtC,OAAM;YACR,CAAC;YACD,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC7C,cAAc,EAAE,CAAA;gBAChB,IAAI,SAAS,KAAK,IAAI;oBAAE,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBACzD,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;oBAAE,WAAW,CAAC,IAAI,iBAAiB,CAAC,+BAA+B,CAAC,CAAC,CAAA;;oBAChG,WAAW,CAAC,KAAK,CAAC,CAAA;gBACvB,OAAM;YACR,CAAC;YACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;gBAChB,cAAc,EAAE,CAAA;gBAChB,WAAW,GAAG,OAAO,CAAA;gBACrB,SAAQ;YACV,CAAC;YACD,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;gBAC5B,WAAW,GAAG,SAAS,KAAK,GAAG;oBAC7B,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAA;gBAChE,SAAQ;YACV,CAAC;YACD,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;gBAC/B,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI;oBAAE,WAAW,GAAG,MAAM,CAAA;gBACtE,SAAQ;YACV,CAAC;YACD,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;gBAC1B,IAAI,IAAI,KAAK,CAAC;oBAAE,WAAW,GAAG,MAAM,CAAA;gBACpC,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBAC/B,cAAc,EAAE,CAAA;gBAChB,KAAK,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAA;gBAClC,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;gBAC7D,IAAI,CAAC,MAAM,IAAI,iBAAiB,GAAG,4BAA4B,EAAE,CAAC;oBAChE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBACzB,iBAAiB,IAAI,CAAC,CAAA;gBACxB,CAAC;qBAAM,CAAC;oBACN,qBAAqB,GAAG,IAAI,CAAA;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QACD,cAAc,EAAE,CAAA;IAClB,CAAC,CAAA;IACD,MAAM,YAAY,GAAG,CAAC,KAAY,EAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAC/D,MAAM,aAAa,GAAG,CAAC,KAAY,EAAQ,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAChE,MAAM,kBAAkB,GAAG,GAAS,EAAE,CAAC,WAAW,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAA;IAC7E,MAAM,OAAO,GAAG,GAAS,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,MAAO,CAAC,CAAC,CAAA;IAE7D,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1D,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IACjC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IACjC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAA;IACrC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAA;IACvC,IAAI,CAAC;QACH,IAAI,MAAM,EAAE,OAAO;YAAE,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAA;QACrD,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,SAAS;YAAE,WAAW,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAA;QAClF,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC,EAAE,CAAC;YAC5C,cAAc,GAAG,IAAI,CAAA;YACrB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC1B,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YACxB,MAAM,uBAAuB,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAA;YAC/F,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC;gBAAE,WAAW,CAAC,IAAI,cAAc,EAAE,CAAC,CAAA;QAC3E,CAAC;QACD,IAAI,CAAC,OAAO;YAAE,KAAK,CAAC,MAAM,EAAE,CAAA;QAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,aAAa,GAAG,IAAI,CAAA;YACpB,WAAW,GAAG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;QAC7D,CAAC;QACD,OAAO,MAAM,MAAM,CAAA;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAe,GAAG,IAAI,CAAA;QACtB,MAAM,KAAK,CAAA;IACb,CAAC;YAAS,CAAC;QACT,IAAI,YAAqB,CAAA;QACzB,MAAM,OAAO,GAAG,CAAC,MAAkB,EAAQ,EAAE;YAC3C,IAAI,CAAC;gBACH,MAAM,EAAE,CAAA;YACV,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,YAAY,KAAK,KAAK,CAAA;YACxB,CAAC;QACH,CAAC,CAAA;QACD,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;QACnD,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;QAC1D,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAA;QAC9D,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAA;QAChE,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;QAC5D,OAAO,CAAC,GAAG,EAAE;YACX,sGAAsG;YACtG,WAAW,EAAE,kBAAkB,EAAE,CAAA;YACjC,WAAW,GAAG,SAAS,CAAA;QACzB,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,EAAE;YACX,IAAI,cAAc;gBAAE,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,UAAU;gBAAE,KAAK,CAAC,KAAK,EAAE,CAAA;QAChC,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAA;QAC5D,OAAO,CAAC,GAAG,EAAE;YACX,IAAI,aAAa,IAAI,MAAM;gBAAE,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;QACF,KAAK,GAAG,EAAE,CAAA;QACV,IAAI,CAAC,eAAe,IAAI,YAAY,KAAK,SAAS;YAAE,MAAM,YAAY,CAAA;IACxE,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,MAA0B,EAC1B,IAAY,EACZ,UAAkC,iBAAiB;IAEnD,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,YAAY,GAAG,EAAE,OAAO,EAAE,CAAA;IAChC,MAAM,MAAM,GAAG;QACb,kBAAkB,EAAE,GAAG,EAAE;YACvB,YAAY,CAAC,OAAO,GAAG,iBAAiB,CAAA;QAC1C,CAAC;KACF,CAAA;IACD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;IAC/B,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;YACzB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAClC,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,MAAM,GAAG,IAAI,CAAA;gBACnB,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;oBAAE,0BAA0B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YACzE,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACrD,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YACxC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACrF,MAAM,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,0BAA0B,CAAC,MAA0B,EAAE,KAAuB;IACrF,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE;QAClC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtE,CAAC,CAAC,CAAA;IACF,SAAS,CAAC,KAAK,EAAE,CAAA;AACnB,CAAC;AAED,SAAS,mBAAmB,CAAC,MAA0B;IACrD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAChD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAE7B,MAAM,KAAK,GAAG,EAAsB,CAAA;IACpC,KAAK,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAA;IACzB,KAAK,CAAC,MAAM,GAAG,KAAK,CAAA;IACpB,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE;QACpB,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,OAAO;YAAE,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACrE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtE,CAAC,CAAA;IACD,KAAK,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC5D,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACtC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC/B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IACnC,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,uBAAuB,CAAC,MAA0B,EAAE,KAAuB;IAClF,IAAI,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK;QAAE,OAAM;IACrD,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAClC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACrB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;AAC/C,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACjG,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa,EAAE,QAA2B,EAAE,oBAA6B;IACvG,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,IAAI,kBAAkB,GAAG,CAAC,CAAA;IAC1B,IAAI,yBAAyB,GAAG,oBAAoB,CAAA;IACpD,YAAY,EAAE,KAAK,MAAM,MAAM,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;QACrD,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,IAAI,kBAAkB,KAAK,4BAA4B,EAAE,CAAC;gBACxD,yBAAyB,GAAG,IAAI,CAAA;gBAChC,MAAM,YAAY,CAAA;YACpB,CAAC;YACD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC1B,kBAAkB,IAAI,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAClG,IAAI,yBAAyB;QAAE,SAAS,CAAC,GAAG,EAAE,CAAA;IAC9C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AAC7D,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAwB;IAClD,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7B,wFAAwF;IAC1F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,OAAO,KAAK,YAAY,mBAAmB,CAAA;AAC7C,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,KAAc;IAEd,OAAO,KAAK,YAAY,mBAAmB;WACtC,KAAK,YAAY,wBAAwB;WACzC,KAAK,YAAY,iBAAiB;WAClC,KAAK,YAAY,cAAc,CAAA;AACtC,CAAC;AAED,SAAS,cAAc,CAAC,MAA+B;IACrD,IAAI,MAAM,EAAE,OAAO;QAAE,MAAM,WAAW,CAAC,MAAM,CAAC,CAAA;AAChD,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,OAAO,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,mBAAmB,EAAE,CAAA;AACnF,CAAC"}

package/dist/commands/account-options.js

@@ -1,9 +1,10 @@
 import { getDataDir } from '../config/env.js';
-import { resolveAccountContext } from '../account/account-context.js';
+import { resolveAccountContext, resolveAuthenticatedAccountContext } from '../account/account-context.js';
 import { renderResult } from '../cli/output.js';
 import { outputFormatConflict } from './types.js';
-export async function runWithAccountContext(options, handler) {
-    const conflict = outputFormatConflict(options);
+export async function runWithAccountContext(options, handler, command) {
+    const effectiveOptions = command == null ? options : mergeOptionsWithGlobals(command, options);
+    const conflict = outputFormatConflict(effectiveOptions);
     if (conflict) {
         await renderResult(conflict, { yaml: true });
         return;
@@ -11,23 +12,52 @@ export async function runWithAccountContext(options, handler) {
     let context;
     try {
         context = resolveAccountContext({
-            explicitName: options.account,
+            explicitName: effectiveOptions.account,
             dataDir: getDataDir(),
         });
     }
     catch (error) {
-        await renderResult(accountFailureFromError(error), options);
+        await renderResult(accountFailureFromError(error), effectiveOptions);
         return;
     }
     const result = await handler(context);
     if (result !== undefined) {
-        await renderResult(result, options);
+        await renderResult(result, effectiveOptions);
     }
 }
+export async function runWithAuthenticatedAccountContext(options, handler, command) {
+    const effectiveOptions = command == null ? options : mergeOptionsWithGlobals(command, options);
+    const conflict = outputFormatConflict(effectiveOptions);
+    if (conflict) {
+        await renderResult(conflict, { yaml: true });
+        return;
+    }
+    let context;
+    try {
+        context = resolveAuthenticatedAccountContext({
+            explicitName: effectiveOptions.account,
+            dataDir: getDataDir(),
+        });
+    }
+    catch (error) {
+        await renderResult(accountFailureFromError(error), effectiveOptions);
+        return;
+    }
+    const result = await handler(context);
+    if (result !== undefined) {
+        await renderResult(result, effectiveOptions);
+    }
+}
+function mergeOptionsWithGlobals(command, options) {
+    return {
+        ...command.optsWithGlobals(),
+        ...options,
+    };
+}
 export function accountFailureFromError(error) {
     const message = error instanceof Error ? error.message : String(error);
     const [code, detail] = splitError(message);
-    if (code === 'account_required' || code === 'account_not_found' || code === 'account_session_missing') {
+    if (code === 'account_required' || code === 'account_not_found' || code === 'account_logged_out' || code === 'account_session_missing') {
         return {
             ok: false,
             error: {

package/dist/commands/account-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"account-options.js","sourceRoot":"","sources":["../../src/commands/account-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,oBAAoB,EAAwC,MAAM,YAAY,CAAA;AAMvF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAA8B,EAC9B,OAAkG;IAElG,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAC9C,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,YAAY,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5C,OAAM;IACR,CAAC;IAED,IAAI,OAAuB,CAAA;IAC3B,IAAI,CAAC;QACH,OAAO,GAAG,qBAAqB,CAAC;YAC9B,YAAY,EAAE,OAAO,CAAC,OAAO;YAC7B,OAAO,EAAE,UAAU,EAAE;SACtB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;QAC3D,OAAM;IACR,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IACrC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAE1C,IAAI,IAAI,KAAK,kBAAkB,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,KAAK,yBAAyB,EAAE,CAAC;QACtG,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,IAAI;gBACJ,OAAO,EAAE,MAAM;aAChB;SACF,CAAA;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,KAAK;QACT,KAAK,EAAE;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO;SACR;KACF,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,SAAS,GAAG,IAAI,CAAA;IACtB,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACxC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IACtB,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;AAC3E,CAAC"}
+{"version":3,"file":"account-options.js","sourceRoot":"","sources":["../../src/commands/account-options.ts"],"names":[],"mappings":"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"}