@clubs.place/cli 0.1.18 → 0.1.24

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@clubs.place/cli",
-  "version": "0.1.18",
-  "description": "AI\u696d\u52d9\u65e5\u5831 \u2014 Claude Code \u306e\u5b9f\u884c\u30ed\u30b0\u304b\u3089\u524d\u65e5\u3076\u3093\u306e\u65e5\u5831\u30e1\u30fc\u30eb\u3092\u751f\u6210\u3057\u3066\u9001\u308b\uff08pull\u578b\u30fb\u672c\u6587\u751f\u6210\u306f\u30e6\u30fc\u30b6\u30fc\u5074LLM\u30fb\u751f\u30ed\u30b0\u306f\u7aef\u672b\u3092\u51fa\u306a\u3044\uff09",
+  "version": "0.1.24",
+  "description": "AI業務日報 — Claude Code の実行ログから前日ぶんの日報メールを生成して送る（pull型・本文生成はユーザー側LLM・生ログは端末を出ない）",
   "license": "MIT",
   "type": "module",
   "bin": {
-    "clubs-place": "bin/clubs-nippo",
     "clubs-nippo": "bin/clubs-nippo",
+    "clubs": "bin/clubs-nippo",
+    "clubs-place": "bin/clubs-nippo",
     "clubs-place-cli": "bin/clubs-nippo"
   },
   "files": [
@@ -31,8 +32,8 @@
     "node": ">=20"
   },
   "scripts": {
-    "nippo": "node ./bin/clubs-nippo.mjs",
-    "dry": "node ./bin/clubs-nippo.mjs --dry-run",
+    "nippo": "node ./bin/clubs.mjs",
+    "dry": "node ./bin/clubs.mjs --dry-run",
     "demo": "node scripts/gen-preview.mjs && node scripts/bundle-demo.mjs",
     "test": "node --test",
     "prepublishOnly": "node scripts/gen-provenance.mjs"

package/src/aggregate.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 /**
  * 収集元が集めた生イベントから、日報に載せる数字を出す。
  *
@@ -26,6 +21,37 @@ const estimateActiveMinutes = (timestampsMs, idleGapMin) => {
   return Math.round(total / 60_000);
 };
 
+/**
+ * 動いていた時間帯（本人 2026-10-17：時間を二重に数えない）。1日を5分ごとの 288 枠に分け、
+ * イベントのある枠と、間が idleGapMin 以内のイベントどうしのあいだの枠に印を付ける
+ * （estimateActiveMinutes と同じ考え方）。CLUBS は AI ごとの枠を重ねて（和集合で）
+ * その日の時間を出す。288 ビットを 16 進 72 文字で送る。時刻は端末の時刻（e.time）。
+ */
+export const SLOT_MIN = 5;
+export const activeSlots = (sorted, idleGapMin) => {
+  const bits = new Array(288).fill(0);
+  const slotOf = (t) => {
+    const [h, m] = String(t ?? "").split(":").map(Number);
+    if (!Number.isFinite(h) || !Number.isFinite(m)) return -1;
+    return Math.min(287, Math.floor((h * 60 + m) / SLOT_MIN));
+  };
+  const capMs = idleGapMin * 60_000;
+  for (let i = 0; i < sorted.length; i += 1) {
+    const s = slotOf(sorted[i].time);
+    if (s < 0) continue;
+    bits[s] = 1;
+    const prev = sorted[i - 1];
+    if (!prev || sorted[i].ms - prev.ms > capMs) continue;
+    const p = slotOf(prev.time);
+    if (p < 0 || p > s) continue;
+    for (let k = p; k <= s; k += 1) bits[k] = 1;
+  }
+  let hex = "";
+  for (let i = 0; i < 288; i += 4)
+    hex += ((bits[i] << 3) | (bits[i + 1] << 2) | (bits[i + 2] << 1) | bits[i + 3]).toString(16);
+  return hex;
+};
+
 export const computeAggregates = ({ events, sessions, idleGapMin }) => {
   // 複数の収集元を合算する場合、イベントは時系列で混ざる。
   // 実働はマージ後の全イベント列から出す（収集元ごとに出して足すと、
@@ -101,5 +127,6 @@ export const computeAggregates = ({ events, sessions, idleGapMin }) => {
     projects,
     firstAt: sorted.at(0)?.time ?? null,
     lastAt: sorted.at(-1)?.time ?? null,
+    activeSlots: activeSlots(sorted, idleGapMin),
   };
 };

package/src/aggregate.slots.test.mjs

@@ -0,0 +1,23 @@
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { activeSlots } from "./aggregate.mjs";
+
+const ev = (time) => {
+  const [h, m] = time.split(":").map(Number);
+  return { time, ms: Date.UTC(2026, 9, 16, h, m) };
+};
+const bits = (hex) =>
+  [...hex].flatMap((c) => parseInt(c, 16).toString(2).padStart(4, "0").split("").map(Number));
+
+test("イベントの枠と、間が idleGap 以内のあいだの枠に印", () => {
+  const b = bits(activeSlots([ev("10:00"), ev("10:12"), ev("11:00")], 15));
+  assert.equal(b.length, 288);
+  const on = b.flatMap((v, i) => (v ? [i] : []));
+  // 10:00–10:12 は 120,121,122 枠・11:00 は 132 枠（10:12→11:00 は 15 分超でつながない）
+  assert.deepEqual(on, [120, 121, 122, 132]);
+});
+
+test("時刻の読めないイベントは数えない・空の日は全部 0", () => {
+  assert.equal(activeSlots([], 15), "0".repeat(72));
+  assert.equal(activeSlots([{ time: "", ms: 0 }], 15), "0".repeat(72));
+});

package/src/autorun.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { platform as osPlatform } from "node:os";
 
 /**
@@ -20,6 +15,6 @@ export const tickCommand = (npx, plat = osPlatform()) => [
   ...(plat === "darwin" ? ["/usr/bin/caffeinate", "-s", "-i", "--"] : []),
   npx,
   "-y",
-  "clubs-nippo@latest",
+  "@clubs.place/cli@latest",
   "tick",
 ];

package/src/autorun.test.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { tickCommand } from "./autorun.mjs";
@@ -21,14 +16,14 @@ test("macOS では caffeinate で包む（実行中のスリープを止める
     "--",
     NPX,
     "-y",
-    "clubs-nippo@latest",
+    "@clubs.place/cli@latest",
     "tick",
   ]);
 });
 
 test("macOS 以外では包まない（caffeinate が無い）", () => {
   for (const plat of ["linux", "freebsd", "win32"]) {
-    assert.deepEqual(tickCommand(NPX, plat), [NPX, "-y", "clubs-nippo@latest", "tick"]);
+    assert.deepEqual(tickCommand(NPX, plat), [NPX, "-y", "@clubs.place/cli@latest", "tick"]);
   }
 });
 

package/src/cards.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { APP_HOME } from "./config.mjs";

package/src/collect.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import claudeCode from "./sources/claude-code.mjs";
 import cowork from "./sources/cowork.mjs";
 import eventsFile from "./sources/events-file.mjs";

package/src/config.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { readFileSync, existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
@@ -24,6 +19,12 @@ export const APP_HOME =
     ? ROOT
     : join(homedir(), ".clubs-nippo"));
 
+/**
+ * .env から読み込んだキー（profiles.mjs が子プロセスに渡さないため）。
+ * 並べた AI を動かすとき、APP_HOME の鍵を引き継がせない。
+ */
+export const LOADED_ENV_KEYS = [];
+
 /** .env は「まだ環境変数に無いキーだけ」入れる。実環境の変数が常に勝つ。 */
 const loadDotEnv = () => {
   const path = join(APP_HOME, ".env");
@@ -32,7 +33,10 @@ const loadDotEnv = () => {
     const m = line.match(/^\s*([A-Z0-9_]+)\s*=\s*(.*)\s*$/);
     if (!m) continue;
     const value = m[2].replace(/^["']|["']$/g, "");
-    if (process.env[m[1]] === undefined) process.env[m[1]] = value;
+    if (process.env[m[1]] === undefined) {
+      process.env[m[1]] = value;
+      LOADED_ENV_KEYS.push(m[1]);
+    }
   }
 };
 loadDotEnv();

package/src/generators/claude.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { makeCliGenerator } from "./cli.mjs";
 
 /**

package/src/generators/cli.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { ROOT } from "../config.mjs";

package/src/generators/codex.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { makeCliGenerator } from "./cli.mjs";
 
 /**

package/src/generators/copilot.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { makeCliGenerator } from "./cli.mjs";
 
 /**

package/src/generators/gemini.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { makeCliGenerator } from "./cli.mjs";
 
 /**

package/src/generators/openai-compat.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 /**
  * OpenAI 互換のカスタムエンドポイントで本文を書く（第3の生成バックエンド）。
  *

package/src/generators/openrouter.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 /**
  * OpenRouter で本文を書く。
  *

package/src/history.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { APP_HOME } from "./config.mjs";
@@ -46,6 +41,8 @@ export const appendHistory = (activity) => {
     failedCalls: a.failedCalls,
     successRate: a.successRate,
     activeHours: a.activeHours,
+    // 関与プロジェクト（名前だけ・くり返しからルールの候補を出す材料・2026-10-04）。
+    projects: a.projects ?? [],
     toolCounts: a.toolCounts,
     toolCountsAm: a.toolCountsAm,
     toolCountsPm: a.toolCountsPm,

package/src/ingest.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 /**
  * 生成した日報を web コンソール（clubsx）へ取り込ませる。
  *

package/src/lemma.docHash.test.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { documentHash } from "./lemma.mjs";

package/src/lemma.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { createHash } from "node:crypto";
 
 // SDK の動的インポート。無い/読めないときは null → commitDeep/proofs.submit をスキップ。

package/src/mask.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 export const REDACT_TOKEN = "[[REDACTED]]";
 
 /**

package/src/mcp.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 /**
  * CLUBS MCP サーバー（stdio・同一バイナリ同梱＝全体設計 §6 / P0 §9）。
  *
@@ -16,6 +11,11 @@
  * - 出力はサーバ確定値・ローカル設定の定型フィールドのみ（自由文・他ユーザー
  *   由来のテキストを返さない＝注入面の最小化）。
  *
+ * **終わる（CLUBS 判断 #26・2026-10-16）**: AI を CLUBS につなぐのはリモート MCP
+ * （接続画面の URL＋許可）になり、この CLI は日報の自動化専用になった。前に
+ * 登録した人の AI が起動したとき黙って落ちないよう、しばらくは動かしたまま、
+ * 起動・道具の説明・返事のすべてで「つなぎ直して」を伝える（DEPRECATION）。
+ *
  * 依存ゼロ方針（このリポの流儀）のため SDK は使わず、MCP の stdio
  * トランスポート（JSON-RPC 2.0・1行1メッセージ）を最小実装する。
  * stdout はプロトコル専用。ログは必ず stderr へ。
@@ -30,6 +30,12 @@ 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;
@@ -110,7 +116,9 @@ const TOOLS = [
   {
     name: "clubs_register",
     description:
-      "この端末を CLUBS に登録する（clubs-nippo init と同じ設定を書く）。url と token は CLUBS の接続画面（/nippo/connections）が発行した値をそのまま渡すこと。登録後にサーバへ疎通確認する。",
+      "【終わります】" +
+      DEPRECATION +
+      " ／ この端末を CLUBS に登録する（clubs-nippo init と同じ設定を書く）。url と token は CLUBS の接続画面（/nippo/connections）が発行した値をそのまま渡すこと。登録後にサーバへ疎通確認する。",
     inputSchema: {
       type: "object",
       properties: {
@@ -132,12 +140,19 @@ const TOOLS = [
   {
     name: "clubs_link_status",
     description:
-      "CLUBS との連携状態を返す（設定の有無・サーバ疎通・トークン有効性・ローカル最終記録日）。",
+      "【終わります】" +
+      DEPRECATION +
+      " ／ CLUBS との連携状態を返す（設定の有無・サーバ疎通・トークン有効性・ローカル最終記録日）。",
     inputSchema: { type: "object", properties: {} },
   },
 ];
 
-const callTool = async (name, args = {}) => {
+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 ?? "");
@@ -184,7 +199,7 @@ const callTool = async (name, args = {}) => {
       ingest_url_host: parsed.host,
       server,
       next: server.token_valid
-        ? "毎朝の自動配信は crontab に `npx -y clubs-nippo@latest tick` を登録（clubs-nippo init のヘルプ参照）"
+        ? "毎朝の自動配信は crontab に `npx -y @clubs.place/cli@latest tick` を登録（clubs-nippo init のヘルプ参照）"
         : "トークンがサーバで確認できませんでした。接続画面で再発行して register し直してください",
     };
   }
@@ -225,6 +240,7 @@ const replyError = (id, code, message) => {
 
 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(", ")})`,
   );
@@ -248,6 +264,7 @@ export const runMcpServer = async () => {
           protocolVersion: params?.protocolVersion ?? PROTOCOL_FALLBACK,
           capabilities: { tools: { listChanged: false } },
           serverInfo: { name: "clubs-nippo", version: pkgVersion() },
+          instructions: DEPRECATION,
         });
       } else if (method === "ping") {
         reply(id, {});

package/src/narrative.blockRepos.test.mjs

@@ -0,0 +1,48 @@
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { fallbackNarrative, withBlockRepos } from "./narrative.mjs";
+import { documentHash } from "./lemma.mjs";
+
+const activity = {
+  date: "2026-10-16",
+  aggregates: { totalCalls: 3, failedCalls: 0, activeHours: 1, projects: ["lemma", "clubsx"] },
+  events: [
+    { time: "09:00", name: "Edit", project: "lemma", summary: "a" },
+    { time: "09:10", name: "Bash", project: "clubsx", summary: "b" },
+    { time: "09:20", name: "Edit", project: "（案件未設定）", summary: "c" },
+  ],
+};
+
+test("行ごとのフォルダは行から外して blockRepos へ・集計の一覧にある名前だけ", () => {
+  const n = withBlockRepos(
+    {
+      workBlocks: [
+        { title: "LP", text: "x", repos: ["lemma", "secret"] },
+        { title: "名簿", text: "y", repos: [] },
+        { title: "表紙", text: "z" },
+      ],
+    },
+    activity,
+  );
+  assert.deepEqual(n.blockRepos, [["lemma"], [], []]);
+  assert.equal("repos" in n.workBlocks[0], false);
+});
+
+test("どの行にもフォルダが無ければ blockRepos を付けない", () => {
+  const n = withBlockRepos({ workBlocks: [{ title: "A", text: "x", repos: ["nope"] }] }, activity);
+  assert.equal("blockRepos" in n, false);
+});
+
+test("docHash は repos を外した行で計算する（前の版と同じ値）", () => {
+  const plain = { workBlocks: [{ title: "LP", text: "x" }], handoff: { title: "h", text: "t" }, selfNote: "s" };
+  const withRepos = withBlockRepos(
+    { ...plain, workBlocks: [{ title: "LP", text: "x", repos: ["lemma"] }] },
+    activity,
+  );
+  assert.equal(documentHash(activity, withRepos), documentHash(activity, plain));
+});
+
+test("予備の書き方はフォルダごとの行なので、そのフォルダ名を付ける（未設定は空）", () => {
+  const n = fallbackNarrative(activity);
+  assert.deepEqual(n.blockRepos, [["lemma"], ["clubsx"], []]);
+});

package/src/narrative.mjs

@@ -1,8 +1,3 @@
-// clubs-nippo — AI業務日報 (CLUBS)
-// Copyright (c) 2026 FRAME00 Inc.
-// SPDX-License-Identifier: MIT
-// https://github.com/frame00/clubs-nippo
-
 import { buildPrompt } from "./prompt.mjs";
 import claudeGenerator from "./generators/claude.mjs";
 import codexGenerator from "./generators/codex.mjs";
@@ -125,7 +120,7 @@ export const fallbackNarrative = (activity, reason = "", generatorId = "") => {
 
   const summary = `${a.totalCalls} 件の操作を実行し、失敗は ${a.failedCalls} 件でした。`;
 
-  return {
+  const narrative = {
     workBlocks,
     handoff: { title: "明日にまわすもの", text: "特にありません。" },
     insights: [],
@@ -136,6 +131,47 @@ export const fallbackNarrative = (activity, reason = "", generatorId = "") => {
       : summary,
     generator: reason ? `fallback（${reason}）` : "fallback",
   };
+  // 予備の書き方はフォルダ（プロジェクト）ごとに1行なので、その名前がそのまま出どころ。
+  return withBlockRepos(
+    narrative,
+    activity,
+    Object.keys(byProject).map((p) => (p === UNSET_PROJECT ? [] : [p])),
+  );
+};
+
+/**
+ * 行ごとの作業したフォルダ（本人 2026-10-17：CLUBS が出どころで業務を推す）。
+ *
+ * AI には各行に repos（ダイジェストの [ ] のプロジェクト名から選ぶ）を答えさせ、ここで
+ * 行から**外して** narrative.blockRepos（workBlocks と同じ順の配列の配列）に移す。
+ * docHash の正準形（workBlocks など）には入れない＝前の版の日報と照合の値が変わらない。
+ * 集計のフォルダの一覧（aggregates.projects・もともと送っている）にある名前だけ残す。
+ */
+export const withBlockRepos = (narrative, activity, fallbackRepos = []) => {
+  const allowed = new Set(
+    (activity?.aggregates?.projects ?? []).map((x) => String(x).trim().toLowerCase()),
+  );
+  const blockRepos = [];
+  const workBlocks = (narrative.workBlocks ?? []).map((wb, i) => {
+    const { repos, ...rest } = wb ?? {};
+    const raw = Array.isArray(repos) ? repos : (fallbackRepos[i] ?? []);
+    blockRepos.push(
+      [
+        ...new Set(
+          raw
+            .filter((x) => typeof x === "string")
+            .map((x) => x.trim())
+            .filter((x) => x && allowed.has(x.toLowerCase())),
+        ),
+      ].slice(0, 4),
+    );
+    return rest;
+  });
+  return {
+    ...narrative,
+    workBlocks,
+    ...(blockRepos.some((r) => r.length) ? { blockRepos } : {}),
+  };
 };
 
 /**
@@ -167,8 +203,11 @@ export const generateNarrative = async (activity, config) => {
   }
 
   const prompt = buildPrompt(activity, {
-    carryover: config.carryover,
+    handedOff: config.handedOff,
     terms: config.terms,
+    cases: config.cases,
+    decided: config.decided,
+    routines: config.routines,
   });
 
   try {
@@ -178,7 +217,7 @@ export const generateNarrative = async (activity, config) => {
       console.warn(`[narrative] ${generator.id} の応答を解釈できず fallback に切り替えます。`);
       return fallbackNarrative(activity, `${generator.id} の応答を解釈できず`, generator.id);
     }
-    return { ...parsed, generator: generator.label(config) };
+    return withBlockRepos({ ...parsed, generator: generator.label(config) }, activity);
   } catch (e) {
     // 未インストール（ENOENT）は「その CLI がこの端末に無い」＝設定ミスの典型なので明示する。
     const why =