openshain 0.8.0 → 0.9.0

package/dist/bin.js

@@ -7,6 +7,7 @@ import { init } from "./commands/init.js";
 import { knowledgeBuild, knowledgeCheck } from "./commands/knowledge.js";
 import { knowledgeAdd } from "./commands/knowledge-add.js";
 import { mcp } from "./commands/mcp.js";
+import { observeCommand } from "./commands/observe.js";
 import { principalCheck } from "./commands/principal.js";
 import { toolsList } from "./commands/tools.js";
 import { workList, workShow } from "./commands/work.js";
@@ -24,8 +25,13 @@ const USAGE = `使い方:
   openshain knowledge check      同じ検証を、索引を書かずに行う(--stale で古い資料も報告)
   openshain knowledge add        決まりを 1 件、質問に答えて追加する
   openshain principal check <id> その人の社員エージェントがどこで働き、何ができるかを確かめる
+  openshain observe <type>       起きたことを記録する。当たる義務があれば Work を作る
   openshain mcp                  MCP Server を stdio で起動する
 
+  --source <name>                observe で、それをどこから知ったか(既定は cli)
+  --at <時刻>                    observe で、それが起きた時刻(既定はいま)
+  --ref <path>                   observe で、中身の置き場
+
   --principal <id>               この端末が誰として働くか。principals/ に書いた id
                                  環境変数 OPENSHAIN_PRINCIPAL でも指定できる。本人確認はしない
   --workspace <dir>              起点のディレクトリ。省略時はカレントディレクトリ
@@ -58,6 +64,9 @@ async function main(argv) {
                 principal: { type: "string" },
                 help: { type: "boolean", short: "h" },
                 stale: { type: "boolean" },
+                source: { type: "string" },
+                at: { type: "string" },
+                ref: { type: "string" },
             },
             allowPositionals: true,
         }));
@@ -118,6 +127,23 @@ async function main(argv) {
             const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
             return await principalCheck({ workspaceRoot, id, write });
         }
+        case "observe": {
+            const type = rest[0];
+            if (!type) {
+                write(USAGE);
+                return 2;
+            }
+            const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+            return await observeCommand({
+                workspaceRoot,
+                type,
+                source: values.source ?? "cli",
+                ...(values.at !== undefined && { at: values.at }),
+                ...(values.ref !== undefined && { ref: values.ref }),
+                as: actingFor(values.principal),
+                write,
+            });
+        }
         case "work": {
             const sub = rest[0];
             const id = rest[1] ?? "";

package/dist/commands/observe.d.ts

@@ -0,0 +1,18 @@
+export interface ObserveOptions {
+    workspaceRoot: string;
+    /** What happened, in the company's own word. An obligation names the same one. */
+    type: string;
+    source: string;
+    /** When it happened, if that is earlier than now. */
+    at?: string | undefined;
+    /** Where the thing itself is, inside the company folder. */
+    ref?: string | undefined;
+    as?: string | undefined;
+    write: (line: string) => void;
+}
+/**
+ * Writes down something that happened, and starts whatever the company said should follow. The
+ * source of the fact is whatever ran this: a script watching a mailbox, a folder, or a person
+ * typing it. openshain records that it happened, and the obligations decide what that means.
+ */
+export declare function observeCommand(options: ObserveOptions): Promise<number>;

package/dist/commands/observe.js

@@ -0,0 +1,25 @@
+import { loadConfig, observe } from "@openshain/core";
+/**
+ * Writes down something that happened, and starts whatever the company said should follow. The
+ * source of the fact is whatever ran this: a script watching a mailbox, a folder, or a person
+ * typing it. openshain records that it happened, and the obligations decide what that means.
+ */
+export async function observeCommand(options) {
+    const { workspaceRoot, type, source, at, ref, as, write } = options;
+    const config = await loadConfig(workspaceRoot, { ...(as !== undefined && { as }) });
+    const { observation, works } = await observe(workspaceRoot, config.principal.id, {
+        type,
+        source,
+        scope: { profession: config.profession.id },
+        ...(at !== undefined && { observedAt: at }),
+        ...(ref !== undefined && { payloadRef: ref }),
+    });
+    write(`${observation.id} ${observation.type}(${observation.source})`);
+    if (works.length === 0) {
+        write("  この観測に当たる義務はありません。記録だけ残しました");
+        return 0;
+    }
+    for (const id of works)
+        write(`  Work を作りました ${id}`);
+    return 0;
+}

package/dist/commands/work.js

@@ -1,9 +1,9 @@
 import { join } from "node:path";
-import { loadConfig, mayReadWork, noSuchWork, PRINCIPALS_DIR_NAME, parseWorkId, pendingApprovals, pendingQuestions, readPrincipals, WorkStore, } from "@openshain/core";
+import { loadConfig, mayReadWork, measureWork, noSuchWork, PRINCIPALS_DIR_NAME, parseWorkId, pendingApprovals, pendingQuestions, readPrincipals, summarizeUsage, 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 { formatUsage } from "../usage.js";
 /**
  * The person this terminal works for, out of the people the company has written. Nobody written:
  * nobody to be, and every work is read, as before there was more than one person.
@@ -52,6 +52,10 @@ export function describeWork(work, events) {
     ];
     if (work.agentName)
         lines.push(`名前      ${work.agentName}(社員エージェント)`);
+    // A work nobody asked for says where it came from, so it is not a mystery in the list.
+    if (work.observation) {
+        lines.push(`きっかけ  ${work.observation}${work.obligation ? `(${work.obligation})` : ""}`);
+    }
     if (work.startedAt)
         lines.push(`開始      ${work.startedAt}`);
     if (work.completedAt)
@@ -81,9 +85,33 @@ export function describeWork(work, events) {
             lines.push(line);
     }
     lines.push(formatUsage(summarizeUsage(events)));
+    lines.push(measureLine(measureWork(work, events)));
     lines.push(nextActor(work));
     return lines;
 }
+/**
+ * What the work asked of a person and what the rules stopped, in one line. Only what happened is
+ * written: a work nobody was asked about says so, rather than listing three zeros.
+ */
+function measureLine(measures) {
+    const { intervention, quality, attention, coverage } = measures;
+    const asked = [
+        intervention.clarification > 0 ? `質問 ${intervention.clarification}` : "",
+        intervention.approval > 0 ? `承認 ${intervention.approval}` : "",
+        intervention.expertReview > 0 ? `資格者の判断 ${intervention.expertReview}` : "",
+    ].filter(Boolean);
+    const notes = [
+        quality.corrected > 0 ? `資格者が書き換え ${quality.corrected}` : "",
+        quality.stoppedByRule > 0 ? `規則が止めた ${quality.stoppedByRule}` : "",
+        coverage.seconds !== undefined ? `所要 ${coverage.seconds} 秒` : "",
+    ].filter(Boolean);
+    const called = attention.calls === 0
+        ? coverage.finished
+            ? "人を呼ばずに終わりました"
+            : "まだ人を呼んでいません"
+        : `人を呼んだ回数 ${attention.calls}(${asked.join("、")})`;
+    return [called, ...notes].join("  ");
+}
 /**
  * How a reviewer is named on the screen. The role of a reviewer is a qualification the company
  * names (tax-accountant), not one of the roles a person handles, so the word comes first and the

package/dist/index.d.ts

@@ -1,8 +1,9 @@
+export { summarizeUsage, type UsageSummary } from "@openshain/core";
 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 ToolsListOptions, toolsList } from "./commands/tools.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 { formatUsage } from "./usage.ts";
 export { findWorkspace } from "./workspace.ts";

package/dist/index.js

@@ -1,9 +1,11 @@
 // openshain: Reference CLI agent for the openshain runtime
+// The sums live in core, where anything that reads a record can reach them.
+export { summarizeUsage } from "@openshain/core";
 export { AGENTS_TEMPLATE, CLAUDE_TEMPLATE, CONFIG_TEMPLATE, init, MCP_TEMPLATE, } from "./commands/init.js";
 export { mcp } from "./commands/mcp.js";
 export { toolsList } from "./commands/tools.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 { formatUsage } from "./usage.js";
 export { findWorkspace } from "./workspace.js";

package/dist/labels.js

@@ -5,6 +5,7 @@ export const STATUS_LABELS = {
     waiting_input: "利用者の入力待ち",
     waiting_approval: "承認待ち",
     waiting_external: "外部の応答待ち",
+    paused: "停止中",
     completed: "完了",
     failed: "失敗",
     cancelled: "取り消し",

package/dist/report.js

@@ -1,7 +1,7 @@
-import { pendingQuestions, } from "@openshain/core";
+import { pendingQuestions, summarizeUsage, } from "@openshain/core";
 import { describeInput, truncate } from "./format.js";
 import { failureLabel, rejectionLabel, statusLabel } from "./labels.js";
-import { formatUsage, summarizeUsage } from "./usage.js";
+import { formatUsage } 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) {

package/dist/usage.d.ts

@@ -1,12 +1,2 @@
-import { type AnyEvent } from "@openshain/core";
-export interface UsageSummary {
-    modelCalls: number;
-    toolCalls: number;
-    inputTokens: number;
-    /** The part of inputTokens a prompt cache served. */
-    cachedInputTokens: number;
-    outputTokens: number;
-}
-/** Totals over a work's events: calls and tokens. */
-export declare function summarizeUsage(events: AnyEvent[]): UsageSummary;
+import type { UsageSummary } from "@openshain/core";
 export declare function formatUsage(summary: UsageSummary): string;

package/dist/usage.js

@@ -1,28 +1,3 @@
-import { countToolCalls } from "@openshain/core";
-/** Totals over a work's events: calls and tokens. */
-export function summarizeUsage(events) {
-    const summary = {
-        modelCalls: 0,
-        toolCalls: 0,
-        inputTokens: 0,
-        cachedInputTokens: 0,
-        outputTokens: 0,
-    };
-    for (const event of events) {
-        if (event.type === "model.requested")
-            summary.modelCalls += 1;
-        if (event.type === "usage.recorded") {
-            const { payload } = event;
-            if (payload.kind === "model_inference") {
-                summary.inputTokens += payload.usage.inputTokens;
-                summary.cachedInputTokens += payload.usage.cachedInputTokens ?? 0;
-                summary.outputTokens += payload.usage.outputTokens;
-            }
-        }
-    }
-    summary.toolCalls = countToolCalls(events);
-    return summary;
-}
 export function formatUsage(summary) {
     if (summary.modelCalls === 0 && summary.inputTokens === 0 && summary.outputTokens === 0) {
         return `model 呼び出し 0 回、Tool 呼び出し ${summary.toolCalls} 回。model の使用量の記録はない`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openshain",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Reference CLI of the openshain agent harness",
   "keywords": [
     "openshain",
@@ -49,10 +49,10 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "1.30.0",
-    "@openshain/agent": "0.8.0",
-    "@openshain/core": "0.8.0",
-    "@openshain/mcp": "0.8.0",
-    "@openshain/tools": "0.8.0",
+    "@openshain/agent": "0.9.0",
+    "@openshain/core": "0.9.0",
+    "@openshain/mcp": "0.9.0",
+    "@openshain/tools": "0.9.0",
     "ink": "7.1.1",
     "marked": "18.0.12",
     "react": "19.2.8"

package/src/bin.ts

@@ -7,6 +7,7 @@ import { init } from "./commands/init.ts";
 import { knowledgeBuild, knowledgeCheck } from "./commands/knowledge.ts";
 import { knowledgeAdd } from "./commands/knowledge-add.ts";
 import { mcp } from "./commands/mcp.ts";
+import { observeCommand } from "./commands/observe.ts";
 import { principalCheck } from "./commands/principal.ts";
 import { toolsList } from "./commands/tools.ts";
 import { workList, workShow } from "./commands/work.ts";
@@ -25,8 +26,13 @@ const USAGE = `使い方:
   openshain knowledge check      同じ検証を、索引を書かずに行う(--stale で古い資料も報告)
   openshain knowledge add        決まりを 1 件、質問に答えて追加する
   openshain principal check <id> その人の社員エージェントがどこで働き、何ができるかを確かめる
+  openshain observe <type>       起きたことを記録する。当たる義務があれば Work を作る
   openshain mcp                  MCP Server を stdio で起動する
 
+  --source <name>                observe で、それをどこから知ったか(既定は cli)
+  --at <時刻>                    observe で、それが起きた時刻(既定はいま)
+  --ref <path>                   observe で、中身の置き場
+
   --principal <id>               この端末が誰として働くか。principals/ に書いた id
                                  環境変数 OPENSHAIN_PRINCIPAL でも指定できる。本人確認はしない
   --workspace <dir>              起点のディレクトリ。省略時はカレントディレクトリ
@@ -52,7 +58,15 @@ function actingFor(flag: string | undefined): string | undefined {
 
 async function main(argv: string[]): Promise<number> {
   const write = (line: string) => console.log(plain(line));
-  let values: { workspace?: string; principal?: string; help?: boolean; stale?: boolean };
+  let values: {
+    workspace?: string;
+    principal?: string;
+    help?: boolean;
+    stale?: boolean;
+    source?: string;
+    at?: string;
+    ref?: string;
+  };
   let positionals: string[];
   try {
     ({ values, positionals } = parseArgs({
@@ -62,6 +76,9 @@ async function main(argv: string[]): Promise<number> {
         principal: { type: "string" },
         help: { type: "boolean", short: "h" },
         stale: { type: "boolean" },
+        source: { type: "string" },
+        at: { type: "string" },
+        ref: { type: "string" },
       },
       allowPositionals: true,
     }));
@@ -120,6 +137,23 @@ async function main(argv: string[]): Promise<number> {
       const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
       return await principalCheck({ workspaceRoot, id, write });
     }
+    case "observe": {
+      const type = rest[0];
+      if (!type) {
+        write(USAGE);
+        return 2;
+      }
+      const workspaceRoot = await findWorkspace(values.workspace ?? process.cwd());
+      return await observeCommand({
+        workspaceRoot,
+        type,
+        source: values.source ?? "cli",
+        ...(values.at !== undefined && { at: values.at }),
+        ...(values.ref !== undefined && { ref: values.ref }),
+        as: actingFor(values.principal),
+        write,
+      });
+    }
     case "work": {
       const sub = rest[0];
       const id = rest[1] ?? "";

package/src/commands/observe.ts

@@ -0,0 +1,38 @@
+import { loadConfig, observe } from "@openshain/core";
+
+export interface ObserveOptions {
+  workspaceRoot: string;
+  /** What happened, in the company's own word. An obligation names the same one. */
+  type: string;
+  source: string;
+  /** When it happened, if that is earlier than now. */
+  at?: string | undefined;
+  /** Where the thing itself is, inside the company folder. */
+  ref?: string | undefined;
+  as?: string | undefined;
+  write: (line: string) => void;
+}
+
+/**
+ * Writes down something that happened, and starts whatever the company said should follow. The
+ * source of the fact is whatever ran this: a script watching a mailbox, a folder, or a person
+ * typing it. openshain records that it happened, and the obligations decide what that means.
+ */
+export async function observeCommand(options: ObserveOptions): Promise<number> {
+  const { workspaceRoot, type, source, at, ref, as, write } = options;
+  const config = await loadConfig(workspaceRoot, { ...(as !== undefined && { as }) });
+  const { observation, works } = await observe(workspaceRoot, config.principal.id, {
+    type,
+    source,
+    scope: { profession: config.profession.id },
+    ...(at !== undefined && { observedAt: at }),
+    ...(ref !== undefined && { payloadRef: ref }),
+  });
+  write(`${observation.id} ${observation.type}(${observation.source})`);
+  if (works.length === 0) {
+    write("  この観測に当たる義務はありません。記録だけ残しました");
+    return 0;
+  }
+  for (const id of works) write(`  Work を作りました ${id}`);
+  return 0;
+}

package/src/commands/work.ts

@@ -4,6 +4,7 @@ import {
   type Event,
   loadConfig,
   mayReadWork,
+  measureWork,
   noSuchWork,
   PRINCIPALS_DIR_NAME,
   type Principal,
@@ -11,13 +12,15 @@ import {
   pendingApprovals,
   pendingQuestions,
   readPrincipals,
+  summarizeUsage,
   type Work,
+  type WorkMeasures,
   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 { formatUsage } from "../usage.ts";
 
 export interface WorkListOptions {
   workspaceRoot: string;
@@ -85,6 +88,10 @@ export function describeWork(work: Work, events: AnyEvent[]): string[] {
     `作成      ${work.createdAt}`,
   ];
   if (work.agentName) lines.push(`名前      ${work.agentName}(社員エージェント)`);
+  // A work nobody asked for says where it came from, so it is not a mystery in the list.
+  if (work.observation) {
+    lines.push(`きっかけ  ${work.observation}${work.obligation ? `(${work.obligation})` : ""}`);
+  }
   if (work.startedAt) lines.push(`開始      ${work.startedAt}`);
   if (work.completedAt) lines.push(`終了      ${work.completedAt}`);
   if (work.outcome) {
@@ -113,10 +120,36 @@ export function describeWork(work: Work, events: AnyEvent[]): string[] {
     for (const line of calls) lines.push(line);
   }
   lines.push(formatUsage(summarizeUsage(events)));
+  lines.push(measureLine(measureWork(work, events)));
   lines.push(nextActor(work));
   return lines;
 }
 
+/**
+ * What the work asked of a person and what the rules stopped, in one line. Only what happened is
+ * written: a work nobody was asked about says so, rather than listing three zeros.
+ */
+function measureLine(measures: WorkMeasures): string {
+  const { intervention, quality, attention, coverage } = measures;
+  const asked = [
+    intervention.clarification > 0 ? `質問 ${intervention.clarification}` : "",
+    intervention.approval > 0 ? `承認 ${intervention.approval}` : "",
+    intervention.expertReview > 0 ? `資格者の判断 ${intervention.expertReview}` : "",
+  ].filter(Boolean);
+  const notes = [
+    quality.corrected > 0 ? `資格者が書き換え ${quality.corrected}` : "",
+    quality.stoppedByRule > 0 ? `規則が止めた ${quality.stoppedByRule}` : "",
+    coverage.seconds !== undefined ? `所要 ${coverage.seconds} 秒` : "",
+  ].filter(Boolean);
+  const called =
+    attention.calls === 0
+      ? coverage.finished
+        ? "人を呼ばずに終わりました"
+        : "まだ人を呼んでいません"
+      : `人を呼んだ回数 ${attention.calls}(${asked.join("、")})`;
+  return [called, ...notes].join("  ");
+}
+
 /**
  * How a reviewer is named on the screen. The role of a reviewer is a qualification the company
  * names (tax-accountant), not one of the roles a person handles, so the word comes first and the

package/src/index.ts

@@ -1,4 +1,7 @@
 // openshain: Reference CLI agent for the openshain runtime
+
+// The sums live in core, where anything that reads a record can reach them.
+export { summarizeUsage, type UsageSummary } from "@openshain/core";
 export {
   AGENTS_TEMPLATE,
   CLAUDE_TEMPLATE,
@@ -27,5 +30,5 @@ export {
   statusLabel,
 } from "./labels.ts";
 export { nextActor, progressLine, report } from "./report.ts";
-export { formatUsage, summarizeUsage, type UsageSummary } from "./usage.ts";
+export { formatUsage } from "./usage.ts";
 export { findWorkspace } from "./workspace.ts";

package/src/labels.ts

@@ -7,6 +7,7 @@ export const STATUS_LABELS: Record<WorkStatus, string> = {
   waiting_input: "利用者の入力待ち",
   waiting_approval: "承認待ち",
   waiting_external: "外部の応答待ち",
+  paused: "停止中",
   completed: "完了",
   failed: "失敗",
   cancelled: "取り消し",

package/src/report.ts

@@ -2,12 +2,13 @@ import {
   type AnyEvent,
   type Event,
   pendingQuestions,
+  summarizeUsage,
   type ToolContent,
   type Work,
 } from "@openshain/core";
 import { describeInput, truncate } from "./format.ts";
 import { failureLabel, rejectionLabel, statusLabel } from "./labels.ts";
-import { formatUsage, summarizeUsage } from "./usage.ts";
+import { formatUsage } 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 {

package/src/usage.ts

@@ -1,37 +1,4 @@
-import { type AnyEvent, countToolCalls, type Event } from "@openshain/core";
-
-export interface UsageSummary {
-  modelCalls: number;
-  toolCalls: number;
-  inputTokens: number;
-  /** The part of inputTokens a prompt cache served. */
-  cachedInputTokens: number;
-  outputTokens: number;
-}
-
-/** Totals over a work's events: calls and tokens. */
-export function summarizeUsage(events: AnyEvent[]): UsageSummary {
-  const summary: UsageSummary = {
-    modelCalls: 0,
-    toolCalls: 0,
-    inputTokens: 0,
-    cachedInputTokens: 0,
-    outputTokens: 0,
-  };
-  for (const event of events) {
-    if (event.type === "model.requested") summary.modelCalls += 1;
-    if (event.type === "usage.recorded") {
-      const { payload } = event as Event<"usage.recorded">;
-      if (payload.kind === "model_inference") {
-        summary.inputTokens += payload.usage.inputTokens;
-        summary.cachedInputTokens += payload.usage.cachedInputTokens ?? 0;
-        summary.outputTokens += payload.usage.outputTokens;
-      }
-    }
-  }
-  summary.toolCalls = countToolCalls(events);
-  return summary;
-}
+import type { UsageSummary } from "@openshain/core";
 
 export function formatUsage(summary: UsageSummary): string {
   if (summary.modelCalls === 0 && summary.inputTokens === 0 && summary.outputTokens === 0) {