openshain 0.2.0 → 0.4.0

package/NOTICE

@@ -0,0 +1,4 @@
+openshain
+Copyright 2026 openshain contributors
+
+Licensed under the Apache License, Version 2.0.

package/dist/bin.js

@@ -1,14 +1,12 @@
 #!/usr/bin/env node
-import { createInterface } from "node:readline/promises";
 import { parseArgs } from "node:util";
 import { anthropicProvider, openaiCompatibleProvider } from "@openshain/agent";
 import { isOpenshainError } from "@openshain/core";
 import { standardTools } from "@openshain/tools";
 import { init } from "./commands/init.js";
 import { mcp } from "./commands/mcp.js";
-import { run } from "./commands/run.js";
 import { toolsList } from "./commands/tools.js";
-import { workList, workResume, workShow } from "./commands/work.js";
+import { workList, workShow } from "./commands/work.js";
 import { plain } from "./format.js";
 import { errorLabel } from "./labels.js";
 import { startTui } from "./tui/index.js";
@@ -16,11 +14,9 @@ import { findWorkspace } from "./workspace.js";
 const USAGE = `使い方:
   openshain                      端末で対話を始める
   openshain init                 openshain.yaml のひな型を書く
-  openshain run "<依頼>"          依頼を Work として進める
   openshain tools list           使える Tool の一覧
   openshain work list            Work の一覧
   openshain work show <id>       Work の詳細
-  openshain work resume <id>     途中で止まった Work を続ける
   openshain mcp                  MCP Server を stdio で起動する
 
   --workspace <dir>              起点のディレクトリ。省略時はカレントディレクトリ
@@ -65,15 +61,6 @@ async function main(argv) {
         case "init":
             await init({ workspaceRoot: values.workspace ?? process.cwd(), write });
             return 0;
-        case "run": {
-            const objective = rest.join(" ").trim();
-            if (!objective) {
-                write('依頼の文を指定してください。openshain run "今月の経理を進めて" のように。');
-                return 2;
-            }
-            const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
-            return withTerminal((ask) => run({ workspaceRoot, providers, objective, write, ...(ask && { ask }) }));
-        }
         case "mcp": {
             const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
             await mcp({ workspaceRoot, providers });
@@ -91,7 +78,7 @@ async function main(argv) {
         case "work": {
             const sub = rest[0];
             const id = rest[1] ?? "";
-            if (!(sub === "list" || ((sub === "show" || sub === "resume") && id))) {
+            if (!(sub === "list" || (sub === "show" && id))) {
                 write(USAGE);
                 return 2;
             }
@@ -100,11 +87,8 @@ async function main(argv) {
                 await workList({ workspaceRoot, write });
                 return 0;
             }
-            if (sub === "show") {
-                await workShow({ workspaceRoot, id, write });
-                return 0;
-            }
-            return withTerminal((ask) => workResume({ workspaceRoot, providers, id, write, ...(ask && { ask }) }));
+            await workShow({ workspaceRoot, id, write });
+            return 0;
         }
         default:
             write(`不明なコマンド ${command}`);
@@ -112,19 +96,6 @@ async function main(argv) {
             return 2;
     }
 }
-/** Runs `fn` with a way to ask the person when a terminal is there to answer; otherwise without one. */
-async function withTerminal(fn) {
-    // Without a terminal there is no one to answer; the work waits instead.
-    if (process.stdin.isTTY !== true || process.stdout.isTTY !== true)
-        return fn();
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        return await fn((question) => rl.question(`${plain(question)}\n> `));
-    }
-    finally {
-        rl.close();
-    }
-}
 main(process.argv.slice(2)).then((code) => process.exit(code), (err) => {
     if (isOpenshainError(err)) {
         const heading = errorLabel(err.code);

package/dist/commands/init.d.ts

@@ -6,7 +6,7 @@ export declare const CONFIG_TEMPLATE: string;
 /** Registers the runtime as a project MCP server for Claude Code. `openshain` must be on PATH. */
 export declare const MCP_TEMPLATE: string;
 /** What an outside agent reads before working in the folder. Codex reads AGENTS.md; Claude Code reads it through CLAUDE.md. */
-export declare const AGENTS_TEMPLATE = "# \u3053\u306E\u4F1A\u793E\u30D5\u30A9\u30EB\u30C0\u3067\u50CD\u304F\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3078\n\n\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u306F openshain \u306E Company Workspace \u3067\u3059\u3002\u3053\u306E\u6307\u793A\u306F\u3001Claude Code \u3084 Codex \u306E\u3088\u3046\u306A\u5916\u90E8\u306E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C MCP \u7D4C\u7531\u3067\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u6271\u3046\u3068\u304D\u306E\u3082\u306E\u3067\u3059\u3002`openshain run` \u3067 Runtime \u81EA\u8EAB\u304C\u52D5\u304F\u3068\u304D\u306F\u3001Work \u306E\u4F5C\u6210\u3068\u5B8C\u4E86\u3092 Runtime \u304C\u884C\u3046\u306E\u3067\u3001\u4E0B\u306E work_* \u306E\u624B\u9806\u306F\u5F53\u3066\u306F\u307E\u308A\u307E\u305B\u3093\u3002\n\n\u4F1A\u793E\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u66F8\u304D\u3068\u96C6\u8A08\u306F openshain \u306E MCP tool \u3067\u884C\u3044\u307E\u3059\u3002Claude Code \u3084 Codex \u81EA\u8EAB\u306E Read\u3001Write\u3001Bash \u306F\u4F1A\u793E\u306E\u30D5\u30A1\u30A4\u30EB\u306B\u306F\u4F7F\u3044\u307E\u305B\u3093\u3002Runtime \u3092\u901A\u3089\u306A\u304B\u3063\u305F\u64CD\u4F5C\u306F\u8A18\u9332\u306B\u6B8B\u3089\u306A\u3044\u305F\u3081\u3067\u3059\u3002\n\n- \u4F9D\u983C\u3092\u53D7\u3051\u305F\u3089\u3001\u307E\u305A `work_create` \u306B\u4F9D\u983C\u306E\u6587\u3092\u305D\u306E\u307E\u307E\u6E21\u3057\u3066 Work \u3092\u4F5C\u308B\n- \u30D5\u30A1\u30A4\u30EB\u306F `fs_list`\u3001`fs_search`\u3001`fs_read`\u3001`csv_read`\u3001`markdown_read` \u3067\u898B\u308B\u3002\u5408\u8A08\u3084\u4EF6\u6570\u306F `csv_aggregate` \u306B\u4EFB\u305B\u3001\u81EA\u5206\u3067\u5408\u8A08\u3057\u306A\u3044\n- \u66F8\u304F\u3068\u304D\u306F `fs_write` \u304B `csv_write`\n- \u7D42\u308F\u3063\u305F\u3089 `work_complete` \u306B\u3001\u4F55\u3092\u3057\u305F\u304B\u3068\u3001\u66F8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u6E21\u3059\u3002\u7D9A\u3051\u3089\u308C\u306A\u3044\u3068\u304D\u306F `work_fail`\n- `openshain.yaml` \u3068 `work/` \u306F Runtime \u306E\u3082\u306E\u3002\u5909\u66F4\u3057\u306A\u3044\n";
+export declare const AGENTS_TEMPLATE = "# \u3053\u306E\u4F1A\u793E\u30D5\u30A9\u30EB\u30C0\u3067\u50CD\u304F\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3078\n\n\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u306F openshain \u306E Company Workspace \u3067\u3059\u3002\u3053\u306E\u6307\u793A\u306F\u3001Claude Code \u3084 Codex \u306E\u3088\u3046\u306A\u5916\u90E8\u306E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C MCP \u7D4C\u7531\u3067\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u3092\u6271\u3046\u3068\u304D\u306E\u3082\u306E\u3067\u3059\u3002openshain \u306E\u5BFE\u8A71\u578B CLI \u3082\u540C\u3058\u624B\u9806\u3067 Runtime \u3092\u4F7F\u3044\u307E\u3059\u3002\n\n\u4F1A\u793E\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u66F8\u304D\u3068\u96C6\u8A08\u306F openshain \u306E MCP tool \u3067\u884C\u3044\u307E\u3059\u3002Claude Code \u3084 Codex \u81EA\u8EAB\u306E Read\u3001Write\u3001Bash \u306F\u4F1A\u793E\u306E\u30D5\u30A1\u30A4\u30EB\u306B\u306F\u4F7F\u3044\u307E\u305B\u3093\u3002Runtime \u3092\u901A\u3089\u306A\u304B\u3063\u305F\u64CD\u4F5C\u306F\u8A18\u9332\u306B\u6B8B\u3089\u306A\u3044\u305F\u3081\u3067\u3059\u3002\n\n- \u4F9D\u983C\u3092\u53D7\u3051\u305F\u3089\u3001\u307E\u305A `work_create` \u306B\u4F9D\u983C\u306E\u6587\u3092\u305D\u306E\u307E\u307E\u6E21\u3057\u3066 Work \u3092\u4F5C\u308B\n- \u30D5\u30A1\u30A4\u30EB\u306F `fs_list`\u3001`fs_search`\u3001`fs_read`\u3001`csv_read`\u3001`markdown_read` \u3067\u898B\u308B\u3002\u5408\u8A08\u3084\u4EF6\u6570\u306F `csv_aggregate` \u306B\u4EFB\u305B\u3001\u81EA\u5206\u3067\u5408\u8A08\u3057\u306A\u3044\n- \u66F8\u304F\u3068\u304D\u306F `fs_write` \u304B `csv_write`\n- \u7D42\u308F\u3063\u305F\u3089 `work_complete` \u306B\u3001\u4F55\u3092\u3057\u305F\u304B\u3068\u3001\u66F8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u6E21\u3059\u3002\u7D9A\u3051\u3089\u308C\u306A\u3044\u3068\u304D\u306F `work_fail`\n- `openshain.yaml`\u3001`work/`\u3001`principals/`\u3001`authority/` \u306F Runtime \u306E\u3082\u306E\u3002\u5909\u66F4\u3057\u306A\u3044\n- \u547C\u3073\u51FA\u3057\u306E\u7D50\u679C\u304C `pending` \u306A\u3089\u3001\u4F1A\u793E\u306E\u6A29\u9650\u306E\u898F\u5247\u304C\u305D\u306E\u547C\u3073\u51FA\u3057\u3092\u6B62\u3081\u3066\u3044\u308B\u3002\u627F\u8A8D\u306F\u4F1A\u793E\u306E\u4EBA\u304C openshain \u306E\u753B\u9762\u3067\u6C7A\u3081\u308B\u3002\u81EA\u5206\u3067 `approval_decide` \u3084 `review_decide` \u3092\u547C\u3093\u3067\u901A\u3055\u306A\u3044\u3002\u4EBA\u306B\u4F1D\u3048\u3066\u3001\u6C7A\u307E\u308B\u307E\u3067\u5225\u306E\u4F5C\u696D\u3092\u3059\u308B\n";
 export declare const CLAUDE_TEMPLATE = "@AGENTS.md\n";
 export interface InitOptions {
     workspaceRoot: string;

package/dist/commands/init.js

@@ -20,7 +20,7 @@ profession:
   id: generic
   # model への指示。100,000 文字まで
   instructions: |
-    あなたはこの会社の事務担当です。依頼された作業を、workspace 内のファイルだけを使って進めてください。
+    あなたはこの会社の一般事務の社員エージェントです。依頼された作業を、workspace 内のファイルだけを使って進めてください。
 model:
   provider: anthropic      # anthropic | openai-compatible
   model: claude-opus-5
@@ -44,7 +44,7 @@ export const MCP_TEMPLATE = `${JSON.stringify({ mcpServers: { openshain: { comma
 /** What an outside agent reads before working in the folder. Codex reads AGENTS.md; Claude Code reads it through CLAUDE.md. */
 export const AGENTS_TEMPLATE = `# この会社フォルダで働くエージェントへ
 
-このフォルダは openshain の Company Workspace です。この指示は、Claude Code や Codex のような外部のエージェントが MCP 経由でこのフォルダを扱うときのものです。\`openshain run\` で Runtime 自身が動くときは、Work の作成と完了を Runtime が行うので、下の work_* の手順は当てはまりません。
+このフォルダは openshain の Company Workspace です。この指示は、Claude Code や Codex のような外部のエージェントが MCP 経由でこのフォルダを扱うときのものです。openshain の対話型 CLI も同じ手順で Runtime を使います。
 
 会社のファイルの読み書きと集計は openshain の MCP tool で行います。Claude Code や Codex 自身の Read、Write、Bash は会社のファイルには使いません。Runtime を通らなかった操作は記録に残らないためです。
 
@@ -52,7 +52,8 @@ export const AGENTS_TEMPLATE = `# この会社フォルダで働くエージェ
 - ファイルは \`fs_list\`、\`fs_search\`、\`fs_read\`、\`csv_read\`、\`markdown_read\` で見る。合計や件数は \`csv_aggregate\` に任せ、自分で合計しない
 - 書くときは \`fs_write\` か \`csv_write\`
 - 終わったら \`work_complete\` に、何をしたかと、書いたファイルを渡す。続けられないときは \`work_fail\`
-- \`openshain.yaml\` と \`work/\` は Runtime のもの。変更しない
+- \`openshain.yaml\`、\`work/\`、\`principals/\`、\`authority/\` は Runtime のもの。変更しない
+- 呼び出しの結果が \`pending\` なら、会社の権限の規則がその呼び出しを止めている。承認は会社の人が openshain の画面で決める。自分で \`approval_decide\` や \`review_decide\` を呼んで通さない。人に伝えて、決まるまで別の作業をする
 `;
 export const CLAUDE_TEMPLATE = "@AGENTS.md\n";
 /**
@@ -96,7 +97,7 @@ export async function init({ workspaceRoot, write }) {
                 write(`${path} はすでにあるので変更しません。`);
         }
     }
-    write("company と principal を自分の会社に合わせ、api_key_env に書いた環境変数を設定してから openshain run を実行してください。");
+    write("company と principal を自分の会社に合わせ、api_key_env に書いた環境変数を設定してから openshain を実行してください。");
 }
 /**
  * Adds the openshain server to a .mcp.json that is already there, keeping every other server.
@@ -108,10 +109,10 @@ async function addToMcpConfig(path) {
         parsed = JSON.parse(await readFile(path, "utf8"));
     }
     catch {
-        return `${path} はすでにあり、JSON として読めないので変更しません。openshain を手で登録してください。`;
+        return `${path} はすでにあり、JSON として読めないので変更しません。openshain を手動で登録してください。`;
     }
     if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-        return `${path} はすでにあり、形が違うので変更しません。openshain を手で登録してください。`;
+        return `${path} はすでにあり、形が違うので変更しません。openshain を手動で登録してください。`;
     }
     const config = parsed;
     const servers = config.mcpServers && typeof config.mcpServers === "object" && !Array.isArray(config.mcpServers)

package/dist/commands/tools.js

@@ -1,5 +1,4 @@
-import { ASK_USER, RUNTIME_PROVIDER_ID } from "@openshain/agent";
-import { createToolRegistry, loadConfig } from "@openshain/core";
+import { ASK_USER, createToolRegistry, loadConfig, RUNTIME_PROVIDER_ID, } from "@openshain/core";
 /** Every tool the model can call in this workspace, and the ones the allow lists hide. Needs no model provider. */
 export async function toolsList({ workspaceRoot, providers, write, }) {
     const config = await loadConfig(workspaceRoot);

package/dist/commands/work.d.ts

@@ -1,5 +1,4 @@
-import { type AnyEvent, type RuntimeProviders, type Work } from "@openshain/core";
-import { type DriveOptions } from "./run.ts";
+import { type AnyEvent, type Work } from "@openshain/core";
 export interface WorkListOptions {
     workspaceRoot: string;
     write: (line: string) => void;
@@ -14,10 +13,3 @@ export interface WorkShowOptions {
 /** Everything about one work: state, outcome, what the tools did, the usage, and who acts next. */
 export declare function workShow({ workspaceRoot, id, write }: WorkShowOptions): Promise<void>;
 export declare function describeWork(work: Work, events: AnyEvent[]): string[];
-export interface WorkResumeOptions extends DriveOptions {
-    workspaceRoot: string;
-    providers: RuntimeProviders;
-    id: string;
-}
-/** Continues a work that stopped before its end, answering its questions when the caller can. */
-export declare function workResume(options: WorkResumeOptions): Promise<number>;

package/dist/commands/work.js

@@ -1,14 +1,13 @@
-import { pendingQuestions } from "@openshain/agent";
-import { createRuntime, isTerminal, parseWorkId, SESSION_WORK_TYPE, WorkStore, } from "@openshain/core";
+import { parseWorkId, pendingApprovals, pendingQuestions, WorkStore, } from "@openshain/core";
 import { describeInput, padDisplay } from "../format.js";
 import { errorLabel, failureLabel, rejectionLabel, statusLabel } from "../labels.js";
+import { nextActor } from "../report.js";
 import { formatUsage, summarizeUsage } from "../usage.js";
-import { drive, nextActor } from "./run.js";
 /** One line per work, oldest first. Works that cannot be read are reported, not hidden. */
 export async function workList({ workspaceRoot, write }) {
     const { works, problems } = await new WorkStore(workspaceRoot).list();
     if (works.length === 0 && problems.length === 0) {
-        write('Work はまだありません。openshain run "<依頼>" で始められます。');
+        write("Work はまだありません。openshain で社員エージェントに依頼すると始まります。");
         return;
     }
     for (const work of works) {
@@ -52,6 +51,12 @@ export function describeWork(work, events) {
         for (const { question } of pendingQuestions(events))
             lines.push(`質問      ${question}`);
     }
+    if (work.status === "waiting_approval") {
+        for (const a of pendingApprovals(events)) {
+            const who = a.kind === "review" ? `${a.reviewer?.role ?? "資格者"}の判断待ち` : "承認待ち";
+            lines.push(`${who}  ${a.call.name} ${describeInput(a.call.input)}  (${a.approvalId})`);
+        }
+    }
     const calls = toolLines(events);
     if (calls.length > 0) {
         lines.push("Tool");
@@ -62,24 +67,6 @@ export function describeWork(work, events) {
     lines.push(nextActor(work));
     return lines;
 }
-/** Continues a work that stopped before its end, answering its questions when the caller can. */
-export async function workResume(options) {
-    const workId = parseWorkId(options.id);
-    const work = await new WorkStore(options.workspaceRoot).get(workId);
-    if (work.type === SESSION_WORK_TYPE) {
-        options.write(`${work.id} は会話の記録のため、再開できません。会話は openshain で始め直してください。`);
-        return 1;
-    }
-    if (isTerminal(work.status)) {
-        options.write(`${work.id} は${statusLabel(work.status)}のため、再開できません。`);
-        return 1;
-    }
-    const runtime = await createRuntime({
-        workspaceRoot: options.workspaceRoot,
-        providers: options.providers,
-    });
-    return drive(runtime, workId, options);
-}
 /** One line per tool call, in log order, with its outcome when it was rejected or failed. */
 function toolLines(events) {
     const lines = new Map();

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 export { AGENTS_TEMPLATE, CLAUDE_TEMPLATE, CONFIG_TEMPLATE, type InitOptions, init, MCP_TEMPLATE, } from "./commands/init.ts";
 export { type McpOptions, mcp } from "./commands/mcp.ts";
-export { type DriveOptions, drive, nextActor, type RunOptions, report, run, } from "./commands/run.ts";
 export { type ToolsListOptions, toolsList } from "./commands/tools.ts";
-export { describeWork, type WorkListOptions, type WorkResumeOptions, type WorkShowOptions, workList, workResume, workShow, } from "./commands/work.ts";
+export { describeWork, type WorkListOptions, type WorkShowOptions, workList, workShow, } from "./commands/work.ts";
 export { ERROR_LABELS, errorLabel, FAILURE_LABELS, failureLabel, REJECTION_LABELS, rejectionLabel, STATUS_LABELS, statusLabel, } from "./labels.ts";
+export { nextActor, progressLine, report } from "./report.ts";
 export { formatUsage, summarizeUsage, type UsageSummary } from "./usage.ts";
 export { findWorkspace } from "./workspace.ts";

package/dist/index.js

@@ -1,9 +1,9 @@
 // openshain: Reference CLI agent for the openshain runtime
 export { AGENTS_TEMPLATE, CLAUDE_TEMPLATE, CONFIG_TEMPLATE, init, MCP_TEMPLATE, } from "./commands/init.js";
 export { mcp } from "./commands/mcp.js";
-export { drive, nextActor, report, run, } from "./commands/run.js";
 export { toolsList } from "./commands/tools.js";
-export { describeWork, workList, workResume, workShow, } from "./commands/work.js";
+export { describeWork, workList, workShow, } from "./commands/work.js";
 export { ERROR_LABELS, errorLabel, FAILURE_LABELS, failureLabel, REJECTION_LABELS, rejectionLabel, STATUS_LABELS, statusLabel, } from "./labels.js";
+export { nextActor, progressLine, report } from "./report.js";
 export { formatUsage, summarizeUsage } from "./usage.js";
 export { findWorkspace } from "./workspace.js";

package/dist/labels.d.ts

@@ -1,5 +1,4 @@
-import type { FailureReason } from "@openshain/agent";
-import type { ErrorCode, ToolRejectionCode, WorkStatus } from "@openshain/core";
+import type { ErrorCode, FailureReason, ToolRejectionCode, WorkStatus } from "@openshain/core";
 /** The words shown for a work's status. The log keeps the original value. */
 export declare const STATUS_LABELS: Record<WorkStatus, string>;
 /** Why a work failed, as a heading before the original detail. */

package/dist/labels.js

@@ -23,6 +23,9 @@ export const REJECTION_LABELS = {
     reserved_path: "予約されたパス",
     outside_workspace: "workspace の外",
     invalid_path: "不正なパス",
+    limit_reached: "Tool 呼び出しの上限",
+    denied: "権限の表で不許可",
+    rejected_by_person: "承認されなかった",
 };
 /** A heading for a runtime error, before the original message. */
 export const ERROR_LABELS = {

package/dist/preview.d.ts

@@ -0,0 +1,13 @@
+export interface PreviewLine {
+    kind: "added" | "removed" | "context" | "note";
+    text: string;
+}
+/**
+ * What a held call would change, for the person about to approve it. A call of a tool that writes
+ * a whole file is shown as a line diff against the file as it is now; anything else is shown as
+ * its input. Reads the file directly: this is the person's own workspace, on their own screen.
+ */
+export declare function previewCall(workspaceRoot: string, call: {
+    name: string;
+    input: unknown;
+}): Promise<PreviewLine[]>;

package/dist/preview.js

@@ -0,0 +1,141 @@
+import { readFile } from "node:fs/promises";
+import { resolveWorkspacePath } from "@openshain/core";
+import { csvText } from "@openshain/tools";
+/** How much of a change the screen shows before it says the rest is cut. */
+const MAX_LINES = 24;
+/** Above this many lines on either side, the diff is replaced by the line counts. */
+const MAX_DIFF_LINES = 400;
+/** A single line longer than this is cut: one line must not fill the screen. */
+const MAX_LINE_CHARS = 300;
+/** The tools whose input the screen can render as the file it would leave behind. */
+const DIFFABLE = new Set(["fs_write", "csv_write"]);
+/**
+ * What a held call would change, for the person about to approve it. A call of a tool that writes
+ * a whole file is shown as a line diff against the file as it is now; anything else is shown as
+ * its input. Reads the file directly: this is the person's own workspace, on their own screen.
+ */
+export async function previewCall(workspaceRoot, call) {
+    if (!DIFFABLE.has(call.name))
+        return [{ kind: "note", text: JSON.stringify(call.input) }];
+    const input = (call.input ?? {});
+    const path = typeof input.path === "string" ? input.path : undefined;
+    const content = typeof input.content === "string"
+        ? input.content
+        : Array.isArray(input.rows)
+            ? csvText(input.rows, Array.isArray(input.columns) ? input.columns : undefined)
+            : undefined;
+    if (path === undefined || content === undefined) {
+        return [{ kind: "note", text: JSON.stringify(call.input) }];
+    }
+    // The same guard the tools run under: a path outside the workspace, a reserved one or a
+    // symlink that leads out is refused here too, so the screen never shows what the call cannot
+    // touch. The model chooses this path; the person is about to read what it says.
+    let resolved;
+    try {
+        resolved = await resolveWorkspacePath(workspaceRoot, path);
+    }
+    catch (err) {
+        return [
+            {
+                kind: "note",
+                text: `${path} は読めません(${err instanceof Error ? err.message : String(err)})。この呼び出しは実行しても拒否されます。`,
+            },
+        ];
+    }
+    const before = await readFile(resolved, "utf8").catch(() => undefined);
+    if (before === undefined) {
+        const lines = content.split("\n");
+        return cap([
+            { kind: "note", text: `${path} を新しく作ります(${lines.length} 行)` },
+            ...lines.map((text) => ({ kind: "added", text })),
+        ]);
+    }
+    const oldLines = before.split("\n");
+    const newLines = content.split("\n");
+    if (oldLines.length > MAX_DIFF_LINES || newLines.length > MAX_DIFF_LINES) {
+        return [
+            {
+                kind: "note",
+                text: `${path} を書き換えます(${oldLines.length} 行 → ${newLines.length} 行。大きいので差分は出しません)`,
+            },
+        ];
+    }
+    const body = diff(oldLines, newLines);
+    return cap([{ kind: "note", text: `${path} を書き換えます` }, ...body]);
+}
+function cap(lines) {
+    const short = lines.map((line) => line.text.length > MAX_LINE_CHARS
+        ? { ...line, text: `${line.text.slice(0, MAX_LINE_CHARS)}…` }
+        : line);
+    if (short.length <= MAX_LINES)
+        return short;
+    const rest = short.length - MAX_LINES;
+    return [...short.slice(0, MAX_LINES), { kind: "note", text: `ほか ${rest} 行` }];
+}
+/**
+ * A line diff by the longest common subsequence, with the unchanged lines around a change kept
+ * as context. Small files only; the caller checks the size first.
+ */
+function diff(before, after) {
+    const table = Array.from({ length: before.length + 1 }, () => new Array(after.length + 1).fill(0));
+    for (let i = before.length - 1; i >= 0; i--) {
+        for (let j = after.length - 1; j >= 0; j--) {
+            const row = table[i];
+            const next = table[i + 1];
+            row[j] =
+                before[i] === after[j]
+                    ? next[j + 1] + 1
+                    : Math.max(next[j], row[j + 1]);
+        }
+    }
+    const all = [];
+    let i = 0;
+    let j = 0;
+    while (i < before.length && j < after.length) {
+        if (before[i] === after[j]) {
+            all.push({ kind: "context", text: before[i] });
+            i++;
+            j++;
+        }
+        else if ((table[i + 1]?.[j] ?? 0) >= (table[i]?.[j + 1] ?? 0)) {
+            all.push({ kind: "removed", text: before[i] });
+            i++;
+        }
+        else {
+            all.push({ kind: "added", text: after[j] });
+            j++;
+        }
+    }
+    for (; i < before.length; i++)
+        all.push({ kind: "removed", text: before[i] });
+    for (; j < after.length; j++)
+        all.push({ kind: "added", text: after[j] });
+    return trimContext(all);
+}
+/** Keeps two unchanged lines on each side of a change and marks what was left out. */
+function trimContext(lines, keep = 2) {
+    const wanted = new Set();
+    lines.forEach((line, index) => {
+        if (line.kind === "context")
+            return;
+        for (let k = index - keep; k <= index + keep; k++)
+            wanted.add(k);
+    });
+    const out = [];
+    let skipped = 0;
+    lines.forEach((line, index) => {
+        if (wanted.has(index)) {
+            if (skipped > 0) {
+                out.push({ kind: "note", text: `… 変わらない ${skipped} 行 …` });
+                skipped = 0;
+            }
+            out.push(line);
+        }
+        else {
+            skipped++;
+        }
+    });
+    if (skipped > 0)
+        out.push({ kind: "note", text: `… 変わらない ${skipped} 行 …` });
+    return out;
+}

package/dist/report.d.ts

@@ -0,0 +1,6 @@
+import { type AnyEvent, type Work } from "@openshain/core";
+/** One line for a tool call, a rejection or a failure; nothing for the other events. `names` maps call ids to tool names. */
+export declare function progressLine(event: AnyEvent, names: Map<string, string>): string | undefined;
+/** The closing lines: what happened, what it cost, and who acts next. */
+export declare function report(work: Work, events: AnyEvent[]): string[];
+export declare function nextActor(work: Work): string;

package/dist/{commands/run.js → report.js}

@@ -1,39 +1,7 @@
-import { pendingQuestions, runWork } from "@openshain/agent";
-import { createRuntime, } from "@openshain/core";
-import { describeInput, truncate } from "../format.js";
-import { failureLabel, rejectionLabel, statusLabel } from "../labels.js";
-import { formatUsage, summarizeUsage } from "../usage.js";
-/** Creates a work for the request and drives it. Exit code 0 when the work completed. */
-export async function run(options) {
-    const runtime = await createRuntime({
-        workspaceRoot: options.workspaceRoot,
-        providers: options.providers,
-    });
-    const work = await runtime.works.create({
-        objective: options.objective,
-        principal: runtime.config.principal.id,
-        profession: runtime.config.profession.id,
-    });
-    options.write(`${work.id} を開始`);
-    return drive(runtime, work.id, options);
-}
-/** Drives a work from its current state, printing one line per tool call, and closes with the report. */
-export async function drive(runtime, workId, options) {
-    const names = new Map();
-    const done = await runWork(runtime, workId, {
-        ...(options.ask && { onInput: options.ask }),
-        ...(options.signal && { signal: options.signal }),
-        onEvent: (event) => {
-            const line = progressLine(event, names);
-            if (line)
-                options.write(line);
-        },
-    });
-    const events = await runtime.works.events(workId);
-    for (const line of report(done, events))
-        options.write(line);
-    return done.status === "completed" ? 0 : 1;
-}
+import { pendingQuestions, } from "@openshain/core";
+import { describeInput, truncate } from "./format.js";
+import { failureLabel, rejectionLabel, statusLabel } from "./labels.js";
+import { formatUsage, summarizeUsage } from "./usage.js";
 /** One line for a tool call, a rejection or a failure; nothing for the other events. `names` maps call ids to tool names. */
 export function progressLine(event, names) {
     switch (event.type) {
@@ -94,9 +62,9 @@ export function nextActor(work) {
         case "cancelled":
             return "次に動く人はいません。";
         case "waiting_input":
-            return `次は利用者の番です。openshain work resume ${work.id} で質問に答えると続きます。`;
+            return `次は利用者の番です。openshain の会話で /work resume ${work.id} を実行し、続きを依頼すると質問に答えられます。`;
         case "waiting_approval":
-            return "次は利用者の番です。承認が要ります。";
+            return "次は利用者の番です。承認が要ります。openshain の会話で /approvals を確かめ、/approve <id> か /reject <id> で決めます。";
         case "failed":
             return "次は利用者の番です。原因を修正して、もう一度依頼してください。";
         default:

package/dist/tui/app.js

@@ -15,7 +15,10 @@ const COLORS = {
 };
 const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 /** Rows that are not history: the header, the input box (three rows) and the status line. */
+/** The rows around the conversation: the header, the input box (3) and the status line. */
 const CHROME_ROWS = 5;
+/** The approval palette is taller: its two lines of heading plus one row per choice. */
+const APPROVAL_EXTRA_ROWS = 2;
 function statusText(state, scrolled) {
     if (scrolled > 0)
         return `↑ ${scrolled} 行上を表示中。End で最新へ、ホイールか PageUp と PageDown で移動`;
@@ -64,9 +67,12 @@ export function App({ controller }) {
         return () => clearInterval(timer);
     }, [state.busy]);
     // One row is left to the terminal: drawing exactly its height makes it scroll on every redraw.
-    const height = Math.max(CHROME_ROWS + 1, size.rows - 1);
+    const chromeRows = (state.approval
+        ? CHROME_ROWS + APPROVAL_EXTRA_ROWS + state.approval.choices.length
+        : CHROME_ROWS) + (state.queued.length > 0 && !state.approval ? 1 : 0);
+    const height = Math.max(chromeRows + 1, size.rows - 1);
     const width = Math.max(20, size.columns);
-    const paneRows = height - CHROME_ROWS;
+    const paneRows = height - chromeRows;
     const lines = useMemo(() => screenLines(state.entries, width).map((line, row) => ({ ...line, row })), [state.entries, width]);
     const maxScroll = Math.max(0, lines.length - paneRows);
     const scrolled = Math.min(scroll, maxScroll);
@@ -93,6 +99,22 @@ export function App({ controller }) {
                 void controller.close();
             return;
         }
+        // While a call waits for approval, the keys pick a choice instead of typing.
+        if (state.approval) {
+            if (key.upArrow)
+                return controller.moveApproval(-1);
+            if (key.downArrow)
+                return controller.moveApproval(1);
+            if (key.return)
+                return controller.decideApproval();
+            if (key.escape)
+                return controller.decideApproval("reject");
+            const index = Number.parseInt(ch, 10) - 1;
+            const chosen = state.approval.choices[index];
+            if (chosen)
+                return controller.decideApproval(chosen.key);
+            return;
+        }
         if (key.pageUp)
             return setScroll((s) => Math.min(maxScroll, s + page));
         if (key.pageDown)
@@ -167,7 +189,9 @@ export function App({ controller }) {
         setInput([...chars.slice(0, at), ch, ...chars.slice(at)].join(""));
         setCursor(at + [...ch].length);
     });
+    const approval = state.approval;
     const asking = state.question !== undefined;
+    const queued = state.queued;
     const chars = [...input];
     const at = Math.min(cursor, chars.length);
     const before = chars.slice(0, at).join("");
@@ -183,9 +207,18 @@ export function App({ controller }) {
                     state.status.model,
                 ].join(" · ") }), _jsx(Box, { flexDirection: "column", height: paneRows, children: visible.map((line) => {
                     const color = COLORS[line.kind];
-                    if (line.segments) {
-                        return (_jsx(Text, { wrap: "truncate", children: line.segments.map((s) => (_jsx(Text, { color: s.color, children: s.text }, s.at))) }, line.row));
+                    if (line.spans) {
+                        // Each piece is named by the column it starts at, which does not move.
+                        let column = 0;
+                        const pieces = line.spans.map((span) => {
+                            const at = column;
+                            column += span.text.length;
+                            return { ...span, at };
+                        });
+                        return (_jsx(Text, { wrap: "truncate", ...(color && { color }), children: pieces.map((s) => (_jsx(Text, { ...(s.color && { color: s.color }), ...(s.bold && { bold: true }), ...(s.italic && { italic: true }), ...(s.dim && { dimColor: true }), ...(s.strikethrough && { strikethrough: true }), children: s.text }, `${line.row}-${s.at}`))) }, line.row));
                     }
                     return (_jsx(Text, { wrap: "truncate", dimColor: line.kind === "banner", ...(color && { color }), children: line.text || " " }, line.row));
-                }) }), _jsxs(Box, { borderStyle: "round", borderColor: asking ? "magenta" : "gray", paddingX: 1, children: [_jsx(Text, { color: asking ? "magenta" : "cyan", children: asking ? "答え> " : "> " }), _jsx(Text, { children: before }), under === "" ? _jsx(Text, { dimColor: true, children: "\u258C" }) : _jsx(Text, { inverse: true, children: under }), _jsx(Text, { children: after })] }), _jsx(Text, { dimColor: true, wrap: "truncate", children: bottom })] }));
+                }) }), approval ? (_jsxs(Box, { borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", wrap: "truncate", children: ["\u627F\u8A8D\u304C\u8981\u308A\u307E\u3059: ", approval.title] }), _jsxs(Text, { dimColor: true, wrap: "truncate", children: ["\u898F\u5247 ", approval.ruleId] }), approval.choices.map((choice, index) => (_jsxs(Text, { ...(index === approval.at && { color: "yellow" }), wrap: "truncate", children: [index === approval.at ? "❯ " : "  ", index + 1, ". ", choice.label] }, choice.key)))] })) : (_jsxs(Box, { borderStyle: "round", borderColor: asking ? "magenta" : "gray", paddingX: 1, children: [_jsx(Text, { color: asking ? "magenta" : "cyan", children: asking ? "答え> " : "> " }), _jsx(Text, { children: before }), under === "" ? _jsx(Text, { dimColor: true, children: "\u258C" }) : _jsx(Text, { inverse: true, children: under }), _jsx(Text, { children: after })] })), queued.length > 0 && !approval ? (_jsxs(Text, { dimColor: true, wrap: "truncate", children: ["\u9806\u756A\u5F85\u3061 ", queued.length, " \u4EF6: ", queued.join(" / ")] })) : null, _jsx(Text, { dimColor: true, wrap: "truncate", children: approval
+                    ? "↑ ↓ と Enter、または数字で選ぶ。Esc は拒否します。Ctrl-C は保留のまま止めます"
+                    : bottom })] }));
 }

package/dist/tui/banner.d.ts

@@ -1,3 +1,4 @@
+import type { Span } from "./markdown.ts";
 /** The version of the openshain command, from its package.json. */
 export declare const VERSION: string;
 /**
@@ -5,11 +6,5 @@ export declare const VERSION: string;
  * screen needs neither the network nor another dependency to show it.
  */
 export declare const LOGO_ROWS: readonly string[];
-export interface Segment {
-    text: string;
-    color: string;
-    /** Position in the row; the screen keys by it. */
-    at: number;
-}
-/** One colored segment per character, so the gradient runs across the row. */
-export declare function logoSegments(row: string): Segment[];
+/** One colored piece per character, so the gradient runs across the row. */
+export declare function logoSegments(row: string): Span[];

package/dist/tui/banner.js

@@ -15,7 +15,7 @@ const GRADIENT = [
     [78, 168, 255],
     [127, 136, 255],
 ];
-/** One colored segment per character, so the gradient runs across the row. */
+/** One colored piece per character, so the gradient runs across the row. */
 export function logoSegments(row) {
     const chars = [...row];
     const last = Math.max(1, chars.length - 1);
@@ -24,6 +24,6 @@ export function logoSegments(row) {
         const [from, to] = GRADIENT;
         const channel = (k) => Math.round(from[k] + (to[k] - from[k]) * t);
         const hex = [channel(0), channel(1), channel(2)].map((v) => v.toString(16).padStart(2, "0"));
-        return { text, color: `#${hex.join("")}`, at };
+        return { text, color: `#${hex.join("")}` };
     });
 }