@astrosheep/keiyaku 2.9.3 → 2.9.5

package/build/cli/commands/task/done/meta.js

@@ -2,7 +2,7 @@ export const meta = {
     command: "task done",
     summary: "Complete a task",
     usage: ["keiyaku task done [-C|--cwd DIR] [ID]"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd"],
     purpose: "Complete an open or in-progress task.",
 };

package/build/cli/commands/task/drop/handler.js

@@ -1,6 +1,3 @@
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { dropTask } from "../../../../core/task.js";
-import { renderTaskMutationRow } from "../../../render/task.js";
-import { textResponse } from "../../../render/shared.js";
-import { effectiveDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags, _signal, positional) => textResponse(renderTaskMutationRow(await dropTask(await openTaskCommandRepository(effectiveDirectory(flags)), positional[0])));
+import { dropTask } from "../../../../core/task/index.js";
+import { runTaskMutationCommand } from "../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => runTaskMutationCommand(flags, (repository) => dropTask(repository, positional[0]));

package/build/cli/commands/task/drop/meta.js

@@ -2,7 +2,7 @@ export const meta = {
     command: "task drop",
     summary: "Drop a task",
     usage: ["keiyaku task drop [-C|--cwd DIR] ID"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd"],
     purpose: "Abandon an open or in-progress task.",
 };

package/build/cli/commands/task/ls/handler.js

@@ -1,13 +1,17 @@
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { readTaskBoard } from "../../../../core/task.js";
-import { renderTaskList, renderTaskListJson } from "../../../render/task.js";
+import { readTaskBoard, selectTaskList } from "../../../../core/task/index.js";
+import { renderSelectedTaskList, renderSelectedTaskListJson } from "../../../render/task.js";
 import { textResponse } from "../../../render/shared.js";
-import { effectiveDirectory } from "../../shared.js";
-import { taskJsonText, taskSelection } from "../shared.js";
+import { taskJsonText, taskSelection, withTaskCommandRepository } from "../shared.js";
 export const handler = async (_stdin, flags) => {
-    const board = await readTaskBoard(await openTaskCommandRepository(effectiveDirectory(flags)));
+    const board = await withTaskCommandRepository(flags, (repository) => readTaskBoard(repository));
     const selection = taskSelection(flags);
+    const tasks = selectTaskList(board.tasks, {
+        selection,
+        filters: flags.taskFilters,
+        sort: flags.taskSort,
+        nowMs: Date.now(),
+    });
     return textResponse(flags.json
-        ? taskJsonText(renderTaskListJson(board.tasks, selection))
-        : renderTaskList(board.tasks, { selection }));
+        ? taskJsonText(renderSelectedTaskListJson(tasks))
+        : renderSelectedTaskList(tasks));
 };

package/build/cli/commands/task/ls/meta.js

@@ -1,8 +1,8 @@
 export const meta = {
     command: "task ls",
     summary: "List tasks",
-    usage: ["keiyaku task ls [-C|--cwd DIR] [--all|--done] [--json]"],
-    stdin: "none",
-    flags: ["cwd", "all", "done", "json"],
+    usage: ["keiyaku task ls [-C|--cwd DIR] [--all|--done] [--filter EXPR] [--sort KEYS] [--json]"],
+    stdin: { mode: "argument" },
+    flags: ["cwd", "all", "done", "filter", "sort", "json"],
     purpose: "List tasks from the working-tree board.",
 };

package/build/cli/commands/task/shared.js

@@ -1,8 +1,18 @@
 import * as path from "node:path";
 import { FlowError } from "../../../flow-error.js";
-import { readTaskDoctor, taskCommandContractId } from "../../../core/task-git-runtime.js";
-import { deriveTaskDisplay, renderTaskList, } from "../../render/task.js";
-import { parseTaskDocument, } from "../../../core/task.js";
+import { isTaskId, openTaskCommandRepository, parseTaskDocument, readTaskDoctor, taskCommandContractId, } from "../../../core/task/index.js";
+import { deriveTaskDisplay, renderTaskList, renderTaskMutationRow, } from "../../render/task.js";
+import { textResponse } from "../../render/shared.js";
+import { effectiveDirectory } from "../shared.js";
+/** Open the task command repository for flags.cwd and run the verb. */
+export async function withTaskCommandRepository(flags, run) {
+    const cwd = effectiveDirectory(flags);
+    return run(await openTaskCommandRepository(cwd), cwd);
+}
+/** Shared shell: open repository → mutate → renderTaskMutationRow receipt. */
+export async function runTaskMutationCommand(flags, mutate) {
+    return textResponse(renderTaskMutationRow(await withTaskCommandRepository(flags, mutate)));
+}
 export function parseTaskAddInput(input) {
     if (!input.trim())
         throw new FlowError("EMPTY_PARAM", "task add input cannot be blank");
@@ -49,7 +59,7 @@ function renderTaskDiseaseRows(diseases, documents) {
     for (const disease of diseases) {
         if (disease.code === "invalid_document") {
             const name = path.basename(disease.path).replace(/\.md$/, "");
-            if (/^k-[0-9a-f]{12}$/.test(name))
+            if (isTaskId(name))
                 rows.push(`! ${name} invalid front matter — quarantined`);
             continue;
         }

package/build/cli/commands/task/{view → show}/handler.js

@@ -1,14 +1,13 @@
 import { FlowError } from "../../../../flow-error.js";
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { readTaskBoard, resolveTaskReadId } from "../../../../core/task.js";
+import { buildTaskTree, readTaskBoard, resolveTaskReadId, } from "../../../../core/task/index.js";
 import { renderTaskShow, renderTaskShowJson } from "../../../render/task.js";
 import { textResponse } from "../../../render/shared.js";
-import { effectiveDirectory } from "../../shared.js";
-import { taskJsonText } from "../shared.js";
-export const handler = async (_stdin, flags, _signal, positional) => {
-    const board = await readTaskBoard(await openTaskCommandRepository(effectiveDirectory(flags)));
+import { taskJsonText, withTaskCommandRepository } from "../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => withTaskCommandRepository(flags, async (repository) => {
+    const board = await readTaskBoard(repository);
     const task = board.byId.get(resolveTaskReadId(board, positional[0]));
     if (!task)
         throw new FlowError("INTERNAL_STATE", "resolved task disappeared from the board");
-    return textResponse(flags.json ? taskJsonText(renderTaskShowJson(task)) : renderTaskShow(task));
-};
+    const tree = buildTaskTree(board, task.id);
+    return textResponse(flags.json ? taskJsonText(renderTaskShowJson(task, tree)) : renderTaskShow(task, tree));
+});

package/build/cli/commands/task/show/meta.js

@@ -0,0 +1,8 @@
+export const meta = {
+    command: "task show",
+    summary: "Show one task and its children tree",
+    usage: ["keiyaku task show [-C|--cwd DIR] ID [--json]"],
+    stdin: { mode: "argument" },
+    flags: ["cwd", "json"],
+    purpose: "Read one task and every descendant linked by parent edges.",
+};

package/build/cli/commands/task/start/handler.js

@@ -1,6 +1,3 @@
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { startTask } from "../../../../core/task.js";
-import { renderTaskMutationRow } from "../../../render/task.js";
-import { textResponse } from "../../../render/shared.js";
-import { effectiveDirectory } from "../../shared.js";
-export const handler = async (_stdin, flags, _signal, positional) => textResponse(renderTaskMutationRow(await startTask(await openTaskCommandRepository(effectiveDirectory(flags)), positional[0], new Date())));
+import { startTask } from "../../../../core/task/index.js";
+import { runTaskMutationCommand } from "../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => runTaskMutationCommand(flags, (repository) => startTask(repository, positional[0], new Date()));

package/build/cli/commands/task/start/meta.js

@@ -2,7 +2,7 @@ export const meta = {
     command: "task start",
     summary: "Start a task",
     usage: ["keiyaku task start [-C|--cwd DIR] ID"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd"],
     purpose: "Move an open task to in_progress.",
 };

package/build/cli/commands/task/stop/handler.js

@@ -1,15 +1,11 @@
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { stopTask } from "../../../../core/task.js";
-import { renderTaskMutationRow } from "../../../render/task.js";
-import { textResponse } from "../../../render/shared.js";
+import { stopTask } from "../../../../core/task/index.js";
 import { effectiveDirectory } from "../../shared.js";
-import { mutationSelectionMessage, rejectBareContractTaskState } from "../shared.js";
+import { mutationSelectionMessage, rejectBareContractTaskState, runTaskMutationCommand } from "../shared.js";
 export const handler = async (_stdin, flags, _signal, positional) => {
     try {
-        const cwd = effectiveDirectory(flags);
         if (positional[0] === undefined)
-            await rejectBareContractTaskState(cwd, "stop");
-        return textResponse(renderTaskMutationRow(await stopTask(await openTaskCommandRepository(cwd), positional[0])));
+            await rejectBareContractTaskState(effectiveDirectory(flags), "stop");
+        return await runTaskMutationCommand(flags, (repository) => stopTask(repository, positional[0]));
     }
     catch (error) {
         return mutationSelectionMessage(error);

package/build/cli/commands/task/stop/meta.js

@@ -2,7 +2,7 @@ export const meta = {
     command: "task stop",
     summary: "Stop a task",
     usage: ["keiyaku task stop [-C|--cwd DIR] [ID]"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: ["cwd"],
     purpose: "Return an in-progress task to open.",
 };

package/build/cli/commands/task/task/handler.js

@@ -1,4 +1,4 @@
-import { missingSubcommandError } from "../../../help.js";
+import { missingSubcommandError } from "../../../missing-subcommand.js";
 import { TASK_SUBCOMMANDS } from "../../../types.js";
 export const handler = async () => {
     throw missingSubcommandError("task", TASK_SUBCOMMANDS);

package/build/cli/commands/task/task/meta.js

@@ -3,7 +3,7 @@ export const meta = {
     command: "task",
     summary: "Manage lightweight repository tasks",
     usage: ["keiyaku task <subcommand>"],
-    stdin: "none",
+    stdin: { mode: "argument" },
     flags: [],
     purpose: "Manage the file-backed task board.",
     subcommands: TASK_SUBCOMMANDS,

package/build/cli/commands/task/update/handler.js

@@ -1,18 +1,13 @@
-import { openTaskCommandRepository } from "../../../../core/task-git-runtime.js";
-import { updateTask } from "../../../../core/task.js";
-import { renderTaskMutationRow } from "../../../render/task.js";
-import { textResponse } from "../../../render/shared.js";
-import { effectiveDirectory } from "../../shared.js";
-export const handler = async (stdin, flags, _signal, positional) => {
-    const body = flags.taskBody === "-" ? stdin : flags.taskBody;
-    const task = await updateTask(await openTaskCommandRepository(effectiveDirectory(flags)), positional[0], {
+import { updateTask } from "../../../../core/task/index.js";
+import { runTaskMutationCommand } from "../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => {
+    return runTaskMutationCommand(flags, (repository) => updateTask(repository, positional[0], {
         ...(flags.taskTitle === undefined ? {} : { title: flags.taskTitle }),
-        ...(body === undefined ? {} : { body }),
+        ...(flags.taskBody === undefined ? {} : { body: flags.taskBody }),
         ...(flags.taskPri === undefined ? {} : { pri: flags.taskPri }),
         ...(flags.taskNeeds === undefined ? {} : { addNeeds: flags.taskNeeds }),
         ...(flags.taskDropNeeds === undefined ? {} : { dropNeeds: flags.taskDropNeeds }),
         ...(flags.taskParent !== undefined ? { parent: flags.taskParent } : flags.taskNoParent ? { parent: null } : {}),
         ...(flags.taskFrom === undefined ? {} : { from: flags.taskFrom }),
-    });
-    return textResponse(renderTaskMutationRow(task));
+    }));
 };

package/build/cli/commands/task/update/meta.js

@@ -2,7 +2,10 @@ export const meta = {
     command: "task update",
     summary: "Update task facts",
     usage: ["keiyaku task update [-C|--cwd DIR] ID [--title TEXT] [--body TEXT|-] [--pri 0-3] [--needs ID] [--drop-needs ID] [--parent ID|--no-parent] [--from ID]"],
-    stdin: "none",
+    stdin: {
+        mode: "argument",
+        selector: { kind: "flag", name: "taskBody", required: false, rejectBlank: false },
+    },
     flags: ["cwd", "title", "body", "pri", "needs", "drop-needs", "parent", "no-parent", "from"],
     purpose: "Change mutable task facts.",
 };

package/build/cli/completion.js

@@ -2,7 +2,7 @@ import { assertSettingsKnobUsable } from "../config/settings/disease.js";
 import { loadKeiyakuSettings } from "../config/settings/loader.js";
 import { loadAkumaCatalog } from "../config/akuma-loader.js";
 import { listContractIds } from "../core/ledger.js";
-import { allCommandMetadata, getCommandMetadata } from "./commands/registry.js";
+import { allCommandMetadata, getCommandMetadata } from "./commands/metadata.js";
 function topLevelCommands() {
     return allCommandMetadata()
         .filter((meta) => meta.completionRank !== undefined)

package/build/cli/flags.js

@@ -4,12 +4,12 @@ export const FLAG_SPECS = {
     cwd: {
         kind: "value",
         placeholder: "DIR",
-        description: "Select the effective command directory (-C/--cwd). Defaults to the process working directory.",
+        description: "Select the effective command directory (-C/--cwd). Defaults to the process working directory; the repository is inferred from here unless --repo is set.",
     },
     repo: {
         kind: "value",
         placeholder: "DIR",
-        description: "Select the repository that supplies contract ledgers.",
+        description: "Override the repository inferred from the effective directory. Needed only when the contract ledger lives in a different repository; the same value as -C is always redundant.",
     },
     contract: {
         kind: "value",
@@ -46,6 +46,10 @@ export const FLAG_SPECS = {
         placeholder: "DURATION",
         description: "Wait at most a positive duration such as 45s, 5m, or 2h (maximum 24h).",
     },
+    any: {
+        kind: "boolean",
+        description: "For a projection set, return when the first observed member reaches a terminal state.",
+    },
     wait: {
         kind: "value",
         placeholder: "DURATION",
@@ -57,7 +61,7 @@ export const FLAG_SPECS = {
     },
     bare: {
         kind: "boolean",
-        description: "Skip contract attachment; Akuma, history, sandbox, credentials, projection, and repository policy remain active.",
+        description: "Explicitly select standalone execution (also the default without --contract); history, sandbox, credentials, projection, and repository policy remain active.",
     },
     detach: {
         kind: "boolean",
@@ -114,10 +118,22 @@ export const FLAG_SPECS = {
         kind: "boolean",
         description: "Preview bind input or petition preflight without mutation.",
     },
-    waive: {
+    "append-scope": {
         kind: "value",
-        placeholder: "PATH",
-        description: "Allow one explicit out-of-scope path for this seal. May be repeated.",
+        placeholder: "PATTERN",
+        description: "Append one ordered scope pattern to the contract before audit. May be repeated.",
+    },
+    resolve: {
+        kind: "boolean",
+        description: "Open a durable Keiyaku-owned renew recovery session when the rewrite conflicts.",
+    },
+    continue: {
+        kind: "boolean",
+        description: "Continue the open Keiyaku-owned renew recovery session.",
+    },
+    abort: {
+        kind: "boolean",
+        description: "Restore and remove the open Keiyaku-owned renew recovery session.",
     },
     shell: {
         kind: "value",
@@ -151,10 +167,25 @@ export const FLAG_SPECS = {
         kind: "boolean",
         description: "Render task data as JSON.",
     },
+    "diff-budget": {
+        kind: "value",
+        placeholder: "BYTES",
+        description: "Set the audit raw-diff presentation budget in bytes.",
+    },
     done: {
         kind: "boolean",
         description: "Show terminal tasks.",
     },
+    filter: {
+        kind: "value",
+        placeholder: "FIELD OP VALUE",
+        description: "Filter structured task facts. Repeat for AND; comma-separated values are OR.",
+    },
+    sort: {
+        kind: "value",
+        placeholder: "KEY[,KEY...]",
+        description: "Sort by priority ascending, modified descending, or created descending.",
+    },
     pri: {
         kind: "value",
         placeholder: "0-3",

package/build/cli/help.js

@@ -1,11 +1,5 @@
-import { FlowError } from "../flow-error.js";
-import { allCommandMetadata, getCommandMetadata } from "./commands/registry.js";
-export function formatSubcommandList(subcommands) {
-    return subcommands.length < 2 ? (subcommands[0] ?? "") : `${subcommands.slice(0, -1).join(", ")} or ${subcommands.at(-1)}`;
-}
-export function missingSubcommandError(name, subcommands) {
-    return new FlowError("EMPTY_PARAM", `${name} requires subcommand: ${formatSubcommandList(subcommands)}`);
-}
+import { CLI_COMMAND_METADATA, getCommandMetadata } from "./commands/metadata.js";
+export { formatSubcommandList, missingSubcommandError } from "./missing-subcommand.js";
 function indent(lines) {
     return lines.map((line) => line ? `  ${line}` : "");
 }
@@ -21,15 +15,14 @@ function flagUsage(name, specs) {
     }
     return spec?.kind === "value" ? `--${name} ${spec.placeholder ?? "VALUE"}` : `--${name}`;
 }
-/** Metadata keyed by command; key order matches the historical CLI_COMMAND_METADATA object. */
-export const CLI_COMMAND_METADATA = Object.fromEntries(allCommandMetadata().map((meta) => [meta.command, meta]));
+export { CLI_COMMAND_METADATA };
 export function renderCliCommandHelp(_command, spec, flagSpecs) {
     const lines = ["Keiyaku command help", "", `${spec.command} - ${spec.summary}`, ""];
     section(lines, "Usage:", spec.usage);
     section(lines, "Purpose:", [spec.purpose]);
     section(lines, "Subcommands:", spec.subcommands);
     section(lines, "Input:", spec.input);
-    section(lines, "Options:", spec.flags.map((name) => `${flagUsage(name, flagSpecs)}  ${flagSpecs[name]?.description ?? ""}`));
+    section(lines, "Options:", spec.flags.map((name) => `${flagUsage(name, flagSpecs)}  ${spec.flagDescriptions?.[name] ?? flagSpecs[name]?.description ?? ""}`));
     section(lines, "Notes:", spec.notes);
     section(lines, "Examples:", spec.examples);
     return lines.join("\n").trimEnd();
@@ -69,9 +62,9 @@ export function renderCliHelp(version) {
         "",
         "Input:",
         "  <> means required; [] means optional.",
-        "  bind, arc, and amend read Markdown from stdin.",
-        "  call and tell require literal BODY or `-`; only literal `-` opens stdin.",
-        "  revive accepts an artifact plus optional BODY or `-`; only literal `-` opens stdin.",
+        "  bind, arc, amend, and petition read document stdin only when literal `-` selects it.",
+        "  call and tell require literal BODY or `-`; literal `-` selects stdin.",
+        "  revive accepts an artifact plus optional BODY or `-`; unselected stdin is ignored.",
         "",
         "Configuration:",
         "  Akuma profiles  <KEIYAKU_HOME>/akuma/*.md or .keiyaku/akuma/*.md",