@astrosheep/keiyaku 0.1.85 → 0.1.87

package/build/config/architect-hints.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { ACTOR_IDENTITY, ACTOR_IDENTITY_PLURAL, BASE_RULES_FILE, KEIYAKU_ARTIFACT_DIRS, KEIYAKU_BRANCH_PREFIX, KEIYAKU_DRAFT_DIR, RESPONSE_HISTORY_DIR, SETTINGS_FILE, TOOL_NAMES, formatArtifactDirectories, } from "../keiyaku.js";
 import { renderTemplate } from "./render-template.js";
 const STATUS_BRANCH_CANDIDATE_LIMIT = 3;
-const STATUS_DIRTY_FILE_DISPLAY_LIMIT = 5;
+const STATUS_DIRTY_FILE_DISPLAY_LIMIT = 2;
 const GUIDANCE_BRANCH_LIST_LIMIT = 3;
 const WORKFLOW_HINT_TEMPLATES = {
     bind: [
@@ -32,22 +32,23 @@ const WORKFLOW_HINT_TEMPLATES = {
 const STATUS_TEXT = {
     blockers: {
         dirtyWorktree: "Working directory has uncommitted changes; commit or stash before continuing.",
+        dirtyWorktreeSummary: "Working directory has uncommitted changes.",
         bindProtocolOutsideActive: "KEIYAKU.md exists outside an active keiyaku branch; remove or relocate before starting.",
         missingBaseMetadata: "Active keiyaku branch is missing base metadata (branch.<keiyaku-branch>.keiyakuBase).",
         missingProtocolFiles: "Active keiyaku branch is missing KEIYAKU.md; restore it before continuing.",
     },
     hints: {
-        missingKeiyaku: "KEIYAKU.md is missing; restore or recreate it before running more rounds.",
-        missingBaseMetadata: "Base branch metadata is missing; set branch.<keiyaku-branch>.keiyakuBase to avoid close-time failures.",
+        missingKeiyaku: "No Keiyaku is active here; bind starts a tracked contract when you want one.",
+        missingBaseMetadata: "This branch is missing base metadata; set branch.<keiyaku-branch>.keiyakuBase before round or petition commands.",
     },
 };
 const HELP_BODY_TEMPLATE = [
     "## Workflow",
-    "`bind -> round open -> [summon | amend | delivery work]* -> delivery commits -> round close -> [round open | amend | petition claim | petition forfeit]`",
+    "`bind -> round open -> [summon/ask | amend | delivery work]* -> delivery commits -> round close -> [round open | amend | petition claim | petition forfeit]`",
     "",
     `- **\${bind}**: Create the active Keiyaku branch and protocol files from Markdown stdin. The worktree must be clean; call it once per Keiyaku.`,
     `- **\${roundOpen}**: Record the delivery round title, objective, and brief before work starts. It does not run agents or mutate delivery code.`,
-    `- **\${summon}**: Summon a ${ACTOR_IDENTITY} for bounded work. If a round is open, the round scope is injected automatically; the caller still owns review, integration, and commits.`,
+    `- **\${summon}** / **ask**: Summon a ${ACTOR_IDENTITY} for bounded work. If a round is open, the round scope is injected automatically; the caller still owns review, integration, and commits.`,
     `- **zako list / zako show**: Inspect available ${ACTOR_IDENTITY_PLURAL} and their resolved provider/executable before choosing \`keiyaku summon NAME\`.`,
     "- **delivery commits**: Commit the actual code or documentation changes in git before closing the round.",
     `- **\${roundClose}**: Record the report and non-empty delivery commit list after the commits already exist. It does not create delivery commits.`,
@@ -58,7 +59,7 @@ const HELP_BODY_TEMPLATE = [
     "",
     "## Command Boundaries",
     `- \`\${roundOpen}\` and \`\${roundClose}\` are ledger operations; they do not summon agents and do not edit delivery code.`,
-    `- \`\${summon}\` can run outside a Keiyaku, but an open round gives the ${ACTOR_IDENTITY} better context.`,
+    `- \`\${summon}\` and \`ask\` can run outside a Keiyaku, but an open round gives the ${ACTOR_IDENTITY} better context.`,
     `- \`\${summon}\` starts a new session. Use \`keiyaku resume RESPONSE_PATH\` to continue a prior response artifact.`,
     "- `zako list` and `zako show <name>` are read-only inspection commands; they do not start a helper.",
     "- `keiyaku resume` restores the agent from the response artifact; `--incognito` summons cannot be resumed later.",
@@ -109,6 +110,7 @@ export const STATUS_OPERATION_NAMES = {
     bind: TOOL_NAMES.bind,
     roundOpen: TOOL_NAMES.roundOpen,
     roundClose: TOOL_NAMES.roundClose,
+    summon: TOOL_NAMES.summon,
     close: TOOL_NAMES.close,
 };
 function renderArchitectText(template) {
@@ -136,15 +138,15 @@ const STATUS_HINT_RULES = [
     },
     {
         when: (input) => input.active && input.openRoundExists === false,
-        render: (input) => renderWithOperationNames("Open a round with ${roundOpen} before starting delivery work; then use ${summon} to run tests and verify, or ${amend} to rewrite the terms.", input.operationNames),
+        render: (input) => renderWithOperationNames("You can ask/summon for investigation now. Open a round with ${roundOpen} before recording delivery work.", input.operationNames),
     },
     {
         when: (input) => !input.active && input.localKeiyakuBranches.length > 0,
-        render: (input) => `No active keiyaku branch; checkout one to resume: ${formatBranchCandidates(input.localKeiyakuBranches, STATUS_BRANCH_CANDIDATE_LIMIT)}.`,
+        render: (input) => `ask and summon are available here. To resume a contract, checkout: ${formatBranchCandidates(input.localKeiyakuBranches, STATUS_BRANCH_CANDIDATE_LIMIT)}.`,
     },
     {
         when: (input) => !input.active && input.localKeiyakuBranches.length === 0,
-        render: (input) => renderWithOperationNames("No active keiyaku branch; ${bind} a new keiyaku when ready.", input.operationNames),
+        render: (input) => "ask and summon are available for investigation outside a contract.",
     },
     {
         when: (input) => input.protocolFiles.draft.present,
@@ -172,7 +174,7 @@ export function buildStatusDirtyWorktreeBlocker(dirtyStatusLines) {
         : [];
     return [STATUS_TEXT.blockers.dirtyWorktree, ...shownLines, ...overflowLine].join("\n");
 }
-export function evaluateStatusBlockedByOperation(input) {
+export function evaluateStatusUnavailableByCommand(input) {
     const bindBlockers = [];
     const roundOpenBlockers = [];
     const roundCloseBlockers = [];
@@ -181,10 +183,10 @@ export function evaluateStatusBlockedByOperation(input) {
     const hasBlockingDirtyForRoundOps = input.blockingDirtyStatusLines.length > 0;
     const missingProtocolFiles = !input.protocolFiles.keiyaku.present;
     if (hasDirtyWorktree) {
-        bindBlockers.push(buildStatusDirtyWorktreeBlocker(input.dirtyStatusLines));
+        bindBlockers.push(STATUS_TEXT.blockers.dirtyWorktreeSummary);
     }
     if (hasBlockingDirtyForRoundOps) {
-        const roundOpsDirtyBlocker = buildStatusDirtyWorktreeBlocker(input.blockingDirtyStatusLines);
+        const roundOpsDirtyBlocker = STATUS_TEXT.blockers.dirtyWorktreeSummary;
         roundOpenBlockers.push(roundOpsDirtyBlocker);
         roundCloseBlockers.push(roundOpsDirtyBlocker);
     }
@@ -209,6 +211,7 @@ export function evaluateStatusBlockedByOperation(input) {
         const missingActiveBranch = renderWithOperationNames("No active keiyaku branch; checkout a keiyaku/* branch or ${bind} a new keiyaku first.", input.operationNames);
         roundOpenBlockers.push(missingActiveBranch);
         roundCloseBlockers.push(missingActiveBranch);
+        closeBlockers.push(missingActiveBranch);
         if (input.protocolFiles.keiyaku.present) {
             bindBlockers.push(STATUS_TEXT.blockers.bindProtocolOutsideActive);
         }

package/build/config/env-keys.js

@@ -13,6 +13,7 @@ export const ENV_KEYS = {
     FAKE_SUBAGENT: "KEIYAKU_FAKE_SUBAGENT",
     SUBAGENT_EXEC_TIMEOUT_MS: "KEIYAKU_SUBAGENT_EXEC_TIMEOUT_MS",
     SUBAGENT_EXEC_IDLE_TIMEOUT_MS: "KEIYAKU_SUBAGENT_EXEC_IDLE_TIMEOUT_MS",
+    SUBAGENT_PROGRESS_INTERVAL_MIN: "KEIYAKU_SUBAGENT_PROGRESS_INTERVAL_MIN",
     CODEX_EXEC_MAX_CAPTURE_CHARS: "KEIYAKU_CODEX_EXEC_MAX_CAPTURE_CHARS",
     CLAUDE_EXEC_MAX_CAPTURE_CHARS: "KEIYAKU_CLAUDE_EXEC_MAX_CAPTURE_CHARS",
     GEMINI_EXEC_MAX_CAPTURE_CHARS: "KEIYAKU_GEMINI_EXEC_MAX_CAPTURE_CHARS",
@@ -33,6 +34,7 @@ const ENV_KEY_ENTRIES = [
     { key: ENV_KEYS.DISABLE_SUBAGENT_SPAWN, defaultValue: "0", description: "Disable subprocess subagent spawning when set to 1", category: "subagent" },
     { key: ENV_KEYS.SUBAGENT_EXEC_TIMEOUT_MS, defaultValue: "2700000", description: "Subagent execution timeout in milliseconds", category: "subagent" },
     { key: ENV_KEYS.SUBAGENT_EXEC_IDLE_TIMEOUT_MS, defaultValue: "600000", description: "Subagent idle timeout in milliseconds", category: "subagent" },
+    { key: ENV_KEYS.SUBAGENT_PROGRESS_INTERVAL_MIN, defaultValue: "0", description: "Print subagent tool/activity summaries every N minutes when greater than 0", category: "subagent" },
     { key: ENV_KEYS.CODEX_EXEC_MAX_CAPTURE_CHARS, defaultValue: "200000", description: "Codex runtime output/diagnostics capture cap", category: "subagent" },
     { key: ENV_KEYS.CLAUDE_EXEC_MAX_CAPTURE_CHARS, defaultValue: "200000", description: "Claude runtime output/diagnostics capture cap", category: "subagent" },
     { key: ENV_KEYS.GEMINI_EXEC_MAX_CAPTURE_CHARS, defaultValue: "200000", description: "Gemini runtime output/diagnostics capture cap", category: "subagent" },

package/build/config/schema.js

@@ -73,6 +73,7 @@ const subagentSchema = z.object({
     disableSpawn: booleanFlagEnv(ENV_KEYS.DISABLE_SUBAGENT_SPAWN),
     execTimeoutMs: positiveIntEnv(ENV_KEYS.SUBAGENT_EXEC_TIMEOUT_MS),
     execIdleTimeoutMs: positiveIntEnv(ENV_KEYS.SUBAGENT_EXEC_IDLE_TIMEOUT_MS),
+    progressIntervalMin: nonNegativeIntEnv(ENV_KEYS.SUBAGENT_PROGRESS_INTERVAL_MIN),
     fakeMode: z
         .string()
         .default(getEnvDefaultValue(ENV_KEYS.FAKE_SUBAGENT))
@@ -120,6 +121,7 @@ export const envSchema = z
     [ENV_KEYS.FAKE_SUBAGENT]: z.string().optional(),
     [ENV_KEYS.SUBAGENT_EXEC_TIMEOUT_MS]: z.string().optional(),
     [ENV_KEYS.SUBAGENT_EXEC_IDLE_TIMEOUT_MS]: z.string().optional(),
+    [ENV_KEYS.SUBAGENT_PROGRESS_INTERVAL_MIN]: z.string().optional(),
     [ENV_KEYS.CODEX_EXEC_MAX_CAPTURE_CHARS]: z.string().optional(),
     [ENV_KEYS.CLAUDE_EXEC_MAX_CAPTURE_CHARS]: z.string().optional(),
     [ENV_KEYS.GEMINI_EXEC_MAX_CAPTURE_CHARS]: z.string().optional(),
@@ -143,6 +145,7 @@ export const envSchema = z
         disableSpawn: rawEnv[ENV_KEYS.DISABLE_SUBAGENT_SPAWN],
         execTimeoutMs: rawEnv[ENV_KEYS.SUBAGENT_EXEC_TIMEOUT_MS],
         execIdleTimeoutMs: rawEnv[ENV_KEYS.SUBAGENT_EXEC_IDLE_TIMEOUT_MS],
+        progressIntervalMin: rawEnv[ENV_KEYS.SUBAGENT_PROGRESS_INTERVAL_MIN],
         fakeMode: rawEnv[ENV_KEYS.FAKE_SUBAGENT],
     }),
     codex: codexSchema.parse({

package/build/generated/version.js

@@ -1,2 +1,2 @@
 // Auto-generated by scripts/generate-version.mjs
-export const VERSION = "0.1.85";
+export const VERSION = "0.1.87";

package/build/git/core.js

@@ -56,7 +56,6 @@ export function createGit(cwd) {
     });
     git.env("GIT_TERMINAL_PROMPT", "0");
     git.env("GCM_INTERACTIVE", "Never");
-    git.env("GIT_EDITOR", "true");
     git.env("GIT_MERGE_AUTOEDIT", "no");
     git.env("LC_ALL", "C");
     return git;

package/build/responses/responses.js

@@ -11,7 +11,8 @@ const INFO_SECTION_TITLE = "Info";
 const HINTS_SECTION_TITLE = "Hints";
 const REVIEW_SECTION_TITLE = "Review";
 const STATUS_KEIYAKU_SECTION_TITLE = "Keiyaku";
-const STATUS_BLOCKED_SECTION_TITLE = "Blocked";
+const STATUS_WORKTREE_SECTION_TITLE = "Worktree";
+const STATUS_COMMANDS_SECTION_TITLE = "Commands";
 const CONTENT_SECTION_TITLE = "Content";
 const STATUS_ACTIVE_SUMMARY_PREFIX = "● Active";
 const STATUS_INACTIVE_SUMMARY = "○ Inactive";
@@ -26,8 +27,6 @@ const INFO_COMMIT_MAX_CHARS = 100;
 const INFO_PLEA_MAX_CHARS = 220;
 const DROPPED_CHANGES_MAX_ITEMS = FORMAT_LIST_MAX_ITEMS;
 const HINTS_LIST_MAX_ITEMS = 12;
-const BLOCKER_LIST_MAX_ITEMS = FORMAT_LIST_MAX_ITEMS;
-const BLOCKER_LIST_MAX_ITEM_CHARS = 300;
 const STATUS_PREVIEW_MAX_CHARS = 400;
 const BIND_PROTOCOL_FILES_CREATED = [KEIYAKU_FILE];
 const BIND_PROTOCOL_FILES_LABEL = "Protocol Files";
@@ -36,7 +35,6 @@ export const STRUCTURED_SUMMARY_MAX_CHARS = 20_000;
 export const STRUCTURED_DIFF_MAX_CHARS = 8_000;
 export const STRUCTURED_RULES_MAX_CHARS = 5_000;
 export const STRUCTURED_TRUNCATED_SUFFIX = "...[truncated]";
-const BLOCKED_ITEMS_FIELD = "blockedItems";
 const HEADER_MAX_WIDTH = 40;
 const HEADER_DASH = "┈";
 function supportsHeaderColor() {
@@ -168,16 +166,8 @@ function buildSection(title, content) {
         return null;
     return { title, body };
 }
-function formatBlockedOperation(label, blockers) {
-    if (blockers.length === 0)
-        return [];
-    return [
-        `${label}:`,
-        ...formatList(`${label} Blockers`, blockers, {
-            maxItems: BLOCKER_LIST_MAX_ITEMS,
-            maxItemChars: BLOCKER_LIST_MAX_ITEM_CHARS,
-        }),
-    ];
+function formatUnavailableReasons(reasons) {
+    return reasons.map((reason) => reason.trim().replace(/[.。]+$/, "")).join("; ");
 }
 function resolveStructuredStringLimit(key, parentKey) {
     if (key === "summary")
@@ -200,8 +190,6 @@ function resolveStructuredStringLimit(key, parentKey) {
     if (key === "keiyakuPreview" || key === "openRoundPreview" || key === "lastClosedRoundPreview") {
         return STATUS_PREVIEW_MAX_CHARS;
     }
-    if (parentKey === BLOCKED_ITEMS_FIELD)
-        return BLOCKER_LIST_MAX_ITEM_CHARS;
     if (key === "hints" || key === "existingBranches" || key === "droppedChanges") {
         return FORMAT_LIST_MAX_ITEM_CHARS;
     }
@@ -480,19 +468,14 @@ export function buildHelpResponse(input) {
     };
 }
 export function buildStatusResponse(result, labels) {
-    const blockedItems = {};
-    if (result.blockedByOperation.bind.length > 0) {
-        blockedItems[labels.bind] = result.blockedByOperation.bind;
-    }
-    if (result.blockedByOperation.roundOpen.length > 0) {
-        blockedItems[labels.roundOpen] = result.blockedByOperation.roundOpen;
-    }
-    if (result.blockedByOperation.roundClose.length > 0) {
-        blockedItems[labels.roundClose] = result.blockedByOperation.roundClose;
-    }
-    if (result.blockedByOperation.close.length > 0) {
-        blockedItems[labels.close] = result.blockedByOperation.close;
-    }
+    const commandReasons = {
+        [labels.bind]: result.unavailableByCommand.bind,
+        [labels.roundOpen]: result.unavailableByCommand.roundOpen,
+        [labels.roundClose]: result.unavailableByCommand.roundClose,
+        [labels.close]: result.unavailableByCommand.close,
+    };
+    const availableCommands = ["ask", labels.summon, ...Object.entries(commandReasons).filter(([, reasons]) => reasons.length === 0).map(([label]) => label)];
+    const unavailableCommands = Object.fromEntries(Object.entries(commandReasons).filter(([, reasons]) => reasons.length > 0));
     const summaryLine = result.branch
         ? `${STATUS_ACTIVE_SUMMARY_PREFIX} — ${result.branch} (round ${result.round})`
         : STATUS_INACTIVE_SUMMARY;
@@ -501,16 +484,17 @@ export function buildStatusResponse(result, labels) {
         ...formatMaybe("Open Round Preview", result.openRoundPreview, STATUS_PREVIEW_MAX_CHARS),
         ...formatMaybe("Last Closed Round Preview", result.lastClosedRoundPreview, STATUS_PREVIEW_MAX_CHARS),
     ];
-    const readinessLines = [
-        ...formatBlockedOperation(labels.bind, result.blockedByOperation.bind),
-        ...formatBlockedOperation(labels.roundOpen, result.blockedByOperation.roundOpen),
-        ...formatBlockedOperation(labels.roundClose, result.blockedByOperation.roundClose),
-        ...formatBlockedOperation(labels.close, result.blockedByOperation.close),
+    const unavailableCommandLines = Object.entries(unavailableCommands).map(([label, reasons]) => `• ${label}: ${formatUnavailableReasons(reasons)}`);
+    const commandLines = [
+        "Available Commands:",
+        ...availableCommands.map((label) => `• ${label}`),
+        ...(unavailableCommandLines.length > 0 ? ["", "Unavailable Commands:", ...unavailableCommandLines] : []),
     ];
     const hintLines = formatHints(result.hints, { maxItems: HINTS_LIST_MAX_ITEMS, maxItemChars: FORMAT_LIST_MAX_ITEM_CHARS });
     const text = assembleResponse(`${RESPONSE_MARKERS.round} Status`, summaryLine, [
         buildSection(STATUS_KEIYAKU_SECTION_TITLE, stateLines),
-        buildSection(STATUS_BLOCKED_SECTION_TITLE, readinessLines),
+        buildSection(STATUS_WORKTREE_SECTION_TITLE, result.worktreeStatus ?? "Clean"),
+        buildSection(STATUS_COMMANDS_SECTION_TITLE, commandLines),
         buildSection(HINTS_SECTION_TITLE, hintLines),
     ].filter((section) => section !== null));
     return {
@@ -524,7 +508,8 @@ export function buildStatusResponse(result, labels) {
             keiyakuPreview: result.keiyakuPreview ?? null,
             openRoundPreview: result.openRoundPreview ?? null,
             lastClosedRoundPreview: result.lastClosedRoundPreview ?? null,
-            blockedItems,
+            availableCommands,
+            unavailableCommands,
         }),
     };
 }

package/build/tools/schema.js

@@ -26,6 +26,7 @@ export const summonToolSchemaBase = z.object({
     task: z.string(),
     context: z.string().optional(),
     agent: z.string().optional(),
+    model: z.string().optional(),
     resumePath: z.string().optional(),
     incognito: z.boolean().optional(),
     cwd: z.string().optional(),

package/build/tools/status/read.js

@@ -3,7 +3,7 @@ import * as path from "node:path";
 import { KEIYAKU_ARTIFACT_DIRS, KEIYAKU_BRANCH_PREFIX, KEIYAKU_DRAFT_DIR, KEIYAKU_FILE, } from "../../keiyaku.js";
 import { isErrnoException } from "../../errno.js";
 import { FlowError } from "../../flow-error.js";
-import { evaluateStatusBlockedByOperation, evaluateStatusHints, STATUS_OPERATION_NAMES, } from "../../config/architect-hints.js";
+import { evaluateStatusUnavailableByCommand, evaluateStatusHints, buildStatusDirtyWorktreeBlocker, STATUS_OPERATION_NAMES, } from "../../config/architect-hints.js";
 import { getCurrentBranch, isGitRepo, listLocalKeiyakuBranches } from "../../git/branches.js";
 import { getKeiyakuBase } from "../../git/keiyaku-state.js";
 import { getDirtyFiles, getUntrackedFiles, isPathTracked, renderDirtyFileStatusLine } from "../../git/worktree.js";
@@ -45,8 +45,8 @@ function isPathInDirectory(filePath, directoryPath) {
     const normalizedDirectory = normalizeStatusPath(directoryPath).replace(/\/+$/, "");
     return normalizedPath === normalizedDirectory || normalizedPath.startsWith(`${normalizedDirectory}/`);
 }
-function buildBlockedByOperation(input) {
-    return evaluateStatusBlockedByOperation(input);
+function buildUnavailableByCommand(input) {
+    return evaluateStatusUnavailableByCommand(input);
 }
 function buildStatusHints(input) {
     return evaluateStatusHints(input);
@@ -71,6 +71,7 @@ export async function readKeiyakuStatus(input) {
     const roundBlockingDirtyFiles = filterDirtyFilesByAllowlist(cwd, bindBlockingDirtyFiles, []).dirtyFiles;
     const dirtyStatusLines = bindBlockingDirtyFiles.map((file) => renderDirtyFileStatusLine(file));
     const blockingDirtyStatusLines = roundBlockingDirtyFiles.map((file) => renderDirtyFileStatusLine(file));
+    const worktreeStatus = dirtyStatusLines.length > 0 ? buildStatusDirtyWorktreeBlocker(dirtyStatusLines) : undefined;
     const draftPath = latestDraft?.path ?? KEIYAKU_DRAFT_DIR;
     const draftDirty = draftPresent ? rawDirtyPaths.includes(draftPath) : false;
     const draftTracked = draftPresent ? await isPathTracked(cwd, draftPath) : undefined;
@@ -90,7 +91,7 @@ export async function readKeiyakuStatus(input) {
     if (!currentBranch.startsWith(KEIYAKU_BRANCH_PREFIX)) {
         const keiyakuContent = await readOptionalFile(cwd, KEIYAKU_FILE);
         const localKeiyakuBranches = await listLocalKeiyakuBranches(cwd);
-        const blockedByOperation = buildBlockedByOperation({
+        const unavailableByCommand = buildUnavailableByCommand({
             active: false,
             dirtyStatusLines,
             blockingDirtyStatusLines,
@@ -100,8 +101,9 @@ export async function readKeiyakuStatus(input) {
         return {
             active: false,
             round: 0,
+            worktreeStatus,
             keiyakuPreview: toStatusPreview(keiyakuContent ? extractDocumentPreviewBySections(keiyakuContent, false) : undefined),
-            blockedByOperation,
+            unavailableByCommand,
             hints: buildStatusHints({
                 active: false,
                 protocolFiles,
@@ -121,7 +123,7 @@ export async function readKeiyakuStatus(input) {
     const keiyakuPreview = toStatusPreview(keiyakuContent ? extractDocumentPreviewBySections(keiyakuContent, false) : undefined);
     const openRoundPreview = renderRoundLedgerPreview(openRound);
     const lastClosedRoundPreview = renderRoundLedgerPreview(latestClosedRound);
-    const blockedByOperation = buildBlockedByOperation({
+    const unavailableByCommand = buildUnavailableByCommand({
         active: true,
         dirtyStatusLines,
         blockingDirtyStatusLines,
@@ -135,10 +137,11 @@ export async function readKeiyakuStatus(input) {
         branch: currentBranch,
         baseBranch: baseBranch ?? undefined,
         round: getMaxRound(ledgerEntries),
+        worktreeStatus,
         keiyakuPreview,
         openRoundPreview,
         lastClosedRoundPreview,
-        blockedByOperation,
+        unavailableByCommand,
         hints: buildStatusHints({
             active: true,
             baseBranch: baseBranch ?? undefined,

package/build/tools/summon/run.js

@@ -70,6 +70,7 @@ export async function runSummon(input) {
     const subagentResult = await runSubagentWithResult(selectedSubagent, prompt, cwd, keiyakuContext.openRound?.round ?? 0, {
         signal,
         resume,
+        model: input.model,
     });
     return {
         summary: subagentResult.summary,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "0.1.85",
+  "version": "0.1.87",
   "description": "CLI for running iterative keiyaku workflows with Codex subagents.",
   "license": "MIT",
   "type": "module",
@@ -44,7 +44,7 @@
     "@google/gemini-cli-core": "^0.42.0",
     "@modelcontextprotocol/sdk": "1.26.0",
     "@openai/codex-sdk": "^0.113.0",
-    "simple-git": "^3.21.0",
+    "simple-git": "^3.36.0",
     "zod": "4.3.6"
   },
   "devDependencies": {

package/skills/keiyaku/SKILL.md

@@ -21,12 +21,12 @@ keiyaku <command> --help
 Use this shape for committed delivery work:
 
 ```text
-bind -> round open -> [summon | amend | delivery work]* -> delivery commits -> round close -> [round open | amend | petition claim | petition forfeit]
+bind -> round open -> [summon/ask | amend | delivery work]* -> delivery commits -> round close -> [round open | amend | petition claim | petition forfeit]
 ```
 
 - `bind`: create the active Keiyaku branch and `KEIYAKU.md` from Markdown stdin.
 - `round open`: record the scope/objective/brief before delivery work starts.
-- `summon`: summon a Zako helper for bounded work with `keiyaku summon NAME [prompt|-]`.
+- `summon` / `ask`: summon a Zako helper for bounded work with `keiyaku summon NAME [prompt|-]` or `keiyaku ask NAME [prompt|-]`.
 - `resume`: continue a prior summon session with `keiyaku resume RESPONSE_PATH [prompt|-]`.
 - `zako list` / `zako show <name>`: inspect available Zako profiles before choosing `keiyaku summon NAME`.
 - `round close`: after delivery commits exist, record the report and non-empty commit list.
@@ -37,7 +37,7 @@ bind -> round open -> [summon | amend | delivery work]* -> delivery commits -> r
 
 ## Temporary Work
 
-For temporary tasks, quick inspection, or bounded helper work, use `summon` directly. It does not require an active Keiyaku. If a round is open, the Zako receives the round scope automatically; otherwise it receives only the task, context, and reference files.
+For temporary tasks, quick inspection, or bounded helper work, use `summon` or `ask` directly. It does not require an active Keiyaku. If a round is open, the Zako receives the round scope automatically; otherwise it receives only the task, context, and reference files.
 
 Recommended summon prompts use this shape, but the CLI accepts plain text and does not require Markdown sections:
 
@@ -60,6 +60,7 @@ keiyaku guide
 keiyaku zako list
 keiyaku round --help
 keiyaku summon --help
+keiyaku ask --help
 keiyaku resume --help
 keiyaku petition claim --help
 ```