throughline 0.1.0 → 0.3.0

package/src/session-start.mjs

@@ -1,23 +1,40 @@
 #!/usr/bin/env node
 /**
- * SessionStart hook — セッション登録 + 前任記憶の張り替え + 引き継ぎ注入
+ * SessionStart hook — セッション登録 + バトン消費 + 引き継ぎ注入
  *
  * stdin: { session_id, source, cwd, transcript_path, hook_event_name }
  *
- * 【実機確認 (2026-04-15)】
- *   SessionStart は /clear 後も source="startup" で発火する。
- *   (Windows + VSCode 拡張では source="clear" は来ないが hook 自体は発火)
- *   source に依存せず、毎回「前任の張り替え候補」を探して合流させる。
+ * 【引き継ぎ条件 (バトン方式)】
+ *   ユーザーが旧セッションで /tl スラッシュコマンドを打つと UserPromptSubmit hook が
+ *   baton テーブルに session_id を書き込む。本 SessionStart hook はそれを TTL 1 時間以内
+ *   なら消費して merge + 引き継ぎヘッダ付き L1+L2 を stdout 注入する。
+ *   バトンが無ければ / 期限切れなら何も引き継がない（docs/INHERITANCE_ON_CLEAR_ONLY.md 参照）。
  *
  * 役割:
  *   1. sessions テーブルに新セッションを INSERT OR IGNORE
- *   2. 同プロジェクト内の最新非合流セッションを新セッションに張り替え (session-merger)
+ *   2. バトン消費 + 指名された前任を merge (session-merger.mjs)
  *   3. 合流成立なら L1+L2 を「引き継ぎヘッダ」付きで stdout 注入
+ *   4. 判定結果を ~/.throughline/logs/inheritance-decision.log に記録
  */
 
 import { getDb } from './db.mjs';
-import { mergePredecessorInto } from './session-merger.mjs';
+import { consumeBaton } from './baton.mjs';
+import { mergeSpecificPredecessor, resolveMergeTarget } from './session-merger.mjs';
 import { buildResumeContext } from './resume-context.mjs';
+import { appendFileSync, mkdirSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { homedir } from 'node:os';
+
+function logDecision(entry) {
+  const path = join(homedir(), '.throughline', 'logs', 'inheritance-decision.log');
+  try {
+    mkdirSync(dirname(path), { recursive: true });
+    appendFileSync(path, JSON.stringify(entry) + '\n', 'utf8');
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : 'unknown';
+    process.stderr.write(`[session-start:decision-log] ${msg}\n`);
+  }
+}
 
 async function main() {
   let raw = '';
@@ -30,7 +47,7 @@ async function main() {
   });
 
   const payload = JSON.parse(raw);
-  const { session_id, cwd } = payload;
+  const { session_id, cwd, source } = payload;
 
   if (!session_id) throw new Error('Missing session_id in SessionStart payload');
 
@@ -44,15 +61,42 @@ async function main() {
      VALUES (?, ?, 'active', ?, ?)`,
   ).run(session_id, projectPath, now, now);
 
-  // 2. 前任の張り替え
-  const mergeResult = mergePredecessorInto(db, {
-    newSessionId: session_id,
-    projectPath,
+  // 2. バトン消費
+  const baton = consumeBaton(db, { projectPath, now });
+
+  let mergeResult = { merged: false, skipReason: 'no_baton' };
+  if (baton.sessionId) {
+    // バトンが指す session が既に他と merge 済みなら、その合流先末端を前任とする
+    const { target: predecessorId } = resolveMergeTarget(db, baton.sessionId);
+    mergeResult = mergeSpecificPredecessor(db, {
+      newSessionId: session_id,
+      predecessorId,
+      now,
+    });
+  }
+
+  logDecision({
+    ts: new Date(now).toISOString(),
+    source: source ?? null,
+    session_id,
+    project_path: projectPath,
+    baton_session_id: baton.sessionId ?? null,
+    baton_age_ms: baton.ageMs ?? null,
+    baton_skip_reason: baton.skipReason ?? null,
+    baton_has_memo: Boolean(baton.memoText),
+    merged: mergeResult.merged,
+    merge_skip_reason: mergeResult.skipReason ?? null,
+    predecessor_id: mergeResult.predecessorId ?? null,
   });
 
   // 3. 合流成立なら引き継ぎヘッダ付きで注入
+  //    バトンに付いていた in-flight メモも併せて先頭セクションに注入する
   if (mergeResult.merged) {
-    const text = buildResumeContext(db, { sessionId: session_id, isInheritance: true });
+    const text = buildResumeContext(db, {
+      sessionId: session_id,
+      isInheritance: true,
+      inflightMemo: baton.memoText ?? null,
+    });
     if (text) {
       process.stdout.write(text + '\n');
     }

package/src/transcript-reader.mjs

@@ -197,7 +197,7 @@ export function sliceCurrentTurnEntries(entries) {
  * 分類ルール:
  *   - assistant の tool_use ブロック → tool_input (name, input を JSON 化して input_text に)
  *   - user の tool_result ブロック → tool_output (content を output_text に、ANSI 剥離)
- *   - assistant/user の thinking ブロック → 破棄
+ *   - assistant の thinking ブロック → thinking (b.thinking を output_text に)
  *   - assistant/user の text ブロック → 扱わない（L2 bodies 側の責務）
  *   - attachment entry (hook_success) → system (hookName + content を出力に)
  *   - system entry (stop_hook_summary) → skip（hook タイミング情報で意味なし）
@@ -215,7 +215,8 @@ export function extractDetailBlocks(turnEntries) {
     if (e.type === 'assistant') {
       const blocks = e.message?.content;
       if (!Array.isArray(blocks)) continue;
-      for (const b of blocks) {
+      for (let i = 0; i < blocks.length; i++) {
+        const b = blocks[i];
         if (!b || !b.type) continue;
         if (b.type === 'tool_use' && typeof b.id === 'string') {
           toolNameById.set(b.id, b.name ?? 'unknown');
@@ -226,6 +227,16 @@ export function extractDetailBlocks(turnEntries) {
             input_text: JSON.stringify(b.input ?? null),
             output_text: null,
           });
+        } else if (b.type === 'thinking' && typeof b.thinking === 'string') {
+          // 固有 id が無いため entry uuid + block index で冪等キーを合成
+          const sourceId = e.uuid ? `${e.uuid}:thinking:${i}` : null;
+          out.push({
+            kind: DETAIL_KIND.THINKING,
+            tool_name: 'thinking',
+            source_id: sourceId,
+            input_text: null,
+            output_text: b.thinking,
+          });
         } else if (b.type === 'image') {
           out.push({
             kind: DETAIL_KIND.IMAGE,
@@ -235,7 +246,7 @@ export function extractDetailBlocks(turnEntries) {
             output_text: '[image]',
           });
         }
-        // text / thinking は扱わない
+        // text は扱わない
       }
     } else if (e.type === 'user') {
       const blocks = e.message?.content;

package/src/transcript-reader.test.mjs

@@ -114,22 +114,80 @@ test('extractDetailBlocks: tool_use と tool_result をペアで抽出', () => {
   assert.equal(output.output_text, 'hi\n');
 });
 
-test('extractDetailBlocks: thinking / text ブロックは L3 に入れない', () => {
+test('extractDetailBlocks: assistant の thinking ブロックを kind=thinking で抽出、text は無視', () => {
   const entries = [
     userEntry('prompt'),
     {
       type: 'assistant',
+      uuid: 'asst-1',
       message: {
         role: 'assistant',
         content: [
-          { type: 'thinking', thinking: 'internal thoughts' },
+          { type: 'thinking', thinking: 'internal thoughts', signature: 'sig' },
           { type: 'text', text: 'response' },
         ],
       },
     },
   ];
   const details = extractDetailBlocks(entries);
-  assert.equal(details.length, 0);
+  assert.equal(details.length, 1);
+  assert.equal(details[0].kind, DETAIL_KIND.THINKING);
+  assert.equal(details[0].tool_name, 'thinking');
+  assert.equal(details[0].source_id, 'asst-1:thinking:0');
+  assert.equal(details[0].input_text, null);
+  assert.equal(details[0].output_text, 'internal thoughts');
+});
+
+test('extractDetailBlocks: 同 entry 内で thinking + tool_use + image が混在しても全て抽出', () => {
+  const entries = [
+    userEntry('prompt'),
+    {
+      type: 'assistant',
+      uuid: 'asst-2',
+      message: {
+        role: 'assistant',
+        content: [
+          { type: 'thinking', thinking: 'first thought' },
+          { type: 'tool_use', id: 'toolu_1', name: 'Read', input: { path: '/x' } },
+          { type: 'thinking', thinking: 'second thought' },
+          { type: 'image', source: {} },
+          { type: 'text', text: 'done' },
+        ],
+      },
+    },
+    asstTextEntry('wrap'),
+  ];
+  const details = extractDetailBlocks(entries);
+  // thinking x2, tool_input x1, image x1 = 4
+  assert.equal(details.length, 4);
+  const thinkings = details.filter((d) => d.kind === DETAIL_KIND.THINKING);
+  assert.equal(thinkings.length, 2);
+  assert.equal(thinkings[0].source_id, 'asst-2:thinking:0');
+  assert.equal(thinkings[1].source_id, 'asst-2:thinking:2');
+  assert.equal(thinkings[0].output_text, 'first thought');
+  assert.equal(thinkings[1].output_text, 'second thought');
+});
+
+test('extractDetailBlocks: thinking エントリに uuid が無くても source_id=null で通過する', () => {
+  const entries = [
+    userEntry('prompt'),
+    {
+      type: 'assistant',
+      // uuid 欠損
+      message: {
+        role: 'assistant',
+        content: [
+          { type: 'thinking', thinking: 'thought without uuid' },
+          { type: 'text', text: 'reply' },
+        ],
+      },
+    },
+  ];
+  const details = extractDetailBlocks(entries);
+  const thinking = details.find((d) => d.kind === DETAIL_KIND.THINKING);
+  assert.ok(thinking);
+  assert.equal(thinking.source_id, null);
+  assert.equal(thinking.output_text, 'thought without uuid');
 });
 
 test('extractDetailBlocks: attachment (hook_success) を system として抽出', () => {