@astrosheep/keiyaku 2.9.5 → 2.9.7

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/errors.js

@@ -1,4 +1,4 @@
-import { asMessage, isFlowError, pickHintsFromError } from "../../flow-error.js";
+import { asMessage, isFlowError, pickHintsFromError, } from "../../flow-error.js";
 import { assertSettingsKnobUsable } from "../../config/settings/disease.js";
 import { loadKeiyakuSettings } from "../../config/settings/loader.js";
 import { loadAkumaCatalog } from "../../config/akuma-loader.js";
@@ -6,6 +6,20 @@ import { appendDebugLog } from "../../telemetry/debug-log.js";
 import { ACTOR_IDENTITY, TOOL_NAMES, BUILTIN_AGENT_NAMES } from "../../keiyaku.js";
 import { buildErrorResponse } from "./misc.js";
 import { addressCarrierFromError } from "../../core/addressing.js";
+import { shellQuote } from "./format.js";
+const TASK_FILTER_GRAMMAR_EXAMPLE = "title~audit,scope";
+function formatTaskFilterExpression(terms) {
+    return terms.map((term) => `${term.field}${term.operator}${term.values.join(",")}`).join("|");
+}
+function renderInvalidTaskFilterMessage(facts) {
+    const guidance = facts.recoveredTerms.length === 0
+        ? `Grammar example: keiyaku task ls --filter ${shellQuote(TASK_FILTER_GRAMMAR_EXAMPLE)}`
+        : `Paste-ready equivalent for parsed terms: keiyaku task ls --filter ${shellQuote(formatTaskFilterExpression(facts.recoveredTerms))}`;
+    return `invalid task filter: ${facts.detail}. Valid fields: ${facts.fields.join(", ")}. `
+        + `Valid operators: ${facts.operators.join(", ")}. `
+        + `Repeat --filter for AND; use commas for same-field OR or | between complete filters. `
+        + guidance;
+}
 function renderScopeViolation(evidence) {
     if (evidence.outcome === "no-positive-match") {
         return `  ${evidence.path}\n    no positive pattern matched`;
@@ -35,6 +49,9 @@ export function renderScopeAuditMessage(scope, evidence) {
     ].join("\n");
 }
 function renderErrorMessage(error) {
+    if (isFlowError(error) && error.facts?.kind === "invalid_task_filter") {
+        return renderInvalidTaskFilterMessage(error.facts);
+    }
     if (isFlowError(error) && error.facts?.kind === "scope_violation") {
         return renderScopeAuditMessage(error.facts.scope, error.facts.violations);
     }

package/build/cli/render/format.js

@@ -1,10 +1,13 @@
 import { getConfig } from "../../config/env.js";
 import { SECTION_ICONS } from "./response-style.js";
-/** Quote a shell argument only when the token is not already a single safe word. */
+// Command-copy output is POSIX shell syntax: close the quote, emit a literal
+// apostrophe, then reopen the quote. Other shell dialects are not supported.
+const POSIX_SINGLE_QUOTE_ESCAPE = "'\\''";
+/** Quote a POSIX shell argument only when the token is not already a single safe word. */
 export function shellQuote(value) {
     if (/^[A-Za-z0-9_./:@%+=,-]+$/.test(value))
         return value;
-    return `'${value.replace(/'/g, "'\\''")}'`;
+    return `'${value.replace(/'/g, POSIX_SINGLE_QUOTE_ESCAPE)}'`;
 }
 export function formatAgeMs(ms) {
     if (ms === undefined)

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}`

package/build/cli/render/projection-activity.js

@@ -1,5 +1,5 @@
 import { compactText } from "./compact-text.js";
-import { fitAffixedLine, fitVariableLine, resolveLineColumns } from "./line-width.js";
+import { displayColumns, fitVariableLine, resolveLineColumns, truncateMiddleColumns } from "./line-width.js";
 import { presentFoldedToolActivity, } from "./tool-presentation.js";
 import { presentLedgerPath, summarizeToolLedger } from "./tool-ledger-rollup.js";
 const TIME_GUTTER_WIDTH = 6;
@@ -33,6 +33,45 @@ function elapsedLabel(anchorMs, at) {
         return "now";
     return formatTimelineDuration(Math.max(0, anchorMs - eventMs));
 }
+export function formatWallClock(at) {
+    const value = new Date(at);
+    if (!Number.isFinite(value.getTime()))
+        return "  :  │";
+    return `${String(value.getHours()).padStart(2, "0")}:${String(value.getMinutes()).padStart(2, "0")}│`;
+}
+function commonPrefix(left, right) {
+    const a = [...left];
+    const b = [...right];
+    let index = 0;
+    while (index < a.length && index < b.length && a[index] === b[index])
+        index += 1;
+    return a.slice(0, index).join("");
+}
+function compressedPrefix(prefix) {
+    const points = [...prefix];
+    if (points.length < 24)
+        return undefined;
+    let cut = -1;
+    for (let index = points.length - 1; index >= 0; index -= 1) {
+        if (points[index] === " ") {
+            cut = index;
+            break;
+        }
+    }
+    if (cut < 0)
+        return undefined;
+    const stable = points.slice(0, cut).join("");
+    const stablePoints = [...stable];
+    if (stablePoints.length < 24)
+        return undefined;
+    return {
+        text: `${stablePoints.slice(0, 10).join("")}…${stablePoints.slice(-14).join("")}`,
+        resumeAt: cut + 1,
+    };
+}
+function timelineGutter(label, spine) {
+    return label || `${"".padStart(TIME_GUTTER_WIDTH)}${spine}`;
+}
 function compactTokens(value) {
     if (value < 1_000)
         return String(value);
@@ -92,22 +131,28 @@ export function renderProjectionActivitySummary(activity, input) {
 function renderTerminalRollup(activity, input) {
     const summary = summarizeProjectionToolLedger(activity, input.workspaceRoot);
     const segments = projectionSummarySegments(summary);
-    const lines = input.diagnostic
-        ? [fitVariableLine(`${elapsedLabel(input.anchorMs, input.diagnostic.at).padStart(TIME_GUTTER_WIDTH)}┆ ${"warning".padEnd(VERB_WIDTH)} `, compactText(input.diagnostic.text), input.maxColumns)]
+    const rows = input.diagnostic
+        ? [{
+                kind: "diagnostic",
+                line: fitVariableLine(`${elapsedLabel(input.anchorMs, input.diagnostic.at).padStart(TIME_GUTTER_WIDTH)}┆ ${"warning".padEnd(VERB_WIDTH)} `, compactText(input.diagnostic.text), input.maxColumns),
+            }]
         : [];
     const endPrefix = `${"end".padStart(TIME_GUTTER_WIDTH)}└`;
-    lines.push(segments.length > 0
-        ? fitVariableLine(`${endPrefix} `, segments.join(" · "), input.maxColumns)
-        : endPrefix);
+    rows.push({
+        kind: "end-anchor",
+        line: segments.length > 0
+            ? fitVariableLine(`${endPrefix} `, segments.join(" · "), input.maxColumns)
+            : endPrefix,
+    });
     for (const file of summary.files) {
         const repeat = file.count > 1 ? ` ×${file.count}` : "";
         const diffstat = file.diffstat ? ` +${file.diffstat.additions} −${file.diffstat.deletions}` : "";
-        lines.push(fitVariableLine("", `${file.path}${repeat}${diffstat}`, input.maxColumns));
+        rows.push({ kind: "file", line: fitVariableLine("", `${file.path}${repeat}${diffstat}`, input.maxColumns) });
     }
     if (summary.hiddenFileCount > 0) {
-        lines.push(fitVariableLine("", `… ${summary.hiddenFileCount} more files`, input.maxColumns));
+        rows.push({ kind: "file", line: fitVariableLine("", `… ${summary.hiddenFileCount} more files`, input.maxColumns) });
     }
-    return { lines, hasMutationFiles: summary.files.length > 0 };
+    return { rows, hasMutationFiles: summary.files.length > 0 };
 }
 function timelineEntries(activity) {
     const entries = [];
@@ -124,11 +169,19 @@ function timelineEntries(activity) {
 }
 export function renderProjectionActivity(activity, input) {
     const lines = [];
+    const rowKinds = [];
     let priorAtMs;
+    let priorMinute;
+    let priorCompletedRan;
     let hasEndAnchor = false;
     let lastRunningTool;
     const maxColumns = input.maxColumns ?? resolveLineColumns();
     const entries = timelineEntries(activity);
+    const pushRow = (line, kind) => {
+        lines.push(line);
+        rowKinds.push(kind);
+        return true;
+    };
     for (let index = 0; index < entries.length; index += 1) {
         const entry = entries[index];
         const atMs = Date.parse(entry.at);
@@ -138,12 +191,15 @@ export function renderProjectionActivity(activity, input) {
             continue;
         }
         if (priorAtMs !== undefined && Number.isFinite(atMs) && atMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
-            lines.push(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(atMs - priorAtMs)} pass in silence`, maxColumns));
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(atMs - priorAtMs)} pass in silence`, maxColumns), "silence");
         }
         if (Number.isFinite(atMs))
             priorAtMs = atMs;
         const row = entry.row;
-        const label = row.kind === "turn" ? "" : elapsedLabel(input.anchorMs, row.at);
+        const minute = row.kind === "turn" ? "" : formatWallClock(row.at);
+        const label = row.kind === "turn" || minute === priorMinute ? "" : minute;
+        if (minute)
+            priorMinute = minute;
         const spine = row.kind === "turn"
             ? "├"
             : input.state === "dead" || input.state === "lost"
@@ -159,27 +215,41 @@ export function renderProjectionActivity(activity, input) {
                         ? "unresolved"
                         : "running";
             const presentation = presentFoldedToolActivity(row, { state: activityState, ...(duration ? { duration } : {}) }, (value) => presentLedgerPath(value, input.workspaceRoot) ?? value);
-            const fixed = `${label.padStart(TIME_GUTTER_WIDTH)}${spine} ${(presentation.semanticClass === "run" ? "ran" : presentation.semanticClass).padEnd(VERB_WIDTH)} `;
-            lines.push(fitAffixedLine(fixed, presentation.variableText, presentation.fixedSuffix, maxColumns));
+            const fixed = `${timelineGutter(label, spine)} ${(presentation.semanticClass === "run" ? "ran" : presentation.semanticClass).padEnd(VERB_WIDTH)} `;
+            let variable = presentation.variableText;
+            if (row.state === "completed" && priorCompletedRan !== undefined) {
+                const common = commonPrefix(priorCompletedRan, variable);
+                const prefix = compressedPrefix(common);
+                if (prefix) {
+                    variable = `${prefix.text} ${[...variable].slice(prefix.resumeAt).join("")}`;
+                }
+            }
+            priorCompletedRan = row.state === "completed" ? presentation.variableText : undefined;
+            const budget = Math.max(0, maxColumns - displayColumns(fixed) - displayColumns(presentation.fixedSuffix));
+            pushRow(`${fixed}${truncateMiddleColumns(variable, budget)}${presentation.fixedSuffix}`, "activity");
             continue;
         }
         if (row.kind === "said") {
-            lines.push(fitVariableLine(`${label.padStart(TIME_GUTTER_WIDTH)}${spine} ${"said".padEnd(VERB_WIDTH)} `, `“${compactText(row.text)}”`, maxColumns));
+            priorCompletedRan = undefined;
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"said".padEnd(VERB_WIDTH)} `, `“${compactText(row.text)}”`, maxColumns), "activity");
         }
         else if (row.kind === "thought") {
+            priorCompletedRan = undefined;
             const text = `${compactText(row.text)}${row.truncated && !row.text.endsWith("…") ? "…" : ""}`;
             const duration = formatActionDuration(row.durationMs);
-            lines.push(fitVariableLine(`${label.padStart(TIME_GUTTER_WIDTH)}${spine} ${"thought".padEnd(VERB_WIDTH)} `, `${duration ? `${duration} — ` : ""}“${text}”`, maxColumns));
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"thought".padEnd(VERB_WIDTH)} `, `${duration ? `${duration} — ` : ""}“${text}”`, maxColumns), "activity");
         }
         else if (row.kind === "warning") {
-            lines.push(fitVariableLine(`${label.padStart(TIME_GUTTER_WIDTH)}${spine} ${"warning".padEnd(VERB_WIDTH)} `, warningText(row), maxColumns));
+            priorCompletedRan = undefined;
+            pushRow(fitVariableLine(`${timelineGutter(label, spine)} ${"warning".padEnd(VERB_WIDTH)} `, warningText(row), maxColumns), "activity");
         }
         else {
+            priorCompletedRan = undefined;
             const usage = row.inputTokens !== undefined && row.outputTokens !== undefined
                 ? ` · ${compactTokens(row.inputTokens)}▸${compactTokens(row.outputTokens)} tok`
                 : "";
             const cost = row.costUsd !== undefined ? ` · $${row.costUsd.toFixed(2)}` : "";
-            lines.push(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}├ `, `turn ${row.turn}${usage}${cost}`, maxColumns));
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}├ `, `turn ${row.turn}${usage}${cost}`, maxColumns), "activity");
         }
     }
     for (const row of activity.pinned) {
@@ -189,9 +259,9 @@ export function renderProjectionActivity(activity, input) {
     if (input.showPlan && activity.plan) {
         const planAtMs = Date.parse(activity.plan.at);
         if (priorAtMs !== undefined && Number.isFinite(planAtMs) && planAtMs - priorAtMs >= SILENCE_THRESHOLD_MS) {
-            lines.push(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(planAtMs - priorAtMs)} pass in silence`, maxColumns));
+            pushRow(fitVariableLine(`${"".padStart(TIME_GUTTER_WIDTH)}┆ `, `${formatTimelineDuration(planAtMs - priorAtMs)} pass in silence`, maxColumns), "silence");
         }
-        lines.push(renderPlan(activity.plan, maxColumns));
+        pushRow(renderPlan(activity.plan, maxColumns), "plan");
     }
     let hasMutationFiles = false;
     if (["returned", "dead", "lost", "dismissed"].includes(input.state)) {
@@ -201,12 +271,15 @@ export function renderProjectionActivity(activity, input) {
             ...(input.terminalDiagnostic ? { diagnostic: input.terminalDiagnostic } : {}),
             maxColumns,
         });
-        lines.push(...rollup.lines);
+        for (const row of rollup.rows) {
+            pushRow(row.line, row.kind);
+        }
         hasEndAnchor = true;
         hasMutationFiles = rollup.hasMutationFiles;
     }
     return {
         lines,
+        rowKinds,
         ...(lastRunningTool ? { lastRunningTool } : {}),
         hasEndAnchor,
         hasMutationFiles,

package/build/cli/render/shared.js

@@ -3,6 +3,7 @@ import { commissionSlug, formatCommissionCoordinate } from "../../core/ids.js";
 import { assembleResponse, buildSection, DISPLAY_TEXT_MAX_CHARS, FORMAT_LIST_MAX_ITEM_CHARS, FORMAT_LIST_MAX_ITEMS, formatMaybe, formatWarnings, shellQuote, truncateForDisplay, } from "./format.js";
 import { WARNING_SECTION_TITLE } from "./response-style.js";
 import { prependAddressReceipt } from "./address.js";
+import { compactPathPreview, compactPatternPair } from "./path-prefix-compaction.js";
 export function textResponse(text) {
     const payload = {};
     return {
@@ -24,18 +25,26 @@ export function buildBindDraftResponse(draftPath) {
     const payload = { draftPath };
     return coreTextResponse(`Draft saved to ${draftPath}.`, payload);
 }
+export function buildBindPreviewResponse(result) {
+    const overlapWarnings = renderScopeOverlapWarnings(result.scopeOverlaps);
+    const payload = {
+        id: result.id,
+        canonicalDraft: result.canonicalDraft,
+        target: result.target,
+        place: result.place,
+        workspace: result.workspace,
+        after: result.after,
+        warnings: overlapWarnings,
+        scopeOverlaps: result.scopeOverlaps,
+    };
+    return {
+        ...coreTextResponse(result.canonicalDraft, payload),
+        ...(overlapWarnings.length > 0 ? { stderr: ["Warnings:", ...overlapWarnings].join("\n") } : {}),
+    };
+}
 export function buildBindResponse(result, cwd) {
     void cwd;
-    const overlapsByCounterparty = new Map();
-    for (const overlap of result.scopeOverlaps) {
-        const counterparty = overlap.contracts[1];
-        const group = overlapsByCounterparty.get(counterparty);
-        if (group)
-            group.push(overlap);
-        else
-            overlapsByCounterparty.set(counterparty, [overlap]);
-    }
-    const overlapWarnings = [...overlapsByCounterparty.entries()].map(([contractId, overlaps]) => renderScopeOverlapGroup(commissionSlug(contractId), overlaps));
+    const overlapWarnings = renderScopeOverlapWarnings(result.scopeOverlaps);
     const place = result.place;
     const payload = {
         id: result.id,
@@ -54,13 +63,26 @@ export function buildBindResponse(result, cwd) {
         ...(overlapWarnings.length > 0 ? ["Warnings:", ...overlapWarnings] : []),
     ].join("\n"), payload);
 }
+function renderScopeOverlapWarnings(overlaps) {
+    const overlapsByCounterparty = new Map();
+    for (const overlap of overlaps) {
+        const counterparty = overlap.contracts[1];
+        const group = overlapsByCounterparty.get(counterparty);
+        if (group)
+            group.push(overlap);
+        else
+            overlapsByCounterparty.set(counterparty, [overlap]);
+    }
+    return [...overlapsByCounterparty.entries()].map(([contractId, overlaps]) => renderScopeOverlapGroup(commissionSlug(contractId), overlaps));
+}
 function renderScopeOverlapGroup(contractAddr, overlaps) {
     const pairs = overlaps.map((overlap) => {
         const [nextPattern, existingPattern] = overlap.patterns;
+        const patternPair = compactPatternPair(nextPattern, existingPattern);
         const evidence = overlap.kind === "potential"
             ? "potential; no current tracked path proves it"
-            : `concrete; ${overlap.paths.count} current tracked path${overlap.paths.count === 1 ? "" : "s"}: ${overlap.paths.preview.join(", ")}${overlap.paths.truncated ? ", …" : ""}`;
-        return `  ${nextPattern} × ${existingPattern} (${evidence})`;
+            : `concrete; ${overlap.paths.count} current tracked path${overlap.paths.count === 1 ? "" : "s"}: ${compactPathPreview(overlap.paths.preview)}${overlap.paths.truncated ? ", …" : ""}`;
+        return `  ${patternPair} (${evidence})`;
     });
     return [
         `▲ scope overlap with ${contractAddr}:`,

package/build/cli/render/success-response.js

@@ -62,6 +62,8 @@ export async function writeSuccessResponse(command, flags, response) {
     if (command === "bind" && flags.dryRun) {
         // Canonical Markdown already ends with exactly one newline.
         await writeCliOutput(process.stdout, responseText(response));
+        if (response.stderr)
+            await writeCliOutput(process.stderr, `${response.stderr}\n`);
         return;
     }
     if (command !== "revive") {

package/build/cli/render/tool-presentation.js

@@ -53,9 +53,9 @@ export function presentToolActivity(input) {
     }
     else if (input.state === "running") {
         if (message)
-            variableText = `${primary} — …${message}`;
+            variableText = `${primary} — ${message}`;
         else
-            fixedSuffix = " — still running…";
+            fixedSuffix = ` — ${input.duration ?? "0s"}…`;
     }
     else if (input.result?.status === "error") {
         if (input.result.exitCode !== undefined) {
@@ -70,7 +70,7 @@ export function presentToolActivity(input) {
             fixedSuffix = ` — +${input.result.diffstat.additions} −${input.result.diffstat.deletions}`;
     }
     else if (input.call.kind === "run") {
-        fixedSuffix = ` — done${input.duration ? ` ${input.duration}` : ""}`;
+        fixedSuffix = input.duration ? ` — ${input.duration}` : "";
     }
     else if (input.call.kind === "other") {
         fixedSuffix = " — done";