@fnndsc/brasa 0.9.2 → 0.10.1

package/dist/builtins/utils.js

@@ -5,12 +5,34 @@
 import * as path from 'path';
 import { context_getSingle } from '@fnndsc/salsa';
 import { session } from '../session/index.js';
+/**
+ * Bridges POSIX-parsed builtin arguments to chili's CLI option bag.
+ *
+ * ParsedArgs and CLIoptions carry incompatible index signatures, so the
+ * conversion is a real copy (positional `_` dropped), not a cast.
+ *
+ * @param parsed - Arguments from `commandArgs_process`.
+ * @returns The same flags as a chili CLIoptions object.
+ */
+export function cliOptions_from(parsed) {
+    const options = {};
+    for (const [key, value] of Object.entries(parsed)) {
+        if (key !== '_')
+            options[key] = value;
+    }
+    return options;
+}
 /**
  * Parses raw argument strings into a structured object.
  * Supports `--` as an end-of-options marker (everything after is treated as positional args).
+ *
+ * @param args - Tokenized command arguments.
+ * @param options - Command-specific long-option policy.
+ * @returns Parsed option values and positional operands.
  */
-export function commandArgs_process(args) {
+export function commandArgs_process(args, options = {}) {
     const result = { _: [] };
+    const booleanLongOptions = new Set(options.booleanLongOptions);
     let endOfOptions = false;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -25,8 +47,13 @@ export function commandArgs_process(args) {
             continue;
         }
         if (arg.startsWith('--')) {
-            const key = arg.substring(2);
-            if (args[i + 1] && !args[i + 1].startsWith('-')) {
+            const rawKey = arg.substring(2);
+            const separator = rawKey.indexOf('=');
+            const key = separator === -1 ? rawKey : rawKey.slice(0, separator);
+            if (separator !== -1) {
+                result[key] = rawKey.slice(separator + 1);
+            }
+            else if (!booleanLongOptions.has(key) && args[i + 1] && !args[i + 1].startsWith('-')) {
                 result[key] = args[i + 1];
                 i++;
             }

package/dist/builtins/utils.js.map

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

package/dist/builtins/wildcard.d.ts

@@ -1,4 +1,6 @@
+import type { ListingItem } from '@fnndsc/chili/models/listing.js';
 import { Result } from '@fnndsc/cumin';
+import { ShellWord } from '../lib/parser.js';
 /**
  * Checks if a string contains wildcard characters.
  *
@@ -6,6 +8,35 @@ import { Result } from '@fnndsc/cumin';
  * @returns True if the argument contains wildcards.
  */
 export declare function string_checkHasWildcard(arg: string): boolean;
+/** A VFS item selected by wildcard expansion. */
+export interface WildcardMatch {
+    path: string;
+    type: ListingItem['type'];
+}
+/**
+ * Expands one quote-aware shell word against the ChRIS filesystem.
+ *
+ * @param word - Parsed shell word.
+ * @returns Expanded words, or the original word when it has no match.
+ */
+export declare function shellWord_expand(word: ShellWord): Promise<Result<ShellWord[]>>;
+/**
+ * Expands selected quote-aware shell words in argument order.
+ *
+ * @param words - Parsed shell words.
+ * @param eligible - Predicate that preserves explicit cross-realm operands.
+ * @returns Expanded words, retaining literal words when no path matches.
+ */
+export declare function shellWords_expand(words: readonly ShellWord[], eligible: (word: ShellWord, index: number) => boolean): Promise<Result<ShellWord[]>>;
+/**
+ * Expands a wildcard pattern against the current directory with item type.
+ *
+ * @param pattern - The glob pattern (e.g., "*.ts", "test*.json").
+ * @returns A Promise resolving to Result<WildcardMatch[]>.
+ *          Ok([]) = no matches (not an error).
+ *          Err(...) = couldn't expand (API failure, permission denied, etc.).
+ */
+export declare function wildcard_expandMatches(pattern: string): Promise<Result<WildcardMatch[]>>;
 /**
  * Expands a wildcard pattern against the current directory.
  *

package/dist/builtins/wildcard.js

@@ -6,9 +6,13 @@
  * @module
  */
 import { minimatch } from 'minimatch';
+import { listingItemsFromVfs_make } from '../lib/vfs/listing.js';
 import { session } from '../session/index.js';
+import { path_resolveChrisFs } from '@fnndsc/chili/utils/cli.js';
 import { vfsDispatcher } from '@fnndsc/salsa';
 import { listCache_get, Ok, Err, errorStack } from '@fnndsc/cumin';
+import { shellWord_literal, shellWord_unquoted } from '../lib/parser.js';
+import { path_resolve } from './utils.js';
 /**
  * Checks if a string contains wildcard characters.
  *
@@ -19,54 +23,49 @@ export function string_checkHasWildcard(arg) {
     return /[*?[\]]/.test(arg);
 }
 /**
- * Expands a wildcard pattern against the current directory.
+ * Expands a rendered pattern and its quote-aware minimatch pattern.
  *
- * @param pattern - The glob pattern (e.g., "*.ts", "test*.json").
- * @returns A Promise resolving to Result<string[]>.
+ * @param value - Rendered shell-word value.
+ * @param globPattern - Quote-aware minimatch pattern.
+ * @returns A Promise resolving to Result<WildcardMatch[]>.
  *          Ok([]) = no matches (not an error).
  *          Err(...) = couldn't expand (API failure, permission denied, etc.).
  */
-export async function wildcard_expand(pattern) {
-    // If no wildcard, return as-is
-    if (!string_checkHasWildcard(pattern)) {
-        return Ok([pattern]);
-    }
+async function wildcardMatches_expand(value, globPattern) {
     try {
         // Get current directory
         const cwd = await session.getCWD();
+        const resolvedValue = await path_resolve(value);
+        const resolvedPattern = await path_resolve(globPattern);
         // Handle patterns with directory components (e.g., "data/*.txt")
         let searchDir = cwd;
-        let matchPattern = pattern;
-        // Check if pattern has directory separator
-        if (pattern.includes('/')) {
-            const parts = pattern.split('/');
-            const lastPart = parts.pop() || '*';
-            const dirPart = parts.join('/');
-            // Resolve directory part (could be relative)
-            if (dirPart.startsWith('/')) {
-                searchDir = dirPart;
-            }
-            else if (dirPart === '.') {
-                searchDir = cwd;
-            }
-            else {
-                // Relative path - append to cwd
-                searchDir = `${cwd}/${dirPart}`.replace(/\/+/g, '/');
-            }
+        let physicalSearchDir = cwd;
+        let matchPattern = resolvedPattern;
+        // Resolve the non-wildcard parent directory before listing. This gives
+        // `~/...` its normal meaning and follows a CFS `.chrislink` parent while
+        // retaining the caller's logical spelling in the expanded result.
+        if (resolvedValue.includes('/')) {
+            const valueParts = resolvedValue.split('/');
+            const patternParts = resolvedPattern.split('/');
+            const lastPart = patternParts.pop() || '*';
+            valueParts.pop();
+            const dirPart = valueParts.join('/');
+            searchDir = dirPart || '/';
+            physicalSearchDir = await path_resolveChrisFs(searchDir, {});
             matchPattern = lastPart;
         }
         // List files in the directory (check cache first)
         let items = [];
         const listCache = listCache_get();
-        const cached = listCache.cache_get(searchDir);
+        const cached = listCache.cache_get(physicalSearchDir);
         if (cached) {
             items = cached.data;
         }
         else {
-            const vfsResult = await vfsDispatcher.list(searchDir);
+            const vfsResult = await vfsDispatcher.list(physicalSearchDir);
             if (vfsResult.ok) {
-                items = vfsResult.value;
-                listCache.cache_set(searchDir, items);
+                items = listingItemsFromVfs_make(vfsResult.value);
+                listCache.cache_set(physicalSearchDir, items);
             }
             else {
                 return Err();
@@ -76,21 +75,96 @@ export async function wildcard_expand(pattern) {
         const matches = items
             .filter((item) => minimatch(item.name, matchPattern))
             .map((item) => {
-            // Return full path if we searched a different directory
-            if (searchDir !== cwd) {
-                return `${searchDir}/${item.name}`.replace(/\/+/g, '/');
-            }
-            return item.name;
+            // Return a full path if we searched a different directory.
+            const itemPath = searchDir !== cwd
+                ? `${searchDir}/${item.name}`.replace(/\/+/g, '/')
+                : item.name;
+            return {
+                path: itemPath,
+                type: item.type,
+            };
         });
         // Ok([]) for no matches (not an error)
         return Ok(matches);
     }
     catch (error) {
         const errorMsg = error instanceof Error ? error.message : String(error);
-        errorStack.stack_push("error", `Failed to expand wildcard '${pattern}': ${errorMsg}`);
+        errorStack.stack_push("error", `Failed to expand wildcard '${value}': ${errorMsg}`);
         return Err();
     }
 }
+/**
+ * Expands one quote-aware shell word against the ChRIS filesystem.
+ *
+ * @param word - Parsed shell word.
+ * @returns Expanded words, or the original word when it has no match.
+ */
+export async function shellWord_expand(word) {
+    if (!word.pathnameExpansion)
+        return Ok([word]);
+    const result = await wildcardMatches_expand(word.value, word.globPattern);
+    if (!result.ok)
+        return result;
+    if (result.value.length === 0)
+        return Ok([word]);
+    return Ok(result.value.map((match) => ({
+        ...shellWord_literal(match.path),
+        pathnameExpanded: true,
+    })));
+}
+/**
+ * Expands selected quote-aware shell words in argument order.
+ *
+ * @param words - Parsed shell words.
+ * @param eligible - Predicate that preserves explicit cross-realm operands.
+ * @returns Expanded words, retaining literal words when no path matches.
+ */
+export async function shellWords_expand(words, eligible) {
+    const expanded = [];
+    for (const [index, word] of words.entries()) {
+        if (!eligible(word, index)) {
+            expanded.push(word);
+            continue;
+        }
+        const result = await shellWord_expand(word);
+        if (!result.ok)
+            return result;
+        expanded.push(...result.value);
+    }
+    return Ok(expanded);
+}
+/**
+ * Expands a wildcard pattern against the current directory with item type.
+ *
+ * @param pattern - The glob pattern (e.g., "*.ts", "test*.json").
+ * @returns A Promise resolving to Result<WildcardMatch[]>.
+ *          Ok([]) = no matches (not an error).
+ *          Err(...) = couldn't expand (API failure, permission denied, etc.).
+ */
+export async function wildcard_expandMatches(pattern) {
+    if (!string_checkHasWildcard(pattern))
+        return Ok([{ path: pattern, type: 'file' }]);
+    return wildcardMatches_expand(pattern, pattern);
+}
+/**
+ * Expands a wildcard pattern against the current directory.
+ *
+ * @param pattern - The glob pattern (e.g., "*.ts", "test*.json").
+ * @returns A Promise resolving to Result<string[]>.
+ *          Ok([]) = no matches (not an error).
+ *          Err(...) = couldn't expand (API failure, permission denied, etc.).
+ */
+export async function wildcard_expand(pattern) {
+    if (!string_checkHasWildcard(pattern))
+        return Ok([pattern]);
+    const word = shellWord_unquoted(pattern);
+    const result = await shellWord_expand(word);
+    if (!result.ok)
+        return result;
+    if (result.value.length === 1 && result.value[0] === word)
+        return Ok([]);
+    return Ok(result.value.map((match) => match.value));
+}
 /**
  * Expands all wildcards in an argument list.
  *
@@ -100,21 +174,10 @@ export async function wildcard_expand(pattern) {
  *          Empty matches return the original pattern.
  */
 export async function wildcards_expandAll(args) {
-    const expanded = [];
-    for (const arg of args) {
-        const result = await wildcard_expand(arg);
-        if (!result.ok) {
-            // Propagate error up
-            return result;
-        }
-        // If no matches, use original pattern (let command handle "not found")
-        if (result.value.length === 0) {
-            expanded.push(arg);
-        }
-        else {
-            expanded.push(...result.value);
-        }
-    }
-    return Ok(expanded);
+    const words = args.map((arg) => shellWord_unquoted(arg));
+    const result = await shellWords_expand(words, () => true);
+    if (!result.ok)
+        return result;
+    return Ok(result.value.map((word) => word.value));
 }
 //# sourceMappingURL=wildcard.js.map

package/dist/builtins/wildcard.js.map

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

package/dist/command-keys.js

@@ -12,7 +12,7 @@ export const COMMAND_HANDLERS_KEYS = [
     // net
     'connect', 'logout', 'pacs', 'query', 'cubepath',
     // sys
-    'context', 'physicalmode', 'prompt', 'timing', 'whoami', 'whereami', 'debug', 'help', 'proc',
+    'context', 'physicalmode', 'prompt', 'timing', 'id', 'whoami', 'whereami', 'debug', 'help', 'proc',
     // resources — canonical + aliases
     'plugin', 'plugins',
     'feed', 'feeds',
@@ -22,6 +22,7 @@ export const COMMAND_HANDLERS_KEYS = [
     'store',
     'tag', 'tags',
     'group', 'groups',
+    'user', 'users',
     'pluginmeta', 'pluginmetas', 'meta', 'metas',
     'plugininstance', 'plugininstances', 'instance', 'instances', 'job', 'jobs',
     'workflow', 'workflows',

package/dist/command-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-keys.js","sourceRoot":"","sources":["../src/command-keys.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAa;IAC7C,aAAa;IACb,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI;IAC1E,QAAQ,EAAE,UAAU,EAAE,MAAM;IAC5B,MAAM;IACN,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAChD,MAAM;IACN,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAC5F,kCAAkC;IAClC,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,UAAU;IACrB,OAAO,EAAE,OAAO,EAAE,MAAM;IACxB,OAAO;IACP,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,QAAQ;IACjB,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO;IAC5C,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM;IAC3E,UAAU,EAAE,WAAW;IACvB,oBAAoB;IACpB,kBAAkB;IAClB,aAAa,EAAE,aAAa,EAAE,cAAc;CAC7C,CAAC"}
+{"version":3,"file":"command-keys.js","sourceRoot":"","sources":["../src/command-keys.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAa;IAC7C,aAAa;IACb,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI;IAC1E,QAAQ,EAAE,UAAU,EAAE,MAAM;IAC5B,MAAM;IACN,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU;IAChD,MAAM;IACN,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;IAClG,kCAAkC;IAClC,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,UAAU;IACrB,OAAO,EAAE,OAAO,EAAE,MAAM;IACxB,OAAO;IACP,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,QAAQ;IACjB,MAAM,EAAE,OAAO;IACf,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO;IAC5C,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM;IAC3E,UAAU,EAAE,WAAW;IACvB,oBAAoB;IACpB,kBAAkB;IAClB,aAAa,EAAE,aAAa,EAAE,cAAc;CAC7C,CAAC"}

package/dist/core/cancellation.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Runs work inside the foreground-command cancellation scope.
+ *
+ * Nested line execution retains its parent's scope, so a semicolon batch has
+ * one cancellation lifetime rather than one controller per segment.
+ *
+ * @param operation - Work performed by one command line.
+ * @returns The operation result.
+ */
+export declare function commandCancellation_run<T>(operation: () => Promise<T>): Promise<T>;
+/**
+ * Marks the current command as able to honor a foreground cancellation.
+ *
+ * @returns Nothing. Calls outside a command scope have no effect.
+ */
+export declare function commandCancellation_enable(): void;
+/**
+ * Gets the abort signal for the command currently running on this async path.
+ *
+ * @returns The command signal, or undefined outside foreground execution.
+ */
+export declare function commandCancellation_signalGet(): AbortSignal | undefined;
+/**
+ * Requests cancellation of the currently running cancellable command.
+ *
+ * @returns True when a cancellable foreground command was signalled.
+ */
+export declare function commandCancellation_request(): boolean;

package/dist/core/cancellation.js

@@ -0,0 +1,70 @@
+/**
+ * @file Foreground-command cancellation scope.
+ *
+ * One interactive engine owns one foreground command at a time. This module
+ * carries that command's abort signal through asynchronous dispatch without
+ * turning cancellation into ambient process state for unrelated work.
+ *
+ * @module
+ */
+import { AsyncLocalStorage } from 'node:async_hooks';
+const cancellationScope = new AsyncLocalStorage();
+let foreground;
+/**
+ * Runs work inside the foreground-command cancellation scope.
+ *
+ * Nested line execution retains its parent's scope, so a semicolon batch has
+ * one cancellation lifetime rather than one controller per segment.
+ *
+ * @param operation - Work performed by one command line.
+ * @returns The operation result.
+ */
+export async function commandCancellation_run(operation) {
+    if (cancellationScope.getStore() !== undefined) {
+        return await operation();
+    }
+    const state = {
+        controller: new AbortController(),
+        cancellable: false,
+    };
+    const previous = foreground;
+    foreground = state;
+    try {
+        return await cancellationScope.run(state, operation);
+    }
+    finally {
+        if (foreground === state)
+            foreground = previous;
+    }
+}
+/**
+ * Marks the current command as able to honor a foreground cancellation.
+ *
+ * @returns Nothing. Calls outside a command scope have no effect.
+ */
+export function commandCancellation_enable() {
+    const state = cancellationScope.getStore();
+    if (state !== undefined)
+        state.cancellable = true;
+}
+/**
+ * Gets the abort signal for the command currently running on this async path.
+ *
+ * @returns The command signal, or undefined outside foreground execution.
+ */
+export function commandCancellation_signalGet() {
+    return cancellationScope.getStore()?.controller.signal;
+}
+/**
+ * Requests cancellation of the currently running cancellable command.
+ *
+ * @returns True when a cancellable foreground command was signalled.
+ */
+export function commandCancellation_request() {
+    if (foreground === undefined || !foreground.cancellable || foreground.controller.signal.aborted) {
+        return false;
+    }
+    foreground.controller.abort();
+    return true;
+}
+//# sourceMappingURL=cancellation.js.map

package/dist/core/cancellation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../../src/core/cancellation.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,MAAM,iBAAiB,GACrB,IAAI,iBAAiB,EAA4B,CAAC;AACpD,IAAI,UAAgD,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAI,SAA2B;IAC1E,IAAI,iBAAiB,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,MAAM,SAAS,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,GAA6B;QACtC,UAAU,EAAE,IAAI,eAAe,EAAE;QACjC,WAAW,EAAE,KAAK;KACnB,CAAC;IACF,MAAM,QAAQ,GAAyC,UAAU,CAAC;IAClE,UAAU,GAAG,KAAK,CAAC;IACnB,IAAI,CAAC;QACH,OAAO,MAAM,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;YAAS,CAAC;QACT,IAAI,UAAU,KAAK,KAAK;YAAE,UAAU,GAAG,QAAQ,CAAC;IAClD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,0BAA0B;IACxC,MAAM,KAAK,GAAyC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IACjF,IAAI,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;AACpD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,6BAA6B;IAC3C,OAAO,iBAAiB,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,MAAM,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B;IACzC,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAChG,OAAO,KAAK,CAAC;IACf,CAAC;IACD,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC9B,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/core/dispatch.d.ts

@@ -2,14 +2,7 @@ import type { CommandEnvelope } from '@fnndsc/cumin';
 import { type RedirectInfo } from './preprocess.js';
 import { chiliCommand_run } from './chiliDelegate.js';
 export { chiliCommand_run };
-/**
- * Executes a shell command on the host system (shell escape with ! prefix).
- *
- * @param shellCommand - The command to execute on the host shell.
- * @returns A Promise resolving to the command's exit code (1 on spawn failure).
- */
-export declare function shellCommand_execute(shellCommand: string): Promise<number>;
-type CommandHandler = (args: string[]) => Promise<void>;
+type CommandHandler = (args: string[]) => Promise<void | CommandEnvelope>;
 /**
  * Shape of a converted builtin: returns its outcome as an envelope instead
  * of printing. The engine layer will consume these directly; the dispatch