@astrosheep/keiyaku 4.1.0 → 4.1.2

package/build/src/cli/parse.js

@@ -1,9 +1,10 @@
 import { isTaskAction, parseTaskCommand, renderTaskHelp, renderTaskUsage, } from "./commands/task.js";
-import { isAkumaAction, parseAkumaCatalogPath, parseAkumaCommand, renderAkumaHelp, renderAkumaRootRows, renderAkumaUsage, } from "./commands/akuma.js";
-import { INSTALL_USAGE, parseInstallCommand, renderInstallHelp } from "./commands/install.js";
-import { CONTRACT_COMMAND_SPECS, } from "./commands/contract.js";
-import { CliUsageError, isBlankInput, usageLine } from "./usage.js";
+import { isAkumaAction, parseAkumaCommand, renderAkumaHelp, renderAkumaRootRows, renderAkumaUsage, } from "./commands/akuma.js";
+import { INSTALL_USAGE, parseInstallCommand, renderInstallHelp, } from "./commands/install.js";
+import { CONTRACT_COMMAND_SPECS, parseContractCommand, renderContractHelp as renderContractHelpForOwner, renderContractUsage, } from "./commands/contract.js";
+import { CliUsageError, isBlankInput } from "./usage.js";
 export { CliUsageError } from "./usage.js";
+export { renderContractHelp } from "./commands/contract.js";
 const ROOT_USAGE = "usage: keiyaku [-C <path>] [--repo <path>] <command> [<contract>|@<contract>] [--flag ...] [-]";
 export function renderRootHelp() {
     return [
@@ -22,13 +23,8 @@ export function renderRootHelp() {
         ...renderAkumaRootRows(),
     ].join("\n");
 }
-export function renderContractHelp(command) {
-    const spec = CONTRACT_COMMAND_SPECS[command];
-    const help = `${spec.purpose}\n\n${usageLine(spec.usage)}`;
-    return spec.help === undefined ? help : `${help}\n\n${spec.help}`;
-}
 function contractUsage(command) {
-    return usageLine(CONTRACT_COMMAND_SPECS[command].usage);
+    return renderContractUsage(command);
 }
 export function renderCommandUsage(command) {
     if (command.command === "install")
@@ -41,11 +37,16 @@ export function renderCommandUsage(command) {
 }
 export function renderHelp(coordinate) {
     switch (coordinate.kind) {
-        case "root": return renderRootHelp();
-        case "contract": return renderContractHelp(coordinate.command);
-        case "task": return renderTaskHelp(coordinate.action);
-        case "install": return renderInstallHelp();
-        case "akuma": return renderAkumaHelp(coordinate.action);
+        case "root":
+            return renderRootHelp();
+        case "contract":
+            return renderContractHelpForOwner(coordinate.command);
+        case "task":
+            return renderTaskHelp(coordinate.action);
+        case "install":
+            return renderInstallHelp();
+        case "akuma":
+            return renderAkumaHelp(coordinate.action);
     }
 }
 export function commandRepoPolicy(command) {
@@ -98,18 +99,12 @@ export function assertExplicitRepoUse(command, repo) {
     if (repo !== undefined && !commandRepoPolicy(command).acceptsExplicit)
         refuseUnusedRepo(command);
 }
-function optionalFlag(flags, name) {
-    const value = flags[name];
-    return typeof value === "string" ? value : undefined;
-}
 function refuse(command, message) {
     throw new CliUsageError(message, contractUsage(command));
 }
-function scanStdin(command, state, index, length) {
+function scanStdin(command, state) {
     if (state.stdin)
         refuse(command, "stdin marker '-' may appear only once");
-    if (index !== length - 1)
-        refuse(command, "stdin marker '-' must be the final argument");
     if (CONTRACT_COMMAND_SPECS[command].stdin === "none")
         refuse(command, `${command} reads no stdin`);
     state.stdin = true;
@@ -155,7 +150,7 @@ function scanArgv(argv) {
     for (let index = 1; index < argv.length; index += 1) {
         const token = argv[index];
         if (token === "-") {
-            scanStdin(command, state, index, argv.length);
+            scanStdin(command, state);
             continue;
         }
         if (token.startsWith("--")) {
@@ -176,174 +171,19 @@ function scanArgv(argv) {
         refuse(command, `${command} requires stdin`);
     }
     const output = state.flags.json === true ? "json" : "text";
-    const actor = optionalFlag(state.flags, "actor");
+    const actor = typeof state.flags.actor === "string" ? state.flags.actor : undefined;
     return { command, ...state, output, ...(actor === undefined ? {} : { actor }) };
 }
-function parseBind(parts) {
-    const task = optionalFlag(parts.flags, "task");
-    const target = optionalFlag(parts.flags, "target");
-    const after = parts.flags.after === undefined ? [] : Array.isArray(parts.flags.after) ? parts.flags.after : [parts.flags.after];
-    const gates = parseGateBundleNames(parts, "bind");
-    return {
-        command: "bind",
-        ...(task === undefined ? {} : { task }),
-        ...(target === undefined ? {} : { target }),
-        ...(parts.flags.here === true ? { workspace: "here" } : {}),
-        ...(parts.flags.after === undefined ? {} : { after }),
-        ...(gates === undefined ? {} : { gates }),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        output: parts.output,
-    };
-}
-function parseAmend(parts) {
-    const contract = parts.positionals[0];
-    const after = parts.flags.after === undefined ? [] : Array.isArray(parts.flags.after) ? parts.flags.after : [parts.flags.after];
-    if (parts.flags["clear-after"] === true && after.length > 0)
-        refuse("amend", "--clear-after and --after are mutually exclusive");
-    const gates = parseGateBundleNames(parts, "amend");
-    if (!parts.stdin && parts.flags.after === undefined && parts.flags["clear-after"] !== true && gates === undefined) {
-        refuse("amend", "amend requires stdin or --after, --clear-after, or --gates");
-    }
-    return {
-        command: "amend",
-        ...(contract === undefined ? {} : { contract }),
-        ...(parts.flags.after === undefined ? {} : { after }),
-        ...(parts.flags["clear-after"] === true ? { clearAfter: true } : {}),
-        ...(gates === undefined ? {} : { gates }),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        ...(parts.stdin ? { stdin: true } : {}),
-        output: parts.output,
-    };
-}
-function parseGateBundleNames(parts, command) {
-    const value = optionalFlag(parts.flags, "gates");
-    if (value === undefined)
-        return undefined;
-    const names = value.split(",");
-    if (names.some((name) => name.length === 0)) {
-        refuse(command, "--gates requires nonempty comma-separated names");
-    }
-    return names;
-}
-function parseDeliver(parts) {
-    const contract = parts.positionals[0];
-    const message = optionalFlag(parts.flags, "message");
-    return {
-        command: "deliver",
-        ...(contract === undefined ? {} : { contract }),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        ...(message === undefined ? {} : { message }),
-        includeDirty: parts.flags["include-dirty"] === true,
-        materializeConflict: parts.flags["materialize-conflict"] === true,
-        output: parts.output,
-    };
-}
-function parseReview(parts) {
-    if (Number(parts.flags.satisfied === true) + Number(parts.flags.unsatisfied === true) !== 1) {
-        refuse("review", "review requires exactly one verdict flag");
-    }
-    const summary = optionalFlag(parts.flags, "summary");
-    if (parts.stdin === (summary !== undefined)) {
-        refuse("review", "review requires exactly one of --summary <text> or stdin '-'");
-    }
-    const contract = parts.positionals[0];
-    return {
-        command: "review",
-        ...(contract === undefined ? {} : { contract }),
-        verdict: parts.flags.satisfied === true ? "satisfied" : "unsatisfied",
-        ...(summary === undefined ? {} : { summary }),
-        ...(parts.stdin ? { summaryFromStdin: true } : {}),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        output: parts.output,
-    };
-}
-function parseArc(parts) {
-    const contract = parts.positionals[0];
-    return {
-        command: "arc",
-        ...(contract === undefined ? {} : { contract }),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        output: parts.output,
-    };
-}
-function parseAbandon(parts) {
-    const contract = parts.positionals[0];
-    const note = optionalFlag(parts.flags, "note");
-    return {
-        command: "abandon",
-        ...(contract === undefined ? {} : { contract }),
-        ...(note === undefined ? {} : { note }),
-        ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-        output: parts.output,
-    };
-}
-function parseStatus(parts) {
-    const contract = parts.positionals[0];
-    if (contract?.startsWith("aku/") === true) {
-        return {
-            command: "status",
-            contract,
-            akuma: true,
-            output: parts.output,
-        };
-    }
-    return {
-        command: "status",
-        ...(contract === undefined ? {} : { contract }),
-        output: parts.output,
-    };
-}
-function parseShow(parts) {
-    const contract = parts.positionals[0];
-    return { command: "show", ...(contract === undefined ? {} : { contract }), output: parts.output };
-}
-function parseRegion(parts) {
-    const contract = parts.positionals[0];
-    const path = optionalFlag(parts.flags, "path");
-    const overlap = parts.flags.overlap === true;
-    if (path !== undefined && (contract !== undefined || overlap))
-        refuse("region", "--path cannot combine with a contract or --overlap");
-    return {
-        command: "region",
-        ...(contract === undefined ? {} : { contract }),
-        ...(path === undefined ? {} : { path }),
-        overlap,
-        output: parts.output,
-    };
-}
-function parseLs(parts) {
-    const path = parts.positionals[0];
-    if (path === "task" || path === "task/")
-        return { command: "ls", query: { kind: "tasks" }, output: parts.output };
-    if (path === "kei" || path === "kei/")
-        return { command: "ls", query: { kind: "contracts" }, output: parts.output };
-    try {
-        const query = parseAkumaCatalogPath(path);
-        if (query === null)
-            refuse("ls", "ls requires a supported identity directory selector");
-        return { command: "ls", query, output: parts.output };
-    }
-    catch (error) {
-        if (error instanceof CliUsageError)
-            throw error;
-        refuse("ls", error instanceof Error ? error.message : "invalid ls directory");
-    }
-}
 function invocationOptions(argv) {
     let cwd;
     let repo;
-    let stdinSeen = false;
     const commandArgv = [];
     for (let index = 0; index < argv.length; index += 1) {
         const token = argv[index];
         if (token !== "-C" && token !== "--cwd" && token !== "--repo") {
             commandArgv.push(token);
-            if (token === "-")
-                stdinSeen = true;
             continue;
         }
-        if (stdinSeen)
-            throw new CliUsageError("stdin marker '-' must be the final argument", renderRootHelp());
         if (token === "--repo" && repo !== undefined) {
             throw new CliUsageError("--repo may appear only once", renderRootHelp());
         }
@@ -385,68 +225,22 @@ function helpCoordinate(argv) {
     }
     return { kind: "root" };
 }
-function parseCommand(parts) {
-    switch (parts.command) {
-        case "bind": return parseBind(parts);
-        case "amend": return parseAmend(parts);
-        case "deliver": return parseDeliver(parts);
-        case "review": return parseReview(parts);
-        case "arc": return parseArc(parts);
-        case "abandon": return parseAbandon(parts);
-        case "status": return parseStatus(parts);
-        case "show": return parseShow(parts);
-        case "ls": return parseLs(parts);
-        case "audit": {
-            const contract = parts.positionals[0];
-            return {
-                command: "audit",
-                ...(contract === undefined ? {} : { contract }),
-                includeDirty: parts.flags["include-dirty"] === true,
-                showDiff: parts.flags.diff === true,
-                ...(parts.actor === undefined ? {} : { actor: parts.actor }),
-                output: parts.output,
-            };
-        }
-        case "reconcile": {
-            const contract = parts.positionals[0];
-            return {
-                command: "reconcile",
-                ...(contract === undefined ? {} : { contract }),
-                retryHooks: parts.flags["retry-hooks"] === true,
-                output: parts.output,
-            };
-        }
-        case "nuke": {
-            const confirm = optionalFlag(parts.flags, "confirm");
-            return { command: "nuke", ...(confirm === undefined ? {} : { confirm }), output: parts.output };
-        }
-        case "settings": return { command: "settings", output: parts.output };
-        case "region": return parseRegion(parts);
-    }
-}
 export function parseArgv(argv) {
     const invocation = invocationOptions(argv);
     const help = helpCoordinate(invocation.commandArgv);
     if (help !== null)
         return { help };
-    if (invocation.commandArgv[0] === "ls"
-        && (invocation.commandArgv.length === 1
-            || (invocation.commandArgv.length === 2 && invocation.commandArgv[1] === "--json"))) {
+    if (invocation.commandArgv[0] === "ls" &&
+        (invocation.commandArgv.length === 1 ||
+            (invocation.commandArgv.length === 2 && invocation.commandArgv[1] === "--json"))) {
         return { help: { kind: "contract", command: "ls" } };
     }
-    const task = invocation.commandArgv[0] === "task"
-        ? parseTaskCommand(invocation.commandArgv.slice(1))
-        : undefined;
-    const install = invocation.commandArgv[0] === "install"
-        ? parseInstallCommand(invocation.commandArgv.slice(1))
-        : undefined;
-    const akuma = isAkumaAction(invocation.commandArgv[0])
-        ? parseAkumaCommand(invocation.commandArgv)
-        : undefined;
-    const parsed = {
+    const task = invocation.commandArgv[0] === "task" ? parseTaskCommand(invocation.commandArgv.slice(1)) : undefined;
+    const install = invocation.commandArgv[0] === "install" ? parseInstallCommand(invocation.commandArgv.slice(1)) : undefined;
+    const akuma = isAkumaAction(invocation.commandArgv[0]) ? parseAkumaCommand(invocation.commandArgv) : undefined;
+    return {
         ...(invocation.cwd === undefined ? {} : { cwd: invocation.cwd }),
         ...(invocation.repo === undefined ? {} : { repo: invocation.repo }),
-        command: task ?? akuma ?? install ?? parseCommand(scanArgv(invocation.commandArgv)),
+        command: task ?? akuma ?? install ?? parseContractCommand(scanArgv(invocation.commandArgv)),
     };
-    return parsed;
 }

package/build/src/cli/render/akuma-activity.d.ts

@@ -0,0 +1,38 @@
+import type { AkumaObservation, AkumaObservationStage, CreatedTaskObservation, DispatchAssociation } from "../../index.js";
+import type { AkumaInvocationResult } from "../commands/akuma-invoke.js";
+import type { ParsedCommand } from "../parse.js";
+import { type TextRenderContext } from "./terminal.js";
+export declare const DEFAULT_CONTEXT: TextRenderContext;
+export declare function associatedIdentity(id: string, alias?: string, contract?: DispatchAssociation): string;
+export declare function snapshotHeading(id: string, alias: string | undefined, contract: DispatchAssociation | undefined): readonly string[];
+type SnapshotView = Readonly<{
+    status: AkumaObservation["status"];
+    contract: DispatchAssociation;
+    createdTasks?: CreatedTaskObservation;
+}>;
+type SnapshotCoreOptions = Readonly<{
+    alias?: string;
+    facts?: readonly string[];
+}>;
+export declare function snapshotText(view: SnapshotView, context: TextRenderContext, options?: SnapshotCoreOptions): string;
+export declare function mutationObservationStageText(id: string, observation: AkumaObservationStage, context: TextRenderContext, options?: SnapshotCoreOptions & Readonly<{
+    showLife?: boolean;
+}>): string;
+export declare function statusAnswer(view: Readonly<{
+    status: AkumaObservation["status"];
+}>): string | undefined;
+export declare function akumaRawAnswer(result: AkumaInvocationResult): string | undefined;
+export declare function waitText(result: Extract<AkumaInvocationResult, {
+    action: "wait";
+}>, context: TextRenderContext): string;
+export declare function historyText(command: Extract<ParsedCommand, {
+    command: "history";
+    last: boolean;
+}>, result: Extract<AkumaInvocationResult, {
+    action: "history";
+}>, context: TextRenderContext): string;
+export declare function tellText(result: Extract<AkumaInvocationResult, {
+    action: "tell";
+    mode: "ordinary";
+}>, context: TextRenderContext): string;
+export {};