@astrosheep/keiyaku 4.1.0 → 4.1.2

package/build/src/cli/render/refusal.js

@@ -22,7 +22,8 @@ function refusalIdentity(refusal, addressed) {
 }
 function refusalHead(kind, identity, details) {
     return [kind, identity === undefined ? undefined : `contractId=${identity}`, ...details]
-        .filter((part) => part !== undefined).join(" ");
+        .filter((part) => part !== undefined)
+        .join(" ");
 }
 function renderDirtyRefusal(refusal, indent, columns, identity) {
     const lines = [];
@@ -71,28 +72,22 @@ export function renderRefusalFacts(refusal, indent, columns, addressed) {
         return lines;
     }
     if (refusal.kind === "merge-state-present") {
-        return renderOpaqueBlock(refusalHead(refusal.kind, identity, [
-            `workspace=${refusal.workspace.kind}`,
-            `path=${refusal.workspace.path}`,
-        ]), indent, columns);
+        return renderOpaqueBlock(refusalHead(refusal.kind, identity, [`workspace=${refusal.workspace.kind}`, `path=${refusal.workspace.path}`]), indent, columns);
     }
     if (refusal.kind === "integration-unsupported") {
         return renderOpaqueBlock(refusalHead(refusal.kind, identity, [`requiredGit=${refusal.requiredGit}`]), indent, columns);
     }
     if (refusal.kind === "checkout-not-followable") {
-        const lines = [...renderOpaqueBlock(refusalHead(refusal.kind, identity, [`target=${refusal.target}`, `path=${refusal.path}`, `reason=${refusal.reason}`]), indent, columns)];
+        const lines = [
+            ...renderOpaqueBlock(refusalHead(refusal.kind, identity, [
+                `target=${refusal.target}`,
+                `path=${refusal.path}`,
+                `reason=${refusal.reason}`,
+            ]), indent, columns),
+        ];
         lines.push(...collectionLines("paths", refusal.paths, indent, columns));
         return lines;
     }
-    if (refusal.kind === "workspace-not-on-target") {
-        return renderOpaqueBlock(refusalHead(refusal.kind, identity, [`target=${refusal.target}`, `branch=${refusal.branch}`]), indent, columns);
-    }
-    if (refusal.kind === "here-target-mismatch") {
-        return renderOpaqueBlock(`here-target-mismatch target=${refusal.target} branch=${refusal.branch}`, indent, columns);
-    }
-    if (refusal.kind === "here-worktree-appointed") {
-        return renderOpaqueBlock(refusalHead(refusal.kind, undefined, [refusal.contract === undefined ? "" : `contract=${refusal.contract}`, `path=${refusal.path}`]), indent, columns);
-    }
     return renderOpaqueBlock(refusalHead(refusal.kind, identity, []), indent, columns);
 }
 export function renderRefusal(result, context) {

package/build/src/cli/render/region.js

@@ -1,16 +1,32 @@
+function overlapBlocks(overlaps) {
+    return overlaps.flatMap((overlap) => {
+        const count = overlap.patterns.length;
+        return [
+            `overlap ${overlap.contract} ${count} ${count === 1 ? "pair" : "pairs"}`,
+            ...overlap.patterns.map((pattern) => `  ${pattern.mine} ~ ${pattern.theirs}`),
+        ];
+    });
+}
 function rows(section) {
     if (section.kind === "absent")
         return [];
     if (section.kind === "failed")
         return [`region failed ${section.failure.message}`];
     const value = section.value;
-    if (value.kind === "declarations")
+    if (value.kind === "declarations") {
+        if (value.declarations.length === 0)
+            return ["no active Region declarations"];
         return value.declarations.map((declaration) => `region ${declaration.contract} ${declaration.patterns.join(" ")}`);
-    if (value.kind === "contract")
-        return [`region ${value.declaration.contract} ${value.declaration.patterns.join(" ")}`];
-    if (value.kind === "path")
-        return value.matches.map((match) => `path ${value.path} ${match.contract} ${match.pattern}`);
-    return value.intersections.flatMap((intersection) => intersection.patterns.map((pattern) => `overlap ${intersection.left} ${pattern.left} ~ ${intersection.right} ${pattern.right}`));
+    }
+    if (value.kind === "contract") {
+        const header = `region ${value.declaration.contract} ${value.declaration.patterns.join(" ")}`;
+        if (value.overlaps.length === 0)
+            return [header, "no overlap with active declarations"];
+        return [header, ...overlapBlocks(value.overlaps)];
+    }
+    if (value.overlaps.length === 0)
+        return [`no active Region declares: ${value.patterns.join(" ")}`];
+    return [...overlapBlocks(value.overlaps)];
 }
 export function renderRegionText(section) {
     return rows(section).join("\n");

package/build/src/cli/render/settings.js

@@ -1,11 +1,11 @@
 function namespaceNames(value) {
-    return [...new Set([value.scopes.user, value.scopes.project].flatMap((scope) => scope.kind === "read" ? scope.namespaces : []))].sort();
+    return [
+        ...new Set([value.scopes.user, value.scopes.project].flatMap((scope) => (scope.kind === "read" ? scope.namespaces : []))),
+    ].sort();
 }
 function scope(name, value) {
     const path = value.path === undefined ? "" : ` ${value.path}`;
-    return value.kind === "failed"
-        ? `${name} failed${path} ${value.diagnostic}`
-        : `${name} ${value.kind}${path}`;
+    return value.kind === "failed" ? `${name} failed${path} ${value.diagnostic}` : `${name} ${value.kind}${path}`;
 }
 export function settingsJsonValue(value) {
     return {

package/build/src/cli/render/task.js

@@ -2,9 +2,10 @@ import { outcomeLines, receiptPayload } from "./receipt.js";
 import { displayColumns, renderTextBlock, safeText } from "./terminal.js";
 const DEFAULT_CONTEXT = { columns: 80, color: false };
 function isWorldObservation(result) {
-    return typeof result === "object" && result !== null
-        && "kind" in result
-        && (result.kind === "present" || result.kind === "absent" || result.kind === "failed");
+    return (typeof result === "object" &&
+        result !== null &&
+        "kind" in result &&
+        (result.kind === "present" || result.kind === "absent" || result.kind === "failed"));
 }
 function markFor(word) {
     if (word === "in_progress")
@@ -25,7 +26,9 @@ function priorityText(priority) {
     return priority === null ? "P?" : `P${priority}`;
 }
 function scanUnit(id, priority, word) {
-    return word === undefined ? `${markFor("ready")} ${id} · ${priorityText(priority)}` : `${markFor(word)} ${id} · ${priorityText(priority)} ${word}`;
+    return word === undefined
+        ? `${markFor("ready")} ${id} · ${priorityText(priority)}`
+        : `${markFor(word)} ${id} · ${priorityText(priority)} ${word}`;
 }
 function entityLines(entity, columns, indent = "") {
     const scan = `${indent}${scanUnit(entity.id, entity.priority, entity.word)}${entity.facts === undefined ? "" : ` · ${entity.facts}`}`;
@@ -38,7 +41,12 @@ function entityLines(entity, columns, indent = "") {
     return [`${scan} —`, ...renderTextBlock(title, `${indent}  `, columns)];
 }
 function stateEntity(task) {
-    return { id: task.id, priority: "priority" in task && task.priority !== undefined ? task.priority : null, word: task.state, title: task.title };
+    return {
+        id: task.id,
+        priority: "priority" in task && task.priority !== undefined ? task.priority : null,
+        word: task.state,
+        title: task.title,
+    };
 }
 function projectRefusal(refusal) {
     if (refusal.kind === "task-missing")
@@ -110,7 +118,9 @@ function renderListRow(item, columns, omitDisposition) {
     }
     return lines;
 }
-function shellQuote(value) { return `'${value.replaceAll("'", "'\\''")}'`; }
+function shellQuote(value) {
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
 function recoveryCommand(command, total) {
     const parts = ["keiyaku", "task", command.action];
     if (command.action === "ls") {
@@ -136,9 +146,17 @@ function renderRows(command, result, columns) {
         return renderFailure(command.action, result, columns);
     const view = command.action === "ls" ? "tasks" : command.action;
     const footer = result.value.truncated
-        ? ["", `  + ${result.value.total - result.value.returned} more not shown`, `    ${recoveryCommand(command, result.value.total)}`]
+        ? [
+            "",
+            `  + ${result.value.total - result.value.returned} more not shown`,
+            `    ${recoveryCommand(command, result.value.total)}`,
+        ]
         : [];
-    return [pageHeading(view, result.value), ...result.value.rows.flatMap((item) => renderListRow(item, columns, command.action === "ready")), ...footer].join("\n");
+    return [
+        pageHeading(view, result.value),
+        ...result.value.rows.flatMap((item) => renderListRow(item, columns, command.action === "ready")),
+        ...footer,
+    ].join("\n");
 }
 function renderShowDetail(result, columns) {
     const task = result.task;
@@ -199,10 +217,7 @@ function renderDoctor(report) {
     return [`${report.issues.length} ${noun}`, ...report.issues.map(doctorIssue)].join("\n");
 }
 function renderAcceptedMutation(verb, task, columns, documentDiff) {
-    const lines = [
-        ...outcomeLines("✓", verb, "accepted", task.id, columns),
-        ...entityLines(stateEntity(task), columns),
-    ];
+    const lines = [...outcomeLines("✓", verb, "accepted", task.id, columns), ...entityLines(stateEntity(task), columns)];
     if (documentDiff !== undefined)
         receiptPayload(lines, "diff", documentDiff);
     return lines.join("\n");
@@ -266,12 +281,17 @@ export function renderTaskText(command, result, context = DEFAULT_CONTEXT) {
 function renderTaskValue(command, result, columns) {
     if (command.action === "show")
         return renderShow(result, columns);
-    if (command.action === "ls" || command.action === "ready" || command.action === "blocked" || command.action === "query") {
+    if (command.action === "ls" ||
+        command.action === "ready" ||
+        command.action === "blocked" ||
+        command.action === "query") {
         return renderRows(command, result, columns);
     }
     if (command.action === "tree") {
         const tree = result;
-        return tree.kind === "accepted" ? treeLines(tree.value, columns).join("\n") : renderFailure(command.action, tree, columns);
+        return tree.kind === "accepted"
+            ? treeLines(tree.value, columns).join("\n")
+            : renderFailure(command.action, tree, columns);
     }
     if (command.action === "doctor")
         return renderDoctor(result);

package/build/src/cli/render/terminal.js

@@ -13,9 +13,17 @@ export function gitShortStat(stat) {
 }
 const GRAPHEMES = new Intl.Segmenter("und", { granularity: "grapheme" });
 const WIDE_RANGES = [
-    [0x1100, 0x115f], [0x2329, 0x232a], [0x2e80, 0xa4cf], [0xac00, 0xd7a3],
-    [0xf900, 0xfaff], [0xfe10, 0xfe19], [0xfe30, 0xfe6f], [0xff00, 0xff60],
-    [0xffe0, 0xffe6], [0x1f300, 0x1faff], [0x20000, 0x3fffd],
+    [0x1100, 0x115f],
+    [0x2329, 0x232a],
+    [0x2e80, 0xa4cf],
+    [0xac00, 0xd7a3],
+    [0xf900, 0xfaff],
+    [0xfe10, 0xfe19],
+    [0xfe30, 0xfe6f],
+    [0xff00, 0xff60],
+    [0xffe0, 0xffe6],
+    [0x1f300, 0x1faff],
+    [0x20000, 0x3fffd],
 ];
 function characterColumns(character) {
     const point = character.codePointAt(0);
@@ -108,10 +116,13 @@ export function renderBoundedTextBlock(value, input) {
     return lines.length === 0 ? [input.first.trimEnd()] : lines;
 }
 export function safeText(value) {
-    return value.replaceAll(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/gu, (character) => /\s/u.test(character) ? " " : "�");
+    return value.replaceAll(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/gu, (character) => (/\s/u.test(character) ? " " : "�"));
 }
 export function renderTextBlock(value, indent, columns) {
-    const words = safeText(value).trim().split(/\s+/u).filter((word) => word.length > 0);
+    const words = safeText(value)
+        .trim()
+        .split(/\s+/u)
+        .filter((word) => word.length > 0);
     if (words.length === 0)
         return [indent];
     const lines = [];

package/build/src/cli/result.d.ts

@@ -2,7 +2,7 @@ import type { AuditReport, ContractHistory, ContractId, ContinuationReport, Deli
 import type { KanshiReport } from "../kanshi/index.js";
 import type { RegionRead, Section } from "../kanshi/index.js";
 import type { Catalog } from "../index.js";
-import type { RegionObservation } from "../library/region.js";
+import type { AmendRegionObservation, RegionObservation } from "../library/region.js";
 import type { NukeResult } from "../index.js";
 export type BindDraftReceipt = Readonly<{
     path: string;
@@ -38,7 +38,7 @@ export type AcceptedEnvelope = Readonly<{
 }>;
 export type AcceptedBindResult = AcceptedEnvelope & Readonly<{
     verb: "bind";
-    workspace: "worktree" | "here";
+    workspace: "worktree";
     target: string | null;
     completion?: never;
     verification?: never;
@@ -73,7 +73,7 @@ export type AcceptedAmendResult = AcceptedEnvelope & Readonly<{
     verdict?: never;
     chapter?: never;
     note?: never;
-}> & RegionObservation;
+}> & AmendRegionObservation;
 export type AcceptedDeliverResult = AcceptedEnvelope & Readonly<{
     verb: "deliver";
     completion?: Delivery["completion"];

package/build/src/cli/runtime.d.ts

@@ -1,2 +1,7 @@
-import type { ParsedExecution } from "./parse.js";
+import type { TaskInvocationResult } from "./commands/task-invoke.js";
+import type { ParsedCommand, ParsedExecution } from "./parse.js";
+export declare function invocationStart(command: ParsedCommand): string | undefined;
+export declare function writeTask(command: Extract<ParsedCommand, {
+    command: "task";
+}>, result: TaskInvocationResult): Promise<number>;
 export declare function runCliCommand(invocation: ParsedExecution): Promise<number>;

package/build/src/cli/runtime.js

@@ -1,6 +1,6 @@
 import { isParsedAkumaCommand } from "./commands/akuma.js";
 import { CliUsageError } from "./parse.js";
-function invocationStart(command) {
+export function invocationStart(command) {
     if (command.output === "json")
         return undefined;
     if (command.command === "bind")
@@ -13,39 +13,90 @@ function invocationStart(command) {
         return "⧖ reconciling";
     return command.command === "install" ? "⧖ installing skills" : undefined;
 }
-async function writeTask(command, result) {
+function writeCliStream(stream, body) {
+    stream.write(body.endsWith("\n") ? body : `${body}\n`);
+}
+export async function writeTask(command, result) {
     const { renderTaskIncompleteDiagnostic, renderTaskText, taskExitCode } = await import("./render/task.js");
     const context = {
         columns: process.stdout.isTTY === true && Number.isInteger(process.stdout.columns) ? process.stdout.columns : 80,
         color: false,
     };
     if (command.output === "json")
-        process.stdout.write(`${JSON.stringify(result)}\n`);
-    else if (command.action === "compose" && typeof result === "object" && result !== null && "kind" in result && result.kind === "incomplete") {
+        writeCliStream(process.stdout, JSON.stringify(result));
+    else if (command.action === "compose" &&
+        typeof result === "object" &&
+        result !== null &&
+        "kind" in result &&
+        result.kind === "incomplete") {
         const diagnostic = renderTaskIncompleteDiagnostic(result);
         if (diagnostic.length > 0)
-            process.stderr.write(`${diagnostic}\n`);
+            writeCliStream(process.stderr, diagnostic);
         process.stdout.write(result.draft);
     }
     else
-        process.stdout.write(`${renderTaskText(command, result, context)}\n`);
+        writeCliStream(process.stdout, renderTaskText(command, result, context));
     return taskExitCode(result);
 }
-async function writeAkuma(command, result) {
-    const { renderAkumaJson, akumaExitCode, akumaRawAnswer, renderAkumaText } = await import("./render/akuma.js");
-    const output = command.output === "json" ? renderAkumaJson(result) : renderAkumaText(command, result, {
+function displayContext() {
+    return {
         columns: process.stdout.isTTY === true && Number.isInteger(process.stdout.columns) ? process.stdout.columns : 80,
         color: process.stdout.isTTY === true && process.env.NO_COLOR === undefined,
-    });
-    const raw = command.output === "text" && ((command.command === "history" && command.last) || akumaRawAnswer(result) !== undefined);
-    process.stdout.write(raw ? output : `${output}\n`);
+    };
+}
+async function writeAkuma(command, result) {
+    const { renderAkumaJson, akumaExitCode, akumaRawAnswer, renderAkumaText } = await import("./render/akuma.js");
+    const output = command.output === "json" ? renderAkumaJson(result) : renderAkumaText(command, result, displayContext());
+    const exact = command.output === "text" &&
+        (akumaRawAnswer(result) !== undefined ||
+            (command.command === "history" && command.last && result.action === "history" && result.mode === "last"));
+    if (exact)
+        process.stdout.write(output);
+    else
+        writeCliStream(process.stdout, output);
     return akumaExitCode(result);
 }
+function isAkumaOutput(command, result) {
+    if (isParsedAkumaCommand(command))
+        return true;
+    return (command.command === "status" &&
+        typeof result === "object" &&
+        result !== null &&
+        "kind" in result &&
+        result.kind === "akuma");
+}
+function invocationJson(result) {
+    switch (result.kind) {
+        case "guidance":
+            return { contract: result.contract, guidance: result.guidance };
+        case "catalog":
+            return result.catalog;
+        case "nuke":
+            return result.result;
+        case "region":
+            return result.region;
+        case "contract-history":
+            return result.history;
+        case "status":
+            return result.report;
+        default:
+            return result;
+    }
+}
+async function invocationExitCode(result) {
+    if (result.kind === "nuke")
+        return (await import("./render/nuke.js")).nukeExitCode(result.result);
+    if (result.kind === "observation") {
+        const { worldObservationFailureText } = await import("./render/board.js");
+        return worldObservationFailureText(result) === undefined ? 0 : 1;
+    }
+    return result.kind === "refused" ? 1 : result.kind === "retry" ? 2 : 0;
+}
 async function writeResult(command, result) {
     if (command.command === "install") {
         const { installExitCode, renderInstallText } = await import("./commands/install.js");
         const value = result;
-        process.stdout.write(`${command.output === "json" ? JSON.stringify(value) : renderInstallText(value)}\n`);
+        writeCliStream(process.stdout, command.output === "json" ? JSON.stringify(value) : renderInstallText(value));
         return installExitCode(value);
     }
     if (command.command === "task")
@@ -53,59 +104,23 @@ async function writeResult(command, result) {
     if (command.command === "settings") {
         const { renderSettingsText, settingsJsonValue } = await import("./render/settings.js");
         const value = result.value;
-        process.stdout.write(`${command.output === "json" ? JSON.stringify(settingsJsonValue(value)) : renderSettingsText(value)}\n`);
-        return 0;
-    }
-    if (typeof result === "object" && result !== null && "kind" in result && result.kind === "contract-history") {
-        const { renderText } = await import("./render/text.js");
-        const history = result.history;
-        const output = command.output === "json" ? JSON.stringify(history) : renderText(result);
-        process.stdout.write(`${output}\n`);
+        writeCliStream(process.stdout, command.output === "json" ? JSON.stringify(settingsJsonValue(value)) : renderSettingsText(value));
         return 0;
     }
-    const akumaResult = typeof result === "object" && result !== null && "kind" in result && result.kind === "akuma";
-    if (isParsedAkumaCommand(command))
-        return await writeAkuma(command, result);
-    if (akumaResult && command.command === "status")
+    if (isAkumaOutput(command, result))
         return await writeAkuma(command, result);
     const contractResult = result;
-    if (contractResult.kind === "guidance") {
-        if (command.output === "json")
-            process.stdout.write(`${JSON.stringify({ contract: contractResult.contract, guidance: contractResult.guidance })}\n`);
-        else
-            process.stdout.write(contractResult.guidance.endsWith("\n") ? contractResult.guidance : `${contractResult.guidance}\n`);
-        return 0;
-    }
-    if (contractResult.kind === "catalog") {
-        const { renderCatalogText } = await import("./render/catalog.js");
-        process.stdout.write(`${command.output === "json" ? JSON.stringify(contractResult.catalog) : renderCatalogText(contractResult.catalog)}\n`);
-        return 0;
-    }
-    if (contractResult.kind === "nuke") {
-        const { nukeExitCode } = await import("./render/nuke.js");
-        const { renderText } = await import("./render/text.js");
-        const output = command.output === "json" ? JSON.stringify(contractResult.result) : renderText(contractResult);
-        process.stdout.write(`${output}\n`);
-        return nukeExitCode(contractResult.result);
-    }
-    if (contractResult.kind === "region") {
-        const { renderText } = await import("./render/text.js");
-        process.stdout.write(`${command.output === "json" ? JSON.stringify(contractResult.region) : renderText(contractResult)}\n`);
-        return 0;
-    }
     const { renderText } = await import("./render/text.js");
-    const output = command.output === "json"
-        ? JSON.stringify(contractResult.kind === "status" ? contractResult.report : contractResult)
-        : renderText(contractResult, {
-            columns: process.stdout.isTTY === true && Number.isInteger(process.stdout.columns) ? process.stdout.columns : 80,
-            color: process.stdout.isTTY === true && process.env.NO_COLOR === undefined,
-        });
-    process.stdout.write(`${output}\n`);
-    return contractResult.kind === "refused" ? 1 : contractResult.kind === "retry" ? 2 : 0;
+    const json = command.output === "json";
+    const body = json ? JSON.stringify(invocationJson(contractResult)) : renderText(contractResult, displayContext());
+    writeCliStream(process.stdout, body);
+    return invocationExitCode(contractResult);
 }
 function writeWorldScopeRefusal(error, output) {
-    const body = output === "json" ? JSON.stringify(error.refusal) : `${error.refusal.kind} ${error.refusal.world} ${error.refusal.ids.join(" ")}`;
-    process.stderr.write(`${body}\n`);
+    const body = output === "json"
+        ? JSON.stringify(error.refusal)
+        : `${error.refusal.kind} ${error.refusal.world} ${error.refusal.ids.join(" ")}`;
+    writeCliStream(process.stderr, body);
     return 1;
 }
 export async function runCliCommand(invocation) {
@@ -115,7 +130,13 @@ export async function runCliCommand(invocation) {
         const { invoke } = await import("./invoke.js");
         const result = await invoke(invocation, {
             cwd: process.cwd(),
-            ...(start === undefined ? {} : { onOperationStart: () => { process.stderr.write(`${start}\n`); } }),
+            ...(start === undefined
+                ? {}
+                : {
+                    onOperationStart: () => {
+                        writeCliStream(process.stderr, start);
+                    },
+                }),
         });
         return await writeResult(command, result);
     }
@@ -128,13 +149,13 @@ export async function runCliCommand(invocation) {
         if (command.command === "bind") {
             const { BindDraftError } = await import("./draft.js");
             if (error instanceof BindDraftError) {
-                process.stderr.write(`${error.original instanceof Error ? error.original.message : String(error.original)}\n`);
+                writeCliStream(process.stderr, error.original instanceof Error ? error.original.message : String(error.original));
                 const { renderBindDraftReceipt } = await import("./render/refusal.js");
-                process.stderr.write(`${renderBindDraftReceipt(error.draft)}\n`);
+                writeCliStream(process.stderr, renderBindDraftReceipt(error.draft));
                 return error.original instanceof CliUsageError ? 1 : 3;
             }
         }
-        process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+        writeCliStream(process.stderr, error instanceof Error ? error.message : String(error));
         return error instanceof CliUsageError ? 1 : 3;
     }
 }

package/build/src/cli/selectors.js

@@ -25,8 +25,7 @@ function resolveShortContract(rows, selector) {
     if (selector.startsWith("@kei/"))
         selectorError(`redundant short contract selector: ${selector}`);
     const short = selector.slice(1);
-    const candidates = activeManagedCandidates(rows)
-        .filter((candidate) => candidate.id.slice("kei/".length) === short);
+    const candidates = activeManagedCandidates(rows).filter((candidate) => candidate.id.slice("kei/".length) === short);
     if (candidates.length === 0)
         selectorError(`unknown contract selector: ${selector}`);
     if (candidates.length !== 1)
@@ -34,8 +33,7 @@ function resolveShortContract(rows, selector) {
     return candidates[0].id;
 }
 function resolveOmittedContract(board, scope) {
-    const candidates = activeManagedCandidates(board.rows)
-        .filter((candidate) => resolve(scope) === resolve(candidate.worktreePath));
+    const candidates = activeManagedCandidates(board.rows).filter((candidate) => resolve(scope) === resolve(candidate.worktreePath));
     if (candidates.length === 0) {
         selectorError("an explicit full or @ contract selector is required outside a managed worktree");
     }

package/build/src/cli/usage.js

@@ -12,11 +12,12 @@ export function isBlankInput(value) {
     return value.trim().length === 0;
 }
 export function usageLine(usage) {
-    return usage.split("\n").map((line, index) => {
+    return usage
+        .split("\n")
+        .map((line, index) => {
         if (index === 0)
             return `usage: keiyaku ${line}`;
-        return line.startsWith("task ")
-            ? `       keiyaku ${line}`
-            : `       ${line.trimStart()}`;
-    }).join("\n");
+        return line.startsWith("task ") ? `       keiyaku ${line}` : `       ${line.trimStart()}`;
+    })
+        .join("\n");
 }

package/build/src/contract-worktree.d.ts

@@ -13,16 +13,6 @@ export type ContractAppointment = Readonly<{
     kind: "invalid";
     path: string;
 }>;
-export type HereContractWorkspaceObservation = Readonly<{
-    kind: "appointed";
-    path: string;
-}> | Readonly<{
-    kind: "unappointed";
-}> | Readonly<{
-    kind: "failed";
-    diagnostic: string;
-    cause?: "duplicate" | "observation";
-}>;
 export declare function renderContractGuidance(state: ContractState): string;
 export type ContractFileEffect = Readonly<{
     kind: "contract-file";
@@ -40,18 +30,6 @@ export type ContractWorktreeResult = Readonly<{
     lag: readonly ContractFileLag[];
 }>;
 export declare function readContractAppointment(repository: GitRepository): Promise<ContractAppointment>;
-/** Fold existing here appointments over all registered worktrees for one Contract. */
-export declare function resolveHereContractWorkspace(repository: GitRepository, contract: ContractId): Promise<HereContractWorkspaceObservation>;
-export type ContractReservation = Readonly<{
-    kind: "reserved";
-    path: string;
-}> | Exclude<ContractAppointment, Readonly<{
-    kind: "absent";
-    path: string;
-}>>;
-export declare function reserveContractWorktree(repository: GitRepository, contract: ContractId): Promise<ContractReservation>;
 export declare function withContractWorktreeAppointment<T>(repository: GitRepository, action: () => T | Promise<T>): Promise<T>;
 export declare function releaseContractWorktree(repository: GitRepository, contract: ContractId): Promise<void>;
-/** Remove matching here appointments and their exact generated support from registered worktrees. */
-export declare function nukeHereAppointments(repository: GitRepository): Promise<void>;
-export declare function projectContractWorktree(repository: GitRepository, state: ContractState | null, register?: PlaceRegister, onConflict?: (diagnostic: string) => never): Promise<ContractWorktreeResult>;
+export declare function projectContractWorktree(repository: GitRepository, state: ContractState | null, register?: PlaceRegister, _onConflict?: (diagnostic: string) => never): Promise<ContractWorktreeResult>;