agentera 3.0.0-dev.6 → 3.0.0-dev.69

package/dist/cli/dispatch/lifecycle.js

@@ -1,25 +1,37 @@
-import fsForHooks from "node:fs";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { cmdAppHome } from "../commands/appHome.js";
 import { cmdDoctor } from "../commands/doctor.js";
 import { cmdUpgrade } from "../commands/upgrade.js";
 import { cmdVerify } from "../commands/verify.js";
 import { cmdGate } from "../commands/compact.js";
 import { cmdReport } from "../commands/report.js";
-import { runSessionStart } from "../../hooks/sessionStart.js";
-import { runSessionStop } from "../../hooks/sessionStop.js";
-import { runCursorSessionStart } from "../../hooks/cursorSessionStart.js";
-import { runCursorPreToolUse } from "../../hooks/cursorPreToolUse.js";
-import { HookCliAdapter } from "../../hooks/validateArtifact/index.js";
+import { runGlossaryAdviceCommand } from "../commands/glossaryAdvice.js";
+import { runPersonalGlossaryCommand } from "../commands/personalGlossary.js";
+import { runProfileGroundingCommand } from "../commands/profileGrounding.js";
+import { preCutoverCommand } from "../preCutoverCommand.js";
 import { usageMain } from "../../analytics/usageStats.js";
 import { validatePathValue } from "../argvalidate.js";
-import { printDoctorHelp, printUpgradeHelp, wantsHelp } from "../help.js";
+import { printAppHomeHelp, printDoctorHelp, printUpgradeHelp, wantsHelp } from "../help.js";
+import { makeArgvValueReader } from "./argvParser.js";
 import { parseCompactArgs } from "./check.js";
-import { asEnvelopeFormat, classifyParseError, emitDeprecationAlias } from "./shared.js";
+import { asEnvelopeFormat, classifyParseError, detectTopLevelFormat, emitDeprecationAlias } from "./shared.js";
 import { emitInvalidInput } from "../errors.js";
+import { migrationProject } from "../migrationRequired.js";
+import { fullEntityUpgradeCommand } from "../../upgrade/upgradeCommands.js";
+import { nativeResourceCleanupIds, resolveNativeResourceCleanupId } from "../../runtime/nativeResourceCleanup.js";
+function rejectUnsupportedUpgradeFlag(io, format, message, recovery) {
+    return emitInvalidInput(io, {
+        format: asEnvelopeFormat(format),
+        body: { class: "unsupported_target", message, recovery },
+    });
+}
 export function runGate(argv, io, prog) {
     const parsed = parseCompactArgs(argv);
     if ("error" in parsed) {
         return emitInvalidInput(io, {
-            format: "text",
+            format: detectTopLevelFormat(argv),
             body: classifyParseError(parsed.error),
         });
     }
@@ -33,6 +45,58 @@ export function runGate(argv, io, prog) {
         });
     }
 }
+export function runAppHome(argv, io, prog) {
+    const out = io.out ?? ((t) => process.stdout.write(t));
+    if (wantsHelp(argv)) {
+        out(printAppHomeHelp() + "\n");
+        return 0;
+    }
+    const args = {
+        installRoot: null,
+        home: null,
+        format: "text",
+    };
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
+        const a = argv[i];
+        let v;
+        if ((v = value("--install-root")) !== null)
+            args.installRoot = v;
+        else if ((v = value("--home")) !== null)
+            args.home = v;
+        else if ((v = value("--format")) !== null) {
+            if (v !== "text" && v !== "json") {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: {
+                        class: "invalid_choice",
+                        message: `argument --format: invalid choice: '${v}' (choose from 'text', 'json')`,
+                        valid_values: ["text", "json"],
+                    },
+                });
+            }
+            args.format = v;
+        }
+        else {
+            return emitInvalidInput(io, {
+                format: asEnvelopeFormat(args.format),
+                body: { class: "unrecognized_argument", message: `unrecognized arguments: ${a}` },
+            });
+        }
+    }
+    try {
+        return cmdAppHome(args, io);
+    }
+    catch (exc) {
+        return emitInvalidInput(io, {
+            format: asEnvelopeFormat(args.format),
+            body: { class: "unsupported_target", message: exc.message },
+        });
+    }
+}
 export function runDoctor(argv, io, prog) {
     const err = io.err ?? ((t) => process.stderr.write(t));
     const out = io.out ?? ((t) => process.stdout.write(t));
@@ -46,20 +110,18 @@ export function runDoctor(argv, io, prog) {
         project: null,
         expectedVersion: null,
         expectCommand: [],
+        retiredResource: null,
         smoke: false,
         allowLiveModel: false,
         format: "text",
     };
     let jsonFlag = false;
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
-        const value = (name) => {
-            if (a === name)
-                return argv[++i];
-            if (a.startsWith(name + "="))
-                return a.slice(name.length + 1);
-            return null;
-        };
         let v;
         if ((v = value("--install-root")) !== null)
             args.installRoot = v;
@@ -71,6 +133,8 @@ export function runDoctor(argv, io, prog) {
             args.expectedVersion = v;
         else if ((v = value("--expect-command")) !== null)
             args.expectCommand.push(v);
+        else if ((v = value("--retired-resource")) !== null)
+            args.retiredResource = v;
         else if ((v = value("--format")) !== null) {
             if (v !== "text" && v !== "json") {
                 return emitInvalidInput(io, {
@@ -111,65 +175,18 @@ export function runDoctor(argv, io, prog) {
         });
     }
 }
-export function readStdin() {
-    try {
-        return fsForHooks.readFileSync(0, "utf8");
-    }
-    catch {
-        return "";
-    }
-}
-export function runHook(name, argv, io) {
-    const err = io.err ?? ((t) => process.stderr.write(t));
-    const raw = io.stdin ? io.stdin() : readStdin();
-    // Each hook owns its own stdout newline convention; do not wrap stdout here.
-    switch (name) {
-        case "session-start":
-            return runSessionStart(raw);
-        case "session-stop":
-            return runSessionStop(raw);
-        case "cursor-session-start":
-            return runCursorSessionStart(raw);
-        case "cursor-pre-tool-use":
-            return runCursorPreToolUse(raw);
-        case "validate-artifact": {
-            const [rc, violations] = new HookCliAdapter().run(raw, null);
-            for (const v of violations)
-                err(`${v}\n`);
-            return rc;
-        }
-        default:
-            return emitInvalidInput(io, {
-                format: "text",
-                body: {
-                    class: "unsupported_target",
-                    message: `unknown hook '${name}'`,
-                    valid_values: [
-                        "session-start",
-                        "session-stop",
-                        "cursor-session-start",
-                        "cursor-pre-tool-use",
-                        "validate-artifact",
-                    ],
-                },
-            });
-    }
-}
 export function runUsage(argv, io, prog) {
     const realOut = io.out ?? ((t) => process.stdout.write(t));
     const realErr = io.err ?? ((t) => process.stderr.write(t));
     let format = "text";
     let corpus = null;
     let project = null;
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
-        const value = (name) => {
-            if (a === name)
-                return argv[++i] ?? null;
-            if (a.startsWith(name + "="))
-                return a.slice(name.length + 1);
-            return null;
-        };
         let v;
         if ((v = value("--format")) !== null)
             format = v;
@@ -239,18 +256,18 @@ export function runUpgrade(argv, io, prog) {
         dryRun: false,
         only: [],
         force: false,
+        verify: false,
+        runtime: null,
+        legacyCleanup: null,
         format: "text",
     };
     let jsonFlag = false;
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
-        const value = (name) => {
-            if (a === name)
-                return argv[++i] ?? null;
-            if (a.startsWith(name + "="))
-                return a.slice(name.length + 1);
-            return null;
-        };
         let v;
         if ((v = value("--install-root")) !== null)
             args.installRoot = v;
@@ -263,17 +280,34 @@ export function runUpgrade(argv, io, prog) {
         else if ((v = value("--channel")) !== null)
             args.channel = v;
         else if ((v = value("--target-major")) !== null) {
-            void v;
+            return rejectUnsupportedUpgradeFlag(io, args.format ?? "text", "--target-major was removed; use --channel with dry-run preview then --yes", fullEntityUpgradeCommand(migrationProject(argv)));
+        }
+        else if ((v = value("--runtime")) !== null) {
             return emitInvalidInput(io, {
-                format: asEnvelopeFormat(args.format),
+                format: detectTopLevelFormat(argv),
                 body: {
-                    class: "unsupported_target",
-                    message: "--target-major was removed; use --channel with dry-run preview then --yes",
+                    class: "invalid_choice",
+                    message: `argument --runtime ${v} is retired; Agentera now uses the shared skill at ` +
+                        "~/.agents/skills/agentera plus the CLI. Remove --runtime and rerun the app/project upgrade. " +
+                        "For explicit Agentera-owned native resource cleanup, use --legacy-cleanup RESOURCE_ID.",
                 },
             });
         }
-        else if ((v = value("--runtime")) !== null)
-            void v; // accepted; orchestrator uses fixture runtimes
+        else if ((v = value("--legacy-cleanup")) !== null) {
+            const validValues = nativeResourceCleanupIds();
+            const selectedResource = resolveNativeResourceCleanupId(v);
+            if (!selectedResource) {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: {
+                        class: "invalid_choice",
+                        message: `argument --legacy-cleanup: invalid choice: '${v}' (choose from ${validValues.map((id) => `'${id}'`).join(", ")})`,
+                        valid_values: validValues,
+                    },
+                });
+            }
+            args.legacyCleanup = selectedResource.id;
+        }
         else if ((v = value("--only")) !== null) {
             if (v !== "artifacts" && v !== "runtime" && v !== "cleanup") {
                 return emitInvalidInput(io, {
@@ -287,16 +321,23 @@ export function runUpgrade(argv, io, prog) {
             }
             args.only.push(v);
         }
-        else if ((v = value("--opencode-config-dir")) !== null)
-            void v; // accepted; ignored
+        else if ((v = value("--opencode-config-dir")) !== null) {
+            return rejectUnsupportedUpgradeFlag(io, args.format ?? "text", "--opencode-config-dir is not yet supported by the TypeScript upgrade command");
+        }
         else if (a === "--yes")
             args.yes = true;
         else if (a === "--dry-run")
             args.dryRun = true;
         else if (a === "--force")
             args.force = true;
-        else if (a === "--update-packages")
-            void 0; // deferred for 3.x channel model
+        else if (a === "--verify")
+            args.verify = true;
+        else if (a === "--update-packages") {
+            return rejectUnsupportedUpgradeFlag(io, args.format ?? "text", "--update-packages is retired; Agentera does not manage host package installation or updates");
+        }
+        else if (["--restore", "--rollback", "--downgrade"].includes(a)) {
+            return rejectUnsupportedUpgradeFlag(io, args.format ?? "text", `${a} was removed; v2-to-v3 upgrade is one-way and apply must run as one full upgrade --yes`, fullEntityUpgradeCommand(migrationProject(argv)));
+        }
         else if (a === "--json")
             jsonFlag = true;
         else if ((v = value("--format")) !== null) {
@@ -345,15 +386,12 @@ export function runVerify(argv, io, prog) {
         fixtures: [],
     };
     const positionals = [];
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
-        const value = (name) => {
-            if (a === name)
-                return argv[++i] ?? null;
-            if (a.startsWith(name + "="))
-                return a.slice(name.length + 1);
-            return null;
-        };
         let v;
         if ((v = value("--format")) !== null) {
             if (v !== "text" && v !== "json") {
@@ -382,7 +420,7 @@ export function runVerify(argv, io, prog) {
             args.dryRun = true;
         else if (a.startsWith("--")) {
             return emitInvalidInput(io, {
-                format: asEnvelopeFormat(args.format),
+                format: detectTopLevelFormat(argv),
                 body: { class: "unrecognized_argument", message: `unrecognized arguments: ${a}` },
             });
         }
@@ -404,29 +442,79 @@ export function runVerify(argv, io, prog) {
     }
 }
 export function runReport(argv, io, prog) {
+    if (argv[0] === "glossary-advice") {
+        if (prog !== "agentera report") {
+            return emitInvalidInput(io, {
+                format: "json",
+                body: {
+                    class: "unsupported_target",
+                    message: "glossary-advice has no stats alias",
+                    valid_values: ["report glossary-advice"],
+                    recovery: `Run ${preCutoverCommand("report glossary-advice --input - --format json")}; no state was changed.`,
+                },
+            });
+        }
+        return runGlossaryAdviceCommand(argv.slice(1), io);
+    }
+    if (argv[0] === "profile-grounding") {
+        if (prog !== "agentera report") {
+            return emitInvalidInput(io, {
+                format: "json",
+                body: {
+                    class: "unsupported_target",
+                    message: "profile-grounding has no stats alias",
+                    valid_values: ["report profile-grounding"],
+                    recovery: `Run ${preCutoverCommand("report profile-grounding --format json")}; no profile bytes were changed.`,
+                },
+            });
+        }
+        return runProfileGroundingCommand(argv.slice(1), io);
+    }
+    if (argv[0] === "profile-glossary") {
+        if (prog !== "agentera report") {
+            return emitInvalidInput(io, {
+                format: "json",
+                body: {
+                    class: "unsupported_target",
+                    message: "profile-glossary has no stats alias",
+                    valid_values: ["report profile-glossary"],
+                    recovery: `Run ${preCutoverCommand("report profile-glossary --input PATH --format json")} with the same input; no profile bytes were changed.`,
+                },
+            });
+        }
+        return runPersonalGlossaryCommand(argv.slice(1), io);
+    }
     const args = {
         action: null,
         format: "text",
         project: null,
+        sources: "active",
         dryRun: false,
         consent: null,
         projectRoot: [],
+        importSources: [],
     };
     const positionals = [];
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
-        const value = (name) => {
-            if (a === name)
-                return argv[++i] ?? null;
-            if (a.startsWith(name + "="))
-                return a.slice(name.length + 1);
-            return null;
-        };
         let v;
         if ((v = value("--format")) !== null)
             args.format = v;
         else if ((v = value("--project")) !== null)
             args.project = v;
+        else if ((v = value("--sources")) !== null) {
+            if (v !== "active" && v !== "all") {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: { class: "invalid_choice", message: `argument --sources: invalid choice: '${v}' (choose from 'active', 'all')`, valid_values: ["active", "all"] },
+                });
+            }
+            args.sources = v;
+        }
         else if ((v = value("--consent")) !== null) {
             if (v !== "local-history") {
                 return emitInvalidInput(io, {
@@ -448,6 +536,20 @@ export function runReport(argv, io, prog) {
             args.codexSessionsDir = v;
         else if ((v = value("--claude-projects-dir")) !== null)
             args.claudeProjectsDir = v;
+        else if ((v = value("--import-source")) !== null) {
+            if (v !== "claude") {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: {
+                        class: "invalid_choice",
+                        message: `argument --import-source: invalid choice: '${v}' (choose from 'claude')`,
+                        valid_values: ["claude"],
+                    },
+                });
+            }
+            if (!args.importSources.includes(v))
+                args.importSources.push(v);
+        }
         else if ((v = value("--opencode-conversations-dir")) !== null)
             args.opencodeConversationsDir = v;
         else if ((v = value("--copilot-conversations-dir")) !== null)
@@ -458,19 +560,21 @@ export function runReport(argv, io, prog) {
             args.cursorChatsDir = v;
         else if (a === "--no-codex")
             args.noCodex = true;
-        else if (a === "--no-claude")
-            args.noClaude = true;
         else if (a === "--no-opencode")
             args.noOpencode = true;
         else if (a === "--no-copilot")
             args.noCopilot = true;
         else if (a === "--no-cursor")
             args.noCursor = true;
+        else if (a === "--accept-coverage-gap")
+            args.acceptCoverageGap = true;
+        else if (a === "--coverage-audit-only")
+            args.coverageAuditOnly = true;
         else if (a === "--dry-run")
             args.dryRun = true;
         else if (a.startsWith("--")) {
             return emitInvalidInput(io, {
-                format: asEnvelopeFormat(args.format),
+                format: detectTopLevelFormat(argv),
                 body: { class: "unrecognized_argument", message: `unrecognized arguments: ${a}` },
             });
         }
@@ -489,4 +593,60 @@ export function runReport(argv, io, prog) {
         });
     }
 }
-//# sourceMappingURL=lifecycle.js.map
+function resolveCliVersion() {
+    const moduleDir = path.dirname(fileURLToPath(import.meta.url));
+    const candidates = [
+        path.resolve(moduleDir, "..", "..", "package.json"),
+        path.resolve(moduleDir, "..", "..", "..", "package.json"),
+    ];
+    for (const pkgPath of candidates) {
+        try {
+            const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+            if (typeof pkg.version === "string" && pkg.version) {
+                return pkg.version;
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return "unknown";
+}
+export function runVersion(argv, io) {
+    const out = io.out ?? ((t) => process.stdout.write(t));
+    const err = io.err ?? ((t) => process.stderr.write(t));
+    let format = "text";
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i];
+        if (a === "--format") {
+            const v = argv[++i];
+            if (v !== "text" && v !== "json") {
+                return emitInvalidInput(io, {
+                    format: "text",
+                    body: {
+                        class: "invalid_choice",
+                        message: `argument --format: invalid choice: '${v}' (choose from 'text', 'json')`,
+                        valid_values: ["text", "json"],
+                    },
+                });
+            }
+            format = v;
+        }
+        else if (a === "--help" || a === "-h") {
+            out("usage: agentera --version [--format {text,json}]\n\nPrint the installed Agentera CLI version.\n");
+            return 0;
+        }
+        else {
+            err(`agentera --version: unrecognized argument: ${a}\n`);
+            return 2;
+        }
+    }
+    const version = resolveCliVersion();
+    if (format === "json") {
+        out(JSON.stringify({ version }) + "\n");
+    }
+    else {
+        out(version + "\n");
+    }
+    return 0;
+}

package/dist/cli/dispatch/prime.js

@@ -1,16 +1,31 @@
 import { cmdPrime } from "../commands/prime.js";
 import { cmdCapability } from "../commands/capability.js";
+import { makeArgvValueReader } from "./argvParser.js";
 import { asEnvelopeFormat } from "./shared.js";
 import { emitInvalidInput } from "../errors.js";
+import { StateRetrievalFailure } from "../../state/directRetrieval.js";
+import { emitStructured } from "../structured.js";
+function emitStateFailure(error, format, io) {
+    const output = io.out ?? ((text) => process.stdout.write(text));
+    const diagnostic = io.err ?? ((text) => process.stderr.write(text));
+    if (format === "json" || format === "yaml")
+        emitStructured(error.body, format, output);
+    else
+        diagnostic(`Error: ${error.body.error.message}\nRecovery: ${error.body.error.recovery}\n`);
+    return error.exitCode;
+}
 export function runCapability(command, argv, io, prog) {
     let format = "text";
-    for (let i = 0; i < argv.length; i++) {
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
         let v = null;
-        if (a === "--format")
-            v = argv[++i];
-        else if (a.startsWith("--format="))
-            v = a.slice("--format=".length);
+        if ((v = value("--format")) !== null) {
+            // format handled below
+        }
         else if (a === "--fields" || a.startsWith("--fields=")) {
             // accepted by the parser but unused by capability routing
             if (a === "--fields")
@@ -23,22 +38,26 @@ export function runCapability(command, argv, io, prog) {
                 body: { class: "unrecognized_argument", message: `unrecognized arguments: ${a}` },
             });
         }
-        if (v !== "text" && v !== "json" && v !== "yaml") {
-            return emitInvalidInput(io, {
-                format: asEnvelopeFormat(format),
-                body: {
-                    class: "invalid_choice",
-                    message: `argument --format: invalid choice: '${v}' (choose from 'text', 'json', 'yaml')`,
-                    valid_values: ["text", "json", "yaml"],
-                },
-            });
+        if (v !== null) {
+            if (v !== "text" && v !== "json" && v !== "yaml") {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(format),
+                    body: {
+                        class: "invalid_choice",
+                        message: `argument --format: invalid choice: '${v}' (choose from 'text', 'json', 'yaml')`,
+                        valid_values: ["text", "json", "yaml"],
+                    },
+                });
+            }
+            format = v;
         }
-        format = v;
     }
     try {
         return cmdCapability(command, { format }, io);
     }
     catch (exc) {
+        if (exc instanceof StateRetrievalFailure)
+            return emitStateFailure(exc, format, io);
         return emitInvalidInput(io, {
             format: asEnvelopeFormat(format),
             body: { class: "unsupported_target", message: exc.message },
@@ -46,8 +65,12 @@ export function runCapability(command, argv, io, prog) {
     }
 }
 export function runPrime(command, argv, io, prog) {
-    const args = { command, guidance: false, context: null, dashboard: false, orientation: false, format: "text" };
-    for (let i = 0; i < argv.length; i++) {
+    const args = { command, guidance: false, context: null, dashboard: false, orientation: false, format: "text", input: null };
+    let i = 0;
+    const value = makeArgvValueReader(argv, () => i, (n) => {
+        i = n;
+    });
+    for (; i < argv.length; i++) {
         const a = argv[i];
         let v = null;
         if (a === "--guidance")
@@ -56,12 +79,30 @@ export function runPrime(command, argv, io, prog) {
             args.dashboard = true;
         else if (a === "--orientation")
             args.orientation = true;
-        else if (a === "--context")
-            args.context = argv[++i];
-        else if (a.startsWith("--context="))
-            args.context = a.slice("--context=".length);
-        else if (a === "--format" || a.startsWith("--format=")) {
-            v = a === "--format" ? argv[++i] : a.slice("--format=".length);
+        else if ((v = value("--context")) !== null)
+            args.context = v;
+        else if (a === "--input" && (!argv[i + 1] || argv[i + 1].startsWith("--"))) {
+            return emitInvalidInput(io, {
+                format: asEnvelopeFormat(args.format),
+                body: { class: "missing_argument", message: "--input requires a file path or -", syntax: "--input <file|->" },
+            });
+        }
+        else if ((v = value("--input")) !== null) {
+            if (v.length === 0) {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: { class: "missing_argument", message: "--input requires a file path or -", syntax: "--input <file|->" },
+                });
+            }
+            if (args.input !== null) {
+                return emitInvalidInput(io, {
+                    format: asEnvelopeFormat(args.format),
+                    body: { class: "mutually_exclusive", message: "--input may only be supplied once" },
+                });
+            }
+            args.input = v;
+        }
+        else if ((v = value("--format")) !== null) {
             if (v !== "text" && v !== "json" && v !== "yaml") {
                 return emitInvalidInput(io, {
                     format: asEnvelopeFormat(args.format),
@@ -74,11 +115,8 @@ export function runPrime(command, argv, io, prog) {
             }
             args.format = v;
         }
-        else if (a === "--fields") {
-            args.fields = argv[++i];
-        }
-        else if (a.startsWith("--fields=")) {
-            args.fields = a.slice("--fields=".length);
+        else if ((v = value("--fields")) !== null) {
+            args.fields = v;
         }
         else {
             return emitInvalidInput(io, {
@@ -91,10 +129,11 @@ export function runPrime(command, argv, io, prog) {
         return cmdPrime(args, io);
     }
     catch (exc) {
+        if (exc instanceof StateRetrievalFailure)
+            return emitStateFailure(exc, args.format, io);
         return emitInvalidInput(io, {
             format: asEnvelopeFormat(args.format),
             body: { class: "unsupported_target", message: exc.message },
         });
     }
 }
-//# sourceMappingURL=prime.js.map