openshain 0.2.0 → 0.3.1

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` \u3068 `work/` \u306F Runtime \u306E\u3082\u306E\u3002\u5909\u66F4\u3057\u306A\u3044\n";
 export declare const CLAUDE_TEMPLATE = "@AGENTS.md\n";
 export interface InitOptions {
     workspaceRoot: string;

package/dist/commands/init.js

@@ -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 を通らなかった操作は記録に残らないためです。
 
@@ -96,7 +96,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 +108,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, 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) {
@@ -62,24 +61,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,7 @@ export const REJECTION_LABELS = {
     reserved_path: "予約されたパス",
     outside_workspace: "workspace の外",
     invalid_path: "不正なパス",
+    limit_reached: "Tool 呼び出しの上限",
 };
 /** A heading for a runtime error, before the original message. */
 export const ERROR_LABELS = {

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,7 +62,7 @@ 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 "次は利用者の番です。承認が要ります。";
         case "failed":

package/dist/tui/controller.d.ts

@@ -1,4 +1,4 @@
-import { type Runtime, type RuntimeProviders, type WorkId } from "@openshain/core";
+import { type RuntimeProviders, type WorkId, WorkStore } from "@openshain/core";
 import { statusLabel } from "../labels.ts";
 /** logo and banner are the rows shown once when the screen opens: the wordmark, the version, the folder. */
 export type EntryKind = "user" | "assistant" | "progress" | "notice" | "question" | "line" | "logo" | "banner";
@@ -47,10 +47,13 @@ export interface Controller {
 export interface ControllerOptions {
     workspaceRoot: string;
     providers: RuntimeProviders;
-    runtime?: Runtime;
 }
-/** The state behind the screen: a session, the works it starts, and the lines to show. */
+/**
+ * The state behind the screen: a session, the works it starts, and the lines to show. The
+ * conversation reaches the runtime only as an MCP client of the workspace's own server, the way
+ * any other agent does; the records are read directly for the closing lines.
+ */
 export declare function createController(options: ControllerOptions): Promise<Controller>;
-/** Lines that close a work in the screen: the CLI's closing lines without the summary, which the clerk relays. */
-export declare function workReport(runtime: Runtime, workId: WorkId): Promise<string[]>;
+/** Lines that close a work in the screen: the CLI's closing lines without the summary, which the agent relays. */
+export declare function workReport(store: WorkStore, workId: WorkId): Promise<string[]>;
 export { statusLabel };

package/dist/tui/controller.js

@@ -1,15 +1,16 @@
-import { createSession } from "@openshain/agent";
-import { createRuntime, } from "@openshain/core";
-import { progressLine, report } from "../commands/run.js";
+import { connectInMemory, createSession } from "@openshain/agent";
+import { loadConfig, OpenshainError, WorkStore, } from "@openshain/core";
+import { createMcpServer } from "@openshain/mcp";
 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 { statusLabel } from "../labels.js";
+import { progressLine, report } from "../report.js";
 import { LOGO_ROWS, VERSION } from "./banner.js";
 const HELP = [
     "/work list         Work の一覧",
     "/work show <id>    Work の詳細",
-    "/work resume <id>  止まった Work を続ける",
+    "/work resume <id>  止まった Work を候補にする。次の依頼がそれに沿えば続ける",
     "/tools             使える Tool",
     "/quit              終わる",
     "↑ ↓                前に送った行を入力欄に呼び戻す。いちばん下は新しい入力",
@@ -19,10 +20,30 @@ const HELP = [
 ];
 /** What the session's model hears when the person stops a work that waits for their answer. */
 const QUESTION_WITHDRAWN = "the person stopped the work while it waited for their answer; the question is still pending and the work can be resumed";
-/** The state behind the screen: a session, the works it starts, and the lines to show. */
+/**
+ * The state behind the screen: a session, the works it starts, and the lines to show. The
+ * conversation reaches the runtime only as an MCP client of the workspace's own server, the way
+ * any other agent does; the records are read directly for the closing lines.
+ */
 export async function createController(options) {
-    const runtime = options.runtime ??
-        (await createRuntime({ workspaceRoot: options.workspaceRoot, providers: options.providers }));
+    const { workspaceRoot, providers } = options;
+    const config = await loadConfig(workspaceRoot, { modelProviders: Object.keys(providers.models) });
+    if (!config.model) {
+        throw new OpenshainError("config", "対話にはモデルが要ります。openshain.yaml に model を書いてください。Claude Code や Codex から使うだけなら要りません。");
+    }
+    const modelFactory = Object.hasOwn(providers.models, config.model.provider)
+        ? providers.models[config.model.provider]
+        : undefined;
+    if (!modelFactory) {
+        throw new OpenshainError("config", `unknown model provider "${config.model.provider}"`);
+    }
+    const model = modelFactory(config.model);
+    if (!model.describe().capabilities.tools) {
+        throw new OpenshainError("config", `model ${config.model.provider}/${config.model.model} cannot call tools; openshain needs a model with tool support`);
+    }
+    const server = await createMcpServer({ workspaceRoot, tools: providers.tools });
+    const client = await connectInMemory(server);
+    const store = new WorkStore(workspaceRoot);
     const listeners = new Set();
     let nextId = 1;
     const state = {
@@ -30,8 +51,8 @@ export async function createController(options) {
         busy: false,
         closed: false,
         status: {
-            company: runtime.config.company.name,
-            model: `${runtime.config.model.provider}/${runtime.config.model.model}`,
+            company: config.company.name,
+            model: `${config.model.provider}/${config.model.model}`,
             usage: { modelCalls: 0, inputTokens: 0, outputTokens: 0 },
         },
     };
@@ -63,8 +84,6 @@ export async function createController(options) {
     let aborter;
     let running;
     let closing;
-    /** The child work of the current turn while it is unfinished. */
-    let lastWorkId;
     const names = new Map();
     const ask = (workId, question) => {
         state.question = question;
@@ -90,60 +109,70 @@ export async function createController(options) {
     };
     /** The lines the CLI prints when a work ends, shown among the progress lines. */
     const closingLines = async (workId) => {
-        for (const line of await workReport(runtime, workId))
+        for (const line of await workReport(store, workId))
             push("progress", line.trimStart());
     };
-    const onWorkEvent = (workId, event) => {
-        lastWorkId = workId;
-        if (event.type === "work.status_changed") {
-            state.status.work = {
-                id: workId,
-                status: event.payload.to,
-            };
-        }
-        else if (event.type === "work.completed" || event.type === "work.failed") {
-            lastWorkId = undefined;
-            state.status.work = {
-                id: workId,
-                status: event.type === "work.completed" ? "completed" : "failed",
-            };
-            return closingLines(workId);
-        }
-        const line = progressLine(event, names);
-        if (line)
-            push("progress", line);
-        else
-            notify();
-    };
-    const session = await createSession(runtime, {
-        onEvent: (event) => {
-            if (event.type === "usage.recorded") {
-                const { payload } = event;
-                if (payload.kind === "model_inference") {
-                    state.status.usage.modelCalls += 1;
-                    state.status.usage.inputTokens += payload.usage.inputTokens;
-                    state.status.usage.outputTokens += payload.usage.outputTokens;
-                    notify();
+    let sessionId;
+    const session = await createSession(client, {
+        model,
+        config,
+        onEvent: (workId, event) => {
+            if (workId === sessionId) {
+                if (event.type === "usage.recorded") {
+                    const { payload } = event;
+                    if (payload.kind === "model_inference") {
+                        state.status.usage.modelCalls += 1;
+                        state.status.usage.inputTokens += payload.usage.inputTokens;
+                        state.status.usage.outputTokens += payload.usage.outputTokens;
+                        notify();
+                    }
                 }
+                return;
+            }
+            if (event.type === "work.status_changed") {
+                state.status.work = {
+                    id: workId,
+                    status: event.payload.to,
+                };
+                notify();
+                return;
+            }
+            if (event.type === "work.completed" || event.type === "work.failed") {
+                state.status.work = {
+                    id: workId,
+                    status: event.type === "work.completed" ? "completed" : "failed",
+                };
+                return closingLines(workId);
+            }
+            // The work_* calls are the loop's own bookkeeping; the closing lines already say the work ended.
+            if (event.type === "tool.called" &&
+                event.payload.name.startsWith("work_")) {
+                names.set(event.payload.callId, event.payload.name);
+                return;
             }
+            const line = progressLine(event, names);
+            if (line)
+                push("progress", line);
+            else
+                notify();
         },
-        onWorkEvent,
         onInput: ask,
     });
+    sessionId = session.id;
     state.status.agentName = session.agentName;
     for (const row of LOGO_ROWS)
         push("logo", row);
     push("banner", `openshain ${VERSION}`);
-    push("banner", runtime.workspaceRoot);
+    push("banner", workspaceRoot);
     const stopped = (workId) => workId
-        ? `止めました。${workId} は途中のまま残っています。/work resume ${workId} で続けられます。`
+        ? `止めました。${workId} は途中のまま残っています。/work resume ${workId} で続けられるようにします。`
         : "止めました。";
     const explain = (result) => {
         switch (result.stopped) {
             case "turn_limit":
-                return "社員エージェントが 1 回の返答でできる回数を超えたので、ここで止めました。続きを依頼できます。";
+                return "社員エージェントが 1 回の返答でできる回数を超えたので、ここで止めました。続きは改めて依頼してください。";
             case "aborted":
-                return stopped(lastWorkId);
+                return stopped(result.work);
             case "max_tokens":
                 return "返答が長さの上限で切れました。";
             case "refusal":
@@ -198,24 +227,13 @@ export async function createController(options) {
         else if (name === "work" && sub === "show" && id)
             await capture((write) => workShow({ workspaceRoot: options.workspaceRoot, id, write }));
         else if (name === "work" && sub === "resume" && id) {
-            await stoppable(async (signal) => {
-                try {
-                    await workResume({
-                        workspaceRoot: options.workspaceRoot,
-                        providers: options.providers,
-                        id,
-                        signal,
-                        write: (text) => push("line", text),
-                        ask: (q) => ask(id, q),
-                    });
-                }
-                catch (err) {
-                    if (!signal.aborted)
-                        push("notice", message(err));
-                }
-                if (signal.aborted)
-                    push("notice", stopped(id));
-            });
+            try {
+                const work = await session.select(id);
+                push("notice", `${work.id}(${statusLabel(work.status)}、${work.objective})を候補にしました。次の依頼がこの Work に沿えば続けます。`);
+            }
+            catch (err) {
+                push("notice", message(err));
+            }
         }
         else if (name === "resume") {
             push("notice", "セッションの再開はまだありません。止まった Work を続けるなら /work resume <id> です。");
@@ -229,9 +247,17 @@ export async function createController(options) {
             aborter?.abort();
             settleQuestion();
             await running;
-            await session.close();
-            state.closed = true;
-            notify();
+            try {
+                await session.close();
+            }
+            catch (err) {
+                push("notice", `会話の記録を閉じられませんでした。${message(err)}`);
+            }
+            finally {
+                await client.close().catch(() => undefined);
+                state.closed = true;
+                notify();
+            }
         })();
         return closing;
     }
@@ -289,10 +315,10 @@ export async function createController(options) {
         close,
     };
 }
-/** Lines that close a work in the screen: the CLI's closing lines without the summary, which the clerk relays. */
-export async function workReport(runtime, workId) {
-    const work = await runtime.works.get(workId);
-    const events = await runtime.works.events(workId);
+/** Lines that close a work in the screen: the CLI's closing lines without the summary, which the agent relays. */
+export async function workReport(store, workId) {
+    const work = await store.get(workId);
+    const events = await store.events(workId);
     const lines = report(work, events);
     return work.status === "completed" ? ["完了。", ...lines.slice(1)] : lines;
 }

package/dist/tui/index.js

@@ -40,6 +40,6 @@ export async function startTui(options) {
     finally {
         leave();
     }
-    console.log(`会話を終えました。記録は openshain work show ${controller.sessionId} で読めます。`);
+    console.log(`会話を終えました。記録は openshain work show ${controller.sessionId} で参照します。`);
     return 0;
 }

package/dist/usage.d.ts

@@ -1,4 +1,4 @@
-import type { AnyEvent } from "@openshain/core";
+import { type AnyEvent } from "@openshain/core";
 export interface UsageSummary {
     modelCalls: number;
     toolCalls: number;

package/dist/usage.js

@@ -1,4 +1,4 @@
-import { countToolCalls } from "@openshain/agent";
+import { countToolCalls } from "@openshain/core";
 /** Totals over a work's events: calls and tokens. */
 export function summarizeUsage(events) {
     const summary = {

package/dist/workspace.js

@@ -12,7 +12,7 @@ export async function findWorkspace(start) {
         catch {
             const parent = dirname(dir);
             if (parent === dir) {
-                throw new OpenshainError("config", `${CONFIG_FILE_NAME} が見つかりません。${resolve(start)} から上に向かって探しました。openshain init で作れます。`);
+                throw new OpenshainError("config", `${CONFIG_FILE_NAME} が見つかりません。${resolve(start)} から上に向かって探しました。openshain init で作成します。`);
             }
             dir = parent;
         }