@clubs.place/cli 0.1.24 → 0.1.26

package/src/tick.profiles.test.mjs

@@ -0,0 +1,131 @@
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, writeFileSync, readFileSync, rmSync, openSync, closeSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { spawn } from "node:child_process";
+import { buildTickScript, shQuote } from "./hermes-cron.mjs";
+
+const BIN = new URL("../bin/clubs.mjs", import.meta.url).pathname;
+const narrative = { workBlocks: [{ title: "test", text: "test", metric: "1" }], handoff: { title: "t", text: "t" }, insights: [], selfNote: "t" };
+
+const run = (command, args, env) => new Promise((resolve, reject) => {
+  const output = join(env.HOME, "process-output.txt");
+  const fd = openSync(output, "w");
+  const child = spawn(command, args, { env, stdio: ["ignore", fd, fd] });
+  closeSync(fd);
+  const timer = setTimeout(() => { child.kill("SIGKILL"); }, 20_000);
+  child.on("error", reject);
+  child.on("close", (code) => {
+    clearTimeout(timer);
+    resolve({ code, out: readFileSync(output, "utf8") });
+  });
+});
+
+// 実 tick + fanout + collector + generator。通信だけを preload でスタブ化し、
+// 認証・会話・report はすべて temp 配下の架空データに限定する。
+const fixture = (t, { native = false, generator } = {}) => {
+  const dir = mkdtempSync(join(tmpdir(), "nippo-profiles-"));
+  t.after(() => rmSync(dir, { recursive: true, force: true }));
+  const home = join(dir, "clubs");
+  const childHome = join(home, "agents", "child");
+  const homes = [join(dir, "A"), join(dir, "B")];
+  for (const [i, h] of homes.entries()) {
+    mkdirSync(join(h, "sessions"), { recursive: true });
+    writeFileSync(join(h, "sessions", "session_20261028_120000.json"), JSON.stringify({
+      session_id: "s", source: "cli", session_start: "2026-10-28T12:00:00Z",
+      last_updated: "2026-10-28T12:00:00Z",
+      messages: [
+        { role: "assistant", tool_calls: [{ id: "c1", function: { name: "terminal", arguments: JSON.stringify({ command: i ? "CHILD_ONLY_COMMAND" : "ROOT_ONLY_COMMAND" }) } }] },
+        { role: "tool", tool_call_id: "c1", name: "terminal", content: '{"ok":true}' },
+      ],
+    }));
+  }
+  for (const [i, h] of [home, childHome].entries()) {
+    mkdirSync(h, { recursive: true });
+    writeFileSync(join(h, ".env"), [
+      "SOURCE=hermes", "TZ_OFFSET_MIN=0",
+      "NIPPO_INGEST_URL=https://clubs.invalid/api/nippo/ingest",
+      `NIPPO_INGEST_TOKEN=${i ? "child-token" : "root-token"}`,
+      // native root は wrapper の既定 A を使う。子の明示 B はそれに勝つ。
+      ...(!native || i ? [`HERMES_HOME=${homes[i]}`] : []),
+      `OPENROUTER_API_KEY=${i ? "child-key" : "root-key"}`,
+    ].join("\n") + "\n");
+  }
+  const log = join(dir, "calls.jsonl");
+  const preload = join(dir, "stub.mjs");
+  writeFileSync(preload, `
+import { appendFileSync } from "node:fs";
+globalThis.fetch = async (url, options = {}) => {
+  const record = { url: String(url), home: process.env.CLUBS_NIPPO_HOME, auth: options.headers?.authorization ?? options.headers?.Authorization, body: options.body };
+  appendFileSync(${JSON.stringify(log)}, JSON.stringify(record) + "\\n");
+  if (String(url).endsWith("/collector-config")) return new Response(JSON.stringify({
+    schedule: { enabled: true }, due: true, reportDate: "2026-10-28", sources: ["hermes"],
+    generator: process.env.CLUBS_NIPPO_CHILD && !${native} ? { backend: "openrouter", model: "child/model" } : { backend: "hermes-cli" }
+  }));
+  if (String(url).includes("openrouter")) return new Response(JSON.stringify({
+    choices: [{ message: { content: ${JSON.stringify(JSON.stringify(narrative))} } }]
+  }));
+  if (String(url).endsWith("/ingest")) return new Response("{}");
+  throw new Error("Unexpected request: " + url);
+};
+`);
+  const hermes = join(dir, "hermes");
+  writeFileSync(hermes, `#!/bin/sh
+cat > "$CLUBS_NIPPO_HOME/prompt.txt"
+printf '{"generator":"hermes","home":"%s","hermesHome":"%s","key":"%s"}\\n' "$CLUBS_NIPPO_HOME" "$HERMES_HOME" "$OPENROUTER_API_KEY" >> ${shQuote(log)}
+printf '%s' ${shQuote(JSON.stringify(narrative))}
+`, { mode: 0o755 });
+  const env = {
+    PATH: process.env.PATH, HOME: dir, CLUBS_NIPPO_HOME: home,
+    HERMES_BIN: hermes, NODE_OPTIONS: `--import=${preload}`,
+    ...(generator ? { GENERATOR: generator } : {}),
+  };
+  return { dir, home, childHome, homes, env, log, calls: () => readFileSync(log, "utf8").trim().split("\n").map(JSON.parse) };
+};
+
+for (const explicit of [false, true]) {
+  test(`root+child tick: ${explicit ? "真の GENERATOR 上書きを継承" : "root の導出 GENERATOR より子の OpenRouter 設定が優先"}`, async (t) => {
+    const f = fixture(t, { generator: explicit ? "hermes" : undefined });
+    const r = await run(process.execPath, [BIN, "tick"], f.env);
+    assert.equal(r.code, 0, r.out);
+    const calls = f.calls();
+    const generators = calls.filter((c) => c.generator || c.url.includes("openrouter"));
+    assert.equal(generators.length, 2, r.out);
+    assert.equal(generators[0].hermesHome, f.homes[0]);
+    assert.equal(generators[1].home, f.childHome);
+    if (explicit) {
+      assert.equal(generators[1].generator, "hermes");
+      assert.equal(generators[1].hermesHome, f.homes[1]);
+    } else {
+      assert.match(r.out, /generator=openrouter/);
+      assert.equal(JSON.parse(generators[1].body).model, "child/model");
+      assert.equal(generators[1].auth, "Bearer child-key");
+    }
+    assert.equal(calls.filter((c) => c.url?.endsWith("/ingest")).length, 2);
+    const childCalls = JSON.stringify(calls.filter((c) => c.home === f.childHome));
+    assert.ok(!childCalls.includes("root-key"));
+    assert.ok(!childCalls.includes("root-token"));
+  });
+}
+
+test("native cron wrapper: 所有者 A と child.env B の collect + generation を分離", async (t) => {
+  const f = fixture(t, { native: true });
+  const script = join(f.dir, "tick.sh");
+  writeFileSync(script, buildTickScript({
+    home: f.home, hermesHome: f.homes[0],
+    tickCmd: `${shQuote(process.execPath)} ${shQuote(BIN)} tick --only=hermes`,
+    logPath: join(f.dir, "cron.log"),
+  }));
+  const r = await run("bash", [script], { ...f.env, HERMES_HOME: f.homes[0] });
+  assert.equal(r.code, 0, r.out);
+  const generated = f.calls().filter((c) => c.generator);
+  assert.equal(generated.length, 2, r.out);
+  for (const [i, c] of generated.entries()) {
+    assert.equal(c.hermesHome, f.homes[i]);
+    assert.equal(c.key, i ? "child-key" : "root-key");
+    const prompt = readFileSync(join(c.home, "prompt.txt"), "utf8");
+    assert.ok(prompt.includes(i ? "CHILD_ONLY_COMMAND" : "ROOT_ONLY_COMMAND"));
+    assert.ok(!prompt.includes(i ? "ROOT_ONLY_COMMAND" : "CHILD_ONLY_COMMAND"));
+  }
+});

package/src/mcp.mjs

@@ -1,286 +0,0 @@
-/**
- * CLUBS MCP サーバー（stdio・同一バイナリ同梱＝全体設計 §6 / P0 §9）。
- *
- * `clubs-nippo mcp` で起動し、Claude Code / Cursor / Gemini CLI 等の
- * MCP クライアントから CLUBS への登録・疎通確認を対話の中で完結させる。
- *
- * CTO裁定（clubsx#53 D-4）に従う:
- * - ツールは clubs_register / clubs_link_status の2本のみ。
- *   発行系・日報の書き込み系は載せない（B-1: 自己申告の発行経路を作らない。
- *   日報の取り込みは従来どおり収集器の pull 経路のみ）。
- * - 出力はサーバ確定値・ローカル設定の定型フィールドのみ（自由文・他ユーザー
- *   由来のテキストを返さない＝注入面の最小化）。
- *
- * **終わる（CLUBS 判断 #26・2026-10-16）**: AI を CLUBS につなぐのはリモート MCP
- * （接続画面の URL＋許可）になり、この CLI は日報の自動化専用になった。前に
- * 登録した人の AI が起動したとき黙って落ちないよう、しばらくは動かしたまま、
- * 起動・道具の説明・返事のすべてで「つなぎ直して」を伝える（DEPRECATION）。
- *
- * 依存ゼロ方針（このリポの流儀）のため SDK は使わず、MCP の stdio
- * トランスポート（JSON-RPC 2.0・1行1メッセージ）を最小実装する。
- * stdout はプロトコル専用。ログは必ず stderr へ。
- */
-
-import { createInterface } from "node:readline";
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
-import { join } from "node:path";
-import { APP_HOME, ROOT } from "./config.mjs";
-import { collectorConfigUrl } from "./remote-config.mjs";
-import { readHistory } from "./history.mjs";
-
-const PROTOCOL_FALLBACK = "2025-06-18";
-
-/** 終わることの知らせ。決まった文だけ（自由文を返さない方針のまま）。 */
-export const DEPRECATION =
-  "この手元の MCP（clubs_register / clubs_link_status）は終わります。" +
-  "CLUBS の接続画面 https://clubs.place/connections からリモート MCP につなぎ直し、" +
-  "この登録は `claude mcp remove clubs` などで外してください。日報の自動化（tick）はこのまま動きます。";
-
-const pkgVersion = () => {
-  try {
-    return JSON.parse(readFileSync(join(ROOT, "package.json"), "utf8")).version;
-  } catch {
-    return "0.0.0";
-  }
-};
-
-// ── 登録先 URL のガード（注入面対策） ─────────────────────
-// MCP 経由の register は AI の文脈から呼ばれるため、細工された取込URLで
-// トークンや日報の送り先を挿げ替えられないよう、既定で CLUBS のホストに限る。
-// 自前ホストの開発者は CLUBS_NIPPO_ALLOW_HOST=<host> で1件だけ追加できる。
-const urlAllowed = (raw) => {
-  try {
-    const u = new URL(raw);
-    const local = u.hostname === "localhost" || u.hostname === "127.0.0.1";
-    if (local) return true; // ローカル開発
-    if (u.protocol !== "https:") return false;
-    if (u.hostname === "clubs.place" || u.hostname.endsWith(".clubs.place"))
-      return true;
-    return u.hostname === process.env.CLUBS_NIPPO_ALLOW_HOST;
-  } catch {
-    return false;
-  }
-};
-
-/** init コマンドと同じ書式で .env を更新（既存キーは生かす）。 */
-const writeEnvUpdates = (updates) => {
-  mkdirSync(join(APP_HOME, "out"), { recursive: true });
-  const envPath = join(APP_HOME, ".env");
-  const lines = existsSync(envPath)
-    ? readFileSync(envPath, "utf8").replace(/\n$/, "").split("\n")
-    : [
-        "# clubs-nippo の設定。キーの一覧は https://www.npmjs.com/package/clubs-nippo を参照。",
-      ];
-  for (const [key, value] of Object.entries(updates)) {
-    const row = `${key}=${value}`;
-    const idx = lines.findIndex((l) => l.match(new RegExp(`^\\s*${key}\\s*=`)));
-    if (idx >= 0) lines[idx] = row;
-    else lines.push(row);
-  }
-  writeFileSync(envPath, lines.join("\n") + "\n", "utf8");
-  return envPath;
-};
-
-const withTimeout = async (fn, ms) => {
-  const ctrl = new AbortController();
-  const timer = setTimeout(() => ctrl.abort(), ms);
-  try {
-    return await fn(ctrl.signal);
-  } finally {
-    clearTimeout(timer);
-  }
-};
-
-/** 連携トークンの実在確認＝collector-config にサーバ照会する。 */
-const serverCheck = async (ingestUrl, ingestToken) => {
-  const url = collectorConfigUrl(ingestUrl);
-  if (!url || !ingestToken) return { reachable: false, token_valid: false };
-  try {
-    const res = await withTimeout(
-      (signal) =>
-        fetch(url, {
-          signal,
-          headers: { Authorization: `Bearer ${ingestToken}` },
-        }),
-      10_000,
-    );
-    return { reachable: true, token_valid: res.ok };
-  } catch {
-    return { reachable: false, token_valid: false };
-  }
-};
-
-// ── ツール定義 ────────────────────────────────────────────
-
-const TOOLS = [
-  {
-    name: "clubs_register",
-    description:
-      "【終わります】" +
-      DEPRECATION +
-      " ／ この端末を CLUBS に登録する（clubs-nippo init と同じ設定を書く）。url と token は CLUBS の接続画面（/nippo/connections）が発行した値をそのまま渡すこと。登録後にサーバへ疎通確認する。",
-    inputSchema: {
-      type: "object",
-      properties: {
-        url: {
-          type: "string",
-          description: "取込URL（接続画面が発行。…/api/nippo/ingest）",
-        },
-        token: { type: "string", description: "連携トークン（接続画面が発行）" },
-        source: {
-          type: "string",
-          description: "収集元（例: claude-code / cowork。省略可）",
-        },
-        agent_name: { type: "string", description: "体の表示名（省略可）" },
-        owner_name: { type: "string", description: "オーナー名（省略可）" },
-      },
-      required: ["url", "token"],
-    },
-  },
-  {
-    name: "clubs_link_status",
-    description:
-      "【終わります】" +
-      DEPRECATION +
-      " ／ CLUBS との連携状態を返す（設定の有無・サーバ疎通・トークン有効性・ローカル最終記録日）。",
-    inputSchema: { type: "object", properties: {} },
-  },
-];
-
-export const callTool = async (name, args = {}) => ({
-  deprecated: DEPRECATION,
-  ...(await callToolInner(name, args)),
-});
-
-const callToolInner = async (name, args = {}) => {
-  if (name === "clubs_register") {
-    const url = String(args.url ?? "");
-    const token = String(args.token ?? "");
-    if (!url || !token) {
-      return { ok: false, error: "url と token は必須です" };
-    }
-    let parsed;
-    try {
-      parsed = new URL(url);
-    } catch {
-      return { ok: false, error: "url が不正です" };
-    }
-    if (!/\/api\/nippo\/ingest\/?$/.test(parsed.pathname)) {
-      return {
-        ok: false,
-        error: "url は接続画面が発行した取込URL（…/api/nippo/ingest）を渡してください",
-      };
-    }
-    if (!urlAllowed(url)) {
-      return {
-        ok: false,
-        error:
-          "この url のホストには登録できません（clubs.place / localhost のみ。自前ホストは CLUBS_NIPPO_ALLOW_HOST で許可）",
-      };
-    }
-    const updates = Object.fromEntries(
-      Object.entries({
-        NIPPO_INGEST_URL: url,
-        NIPPO_INGEST_TOKEN: token,
-        SOURCE: args.source,
-        AGENT_NAME: args.agent_name,
-        OWNER_NAME: args.owner_name,
-      }).filter(([, v]) => v),
-    );
-    const envPath = writeEnvUpdates(updates);
-    // 同一セッション内の link_status が新しい値を見られるように反映する
-    // （config.mjs の loadDotEnv は起動時に未設定キーしか埋めない）
-    for (const [key, value] of Object.entries(updates)) process.env[key] = value;
-    const server = await serverCheck(url, token);
-    return {
-      ok: server.token_valid,
-      wrote: Object.keys(updates),
-      env_path: envPath,
-      ingest_url_host: parsed.host,
-      server,
-      next: server.token_valid
-        ? "毎朝の自動配信は crontab に `npx -y @clubs.place/cli@latest tick` を登録（clubs-nippo init のヘルプ参照）"
-        : "トークンがサーバで確認できませんでした。接続画面で再発行して register し直してください",
-    };
-  }
-
-  if (name === "clubs_link_status") {
-    const ingestUrl = process.env.NIPPO_INGEST_URL ?? "";
-    const ingestToken = process.env.NIPPO_INGEST_TOKEN ?? "";
-    const configured = Boolean(ingestUrl && ingestToken);
-    const server = configured
-      ? await serverCheck(ingestUrl, ingestToken)
-      : { reachable: false, token_valid: false };
-    const history = readHistory();
-    return {
-      ok: configured && server.token_valid,
-      configured,
-      ingest_url_host: ingestUrl ? new URL(ingestUrl).host : null,
-      agent_name: process.env.AGENT_NAME ?? null,
-      server,
-      last_local_report_date: history.at(-1)?.date ?? null,
-      env_path: join(APP_HOME, ".env"),
-    };
-  }
-
-  return { ok: false, error: `unknown tool: ${name}` };
-};
-
-// ── JSON-RPC 2.0 / stdio ─────────────────────────────────
-
-const reply = (id, result) => {
-  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id, result }) + "\n");
-};
-
-const replyError = (id, code, message) => {
-  process.stdout.write(
-    JSON.stringify({ jsonrpc: "2.0", id, error: { code, message } }) + "\n",
-  );
-};
-
-export const runMcpServer = async () => {
-  const rl = createInterface({ input: process.stdin, terminal: false });
-  console.error(`[clubs-nippo mcp] ${DEPRECATION}`);
-  console.error(
-    `[clubs-nippo mcp] stdio server ready (tools: ${TOOLS.map((t) => t.name).join(", ")})`,
-  );
-
-  for await (const line of rl) {
-    if (!line.trim()) continue;
-    let msg;
-    try {
-      msg = JSON.parse(line);
-    } catch {
-      continue; // 不正な行は無視（プロトコル外のノイズ）
-    }
-    const { id, method, params } = msg;
-
-    // 通知（id なし）は initialized 含め応答しない
-    if (id === undefined || id === null) continue;
-
-    try {
-      if (method === "initialize") {
-        reply(id, {
-          protocolVersion: params?.protocolVersion ?? PROTOCOL_FALLBACK,
-          capabilities: { tools: { listChanged: false } },
-          serverInfo: { name: "clubs-nippo", version: pkgVersion() },
-          instructions: DEPRECATION,
-        });
-      } else if (method === "ping") {
-        reply(id, {});
-      } else if (method === "tools/list") {
-        reply(id, { tools: TOOLS });
-      } else if (method === "tools/call") {
-        const result = await callTool(params?.name, params?.arguments ?? {});
-        reply(id, {
-          content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
-          isError: result.ok === false,
-        });
-      } else {
-        replyError(id, -32601, `method not found: ${method}`);
-      }
-    } catch (e) {
-      replyError(id, -32603, e?.message ?? "internal error");
-    }
-  }
-};