@astrosheep/keiyaku 2.9.6 → 2.9.7

package/build/agents/harness/outcome.js

@@ -86,6 +86,16 @@ export function classifyFailure(shared, state, error, idleTimedOut, transportFai
             warnings: [...state.warnings],
         });
     }
+    if (shared.explicitlyAborted && isProviderTerminalError(error) && error.fact.kind === "aborted") {
+        return mintOutcome({
+            status: "interrupted",
+            finalMessage: state.finalMessageCandidate ?? "",
+            output: renderCapturedText(state.outputBuffer),
+            diagnostics: renderCapturedText(state.diagnosticsBuffer),
+            session: state.session ?? fallbackSession(shared),
+            warnings: [...state.warnings],
+        });
+    }
     if (transportFailure) {
         const message = transportFailure instanceof Error ? transportFailure.message : `${shared.terms.provider} session transport probe failed`;
         const timeoutMs = isProviderTerminalError(transportFailure) && transportFailure.fact.kind === "failed"

package/build/cli/commands/contract/bind/handler.js

@@ -1,13 +1,19 @@
-import { bindContract } from "../../../../core/bind.js";
+import { bindContract, previewBindContract } from "../../../../core/bind.js";
 import { defaultActorClock } from "../../../../core/outcome-base.js";
 import { writeDraftArtifact } from "../../../draft-artifact.js";
-import { buildBindDraftResponse, buildBindResponse, textResponse } from "../../../render/shared.js";
+import { buildBindDraftResponse, buildBindPreviewResponse, buildBindResponse } from "../../../render/shared.js";
 import { repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags, signal) => {
+    const cwd = await repositoryDirectory(flags, "bind");
     if (flags.dryRun) {
-        return textResponse(stdin);
+        const preview = await previewBindContract({
+            cwd, draft: stdin, ...defaultActorClock(), workspace: "worktree",
+            after: flags.after ?? [], exclusive: flags.exclusive,
+            ...(flags.bindTaskIds === undefined ? {} : { taskIds: flags.bindTaskIds }),
+            signal,
+        });
+        return buildBindPreviewResponse(preview);
     }
-    const cwd = await repositoryDirectory(flags, "bind");
     if (flags.draftOnly) {
         return buildBindDraftResponse(await writeDraftArtifact({ cwd, title: "bind-draft", content: stdin }));
     }

package/build/cli/commands/contract/bind/meta.js

@@ -17,10 +17,10 @@ export const meta = {
         "<what the commission should accomplish>",
         "",
         "## Scope",
-        "```",
+        "~~~",
         "<pattern>",
         "<another-pattern>",
-        "```",
+        "~~~",
         "",
         "## Checks",
         "- <verification>",
@@ -40,10 +40,10 @@ export const meta = {
             "<what the commission should accomplish>",
             "",
             "## Scope",
-            "```",
+            "~~~",
             "<pattern>",
             "<another-pattern>",
-            "```",
+            "~~~",
             "",
             "## Checks",
             "- <verification>",
@@ -52,10 +52,10 @@ export const meta = {
         [
             "keiyaku bind --task fix-flaky-pump - <<'KEIYAKU'",
             "## Scope",
-            "```",
+            "~~~",
             "<pattern>",
             "<another-pattern>",
-            "```",
+            "~~~",
             "",
             "## Checks",
             "- <verification>",

package/build/cli/commands/contract/petition/handler.js

@@ -1,23 +1,36 @@
 import { FlowError } from "../../../../flow-error.js";
 import { resolveExistingContractAddress, withResolvedAddress } from "../../../../core/addressing.js";
 import { buildPetitionClaimInput, petitionKeiyaku, previewPetition, } from "../../../../core/settlement/index.js";
-import { buildPetitionClaimResponse, buildPetitionPreviewResponse } from "../../../render/petition.js";
+import { renewKeiyaku } from "../../../../core/renew.js";
+import { buildPetitionClaimResponse, buildPetitionPreviewResponse, renderPetitionRenewedConsequence, } from "../../../render/petition.js";
+import { writeCliOutput } from "../../../output-stream-error-policy.js";
 import { effectiveDirectory, repositoryDirectory } from "../../shared.js";
 export const handler = async (stdin, flags, signal) => {
     if (flags.json && !flags.dryRun) {
         throw new FlowError("EMPTY_PARAM", "petition --json requires --dry-run");
     }
+    if (flags.renewBeforePetition && flags.dryRun) {
+        throw new FlowError("EMPTY_PARAM", "petition --renew cannot be used with --dry-run");
+    }
     const cwd = await repositoryDirectory(flags, "petition");
     const address = await resolveExistingContractAddress(cwd, flags.contractId, flags.contractAddressSource, effectiveDirectory(flags));
     return await withResolvedAddress(address, async () => {
-        const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal, appendScope: flags.appendScope });
         if (flags.dryRun) {
+            const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal });
             return buildPetitionPreviewResponse(await previewPetition({
                 cwd,
                 contractId: address.binding.commissionId,
                 oath: input.oath,
             }), flags.json === true);
         }
-        return buildPetitionClaimResponse({ ...await petitionKeiyaku(input), address }, input);
+        const renewed = flags.renewBeforePetition
+            ? await renewKeiyaku({ cwd, address, appendScope: flags.appendScope })
+            : undefined;
+        if (renewed && !renewed.alreadyFresh) {
+            await writeCliOutput(process.stdout, `${renderPetitionRenewedConsequence(renewed)}\n`);
+        }
+        const input = buildPetitionClaimInput({ cwd, contractId: address.binding.commissionId, stdin, signal, appendScope: flags.appendScope });
+        const petitionInput = renewed ? { ...input, appendScope: undefined } : input;
+        return buildPetitionClaimResponse({ ...await petitionKeiyaku(petitionInput), address }, input);
     });
 };

package/build/cli/commands/contract/petition/meta.js

@@ -2,12 +2,12 @@ export const meta = {
     command: "petition",
     summary: "Run or preview the gated settlement pipeline",
     usage: [
-        "keiyaku petition [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--append-scope PATTERN] [- < petition.md]",
-        "keiyaku @<id> petition [-C|--cwd DIR] [--repo DIR] [--append-scope PATTERN] [- < petition.md]",
+        "keiyaku petition [-C|--cwd DIR] [--repo DIR] [--contract ADDR] [--renew] [--append-scope PATTERN] [- < petition.md]",
+        "keiyaku @<id> petition [-C|--cwd DIR] [--repo DIR] [--renew] [--append-scope PATTERN] [- < petition.md]",
         "keiyaku @<id> petition --dry-run [--json] [- < petition.md]",
     ],
     stdin: { mode: "document", selector: { kind: "positional", index: 0, required: false, rejectBlank: false } },
-    flags: ["cwd", "repo", "contract", "append-scope", "dry-run", "json"],
+    flags: ["cwd", "repo", "contract", "renew", "append-scope", "dry-run", "json"],
     purpose: "Seal the current a0 or open explicit arc, queue the contract, and run verdict and claim processing; dry-run previews deterministic gates without mutation.",
     input: [
         "## Oath",
@@ -16,7 +16,7 @@ export const meta = {
     notes: [
         "Petition stdin is optional and read only when literal - is supplied; a missing, empty, or blank oath is rejected by the settlement gate with OATH_MISSING.",
         "The machine checks only that the oath is present. Accepted oath text is persisted in the petition entry and hidden from the reviewer.",
-        "Base drift requires explicit `keiyaku renew` before petition.",
+        "Use --renew to run ordinary renew before petition; renew failures stop the command before settlement.",
         "Dry-run never runs verification or review and exits 0, 1, or 2.",
     ],
     completionRank: 10,

package/build/cli/commands/metadata.js

@@ -23,6 +23,7 @@ import { meta as taskMeta } from "./task/task/meta.js";
 import { meta as taskAddMeta } from "./task/add/meta.js";
 import { meta as taskShowMeta } from "./task/show/meta.js";
 import { meta as taskLsMeta } from "./task/ls/meta.js";
+import { meta as taskLogMeta } from "./task/log/meta.js";
 import { meta as taskStartMeta } from "./task/start/meta.js";
 import { meta as taskStopMeta } from "./task/stop/meta.js";
 import { meta as taskDoneMeta } from "./task/done/meta.js";
@@ -34,14 +35,14 @@ export const COMMAND_METADATA_ORDER = [
     "bind", "arc", "call", "revive", "wait", "tell", "kill", "log",
     "akuma", "akuma ls", "akuma view", "skills", "skills install", "amend", "audit",
     "renew", "petition", "forfeit", "guide", "completion", "status", "task",
-    "task add", "task show", "task ls", "task start", "task stop", "task done",
+    "task add", "task show", "task ls", "task log", "task start", "task stop", "task done",
     "task drop", "task update", "task doctor", "dump-env",
 ];
 const COMMAND_METADATA = [
     bindMeta, arcMeta, callMeta, reviveMeta, waitMeta, tellMeta, killMeta, logMeta,
     akumaMeta, akumaLsMeta, akumaViewMeta, skillsMeta, skillsInstallMeta, amendMeta, auditMeta,
     renewMeta, petitionMeta, forfeitMeta, guideMeta, completionMeta, statusMeta,
-    taskMeta, taskAddMeta, taskShowMeta, taskLsMeta, taskStartMeta, taskStopMeta,
+    taskMeta, taskAddMeta, taskShowMeta, taskLsMeta, taskLogMeta, taskStartMeta, taskStopMeta,
     taskDoneMeta, taskDropMeta, taskUpdateMeta, taskDoctorMeta, dumpEnvMeta,
 ];
 export const CLI_COMMAND_METADATA = Object.fromEntries(COMMAND_METADATA.map((meta) => [meta.command, meta]));

package/build/cli/commands/projection/tell/handler.js

@@ -1,5 +1,5 @@
 import { FlowError } from "../../../../flow-error.js";
-import { assertTellEffortSupported, tellProjection, writeInboxTell } from "../../../../core/projection/index.js";
+import { assertTellEffortSupported, interruptProjectionGeneration, tellProjection, writeInboxTell } from "../../../../core/projection/index.js";
 import { waitForProjection } from "../../../../core/projection/index.js";
 import { prependAddressReceipt } from "../../../render/address.js";
 import { buildSilentTellResponse } from "../../../render/tell.js";
@@ -13,7 +13,15 @@ export const handler = async (body, flags, signal, positional) => runProjectionC
     assertTellEffortSupported(projection.directory, flags.effort);
     // Address admission and any effort validation precede the durable mailbox write.
     writeInboxTell(projection.directory, body, Date.now(), { effort: flags.effort });
-    await tellProjection(projection.directory, projection.id, flags.effort);
+    if (flags.interrupt) {
+        const interrupted = interruptProjectionGeneration(projection.directory);
+        if (interrupted.status === "already-closed") {
+            await tellProjection(projection.directory, projection.id, flags.effort);
+        }
+    }
+    else {
+        await tellProjection(projection.directory, projection.id, flags.effort);
+    }
     if (flags.timeoutMs === undefined)
         return buildSilentTellResponse();
     return prependAddressReceipt(buildWaitResponse(projection.id, await waitForProjection({ projectionDirectory: projection.directory, timeoutMs: flags.timeoutMs, signal }), { alias: projection.alias }), ctx.address, { projectionId: projection.id, projectionAlias: projection.alias });

package/build/cli/commands/projection/tell/meta.js

@@ -1,12 +1,12 @@
 export const meta = {
     command: "tell",
     summary: "Send intent to a projection mailbox",
-    usage: ["keiyaku tell PROJECTION [--wait DURATION] [--] <BODY|->"],
+    usage: ["keiyaku tell PROJECTION [--interrupt] [--wait DURATION] [--] <BODY|->"],
     stdin: {
         mode: "argument",
         selector: { kind: "positional", index: 1, required: true, rejectBlank: true },
     },
-    flags: ["cwd", "repo", "contract", "effort", "wait"],
-    purpose: "Write intent to the mailbox and wake only when eligible.",
+    flags: ["cwd", "repo", "contract", "effort", "interrupt", "wait"],
+    purpose: "Write intent to the mailbox; --interrupt terminates the active turn before successor wake.",
     completionRank: 3,
 };

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

@@ -2,6 +2,7 @@ import { meta as taskMeta } from "./task/meta.js";
 import { meta as addMeta } from "./add/meta.js";
 import { meta as showMeta } from "./show/meta.js";
 import { meta as lsMeta } from "./ls/meta.js";
+import { meta as logMeta } from "./log/meta.js";
 import { meta as startMeta } from "./start/meta.js";
 import { meta as stopMeta } from "./stop/meta.js";
 import { meta as doneMeta } from "./done/meta.js";
@@ -13,6 +14,7 @@ export const taskCatalog = [
     { meta: addMeta, load: () => import("./add/handler.js") },
     { meta: showMeta, load: () => import("./show/handler.js") },
     { meta: lsMeta, load: () => import("./ls/handler.js") },
+    { meta: logMeta, load: () => import("./log/handler.js") },
     { meta: startMeta, load: () => import("./start/handler.js") },
     { meta: stopMeta, load: () => import("./stop/handler.js") },
     { meta: doneMeta, load: () => import("./done/handler.js") },

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

@@ -0,0 +1,12 @@
+import { FlowError } from "../../../../flow-error.js";
+import { readTaskBoard, readTaskHistory, resolveTaskReadId, } from "../../../../core/task/index.js";
+import { textResponse } from "../../../render/shared.js";
+import { withTaskCommandRepository } from "../shared.js";
+export const handler = async (_stdin, flags, _signal, positional) => withTaskCommandRepository(flags, async (repository, cwd) => {
+    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");
+    const rows = await readTaskHistory(cwd, task.id);
+    return textResponse(rows.map(({ timestamp, actor, subject }) => `${timestamp}\t${actor}\t${subject}`).join("\n"));
+});

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

@@ -0,0 +1,8 @@
+export const meta = {
+    command: "task log",
+    summary: "Show one task's Git history",
+    usage: ["keiyaku task log [-C|--cwd DIR] ID"],
+    stdin: { mode: "argument" },
+    flags: ["cwd"],
+    purpose: "Read the current hub branch's task micro-commit history.",
+};

package/build/cli/flags.js

@@ -68,6 +68,10 @@ export const FLAG_SPECS = {
         kind: "boolean",
         description: "Return after durable launch instead of waiting for completion.",
     },
+    interrupt: {
+        kind: "boolean",
+        description: "Interrupt the current projection turn after saving the tell.",
+    },
     "draft-only": {
         kind: "boolean",
         description: "Write a draft artifact without creating a contract workspace.",
@@ -124,6 +128,10 @@ export const FLAG_SPECS = {
         placeholder: "PATTERN",
         description: "Append one ordered scope pattern to the contract before audit. May be repeated.",
     },
+    renew: {
+        kind: "boolean",
+        description: "Renew onto the current target before petitioning.",
+    },
     resolve: {
         kind: "boolean",
         description: "Open a durable Keiyaku-owned renew recovery session when the rewrite conflicts.",

package/build/cli/index.js

@@ -57,9 +57,6 @@ function prepareBindInput(stdin, flags) {
             checks: flags.bindChecks,
         });
     }
-    if (flags.dryRun) {
-        throw new FlowError("EMPTY_PARAM", "--dry-run requires --place, --objective, --scope, and --checks");
-    }
     if (!nonblankStdin) {
         // --task may supply name/objective defaults; core merges and reports missing sections.
         if (flags.bindTaskIds !== undefined && flags.bindTaskIds.length > 0) {
@@ -188,11 +185,17 @@ function selectedArgument(parsed) {
     if (stdin.selector === undefined)
         return undefined;
     if (stdin.selector.kind === "positional") {
-        return { token: parsed.positional[stdin.selector.index], replace: () => parsed.flags };
+        const token = parsed.positional[stdin.selector.index];
+        if (token === undefined && !stdin.selector.required)
+            return undefined;
+        return { token, replace: () => parsed.flags };
     }
     const flagName = stdin.selector.name;
+    const token = parsed.flags[flagName];
+    if (token === undefined && !stdin.selector.required)
+        return undefined;
     return {
-        token: parsed.flags[flagName],
+        token,
         replace: (value) => ({ ...parsed.flags, [flagName]: value }),
     };
 }
@@ -248,7 +251,8 @@ export async function runCliCommand(tokens) {
         await printFailure(error, cwd);
         return 1;
     }
-    // Bind dry-run must compile and return before repository/cwd resolution or filesystem effects.
+    // Bind input compilation is side-effect free. Dry-run then performs the same
+    // repository admission as bind but does not persist an artifact on failure.
     if (parsed.command === "bind") {
         try {
             stdin = prepareBindInput(stdin, parsed.flags);

package/build/cli/parse-flags.js

@@ -54,6 +54,9 @@ export function assignFlag(flags, name, value) {
         case "detach":
             flags.detach = Boolean(value);
             return;
+        case "interrupt":
+            flags.interrupt = Boolean(value);
+            return;
         case "draft-only":
             flags.draftOnly = Boolean(value);
             return;
@@ -102,6 +105,9 @@ export function assignFlag(flags, name, value) {
         case "append-scope":
             flags.appendScope = [...(flags.appendScope ?? []), String(value)];
             return;
+        case "renew":
+            flags.renewBeforePetition = Boolean(value);
+            return;
         case "resolve":
             flags.renewResolve = Boolean(value);
             return;

package/build/cli/parse-metadata.js

@@ -83,7 +83,7 @@ export function commandPositionalRange(command) {
     if (command === "task add") {
         return { min: 1, max: 1, label: "<BODY|->" };
     }
-    if (command === "task show" || command === "task start" || command === "task drop") {
+    if (command === "task show" || command === "task log" || command === "task start" || command === "task drop") {
         return { min: 1, max: 1, label: "<ID>" };
     }
     if (command === "task update") {

package/build/cli/render/line-width.js

@@ -54,6 +54,39 @@ export function truncateColumns(value, maxColumns) {
     }
     return `${output}…`;
 }
+/** Truncate descriptive command text in the middle while retaining both ends. */
+export function truncateMiddleColumns(value, maxColumns) {
+    if (maxColumns <= 0)
+        return "";
+    if (displayColumns(value) <= maxColumns)
+        return value;
+    if (maxColumns === 1)
+        return "…";
+    const budget = maxColumns - 1;
+    const leftBudget = Math.ceil(budget / 2);
+    const rightBudget = Math.floor(budget / 2);
+    let left = "";
+    let width = 0;
+    for (const character of value) {
+        const next = characterColumns(character);
+        if (width + next > leftBudget)
+            break;
+        left += character;
+        width += next;
+    }
+    const chars = [...value];
+    let right = "";
+    width = 0;
+    for (let index = chars.length - 1; index >= 0; index -= 1) {
+        const character = chars[index];
+        const next = characterColumns(character);
+        if (width + next > rightBudget)
+            break;
+        right = character + right;
+        width += next;
+    }
+    return `${left}…${right}`;
+}
 export function resolveLineColumns(stream = process.stdout) {
     return stream.isTTY === true && Number.isInteger(stream.columns) && stream.columns > 0
         ? stream.columns

package/build/cli/render/path-prefix-compaction.js

@@ -0,0 +1,88 @@
+const MIN_COMPACTION_SAVINGS = 4;
+const SAFE_PATTERN_COMPONENT = /^[A-Za-z0-9._*?\[\]-]+$/;
+const SAFE_CONCRETE_PATH_COMPONENT = /^[A-Za-z0-9._-]+$/;
+/** Compact one displayed pattern-pair without merging distinct overlap facts. */
+export function compactPatternPair(left, right) {
+    const literal = `${left} × ${right}`;
+    const leftParts = safePatternComponents(left);
+    const rightParts = safePatternComponents(right);
+    if (!leftParts || !rightParts)
+        return literal;
+    let sharedCount = 0;
+    const maximumShared = Math.min(leftParts.length, rightParts.length) - 1;
+    while (sharedCount < maximumShared && leftParts[sharedCount] === rightParts[sharedCount]) {
+        sharedCount += 1;
+    }
+    if (sharedCount === 0)
+        return literal;
+    const prefix = leftParts.slice(0, sharedCount).join("/");
+    const compacted = `${prefix}/{${leftParts.slice(sharedCount).join("/")} × ${rightParts.slice(sharedCount).join("/")}}`;
+    return savesEnough(literal, compacted) ? compacted : literal;
+}
+/** Compact a concrete preview through a stable slash-component trie when unambiguous. */
+export function compactPathPreview(paths) {
+    const literal = paths.join(", ");
+    if (paths.length < 2)
+        return literal;
+    const components = paths.map(safeConcretePathComponents);
+    if (components.some((parts) => !parts))
+        return literal;
+    const trie = createTrie();
+    for (const parts of components)
+        insertPath(trie, parts);
+    if (hasTerminalBranch(trie))
+        return literal;
+    if (!hasSharedDirectoryPrefix(trie))
+        return literal;
+    const compacted = renderTrie(trie);
+    return savesEnough(literal, compacted) ? compacted : literal;
+}
+function safePatternComponents(value) {
+    return safeSlashComponents(value, SAFE_PATTERN_COMPONENT);
+}
+function safeConcretePathComponents(value) {
+    return safeSlashComponents(value, SAFE_CONCRETE_PATH_COMPONENT);
+}
+function safeSlashComponents(value, safeComponent) {
+    const parts = value.split("/");
+    if (parts.length === 0 || parts.some((part) => part === "." || part === ".." || !safeComponent.test(part))) {
+        return null;
+    }
+    return parts;
+}
+function createTrie() {
+    return { terminal: false, children: new Map() };
+}
+function insertPath(node, parts) {
+    let current = node;
+    for (const part of parts) {
+        let child = current.children.get(part);
+        if (!child) {
+            child = createTrie();
+            current.children.set(part, child);
+        }
+        current = child;
+    }
+    current.terminal = true;
+}
+function hasTerminalBranch(node) {
+    if (node.terminal && node.children.size > 0)
+        return true;
+    return [...node.children.values()].some(hasTerminalBranch);
+}
+function hasSharedDirectoryPrefix(node, isRoot = true) {
+    if (!isRoot && node.children.size > 1)
+        return true;
+    return [...node.children.values()].some((child) => hasSharedDirectoryPrefix(child, false));
+}
+function renderTrie(node) {
+    const entries = [...node.children.entries()].map(([part, child]) => {
+        if (child.children.size === 0)
+            return part;
+        return `${part}/${renderTrie(child)}`;
+    });
+    return entries.length === 1 ? entries[0] : `{${entries.join(",")}}`;
+}
+function savesEnough(literal, compacted) {
+    return literal.length - compacted.length >= MIN_COMPACTION_SAVINGS;
+}

package/build/cli/render/petition.js

@@ -4,6 +4,10 @@ import { assembleResponse, buildPayload, buildSection, formatMaybe, formatWarnin
 import { DIFF_OVERVIEW_SECTION_TITLE, RESPONSE_MARKERS, WARNING_SECTION_TITLE } from "./response-style.js";
 import { INFO_COMMIT_MAX_CHARS, INFO_PLEA_MAX_CHARS, } from "./shared.js";
 import { prependAddressReceipt } from "./address.js";
+/** Public consequence for a completed renew phase of petition --renew. */
+export function renderPetitionRenewedConsequence(input) {
+    return `renewed onto ${input.newBase.slice(0, 8)} · ${input.sealed?.receipts.length ?? 0} receipts replayed`;
+}
 function formatPetitionSealSource(source) {
     return source.arc === null
         ? `no open arc · fence ${source.fence}`