throughline 0.12.8 → 0.13.0

package/src/transcript-reader.mjs

@@ -25,6 +25,15 @@ function entryKind(entry) {
  * @param {unknown} content
  * @returns {string}
  */
+/**
+ * Claude Code が圧縮の直後に書く要約行か。type は user だが、人の発言ではない
+ * （`isCompactSummary: true`。ADR 0032）。ターンの始まりにも本文にもしない。
+ * @param {object} entry
+ */
+export function isCompactSummaryEntry(entry) {
+  return entry?.isCompactSummary === true;
+}
+
 function extractText(content) {
   if (typeof content === 'string') return content;
   if (Array.isArray(content)) {
@@ -48,6 +57,9 @@ export function readTranscript(transcriptPath) {
   const raw = readFileSync(transcriptPath, 'utf8');
 
   const turns = [];
+  // turn_number は transcript 内の本文行の通し番号。圧縮の要約行は返さないが番号は進める。
+  // 番号を詰めると、要約行を数えていた頃に保存した bodies の turn_number と食い違う。
+  let position = 0;
   for (const line of raw.split('\n')) {
     const trimmed = line.trim();
     if (!trimmed) continue;
@@ -81,14 +93,24 @@ export function readTranscript(transcriptPath) {
       : extracted;
     if (!text) continue;
 
+    const turnNumber = position++;
+    // 圧縮の要約は host が書いた行。ターンは圧縮をまたいで続くので、ここで区切らない。
+    if (isCompactSummaryEntry(entry)) continue;
+
     const ts = typeof entry.timestamp === 'string' ? Date.parse(entry.timestamp) : NaN;
     // grok chat_history.jsonl は Claude の message 包みを持たず type/content 直置き。
     turns.push({
       role,
       content: text,
-      turn_number: turns.length,
+      turn_number: turnNumber,
       timestamp: Number.isNaN(ts) ? null : ts,
-      ...(role === 'user' ? { start: classifyTurnStart(entry, extracted) } : {}),
+      ...(role === 'user'
+        ? {
+            start: classifyTurnStart(entry, extracted),
+            // Claude Code が user 行に付ける prompt の id。hook payload の prompt_id と同じ値。
+            prompt_id: typeof entry.promptId === 'string' ? entry.promptId : null,
+          }
+        : {}),
     });
   }
 
@@ -160,6 +182,38 @@ export function getLogicalTurnGroups(transcriptPath) {
   return groups;
 }
 
+/**
+ * 最後の user 発言と、それに続く assistant 本文の断片を返す。
+ *
+ * getLogicalTurnGroups は完了したターンの回収用で、本文の断片が無い群を返さない。
+ * こちらは作業途中のターン（Stop 前。本文がまだ無いこともある）を読むために使う。
+ *
+ * @param {string} transcriptPath
+ * @returns {{
+ *   user: {content: string, timestamp: number|null, turn_number: number, start: 'prompt'|'self'|'unknown', prompt_id: string|null},
+ *   fragments: Array<{index: number, content: string, timestamp: number|null}>,
+ * }|null}
+ */
+export function readLatestUserGroup(transcriptPath) {
+  const turns = readTranscript(transcriptPath);
+  let userIndex = -1;
+  for (let index = turns.length - 1; index >= 0; index--) {
+    if (turns[index].role === 'user') {
+      userIndex = index;
+      break;
+    }
+  }
+  if (userIndex < 0) return null;
+  const { content, timestamp, turn_number, start, prompt_id } = turns[userIndex];
+  return {
+    user: { content, timestamp, turn_number, start, prompt_id },
+    fragments: turns
+      .slice(userIndex + 1)
+      .filter((turn) => turn.role === 'assistant')
+      .map((turn) => ({ index: turn.turn_number, content: turn.content, timestamp: turn.timestamp })),
+  };
+}
+
 /**
  * latest user group と、その1つ前のgroupが、どのassistant本文まで永続化されたかを返す。
  *
@@ -315,6 +369,8 @@ export function sliceCurrentTurnEntries(entries) {
   for (let i = lastAssistantTextIdx - 1; i >= 0; i--) {
     const e = entries[i];
     if (entryKind(e) !== 'user') continue;
+    // 圧縮の要約行はターンの始まりではない。圧縮より前の tool 入出力も同じターンに含める。
+    if (isCompactSummaryEntry(e)) continue;
     const blocks = e.message?.content;
     if (Array.isArray(blocks)) {
       if (blocks.some((b) => b && b.type === 'text' && typeof b.text === 'string' && b.text.length > 0)) {

package/src/transcript-reader.test.mjs

@@ -7,6 +7,8 @@ import {
   normalizeTerminalText,
   normalizeToolResultContent,
   readTranscript,
+  getLogicalTurnGroups,
+  readLatestUserGroup,
   sliceCurrentTurnEntries,
   extractDetailBlocks,
 } from './transcript-reader.mjs';
@@ -153,6 +155,94 @@ test('sliceCurrentTurnEntries: 最後の user text → 最後の assistant text
   assert.equal(slice[3].message.content[0].text, 'current response');
 });
 
+/** Claude Code が圧縮の直後に書く要約行（実測 2.1.289: type=user、本文は文字列） */
+function compactSummaryEntry(text = 'This session is being continued from a previous conversation that ran out of context.') {
+  return { type: 'user', isCompactSummary: true, isVisibleInTranscriptOnly: true, message: { role: 'user', content: text } };
+}
+
+test('readTranscript: 圧縮の要約行は返さず、turn_number は詰めない', () => {
+  const path = writeTranscript([
+    userEntry('依頼'),
+    asstTextEntry('途中の報告'),
+    compactSummaryEntry(),
+    asstTextEntry('最終回答'),
+  ]);
+  const turns = readTranscript(path);
+  assert.deepEqual(turns.map((t) => [t.role, t.content, t.turn_number]), [
+    ['user', '依頼', 0],
+    ['assistant', '途中の報告', 1],
+    ['assistant', '最終回答', 3],
+  ]);
+});
+
+test('getLogicalTurnGroups: 圧縮をまたいだターンは1つの群になり、元の依頼を user に持つ', () => {
+  const path = writeTranscript([
+    userEntry('依頼'),
+    asstTextEntry('途中の報告'),
+    compactSummaryEntry(),
+    asstTextEntry('圧縮後の報告'),
+    compactSummaryEntry(),
+    asstTextEntry('最終回答'),
+    userEntry('次の依頼'),
+    asstTextEntry('次の回答'),
+  ]);
+  const groups = getLogicalTurnGroups(path);
+  assert.equal(groups.length, 2);
+  assert.equal(groups[0].user.content, '依頼');
+  assert.deepEqual(groups[0].fragments.map((f) => f.index), [1, 3, 5]);
+  assert.equal(groups[0].representative.content, '最終回答');
+  assert.equal(groups[1].user.content, '次の依頼');
+  assert.equal(groups[1].representative.index, 7);
+});
+
+test('readLatestUserGroup: 作業途中のターンを、本文がまだ無くても返す', () => {
+  const noAnswer = writeTranscript([
+    userEntry('前の依頼'),
+    asstTextEntry('前の回答'),
+    userEntry('今の依頼'),
+    asstToolUseEntry('toolu_1', 'Read', { file_path: '/a' }),
+    userToolResultEntry('toolu_1', 'contents'),
+    compactSummaryEntry(),
+  ]);
+  assert.deepEqual(readLatestUserGroup(noAnswer), {
+    user: { content: '今の依頼', timestamp: null, turn_number: 2, start: 'unknown', prompt_id: null },
+    fragments: [],
+  });
+  const withAnswer = writeTranscript([
+    userEntry('今の依頼'),
+    asstTextEntry('途中1'),
+    compactSummaryEntry(),
+    asstTextEntry('途中2'),
+  ]);
+  const latest = readLatestUserGroup(withAnswer);
+  assert.equal(latest.user.content, '今の依頼');
+  assert.deepEqual(latest.fragments.map((f) => [f.index, f.content]), [[1, '途中1'], [3, '途中2']]);
+  assert.equal(readLatestUserGroup(writeTranscript([asstTextEntry('user 行が無い')])), null);
+  const withPromptId = writeTranscript([{ ...userEntry('依頼'), promptId: 'prompt-1' }]);
+  assert.equal(readLatestUserGroup(withPromptId).user.prompt_id, 'prompt-1');
+});
+
+test('sliceCurrentTurnEntries: 圧縮の要約行で区切らず、圧縮より前の tool も同じターンに含める', () => {
+  const entries = [
+    userEntry('old prompt'),
+    asstTextEntry('old response'),
+    userEntry('current prompt'),
+    asstToolUseEntry('toolu_1', 'Read', { file_path: '/a' }),
+    userToolResultEntry('toolu_1', 'before compaction'),
+    { type: 'system', subtype: 'compact_boundary', compactMetadata: { trigger: 'auto' } },
+    compactSummaryEntry(),
+    asstToolUseEntry('toolu_2', 'Write', { file_path: '/b' }),
+    userToolResultEntry('toolu_2', 'after compaction'),
+    asstTextEntry('current response'),
+  ];
+  const slice = sliceCurrentTurnEntries(entries);
+  assert.equal(slice[0].message.content[0].text, 'current prompt');
+  assert.deepEqual(
+    extractDetailBlocks(slice).filter((d) => d.kind === DETAIL_KIND.TOOL_INPUT).map((d) => d.tool_name),
+    ['Read', 'Write'],
+  );
+});
+
 test('sliceCurrentTurnEntries: 空配列なら空を返す', () => {
   assert.deepEqual(sliceCurrentTurnEntries([]), []);
 });

package/src/turn-backfill.mjs

@@ -59,10 +59,15 @@ export function deriveTranscriptPath(projectPath, sessionId) {
  * @param {string} opts.originSessionId transcript を所有する origin session_id
  * @param {string|null|undefined} opts.transcriptPath
  * @param {number} opts.now timestamp 欠損時の fallback epoch ms
+ * @param {number|null} [opts.beforeUserTurnNumber] 指定した時は、user 行の番号がこれより前の群だけを回収する。
+ *   作業途中のターンがある時点（自動圧縮の直後。ADR 0032）で呼ぶ時に、その群を除くために使う。
+ *   途中の断片を代表として保存すると、群レベル dedup で最終回答が二度と入らない。
  * @returns {{groups: number, insertedTurns: number, skippedExisting: number, lastTurnNumber: number|null, turnNumbers: number[]}}
  */
-export function backfillBodies(db, { targetSessionId, originSessionId, transcriptPath, now }) {
-  const groups = getLogicalTurnGroups(transcriptPath);
+export function backfillBodies(db, { targetSessionId, originSessionId, transcriptPath, now, beforeUserTurnNumber = null }) {
+  const groups = getLogicalTurnGroups(transcriptPath).filter(
+    (group) => beforeUserTurnNumber === null || group.user.turn_number < beforeUserTurnNumber,
+  );
   if (groups.length === 0) {
     return { groups: 0, insertedTurns: 0, skippedExisting: 0, lastTurnNumber: null, turnNumbers: [] };
   }

package/src/turn-backfill.test.mjs

@@ -241,3 +241,61 @@ test('backfillBodies: user row keeps the turn start and assistant row leaves it
     },
   );
 });
+
+test('backfillBodies: beforeUserTurnNumber は作業途中のターンを回収から外す', () => {
+  withData(
+    [
+      entry('user', 'done prompt', '2026-10-04T00:00:00Z'),
+      entry('assistant', 'done answer', '2026-10-04T00:00:01Z'),
+      entry('user', 'in-flight prompt', '2026-10-04T00:00:02Z'),
+      entry('assistant', 'interim remark', '2026-10-04T00:00:03Z'),
+    ],
+    (path) => {
+      const db = makeDb();
+      const partial = backfillBodies(db, { targetSessionId: 'S', originSessionId: 'S', transcriptPath: path, now: 1, beforeUserTurnNumber: 2 });
+      assert.equal(partial.insertedTurns, 1);
+      assert.deepEqual(partial.turnNumbers, [1]);
+      assert.deepEqual(db.prepare('SELECT text FROM bodies ORDER BY id').all().map((r) => r.text), ['done prompt', 'done answer']);
+      // Stop で改めて全体を回収すると、作業途中だったターンが最終回答つきで入る
+      const full = backfillBodies(db, { targetSessionId: 'S', originSessionId: 'S', transcriptPath: path, now: 1 });
+      assert.equal(full.insertedTurns, 1);
+      assert.equal(full.skippedExisting, 1);
+    },
+  );
+});
+
+test('backfillBodies: 圧縮の要約行を数えていた頃に保存したターンは、重複させずにそのまま残す', () => {
+  const summary = { type: 'user', isCompactSummary: true, message: { role: 'user', content: 'This session is being continued' } };
+  withData(
+    [
+      entry('user', 'prompt', '2026-10-04T00:00:00Z'),
+      entry('assistant', 'before compaction', '2026-10-04T00:00:01Z'),
+      summary,
+      entry('assistant', 'after compaction', '2026-10-04T00:00:03Z'),
+      entry('user', 'next prompt', '2026-10-04T00:00:04Z'),
+      entry('assistant', 'next answer', '2026-10-04T00:00:05Z'),
+    ],
+    (path) => {
+      const db = makeDb();
+      // 旧版は要約行を user 発言として、圧縮後の断片 (index 3) と組で保存していた
+      const insert = db.prepare(
+        `INSERT INTO bodies (session_id, origin_session_id, turn_number, role, text, token_count, created_at)
+         VALUES ('S', 'S', 3, ?, ?, 1, 1)`,
+      );
+      insert.run('user', 'This session is being continued');
+      insert.run('assistant', 'after compaction');
+      const result = backfillBodies(db, { targetSessionId: 'S', originSessionId: 'S', transcriptPath: path, now: 1 });
+      assert.equal(result.skippedExisting, 1, '同じ断片を持つ群は入れ直さない');
+      assert.equal(result.insertedTurns, 1);
+      assert.deepEqual(
+        db.prepare('SELECT turn_number, role, text FROM bodies ORDER BY turn_number, role DESC').all().map((r) => [r.turn_number, r.role, r.text]),
+        [
+          [3, 'user', 'This session is being continued'],
+          [3, 'assistant', 'after compaction'],
+          [5, 'user', 'next prompt'],
+          [5, 'assistant', 'next answer'],
+        ],
+      );
+    },
+  );
+});