throughline 0.10.9 → 0.10.10

package/CHANGELOG.md

@@ -10,6 +10,16 @@ shipped to npm but were not individually tagged on GitHub.
 
 ## [Unreleased]
 
+## [0.10.10] — 2026-09-01
+
+### Fixed
+
+- Grok 1.0.13がcamelCaseとsnake_caseのhook属性を同時に送る場合でも、Grokの
+  予約環境変数をhost境界として`grok:` sessionへ正規化する。Stop hookをCursorと
+  誤認して同じBotに`cursor:` sessionを作る問題を修正した。
+- `latest-session`と`handoff-context`のread-only SQLite接続にも、書込接続と同じ
+  5秒の競合待ちを適用した。hook書込と再起動時の記憶読取が重なっても、即時失敗しない。
+
 ## [0.10.9] — 2026-09-01
 
 ### Fixed
@@ -1397,7 +1407,8 @@ two attempts, instrument first instead of patching again.
 
 ---
 
-[Unreleased]: https://github.com/kitepon/Throughline/compare/v0.10.9...HEAD
+[Unreleased]: https://github.com/kitepon/Throughline/compare/v0.10.10...HEAD
+[0.10.10]: https://github.com/kitepon/Throughline/compare/v0.10.9...v0.10.10
 [0.10.9]: https://github.com/kitepon/Throughline/compare/v0.10.8...v0.10.9
 [0.10.8]: https://github.com/kitepon/Throughline/compare/v0.10.7...v0.10.8
 [0.10.7]: https://github.com/kitepon/Throughline/compare/v0.10.6...v0.10.7

package/README.md

@@ -817,7 +817,7 @@ entry to the `tasks` array yourself:
 
 ## Commands
 
-**The current release is v0.10.9.** Throughline supports Claude Code, Codex,
+**The current release is v0.10.10.** Throughline supports Claude Code, Codex,
 Grok, and Cursor as documented host adapters. The versioned, read-only
 `handoff-context` boundary opens only an existing database and leaves baton
 state, session ownership, and memory rows unchanged. Factory diagnostics,

package/docs/04_public_release_plan.md

@@ -6,7 +6,7 @@
 
 ## 現行状態
 
-- release candidateのpackage版は `0.10.9`。tagとnpmの公開確認はpublish後に行う。
+- release candidateのpackage版は `0.10.10`。tagとnpmの公開確認はpublish後に行う。
 - Claude Code、Codex、Grok、Cursorをfirst-class hostとして扱う。
 - 現行DB schemaはv9。schemaの正本は [src/db.mjs](../src/db.mjs) の
   `CURRENT_VERSION`、二相handoffの判断は
@@ -77,6 +77,7 @@ publish済みでも、上の確認が終わるまではrelease完了としない
 - Codex: UserPromptSubmit / PostToolUse / Stop hook、feature flags、`$throughline` skill。
   絶対Node + installed CLI pathを使う。
 - Grok: `~/.grok/hooks/throughline.json`と`grok-continue`。絶対pathを使う。
+  Grok予約環境変数でhostを確定し、camelCase／snake_caseの属性名を同じ境界で正規化する。
 - Cursor: `~/.cursor/hooks.json`へsessionStart / beforeSubmitPrompt / stopをupsertし、
   既存hookを保持する。注入は`additional_context`を使う。
 

package/docs/adr/0021-grok-host-capture.md

@@ -14,8 +14,10 @@ Grok stores turns in `~/.grok/sessions/<encodeURIComponent(cwd)>/<sessionId>/cha
 
 ## Decision
 
-- Detect the camelCase envelope (`sessionId` + `hookEventName`, no `session_id`) as host=grok.
-- Normalize it to the existing snake_case hook contract and prefix ids with `grok:`.
+- Grokの予約環境変数（`GROK_HOOK_EVENT` / `GROK_SESSION_ID`）をhost境界とする。
+- camelCase (`sessionId` / `hookEventName`) とsnake_case (`session_id` /
+  `hook_event_name`) のどちらも既存hook契約へ正規化し、idへ`grok:`を付ける。
+  Grok 1.0.13のように両方が同居してもCursorとして分類しない。
 - Read L2 from Grok `chat_history.jsonl`. Do not invent a Claude-shaped transcript.
 - Grok host ignores payload `transcriptPath`. Live Stop sends `updates.jsonl`, which has no user/assistant rows.
 - Install product hooks at `~/.grok/hooks/throughline.json`. Do not write factory.json.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "throughline",
-    "version": "0.10.9",
+    "version": "0.10.10",
     "type": "module",
     "description": "Persistent memory hooks for Claude Code, Codex, Grok, and Cursor (/clear-safe context compression)",
     "keywords": [

package/src/cli/handoff-context.mjs

@@ -1,9 +1,9 @@
-import { DatabaseSync } from 'node:sqlite';
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { isAbsolute, join } from 'node:path';
 
 import { sameProjectPath } from '../project-path.mjs';
+import { openReadOnlyDb } from '../db.mjs';
 import {
   buildBudgetedResumeContext,
   INJECTION_BUDGET_CHARS,
@@ -62,7 +62,7 @@ export function readHandoffContext(sessionId, {
 } = {}) {
   if (!existsSync(dbPath)) return null;
 
-  const db = new DatabaseSync(dbPath, { readOnly: true });
+  const db = openReadOnlyDb(dbPath);
   try {
     let supplementContext = null;
     if (supplementFile) {
@@ -101,7 +101,7 @@ export function readSessionProjectPath(sessionId, {
 } = {}) {
   if (!existsSync(dbPath)) return null;
 
-  const db = new DatabaseSync(dbPath, { readOnly: true });
+  const db = openReadOnlyDb(dbPath);
   try {
     const row = db.prepare(
       'SELECT project_path FROM sessions WHERE session_id = ?',

package/src/cli/latest-session.mjs

@@ -1,8 +1,8 @@
-import { DatabaseSync } from 'node:sqlite';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 
+import { openReadOnlyDb } from '../db.mjs';
 import { sameProjectPath } from '../project-path.mjs';
 
 export const LATEST_SESSION_SCHEMA = 'throughline.latest_session.v1';
@@ -25,7 +25,7 @@ export function findLatestSession(projectPath, {
 } = {}) {
   if (!existsSync(dbPath)) return null;
 
-  const db = new DatabaseSync(dbPath, { readOnly: true });
+  const db = openReadOnlyDb(dbPath);
   try {
     const rows = db.prepare(
       `SELECT session_id, project_path, updated_at

package/src/cli/latest-session.test.mjs

@@ -1,4 +1,6 @@
 import assert from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import { once } from 'node:events';
 import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join, resolve } from 'node:path';
@@ -38,6 +40,38 @@ test('同じprojectの最新sessionだけを返す', () => {
   }
 });
 
+test('別hook processの短いwriter lockを待って同じprojectを読む', async () => {
+  const root = mkdtempSync(join(tmpdir(), 'throughline-latest-session-lock-'));
+  const dbPath = join(root, 'throughline.db');
+  const project = join(root, 'bot');
+  const db = new DatabaseSync(dbPath);
+  db.exec('PRAGMA journal_mode=DELETE; CREATE TABLE sessions (session_id TEXT, project_path TEXT, updated_at TEXT)');
+  db.prepare('INSERT INTO sessions VALUES (?, ?, ?)').run('same', project, '2026-09-01T02:00:00Z');
+  db.close();
+
+  const holder = spawn(process.execPath, ['--input-type=module', '-e', `
+    import { DatabaseSync } from 'node:sqlite';
+    const db = new DatabaseSync(process.argv[1]);
+    db.exec('BEGIN EXCLUSIVE');
+    process.stdout.write('locked\\n');
+    setTimeout(() => { db.exec('COMMIT'); db.close(); }, 200);
+  `, dbPath], { stdio: ['ignore', 'pipe', 'pipe'] });
+  const holderExit = once(holder, 'exit');
+  await new Promise((resolve, reject) => {
+    holder.stdout.once('data', resolve);
+    holder.once('error', reject);
+  });
+
+  try {
+    assert.equal(findLatestSession(project, { dbPath }).session_id, 'same');
+    const [code] = await holderExit;
+    assert.equal(code, 0);
+  } finally {
+    if (holder.exitCode === null) holder.kill();
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
 test('readyとemptyをJSONで返す', () => {
   const stdout = output();
   const stderr = output();

package/src/db.mjs

@@ -9,11 +9,22 @@ import { join } from 'path';
 
 const DB_DIR = join(homedir(), '.throughline');
 const DB_PATH = join(DB_DIR, 'throughline.db');
-const DB_BUSY_TIMEOUT_MS = 5_000;
+export const DB_BUSY_TIMEOUT_MS = 5_000;
 export const CURRENT_VERSION = 9;
 
 let _db = null;
 
+export function openReadOnlyDb(path = DB_PATH) {
+  const db = new DatabaseSync(path, { readOnly: true });
+  try {
+    db.exec(`PRAGMA busy_timeout = ${DB_BUSY_TIMEOUT_MS}`);
+    return db;
+  } catch (error) {
+    db.close();
+    throw error;
+  }
+}
+
 function initSchema(db) {
   const row = db.prepare('PRAGMA user_version').get();
   const version = row.user_version ?? 0;

package/src/hosts/grok.mjs

@@ -1,10 +1,10 @@
 /**
  * hosts/grok.mjs — Grok host 境界 (envelope 正規化 + hook adapter)
  *
- * Grok sends Claude-compatible hook commands with a camelCase wire
- * (sessionId, hookEventName) and no session_id. Throughline treats that
- * envelope as host=grok: normalize to the Claude snake_case contract and
- * prefix session ids so they never mix with Claude predecessor search.
+ * Grok sends Claude-compatible hook commands and may expose both camelCase
+ * and snake_case aliases. The reserved GROK_* hook environment binds the
+ * host; Throughline normalizes either wire to the Claude snake_case contract
+ * and prefixes session ids so they never mix with other host identities.
  *
  * Grok 固有の挙動 (v0.10.0 / ADR 0021):
  *   - UserPromptSubmit stdout はモデルへ渡らないため、引き継ぎ注入は
@@ -30,8 +30,7 @@ export function isGrokEnvelope(payload) {
     && typeof payload.sessionId === 'string'
     && payload.sessionId.length > 0
     && typeof payload.hookEventName === 'string'
-    && payload.hookEventName.length > 0
-    && !Object.hasOwn(payload, 'session_id');
+    && payload.hookEventName.length > 0;
 }
 
 export function deriveGrokChatHistoryPath(projectPath, sessionId, { home = homedir() } = {}) {
@@ -40,21 +39,23 @@ export function deriveGrokChatHistoryPath(projectPath, sessionId, { home = homed
   return join(home, '.grok', 'sessions', encodeURIComponent(projectPath), bare, 'chat_history.jsonl');
 }
 
-export function normalizeGrokHookPayload(payload, { home = homedir() } = {}) {
-  if (!isGrokEnvelope(payload)) return payload;
+export function normalizeGrokHookPayload(payload, { home = homedir(), force = false, env = {} } = {}) {
+  if (!force && !isGrokEnvelope(payload)) return payload;
+  const rawSessionId = payload.sessionId ?? payload.session_id ?? env.GROK_SESSION_ID;
+  const hookEventName = payload.hookEventName ?? payload.hook_event_name ?? env.GROK_HOOK_EVENT;
   const cwd = typeof payload.cwd === 'string' && payload.cwd.length > 0
     ? payload.cwd
-    : (typeof payload.workspaceRoot === 'string' ? payload.workspaceRoot : undefined);
+    : (typeof payload.workspaceRoot === 'string' ? payload.workspaceRoot : env.GROK_WORKSPACE_ROOT);
   // Live Grok Stop sets transcriptPath to updates.jsonl (sessionUpdate frames,
   // no user/assistant rows). L2 lives in chat_history.jsonl only.
-  const transcriptPath = deriveGrokChatHistoryPath(cwd, payload.sessionId, { home });
+  const transcriptPath = deriveGrokChatHistoryPath(cwd, rawSessionId, { home });
   return {
     ...payload,
-    session_id: `${GROK_SESSION_PREFIX}${payload.sessionId}`,
+    session_id: `${GROK_SESSION_PREFIX}${rawSessionId}`,
     cwd,
     source: payload.source,
     prompt: payload.prompt,
-    hook_event_name: payload.hookEventName,
+    hook_event_name: hookEventName,
     transcript_path: transcriptPath,
     last_assistant_message: payload.lastAssistantMessage,
   };

package/src/hosts/grok.test.mjs

@@ -17,6 +17,15 @@ test('isGrokEnvelope detects camelCase wire without session_id', () => {
     }),
     true,
   );
+  assert.equal(
+    isGrokEnvelope({
+      sessionId: '01a00aa2-dead-beef',
+      session_id: '01a00aa2-dead-beef',
+      hookEventName: 'stop',
+      hook_event_name: 'stop',
+    }),
+    true,
+  );
   assert.equal(
     isGrokEnvelope({
       session_id: 'claude-session',
@@ -26,6 +35,34 @@ test('isGrokEnvelope detects camelCase wire without session_id', () => {
   );
 });
 
+test('Grok予約環境がsnake_case payloadをCursorではなくGrokへ固定する', () => {
+  const home = '/tmp/tl-home';
+  const cwd = '/srv/bellteam/bots/bot-a6fbf921';
+  const sessionId = '15e10cc9-ba86-4056-874b-0d1724b1bed3';
+  const payload = normalizeHookPayload(
+    {
+      session_id: sessionId,
+      hook_event_name: 'stop',
+      cwd,
+      last_assistant_message: 'done',
+    },
+    {
+      home,
+      env: {
+        GROK_HOOK_EVENT: 'stop',
+        GROK_SESSION_ID: sessionId,
+        GROK_WORKSPACE_ROOT: cwd,
+      },
+    },
+  );
+  assert.equal(payload.session_id, `grok:${sessionId}`);
+  assert.equal(payload.hook_event_name, 'stop');
+  assert.equal(
+    payload.transcript_path,
+    join(home, '.grok', 'sessions', encodeURIComponent(cwd), sessionId, 'chat_history.jsonl'),
+  );
+});
+
 test('normalizeHookPayload prefixes grok: and derives chat_history path', () => {
   const home = '/tmp/tl-home';
   const cwd = '/Users/kite/Developer/dotagents';

package/src/hosts/index.mjs

@@ -32,6 +32,9 @@ const ADAPTERS = Object.freeze({
  * Grok は camelCase wire、Cursor は hook_event_name が sessionStart 等。
  */
 export function normalizeHookPayload(payload, options = {}) {
+  if (options.env?.GROK_HOOK_EVENT || options.env?.GROK_SESSION_ID) {
+    return normalizeGrokHookPayload(payload, { ...options, force: true });
+  }
   if (isGrokEnvelope(payload)) return normalizeGrokHookPayload(payload, options);
   if (isCursorEnvelope(payload)) return normalizeCursorHookPayload(payload, options);
   return payload;

package/src/prompt-submit.mjs

@@ -152,7 +152,7 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = normalizeHookPayload(JSON.parse(raw));
+  const payload = normalizeHookPayload(JSON.parse(raw), { env: process.env });
   const { session_id, cwd, prompt } = payload;
   const hostAdapter = hostAdapterForSessionId(session_id);
 

package/src/session-start.mjs

@@ -101,7 +101,7 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = normalizeHookPayload(JSON.parse(raw));
+  const payload = normalizeHookPayload(JSON.parse(raw), { env: process.env });
   const { session_id, cwd, source, transcript_path } = payload;
 
   if (!session_id) throw new Error('Missing session_id in SessionStart payload');

package/src/turn-processor.mjs

@@ -191,7 +191,7 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = normalizeHookPayload(JSON.parse(raw || '{}'));
+  const payload = normalizeHookPayload(JSON.parse(raw || '{}'), { env: process.env });
   const { session_id, transcript_path, cwd, last_assistant_message } = payload;
   if (!session_id) throw new Error('Missing session_id in Stop payload');