throughline 0.10.2 → 0.10.5

package/src/runtime-error-store.test.mjs

@@ -8,13 +8,14 @@ import { dirname, join } from 'node:path';
 import {
   acknowledgeRuntimeErrors,
   compactRuntimeErrors,
-  defaultFactoryReporterConfigPath,
+  defaultRuntimeErrorConfigPath,
   defaultRuntimeErrorStorePath,
   getRuntimeErrorDiagnostics,
   observeRuntimeError,
   readRuntimeErrorSnapshot,
   reopenRuntimeError,
   resolveRuntimeError,
+  setRuntimeErrorCollectionEnabled,
 } from './runtime-error-store.mjs';
 import { applyWindowsPrivateAcl, verifyWindowsPrivateAcl } from './os/windows-acl-test-helper.mjs';
 
@@ -29,18 +30,16 @@ function sandbox() {
     XDG_CONFIG_HOME: join(root, 'config'),
     XDG_STATE_HOME: join(root, 'state'),
   };
-  const configPath = defaultFactoryReporterConfigPath(env);
+  const configPath = defaultRuntimeErrorConfigPath(env);
   const storePath = defaultRuntimeErrorStorePath(env);
   return { root, env, configPath, storePath };
 }
 
-function enableCollection(box, reporting = { enabled: false }) {
+function enableCollection(box) {
   mkdirSync(dirname(box.configPath), { recursive: true });
   writeFileSync(box.configPath, JSON.stringify({
-    schema_version: '1.0',
-    host: { id: 'test-host', profile: process.platform === 'win32' ? 'windows-native' : 'mac' },
+    schema: 'throughline.runtime_error_config.v1',
     collection: { enabled: true },
-    reporting,
   }));
   applyWindowsPrivateAcl(box.configPath);
 }
@@ -49,8 +48,8 @@ test('runtime error store: missing/false/malformed config is fail-closed and cre
   for (const config of [
     null,
     { collection: { enabled: true } },
-    { collection: { enabled: false } },
-    { collection: { enabled: 'true' } },
+    { schema: 'throughline.runtime_error_config.v1', collection: { enabled: false } },
+    { schema: 'throughline.runtime_error_config.v1', collection: { enabled: 'true' } },
     '{malformed',
   ]) {
     const box = sandbox();
@@ -67,15 +66,15 @@ test('runtime error store: missing/false/malformed config is fail-closed and cre
   }
 });
 
-test('runtime error store: Windows native uses the canonical LocalAppData paths', () => {
+test('runtime error store: Windows native uses product-owned LocalAppData paths', () => {
   const env = {
     OS: 'Windows_NT',
     USERPROFILE: 'C:\\Users\\kite_',
     LOCALAPPDATA: 'C:\\Users\\kite_\\AppData\\Local',
   };
   assert.equal(
-    defaultFactoryReporterConfigPath(env),
-    join(env.LOCALAPPDATA, 'dotagents', 'factory-reporter', 'config.json'),
+    defaultRuntimeErrorConfigPath(env),
+    join(env.LOCALAPPDATA, 'throughline', 'runtime-errors.config.json'),
   );
   assert.equal(
     defaultRuntimeErrorStorePath(env),
@@ -83,6 +82,34 @@ test('runtime error store: Windows native uses the canonical LocalAppData paths'
   );
 });
 
+test('runtime error store: product-owned config enables and disables collection', () => {
+  const box = sandbox();
+  assert.deepEqual(setRuntimeErrorCollectionEnabled(true, { env: box.env }), {
+    schema: 'throughline.runtime_error_config.v1',
+    collection: { enabled: true },
+  });
+  assert.equal(observeRuntimeError({ code: 'HOOK_PROCESS_TURN_FAILED' }, { env: box.env }).status, 'recorded');
+  assert.deepEqual(setRuntimeErrorCollectionEnabled(false, { env: box.env }), {
+    schema: 'throughline.runtime_error_config.v1',
+    collection: { enabled: false },
+  });
+  assert.equal(getRuntimeErrorDiagnostics({ env: box.env }).collection, 'disabled');
+});
+
+test('runtime error store: legacy dotagents config cannot control collection', () => {
+  const box = sandbox();
+  const legacyPath = join(box.env.XDG_CONFIG_HOME, 'dotagents', 'factory-reporter.json');
+  mkdirSync(dirname(legacyPath), { recursive: true });
+  writeFileSync(legacyPath, JSON.stringify({
+    schema_version: '1.0',
+    host: { id: 'test-host', profile: 'mac' },
+    collection: { enabled: true },
+    reporting: { enabled: false },
+  }));
+  assert.equal(observeRuntimeError({ code: 'HOOK_PROCESS_TURN_FAILED' }, { env: box.env }).status, 'disabled');
+  assert.throws(() => statSync(box.storePath), { code: 'ENOENT' });
+});
+
 test('runtime error store: one Windows mutation spends ACL processes only on distinct state transitions', (t) => {
   const box = sandbox();
   box.env.OS = 'Windows_NT';
@@ -127,20 +154,26 @@ test('runtime error store: Windows temporary ACL failure leaves the previous ato
   assert.deepEqual(readdirSync(dirname(box.storePath)).filter((name) => name.endsWith('.tmp')), []);
 });
 
-test('runtime error store: reporting config and credentials are ignored and no network API is accepted', () => {
+test('runtime error store: factory reporting fields cannot enable product collection', () => {
   const box = sandbox();
-  enableCollection(box, {
-    enabled: true,
-    endpoint: 'https://should-never-be-read.invalid/private',
-    credential_file: process.platform === 'win32' ? 'C:\\private\\token' : '/private/token',
-  });
+  mkdirSync(dirname(box.configPath), { recursive: true });
+  writeFileSync(box.configPath, JSON.stringify({
+    schema_version: '1.0',
+    host: { id: 'test-host', profile: 'mac' },
+    collection: { enabled: true },
+    reporting: {
+      enabled: true,
+      endpoint: 'https://should-never-be-read.invalid/private',
+      credential_file: '/private/token',
+    },
+  }));
+  applyWindowsPrivateAcl(box.configPath);
   const result = observeRuntimeError(
     { code: 'HOOK_PROCESS_TURN_FAILED', now: '2026-07-13T00:00:00.000Z' },
     { env: box.env, version: '0.6.1', platform: TEST_PLATFORM, arch: 'arm64' },
   );
-  assert.equal(result.status, 'recorded');
-  const bytes = readFileSync(box.storePath, 'utf8');
-  assert.doesNotMatch(bytes, /should-never-be-read|private\/token|endpoint|credential/i);
+  assert.equal(result.status, 'disabled');
+  assert.throws(() => statSync(box.storePath), { code: 'ENOENT' });
 });
 
 test('runtime error store: observation API rejects raw or arbitrary fields', () => {
@@ -294,12 +327,6 @@ test('runtime error store: atomic private store has owner-only modes and bounded
   assert.doesNotMatch(JSON.stringify(diagnostics), /Users|\\|\.throughline|runtime-errors\.json/);
 });
 
-test('runtime error store: non-canonical reporting values keep collection fail-closed', () => {
-  const box = sandbox();
-  enableCollection(box, { enabled: true, endpoint: 'ftp://invalid', credential_file: '' });
-  assert.deepEqual(observeRuntimeError({ code: 'HOOK_CODEX_FAILED' }, { env: box.env }), { status: 'disabled' });
-});
-
 test('runtime error store: unknown top-level fields and future ack are rejected before compaction', () => {
   const box = sandbox();
   enableCollection(box);

package/src/session-merger.mjs

@@ -2,15 +2,19 @@
  * session-merger.mjs — 記憶張り替え + merged_into チェーン解決
  *
  * 用途:
- *   - SessionStart hook: バトンで指名された旧セッションを mergeSpecificPredecessor で新セッションに張り替え
+ *   - 初回 UserPromptSubmit: baton または source='clear' で凍結した旧セッションを
+ *     mergeSpecificPredecessor で新セッションに張り替え
  *   - Stop hook: resolveMergeTarget で「入力 session_id → 実書き込み先」を解決
  *
- * 設計背景: docs/archive/SESSION_LINKING_DESIGN.md, docs/03_inheritance_on_clear_only.md (バトン方式採用)
+ * 設計背景: docs/archive/SESSION_LINKING_DESIGN.md, docs/archive/03_inheritance_on_clear_only.md (バトン方式採用)
  *
- * 旧実装 (案 D: 時間差ヒューリスティック / 自動前任選択) は撤去済み。
- * 引き継ぎはユーザーが /tl を打って書いたバトンによる明示的指名のみで発火する。
+ * 旧実装の無条件な時間差ヒューリスティックは撤去済み。
+ * 引き継ぎは `/tl` baton、または VS Code `/clear` の `source='clear'` で
+ * SessionStart 時に凍結した transcript-backed predecessor からだけ発火する。
  */
 
+import { sameProjectPath } from './project-path.mjs';
+
 const MAX_CHAIN_DEPTH = 10;
 
 /**
@@ -61,7 +65,7 @@ export function resolveMergeTarget(db, sessionId) {
  *   merged: boolean,
  *   predecessorId?: string,
  *   rowCounts?: { sk: number, dt: number, bd: number },
- *   skipReason?: 'self_handoff' | 'predecessor_not_found' | 'already_merged' | 'predecessor_not_older',
+ *   skipReason?: 'self_handoff' | 'predecessor_not_found' | 'already_merged' | 'project_mismatch' | 'predecessor_not_older',
  * }}
  */
 export function mergeSpecificPredecessor(db, { newSessionId, predecessorId, now = Date.now() }) {
@@ -72,7 +76,7 @@ export function mergeSpecificPredecessor(db, { newSessionId, predecessorId, now
   db.exec('BEGIN IMMEDIATE');
   try {
     const pred = db
-      .prepare('SELECT session_id, created_at, merged_into FROM sessions WHERE session_id = ?')
+      .prepare('SELECT session_id, project_path, created_at, merged_into FROM sessions WHERE session_id = ?')
       .get(predecessorId);
 
     if (!pred) {
@@ -85,9 +89,14 @@ export function mergeSpecificPredecessor(db, { newSessionId, predecessorId, now
     }
 
     const self = db
-      .prepare('SELECT created_at FROM sessions WHERE session_id = ?')
+      .prepare('SELECT project_path, created_at FROM sessions WHERE session_id = ?')
       .get(newSessionId);
 
+    if (self && !sameProjectPath(pred.project_path, self.project_path)) {
+      db.exec('COMMIT');
+      return { merged: false, skipReason: 'project_mismatch' };
+    }
+
     // 時系列単調制約: 前任は新セッションより created_at が古いこと。
     // バトンが自分より新しい session を指していたら（異常データ）merge しない。
     if (self && pred.created_at >= self.created_at) {

package/src/session-merger.test.mjs

@@ -151,6 +151,33 @@ test('mergeSpecificPredecessor: predecessor already merged into third session',
   assert.equal(result.skipReason, 'already_merged');
 });
 
+test('mergeSpecificPredecessor: refuses to move memory across projects', () => {
+  const db = makeDb();
+  insertSession(db, 'bot-a-old', 100, null, '/bots/bot-a');
+  insertSession(db, 'bot-b-new', 200, null, '/bots/bot-b');
+  db.prepare(
+    `INSERT INTO bodies
+       (session_id, origin_session_id, turn_number, role, text, created_at)
+     VALUES ('bot-a-old', 'bot-a-old', 1, 'user', 'A_PRIVATE_MEMORY', 100)`,
+  ).run();
+
+  const result = mergeSpecificPredecessor(db, {
+    newSessionId: 'bot-b-new',
+    predecessorId: 'bot-a-old',
+    now: 200,
+  });
+
+  assert.deepEqual(result, { merged: false, skipReason: 'project_mismatch' });
+  assert.equal(
+    db.prepare('SELECT session_id FROM bodies WHERE text = ?').get('A_PRIVATE_MEMORY').session_id,
+    'bot-a-old',
+  );
+  assert.equal(
+    db.prepare('SELECT merged_into FROM sessions WHERE session_id = ?').get('bot-a-old').merged_into,
+    null,
+  );
+});
+
 test('mergeSpecificPredecessor: refuses predecessor with created_at >= self', () => {
   const db = makeDb();
   insertSession(db, 'new', 100);

package/src/session-start.mjs

@@ -32,7 +32,8 @@ import { logDecision } from './decision-log.mjs';
 import { existsSync } from 'node:fs';
 import { pathToFileURL } from 'node:url';
 import { recordRuntimeErrorBestEffort } from './runtime-error-store.mjs';
-import { NON_CLAUDE_SESSION_PREFIXES, normalizeHookPayload } from './hosts/index.mjs';
+import { hostAdapterForSessionId, NON_CLAUDE_SESSION_PREFIXES, normalizeHookPayload } from './hosts/index.mjs';
+import { executeFirstPromptHandoff } from './handoff-executor.mjs';
 
 const ENV_DISABLE_AUTO_HANDOFF = 'THROUGHLINE_DISABLE_AUTO_HANDOFF';
 
@@ -161,6 +162,28 @@ export async function run() {
     pending_registered: true,
   });
 
+  // Cursor は beforeSubmitPrompt が additional_context を持たない。
+  // 新規 composer 会話の sessionStart が公式の注入口なので、ここで第二相を実行する。
+  // Claude の幽霊 SessionStart 問題はこの host では sessionStart = 会話作成のため適用しない。
+  // クラウド / background agent は baton を奪わない。
+  const hostAdapter = hostAdapterForSessionId(session_id);
+  if (hostAdapter.consumesHandoffAtSessionStart === true && payload.is_background_agent !== true) {
+    const handoff = executeFirstPromptHandoff(db, {
+      sessionId: session_id,
+      projectPath,
+      now,
+    });
+    if (handoff.attempted && handoff.injectionText) {
+      const delivery = hostAdapter.deliverHandoffInjection({
+        payload,
+        text: handoff.injectionText,
+      });
+      if (!delivery.delivered) {
+        process.stderr.write(`[session-start] ${delivery.reason}\n`);
+      }
+    }
+  }
+
   process.exit(0);
 }
 

package/src/spike-transcript-writer.mjs

@@ -1,7 +1,7 @@
 /**
  * SPIKE ONLY — Phase 0-2 / 0-4 検証用。本実装ではない。
  *
- * docs/10_transcript_injection_plan.md Phase 0-2 で
+ * docs/archive/10_transcript_injection_plan.md Phase 0-2 で
  * 「`/clear` 直後の SessionStart hook 内で transcript_path に L2 を user/assistant
  *  role 付きで append すると、Claude が次の short prompt の文脈として読むか」を実機検証する。
  *

package/src/transcript-reader-cursor.test.mjs

@@ -0,0 +1,43 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { getLogicalTurnGroups, readTranscript, sliceCurrentTurnEntries, readRawEntries } from './transcript-reader.mjs';
+
+test('readTranscript accepts Cursor agent-transcripts role-first jsonl', () => {
+  const dir = mkdtempSync(join(tmpdir(), 'tl-cursor-transcript-'));
+  const path = join(dir, '7face712.jsonl');
+  writeFileSync(
+    path,
+    [
+      JSON.stringify({
+        role: 'user',
+        message: { content: [{ type: 'text', text: 'hello cursor' }] },
+      }),
+      JSON.stringify({
+        role: 'assistant',
+        message: { content: [{ type: 'text', text: 'captured reply' }] },
+      }),
+    ].join('\n'),
+  );
+  try {
+    const turns = readTranscript(path);
+    assert.deepEqual(
+      turns.map((t) => ({ role: t.role, content: t.content })),
+      [
+        { role: 'user', content: 'hello cursor' },
+        { role: 'assistant', content: 'captured reply' },
+      ],
+    );
+    const groups = getLogicalTurnGroups(path);
+    assert.equal(groups.length, 1);
+    assert.equal(groups[0].user.content, 'hello cursor');
+    assert.equal(groups[0].representative.content, 'captured reply');
+    const sliced = sliceCurrentTurnEntries(readRawEntries(path));
+    assert.equal(sliced.length, 2);
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});

package/src/transcript-reader.mjs

@@ -11,6 +11,12 @@
 import { readFileSync, existsSync } from 'fs';
 import { DETAIL_KIND } from './constants.mjs';
 
+function entryKind(entry) {
+  if (typeof entry?.type === 'string' && entry.type.length > 0) return entry.type;
+  if (typeof entry?.role === 'string' && entry.role.length > 0) return entry.role;
+  return undefined;
+}
+
 /**
  * content 配列からテキスト部分だけを結合する。
  * thinking ブロックは除外。
@@ -51,8 +57,9 @@ export function readTranscript(transcriptPath) {
       continue;
     }
 
-    // user / assistant エントリのみ対象
-    if (entry.type !== 'user' && entry.type !== 'assistant') continue;
+    // user / assistant エントリのみ対象。Claude は type、Cursor jsonl は role。
+    const kind = entryKind(entry);
+    if (kind !== 'user' && kind !== 'assistant') continue;
 
     // subagent の sidechain エントリは主会話ではないので除外。現行 CC は主 transcript に
     // 書かない（400 transcript 実測ゼロ件）が、将来変更への安価な防御 (docs/12 B-1)
@@ -60,7 +67,7 @@ export function readTranscript(transcriptPath) {
 
     const msg = entry.message;
     const grokContent = entry.content;
-    const role = msg?.role ?? entry.type;
+    const role = msg?.role ?? kind;
     const rawContent = msg?.content ?? grokContent;
     if (!role || rawContent == null) continue;
 
@@ -258,7 +265,7 @@ export function sliceCurrentTurnEntries(entries) {
   let lastAssistantTextIdx = -1;
   for (let i = entries.length - 1; i >= 0; i--) {
     const e = entries[i];
-    if (e.type !== 'assistant') continue;
+    if (entryKind(e) !== 'assistant') continue;
     const blocks = e.message?.content;
     if (!Array.isArray(blocks)) continue;
     if (blocks.some((b) => b && b.type === 'text' && typeof b.text === 'string' && b.text.length > 0)) {
@@ -272,7 +279,7 @@ export function sliceCurrentTurnEntries(entries) {
   let userTextIdx = -1;
   for (let i = lastAssistantTextIdx - 1; i >= 0; i--) {
     const e = entries[i];
-    if (e.type !== 'user') continue;
+    if (entryKind(e) !== 'user') 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)) {
@@ -319,7 +326,7 @@ export function extractDetailBlocks(turnEntries) {
   const toolNameById = new Map();
 
   for (const e of turnEntries) {
-    if (e.type === 'assistant') {
+    if (entryKind(e) === 'assistant') {
       const blocks = e.message?.content;
       if (!Array.isArray(blocks)) continue;
       for (let i = 0; i < blocks.length; i++) {
@@ -355,7 +362,7 @@ export function extractDetailBlocks(turnEntries) {
         }
         // text は扱わない
       }
-    } else if (e.type === 'user') {
+    } else if (entryKind(e) === 'user') {
       const blocks = e.message?.content;
       if (!Array.isArray(blocks)) continue;
       for (const b of blocks) {