openshain 0.1.1 → 0.3.1

package/src/commands/init.ts

@@ -52,15 +52,15 @@ export const MCP_TEMPLATE = `${JSON.stringify(
 /** 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 を通らなかった操作は記録に残らないためです。
 
 - 依頼を受けたら、まず \`work_create\` に依頼の文をそのまま渡して Work を作る
-- ファイルは \`fs_list\`、\`fs_search\`、\`fs_read\`、\`csv_read\`、\`markdown_read\` で見る。合計や件数は \`csv_aggregate\` に任せ、自分で足さない
+- ファイルは \`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/\` は Runtime のもの。変更しない
 `;
 
 export const CLAUDE_TEMPLATE = "@AGENTS.md\n";
@@ -106,11 +106,11 @@ export async function init({ workspaceRoot, write }: InitOptions): Promise<void>
     } catch (err) {
       if ((err as NodeJS.ErrnoException).code !== "EEXIST") throw err;
       if (name === ".mcp.json") write(await addToMcpConfig(path));
-      else write(`${path} はすでにあるので触りません。`);
+      else write(`${path} はすでにあるので変更しません。`);
     }
   }
   write(
-    "company と principal を自分の会社に合わせ、api_key_env に書いた環境変数を設定してから openshain run を実行してください。",
+    "company と principal を自分の会社に合わせ、api_key_env に書いた環境変数を設定してから openshain を実行してください。",
   );
 }
 
@@ -123,10 +123,10 @@ async function addToMcpConfig(path: string): Promise<string> {
   try {
     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 as { mcpServers?: unknown };
   const servers =
@@ -134,11 +134,11 @@ async function addToMcpConfig(path: string): Promise<string> {
       ? (config.mcpServers as Record<string, unknown>)
       : {};
   if (Object.hasOwn(servers, "openshain"))
-    return `${path} には openshain がすでにあるので触りません。`;
+    return `${path} には openshain がすでにあるので変更しません。`;
   const next = {
     ...config,
     mcpServers: { ...servers, openshain: { command: "openshain", args: ["mcp"] } },
   };
   await writeFile(path, `${JSON.stringify(next, null, 2)}\n`, "utf8");
-  return `${path} に openshain を足しました。他の項目はそのままです。`;
+  return `${path} に openshain を追加しました。他の項目はそのままです。`;
 }

package/src/commands/tools.ts

@@ -1,5 +1,10 @@
-import { ASK_USER, RUNTIME_PROVIDER_ID } from "@openshain/agent";
-import { createToolRegistry, loadConfig, type RuntimeProviders } from "@openshain/core";
+import {
+  ASK_USER,
+  createToolRegistry,
+  loadConfig,
+  RUNTIME_PROVIDER_ID,
+  type RuntimeProviders,
+} from "@openshain/core";
 
 export interface ToolsListOptions {
   workspaceRoot: string;

package/src/commands/work.ts

@@ -1,19 +1,15 @@
-import { pendingQuestions } from "@openshain/agent";
 import {
   type AnyEvent,
-  createRuntime,
   type Event,
-  isTerminal,
   parseWorkId,
-  type RuntimeProviders,
-  SESSION_WORK_TYPE,
+  pendingQuestions,
   type Work,
   WorkStore,
 } from "@openshain/core";
 import { describeInput, padDisplay } from "../format.ts";
 import { errorLabel, failureLabel, rejectionLabel, statusLabel } from "../labels.ts";
+import { nextActor } from "../report.ts";
 import { formatUsage, summarizeUsage } from "../usage.ts";
-import { type DriveOptions, drive, nextActor } from "./run.ts";
 
 export interface WorkListOptions {
   workspaceRoot: string;
@@ -24,7 +20,7 @@ export interface WorkListOptions {
 export async function workList({ workspaceRoot, write }: WorkListOptions): Promise<void> {
   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) {
@@ -86,33 +82,6 @@ export function describeWork(work: Work, events: AnyEvent[]): string[] {
   return lines;
 }
 
-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 async function workResume(options: WorkResumeOptions): Promise<number> {
-  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: AnyEvent[]): string[] {
   const lines = new Map<string, string>();

package/src/index.ts

@@ -8,22 +8,12 @@ export {
   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 {
@@ -36,5 +26,6 @@ export {
   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/src/labels.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 const STATUS_LABELS: Record<WorkStatus, string> = {
@@ -28,6 +27,7 @@ export const REJECTION_LABELS: Record<ToolRejectionCode, string> = {
   reserved_path: "予約されたパス",
   outside_workspace: "workspace の外",
   invalid_path: "不正なパス",
+  limit_reached: "Tool 呼び出しの上限",
 };
 
 /** A heading for a runtime error, before the original message. */

package/src/{commands/run.ts → report.ts}

@@ -1,66 +1,13 @@
-import { pendingQuestions, runWork } from "@openshain/agent";
 import {
   type AnyEvent,
-  createRuntime,
   type Event,
-  type Runtime,
-  type RuntimeProviders,
+  pendingQuestions,
   type ToolContent,
   type Work,
-  type WorkId,
 } from "@openshain/core";
-import { describeInput, truncate } from "../format.ts";
-import { failureLabel, rejectionLabel, statusLabel } from "../labels.ts";
-import { formatUsage, summarizeUsage } from "../usage.ts";
-
-export interface DriveOptions {
-  write: (line: string) => void;
-  /** Answers the model's questions. Without it, a question leaves the work waiting and the run ends. */
-  ask?: (question: string) => Promise<string>;
-  /** Stops the run. The work stays where it is and can be resumed. */
-  signal?: AbortSignal;
-}
-
-export interface RunOptions extends DriveOptions {
-  workspaceRoot: string;
-  providers: RuntimeProviders;
-  objective: string;
-}
-
-/** Creates a work for the request and drives it. Exit code 0 when the work completed. */
-export async function run(options: RunOptions): Promise<number> {
-  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: Runtime,
-  workId: WorkId,
-  options: DriveOptions,
-): Promise<number> {
-  const names = new Map<string, string>();
-  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 { describeInput, truncate } from "./format.ts";
+import { failureLabel, rejectionLabel, statusLabel } from "./labels.ts";
+import { formatUsage, summarizeUsage } from "./usage.ts";
 
 /** 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: AnyEvent, names: Map<string, string>): string | undefined {
@@ -126,11 +73,11 @@ export function nextActor(work: Work): string {
     case "cancelled":
       return "次に動く人はいません。";
     case "waiting_input":
-      return `次は利用者の番です。openshain work resume ${work.id} で質問に答えると続きます。`;
+      return `次は利用者の番です。openshain の会話で /work resume ${work.id} を実行し、続きを依頼すると質問に答えられます。`;
     case "waiting_approval":
       return "次は利用者の番です。承認が要ります。";
     case "failed":
-      return "次は利用者の番です。原因を直して、もう一度依頼してください。";
+      return "次は利用者の番です。原因を修正して、もう一度依頼してください。";
     default:
       return "次は model の番です。";
   }

package/src/tui/controller.ts

@@ -1,17 +1,18 @@
-import { createSession, type Session, type TurnResult } from "@openshain/agent";
+import { connectInMemory, createSession, type Session, type TurnResult } from "@openshain/agent";
 import {
-  type AnyEvent,
-  createRuntime,
   type Event,
-  type Runtime,
+  loadConfig,
+  OpenshainError,
   type RuntimeProviders,
   type WorkId,
+  WorkStore,
 } from "@openshain/core";
-import { progressLine, report } from "../commands/run.ts";
+import { createMcpServer } from "@openshain/mcp";
 import { toolsList } from "../commands/tools.ts";
-import { workList, workResume, workShow } from "../commands/work.ts";
+import { workList, workShow } from "../commands/work.ts";
 import { plain } from "../format.ts";
 import { statusLabel } from "../labels.ts";
+import { progressLine, report } from "../report.ts";
 import { LOGO_ROWS, VERSION } from "./banner.ts";
 
 /** logo and banner are the rows shown once when the screen opens: the wordmark, the version, the folder. */
@@ -66,13 +67,12 @@ export interface Controller {
 export interface ControllerOptions {
   workspaceRoot: string;
   providers: RuntimeProviders;
-  runtime?: Runtime;
 }
 
 const HELP = [
   "/work list         Work の一覧",
   "/work show <id>    Work の詳細",
-  "/work resume <id>  止まった Work を続ける",
+  "/work resume <id>  止まった Work を候補にする。次の依頼がそれに沿えば続ける",
   "/tools             使える Tool",
   "/quit              終わる",
   "↑ ↓                前に送った行を入力欄に呼び戻す。いちばん下は新しい入力",
@@ -85,11 +85,36 @@ const HELP = [
 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: ControllerOptions): Promise<Controller> {
-  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<() => void>();
   let nextId = 1;
   const state: ControllerState = {
@@ -97,8 +122,8 @@ export async function createController(options: ControllerOptions): Promise<Cont
     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 },
     },
   };
@@ -129,8 +154,6 @@ export async function createController(options: ControllerOptions): Promise<Cont
   let aborter: AbortController | undefined;
   let running: Promise<void> | undefined;
   let closing: Promise<void> | undefined;
-  /** The child work of the current turn while it is unfinished. */
-  let lastWorkId: WorkId | undefined;
   const names = new Map<string, string>();
 
   const ask = (workId: WorkId, question: string): Promise<string> => {
@@ -155,60 +178,75 @@ export async function createController(options: ControllerOptions): Promise<Cont
 
   /** The lines the CLI prints when a work ends, shown among the progress lines. */
   const closingLines = async (workId: WorkId) => {
-    for (const line of await workReport(runtime, workId)) push("progress", line.trimStart());
-  };
-
-  const onWorkEvent = (workId: WorkId, event: AnyEvent): void | Promise<void> => {
-    lastWorkId = workId;
-    if (event.type === "work.status_changed") {
-      state.status.work = {
-        id: workId,
-        status: (event as Event<"work.status_changed">).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();
+    for (const line of await workReport(store, workId)) push("progress", line.trimStart());
   };
 
-  const session: Session = await createSession(runtime, {
-    onEvent: (event) => {
-      if (event.type === "usage.recorded") {
-        const { payload } = event as Event<"usage.recorded">;
-        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: WorkId | undefined;
+  const session: Session = await createSession(client, {
+    model,
+    config,
+    onEvent: (workId, event) => {
+      if (workId === sessionId) {
+        if (event.type === "usage.recorded") {
+          const { payload } = event as Event<"usage.recorded">;
+          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 as Event<"work.status_changed">).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 as Event<"tool.called">).payload.name.startsWith("work_")
+      ) {
+        names.set(
+          (event as Event<"tool.called">).payload.callId,
+          (event as Event<"tool.called">).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: string | undefined) =>
+  const stopped = (workId: WorkId | undefined) =>
     workId
-      ? `止めました。${workId} は途中のまま残っています。/work resume ${workId} で続けられます。`
+      ? `止めました。${workId} は途中のまま残っています。/work resume ${workId} で続けられるようにします。`
       : "止めました。";
 
   const explain = (result: TurnResult) => {
     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":
@@ -261,28 +299,22 @@ export async function createController(options: ControllerOptions): Promise<Cont
     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 as WorkId, q),
-          });
-        } catch (err) {
-          if (!signal.aborted) push("notice", message(err));
-        }
-        if (signal.aborted) push("notice", stopped(id));
-      });
+      try {
+        const work = await session.select(id as WorkId);
+        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> です。",
       );
     } else {
-      push("notice", `分からないコマンドです。/help で一覧が出ます。`);
+      push("notice", `分からないコマンドです。/help で一覧が表示されます。`);
     }
   };
 
@@ -291,9 +323,15 @@ export async function createController(options: ControllerOptions): Promise<Cont
       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;
   }
@@ -346,10 +384,10 @@ export async function createController(options: ControllerOptions): Promise<Cont
   };
 }
 
-/** 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: Runtime, workId: WorkId): Promise<string[]> {
-  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: WorkStore, workId: WorkId): Promise<string[]> {
+  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/src/tui/index.ts

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

package/src/usage.ts

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

package/src/workspace.ts

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