throughline 0.9.1 → 0.10.1

package/src/prompt-submit.mjs

@@ -42,7 +42,7 @@ import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { pathToFileURL } from 'node:url';
 import { recordRuntimeErrorBestEffort } from './runtime-error-store.mjs';
-import { isUnsupportedNonClaudeEnvelope } from './hook-envelope.mjs';
+import { hostAdapterForSessionId, normalizeHookPayload } from './hosts/index.mjs';
 
 // Phase 0-5 spike marker (SessionStart の spike-inject.flag とは別)
 const PROMPT_SPIKE_MARKER_PATH = join(homedir(), '.throughline', 'spike-prompt.flag');
@@ -109,28 +109,39 @@ function markSpiked(sessionId) {
   writeFileSync(join(PROMPT_SPIKE_STATE_DIR, sessionId), '', 'utf8');
 }
 
+const USER_QUERY_RE = /<user_query>\s*([\s\S]*?)\s*<\/user_query>/i;
+
+/**
+ * Grok は hook prompt と chat_history を
+ * `<user_query>/tl</user_query>` + skill 本文で包む。
+ * Claude の裸 `/tl` はそのまま返す。
+ */
+export function commandTextFromPrompt(prompt) {
+  if (typeof prompt !== 'string') return '';
+  const match = prompt.match(USER_QUERY_RE);
+  return (match ? match[1] : prompt).trim();
+}
+
+function isNamedSlashCommand(prompt, name) {
+  const text = commandTextFromPrompt(prompt);
+  if (!text) return false;
+  return text === name || text.startsWith(`${name} `) || text.startsWith(`${name}\n`);
+}
+
 /**
  * プロンプトが /tl バトン発動コマンドか判定する。
- * 許容: "/tl", "/tl\n", "/tl 何か" (前後空白は trim 済み前提)
+ * 許容: "/tl", "/tl\n", "/tl 何か"。Grok の user_query 包装も見る。
  */
 export function isBatonCommand(prompt) {
-  if (typeof prompt !== 'string') return false;
-  const trimmed = prompt.trim();
-  if (trimmed === '/tl') return true;
-  if (trimmed.startsWith('/tl ') || trimmed.startsWith('/tl\n')) return true;
-  return false;
+  return isNamedSlashCommand(prompt, '/tl');
 }
 
 /**
  * プロンプトが /clear バトン発動コマンドか判定する。
- * 許容: "/clear", "/clear\n", "/clear 何か" (前後空白は trim 済み前提)
+ * 許容: "/clear", Grok の alias "/new"。Grok の user_query 包装も見る。
  */
 export function isClearCommand(prompt) {
-  if (typeof prompt !== 'string') return false;
-  const trimmed = prompt.trim();
-  if (trimmed === '/clear') return true;
-  if (trimmed.startsWith('/clear ') || trimmed.startsWith('/clear\n')) return true;
-  return false;
+  return isNamedSlashCommand(prompt, '/clear') || isNamedSlashCommand(prompt, '/new');
 }
 
 export async function run() {
@@ -143,9 +154,9 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = JSON.parse(raw);
-  if (isUnsupportedNonClaudeEnvelope(payload)) return;
+  const payload = normalizeHookPayload(JSON.parse(raw));
   const { session_id, cwd, prompt } = payload;
+  const hostAdapter = hostAdapterForSessionId(session_id);
 
   // VSCode 新規プロジェクトへの tasks.json 自動プロビジョニング。
   // SessionStart/Stop に加えここでも呼ぶことで、どれか 1 つでも発火すれば初回メッセージ送信で
@@ -173,7 +184,14 @@ export async function run() {
     });
     if (handoff.attempted) {
       if (handoff.injectionText) {
-        process.stdout.write(handoff.injectionText + '\n');
+        // 注入の届け方は host 依存 (Claude: stdout / Grok: chat_history 直書き)。
+        const delivery = hostAdapter.deliverHandoffInjection({
+          payload,
+          text: handoff.injectionText,
+        });
+        if (!delivery.delivered) {
+          process.stderr.write(`[prompt-submit] ${delivery.reason}\n`);
+        }
       }
       logDecision({
         ts: new Date(now).toISOString(),
@@ -193,8 +211,15 @@ export async function run() {
     }
   }
 
-  const tlMatch = isBatonCommand(prompt);
-  const clearMatch = !tlMatch && isClearCommand(prompt);
+  // slash command の判定材料は host 依存 (Grok は user_query 包装のため
+  // chat_history の最新 user 発話へ fallback する)。
+  const commandPrompt = hostAdapter.resolveCommandPrompt({
+    prompt,
+    payload,
+    isCommandPrompt: (p) => isBatonCommand(p) || isClearCommand(p),
+  });
+  const tlMatch = isBatonCommand(commandPrompt);
+  const clearMatch = !tlMatch && isClearCommand(commandPrompt);
 
   // Phase 0-5 spike: real user prompt (not /tl, not /clear) で、marker file あり、
   // session 未 spike なら chain (b) で JSONL に inject する。失敗しても prompt 自体は
@@ -227,6 +252,16 @@ export async function run() {
     trigger: tlMatch ? 'tl' : 'clear',
   });
 
+  // バトン書き込み後の副作用は host 依存 (Grok /tl だけ後継セッションを起動する)。
+  const afterBaton = hostAdapter.afterBatonWrite({
+    trigger: tlMatch ? 'tl' : 'clear',
+    sessionId: session_id,
+    cwd: projectPath,
+  });
+  if (afterBaton.launched && afterBaton.exitCode !== 0) {
+    process.stderr.write(`[prompt-submit] grok-continue exited ${afterBaton.exitCode}\n`);
+  }
+
   process.exit(0);
 }
 

package/src/prompt-submit.test.mjs

@@ -1,6 +1,11 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { isBatonCommand, isClearCommand } from './prompt-submit.mjs';
+import {
+  commandTextFromPrompt,
+  isBatonCommand,
+  isClearCommand,
+} from './prompt-submit.mjs';
+import { hostAdapterForSessionId } from './hosts/index.mjs';
 
 test('isBatonCommand: bare /tl', () => {
   assert.equal(isBatonCommand('/tl'), true);
@@ -64,3 +69,72 @@ test('isClearCommand: rejects empty / non-string', () => {
   assert.equal(isClearCommand(undefined), false);
   assert.equal(isClearCommand(42), false);
 });
+
+test('commandTextFromPrompt unwraps Grok user_query and leaves bare Claude text', () => {
+  assert.equal(commandTextFromPrompt('/tl'), '/tl');
+  assert.equal(
+    commandTextFromPrompt('<user_query>\n/tl\n</user_query>\n<skill_information>saved</skill_information>'),
+    '/tl',
+  );
+});
+
+test('afterBatonWrite launches grok-continue only for Grok /tl', () => {
+  const noLaunch = () => {
+    throw new Error('must not launch');
+  };
+  assert.deepEqual(
+    hostAdapterForSessionId('grok:abc').afterBatonWrite({
+      trigger: 'clear', sessionId: 'grok:abc', cwd: '/work', continueRun: noLaunch,
+    }),
+    { launched: false },
+  );
+  assert.deepEqual(
+    hostAdapterForSessionId('old-session').afterBatonWrite({
+      trigger: 'tl', sessionId: 'old-session', cwd: '/work', continueRun: noLaunch,
+    }),
+    { launched: false },
+  );
+  assert.deepEqual(
+    hostAdapterForSessionId('codex:thread').afterBatonWrite({
+      trigger: 'tl', sessionId: 'codex:thread', cwd: '/work', continueRun: noLaunch,
+    }),
+    { launched: false },
+  );
+});
+
+test('Grok afterBatonWrite calls grok-continue with the source session', () => {
+  const calls = [];
+  const result = hostAdapterForSessionId('grok:abc').afterBatonWrite({
+    trigger: 'tl',
+    sessionId: 'grok:abc',
+    cwd: '/work/Throughline',
+    continueRun: (argv, opts) => {
+      calls.push({ argv, opts });
+      return 0;
+    },
+  });
+  assert.deepEqual(result, { launched: true, exitCode: 0 });
+  assert.deepEqual(calls, [{
+    argv: ['--session', 'grok:abc'],
+    opts: { cwd: '/work/Throughline' },
+  }]);
+});
+
+test('isBatonCommand: Grok user_query wrap around /tl', () => {
+  const wrapped =
+    '<user_query>\n/tl\n</user_query>\n<skill_information>\nThroughline saved the baton.\n</skill_information>';
+  assert.equal(isBatonCommand(wrapped), true);
+});
+
+test('isBatonCommand: Grok wrap does not treat skill body /tl as the command', () => {
+  const wrapped =
+    '<user_query>\n続けてくれ\n</user_query>\n<skill_information>\nType /tl to hand off.\n</skill_information>';
+  assert.equal(isBatonCommand(wrapped), false);
+});
+
+test('isClearCommand: Grok user_query wrap around /clear and /new', () => {
+  assert.equal(isClearCommand('<user_query>\n/clear\n</user_query>'), true);
+  assert.equal(isClearCommand('<user_query>\n/new\n</user_query>'), true);
+  assert.equal(isClearCommand('/new'), true);
+  assert.equal(isClearCommand('/newest'), false);
+});

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

@@ -6,7 +6,7 @@ import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { defaultFactoryReporterConfigPath, defaultRuntimeErrorStorePath } from './runtime-error-store.mjs';
-import { applyWindowsPrivateAcl } from './windows-acl-test-helper.mjs';
+import { applyWindowsPrivateAcl } from './os/windows-acl-test-helper.mjs';
 
 const BIN = fileURLToPath(new URL('../bin/throughline.mjs', import.meta.url));
 

package/src/runtime-error-store.mjs

@@ -15,6 +15,7 @@ import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { DatabaseSync } from 'node:sqlite';
+import { applyAndVerifyWindowsAcl, isWindows, verifyWindowsAcl } from './os/windows-acl.mjs';
 
 const require = createRequire(import.meta.url);
 const PACKAGE_VERSION = require('../package.json').version;
@@ -25,8 +26,6 @@ export const RUNTIME_ERROR_DIAGNOSTIC = '[throughline:runtime-errors] store_unav
 const DEFAULT_SNAPSHOT_LIMIT = 256;
 const BEST_EFFORT_TIMEOUT_MS = 750;
 const WINDOWS_BEST_EFFORT_TIMEOUT_MS = 5_000;
-// CI実測でPowerShellコールドスタートが3.0〜3.2秒に達しflakeしたため15秒 (run 29586852389 / 29628634501)
-const WINDOWS_ACL_TIMEOUT_MS = 15_000;
 const RESOLUTION_REASONS = new Set(['manual', 'recovered']);
 const PRIVATE_DIRECTORY_CAPABILITY = Symbol('throughline.private-directory');
 
@@ -55,7 +54,7 @@ const DEFINITIONS = Object.freeze({
 
 export function defaultFactoryReporterConfigPath(env = process.env) {
   const home = env.HOME || env.USERPROFILE || homedir();
-  if ((env.OS === 'Windows_NT' || hostPlatform() === 'win32')) {
+  if (isWindows(env)) {
     return join(env.LOCALAPPDATA || join(home, 'AppData', 'Local'), 'dotagents', 'factory-reporter', 'config.json');
   }
   return join(env.XDG_CONFIG_HOME || join(home, '.config'), 'dotagents', 'factory-reporter.json');
@@ -63,7 +62,7 @@ export function defaultFactoryReporterConfigPath(env = process.env) {
 
 export function defaultRuntimeErrorStorePath(env = process.env) {
   const home = env.HOME || env.USERPROFILE || homedir();
-  if ((env.OS === 'Windows_NT' || hostPlatform() === 'win32')) {
+  if (isWindows(env)) {
     return join(env.LOCALAPPDATA || join(home, 'AppData', 'Local'), 'throughline', 'runtime-errors.json');
   }
   return join(env.XDG_STATE_HOME || join(home, '.local', 'state'), 'throughline', 'runtime-errors.json');
@@ -412,10 +411,6 @@ function assertPrivateStoreFileShape(info) {
   }
 }
 
-function isWindows(env = process.env) {
-  return env.OS === 'Windows_NT' || hostPlatform() === 'win32';
-}
-
 function isCanonicalFactoryReporterConfig(value) {
   if (!isPlainObject(value) || !exactKeys(value, ['schema_version', 'host', 'collection', 'reporting']) || value.schema_version !== '1.0') return false;
   if (!isPlainObject(value.host) || !exactKeys(value.host, ['id', 'profile']) ||
@@ -555,38 +550,6 @@ function assertPosixOwnerMode(info, expectedMode) {
   if (typeof process.getuid === 'function' && info.uid !== process.getuid()) throw new Error('runtime error store owner unsafe');
 }
 
-function applyAndVerifyWindowsAcl(path, directory) {
-  runWindowsAclScript(path, directory, WINDOWS_ACL_APPLY_SCRIPT);
-}
-
-function verifyWindowsAcl(path, directory) {
-  runWindowsAclScript(path, directory, WINDOWS_ACL_VERIFY_SCRIPT);
-}
-
-function runWindowsAclScript(path, directory, script) {
-  const result = childProcess.spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
-    env: { ...process.env, FACTORY_ACL_PATH: path, FACTORY_ACL_DIRECTORY: directory ? '1' : '0' },
-    stdio: 'ignore', timeout: WINDOWS_ACL_TIMEOUT_MS, windowsHide: true,
-  });
-  if (result.status !== 0) throw new Error('Windows owner-only ACL verification failed');
-}
-
-const WINDOWS_ACL_VERIFY_SCRIPT = String.raw`
-$p=$env:FACTORY_ACL_PATH; $isDir=$env:FACTORY_ACL_DIRECTORY -eq '1'; $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User.Value
-$acl=if($isDir){[System.IO.Directory]::GetAccessControl($p)}else{[System.IO.File]::GetAccessControl($p)}
-$owner=$acl.GetOwner([System.Security.Principal.SecurityIdentifier]).Value
-if($owner -ne $sid){exit 41}; $rules=@($acl.GetAccessRules($true,$true,[System.Security.Principal.SecurityIdentifier])); if($rules.Count -ne 1){exit 42}
-$r=$rules[0]; if($r.IdentityReference.Value -ne $sid -or $r.AccessControlType -ne 'Allow' -or $r.IsInherited -or ($r.FileSystemRights -band [System.Security.AccessControl.FileSystemRights]::FullControl) -ne [System.Security.AccessControl.FileSystemRights]::FullControl){exit 43}
-`;
-
-const WINDOWS_ACL_APPLY_SCRIPT = String.raw`
-$p=$env:FACTORY_ACL_PATH; $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User
-$isDir=$env:FACTORY_ACL_DIRECTORY -eq '1'; $acl=if($isDir){New-Object System.Security.AccessControl.DirectorySecurity}else{New-Object System.Security.AccessControl.FileSecurity}; $acl.SetAccessRuleProtection($true,$false)
-$flags=if($isDir){[System.Security.AccessControl.InheritanceFlags]'ContainerInherit, ObjectInherit'}else{[System.Security.AccessControl.InheritanceFlags]::None}
-$rule=New-Object System.Security.AccessControl.FileSystemAccessRule($sid,'FullControl',$flags,[System.Security.AccessControl.PropagationFlags]::None,[System.Security.AccessControl.AccessControlType]::Allow)
-$acl.SetOwner($sid); $acl.AddAccessRule($rule); if($isDir){[System.IO.Directory]::SetAccessControl($p,$acl)}else{[System.IO.File]::SetAccessControl($p,$acl)}
-` + WINDOWS_ACL_VERIFY_SCRIPT;
-
 function assertExactInput(input, allowed) {
   if (!input || typeof input !== 'object' || Array.isArray(input) ||
     Object.keys(input).some((key) => !allowed.includes(key))) {

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

@@ -16,7 +16,7 @@ import {
   reopenRuntimeError,
   resolveRuntimeError,
 } from './runtime-error-store.mjs';
-import { applyWindowsPrivateAcl, verifyWindowsPrivateAcl } from './windows-acl-test-helper.mjs';
+import { applyWindowsPrivateAcl, verifyWindowsPrivateAcl } from './os/windows-acl-test-helper.mjs';
 
 const TEST_PLATFORM = process.platform === 'win32' ? 'win32' : 'darwin';
 

package/src/session-start.mjs

@@ -32,7 +32,7 @@ import { logDecision } from './decision-log.mjs';
 import { existsSync } from 'node:fs';
 import { pathToFileURL } from 'node:url';
 import { recordRuntimeErrorBestEffort } from './runtime-error-store.mjs';
-import { isUnsupportedNonClaudeEnvelope } from './hook-envelope.mjs';
+import { NON_CLAUDE_SESSION_PREFIXES, normalizeHookPayload } from './hosts/index.mjs';
 
 const ENV_DISABLE_AUTO_HANDOFF = 'THROUGHLINE_DISABLE_AUTO_HANDOFF';
 
@@ -55,17 +55,26 @@ function isAutoHandoffDisabled(env) {
  * @returns {{ session_id: string } | null}
  */
 function findLatestClaudePredecessor(db, projectPath, currentSessionId) {
+  // Claude 以外の host session (prefix 付き) を前任候補から除外する。
+  // prefix の正本は hosts/identity.mjs。
+  const nonClaudeExclusion = NON_CLAUDE_SESSION_PREFIXES
+    .map(() => 'AND session_id NOT LIKE ?')
+    .join('\n         ');
   const candidates = db
     .prepare(
       `SELECT session_id FROM sessions
        WHERE lower(project_path) = lower(?)
          AND merged_into IS NULL
          AND session_id != ?
-         AND session_id NOT LIKE 'codex:%'
+         ${nonClaudeExclusion}
        ORDER BY updated_at DESC
        LIMIT 5`,
     )
-    .all(projectPath, currentSessionId);
+    .all(
+      projectPath,
+      currentSessionId,
+      ...NON_CLAUDE_SESSION_PREFIXES.map((prefix) => `${prefix}%`),
+    );
 
   if (candidates.length === 0) return null;
 
@@ -91,8 +100,7 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = JSON.parse(raw);
-  if (isUnsupportedNonClaudeEnvelope(payload)) return;
+  const payload = normalizeHookPayload(JSON.parse(raw));
   const { session_id, cwd, source, transcript_path } = payload;
 
   if (!session_id) throw new Error('Missing session_id in SessionStart payload');

package/src/state-file.mjs

@@ -12,8 +12,10 @@
  */
 
 import { readFileSync, writeFileSync, mkdirSync, readdirSync, statSync, unlinkSync, existsSync } from 'node:fs';
-import { homedir, platform } from 'node:os';
+import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
+import { CLAUDE_HOST, KNOWN_STATE_HOSTS } from './hosts/identity.mjs';
+import { foldPathCaseForPlatform } from './os/paths.mjs';
 
 const STATE_DIR = join(homedir(), '.throughline', 'state');
 
@@ -31,8 +33,7 @@ export function normalizeProjectPath(p) {
   if (!p) return '';
   let result = resolve(p).replace(/\\/g, '/');
   if (result.length > 1 && result.endsWith('/')) result = result.slice(0, -1);
-  if (platform() === 'win32') result = result.toLowerCase();
-  return result;
+  return foldPathCaseForPlatform(result);
 }
 
 /**
@@ -155,8 +156,8 @@ function stateFilename(sessionId) {
 }
 
 function normalizeHost(host) {
-  if (host === undefined || host === null || host === '') return 'claude';
-  if (host === 'claude' || host === 'codex') return host;
+  if (host === undefined || host === null || host === '') return CLAUDE_HOST;
+  if (KNOWN_STATE_HOSTS.includes(host)) return host;
   return 'unknown';
 }
 

package/src/token-monitor.mjs

@@ -28,6 +28,7 @@ import { buildCodexMonitorUsage } from './codex-usage.mjs';
 import { listCodexThreadCandidates } from './codex-thread-index.mjs';
 import { readLatestUsage } from './transcript-usage.mjs';
 import { startSizeQuery } from './terminal-size.mjs';
+import { CODEX_HOST, CODEX_SESSION_PREFIX, codexSessionIdToThreadId } from './hosts/identity.mjs';
 
 const REFRESH_MS = 1000;
 // データ変化が無くても N ms ごとに再描画して「(24m ago)」表示を進める。
@@ -292,7 +293,7 @@ export function resolveColumns() {
 function formatLine({ state, usage, isActive, now = Date.now() }) {
   const project = basename(state.projectPath || '?');
   const shortId = formatShortSessionId(state);
-  const host = state.host === 'codex' ? 'Codex' : state.host === 'unknown' ? 'Unknown' : 'Claude';
+  const host = state.host === CODEX_HOST ? 'Codex' : state.host === 'unknown' ? 'Unknown' : 'Claude';
   const tokens = usage?.tokens ?? 0;
   const max = usage?.contextWindowSize ?? 200_000;
   const ratio = max > 0 ? tokens / max : 0;
@@ -337,8 +338,8 @@ function formatLine({ state, usage, isActive, now = Date.now() }) {
 
 function formatShortSessionId(state) {
   const sessionId = String(state?.sessionId ?? '');
-  if (state?.host === 'codex' && sessionId.startsWith('codex:')) {
-    return sessionId.slice('codex:'.length, 'codex:'.length + 8);
+  if (state?.host === CODEX_HOST && sessionId.startsWith(CODEX_SESSION_PREFIX)) {
+    return (codexSessionIdToThreadId(sessionId) ?? '').slice(0, 8);
   }
   return sessionId.slice(0, 8);
 }
@@ -372,7 +373,7 @@ function withLiveActivity(state, now = Date.now()) {
 }
 
 function resolveMonitorUsage(state) {
-  if (state.host === 'codex' && state.rolloutPath) {
+  if (state.host === CODEX_HOST && state.rolloutPath) {
     return buildCodexMonitorUsage(state.rolloutPath) ?? state.usage ?? null;
   }
   if (state.transcriptPath) {
@@ -410,8 +411,8 @@ function discoverCodexSessionStates(args = {}, cwd = process.cwd()) {
 
   lastCodexDiscoveryError = null;
   return candidates.map((candidate) => ({
-    sessionId: `codex:${candidate.id}`,
-    host: 'codex',
+    sessionId: `${CODEX_SESSION_PREFIX}${candidate.id}`,
+    host: CODEX_HOST,
     projectPath: normalizeProjectPath(candidate.cwd ?? cwd),
     transcriptPath: null,
     rolloutPath: candidate.rolloutPath,

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

@@ -0,0 +1,37 @@
+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 } from './transcript-reader.mjs';
+
+test('readTranscript accepts Grok chat_history.jsonl user/assistant rows', () => {
+  const dir = mkdtempSync(join(tmpdir(), 'tl-grok-transcript-'));
+  const path = join(dir, 'chat_history.jsonl');
+  writeFileSync(
+    path,
+    [
+      JSON.stringify({ type: 'system', content: 'ignore' }),
+      JSON.stringify({ type: 'user', content: [{ type: 'text', text: 'hello grok' }] }),
+      JSON.stringify({ type: 'assistant', content: 'captured reply' }),
+      JSON.stringify({ type: 'tool_result', content: 'not a turn' }),
+    ].join('\n'),
+  );
+  try {
+    const turns = readTranscript(path);
+    assert.deepEqual(
+      turns.map((t) => ({ role: t.role, content: t.content })),
+      [
+        { role: 'user', content: 'hello grok' },
+        { role: 'assistant', content: 'captured reply' },
+      ],
+    );
+    const groups = getLogicalTurnGroups(path);
+    assert.equal(groups.length, 1);
+    assert.equal(groups[0].user.content, 'hello grok');
+    assert.equal(groups[0].representative.content, 'captured reply');
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});

package/src/transcript-reader.mjs

@@ -59,14 +59,18 @@ export function readTranscript(transcriptPath) {
     if (entry.isSidechain === true) continue;
 
     const msg = entry.message;
-    if (!msg || !msg.role || msg.content == null) continue;
+    const grokContent = entry.content;
+    const role = msg?.role ?? entry.type;
+    const rawContent = msg?.content ?? grokContent;
+    if (!role || rawContent == null) continue;
 
-    const text = extractText(msg.content);
+    const text = extractText(rawContent);
     if (!text) continue;
 
     const ts = typeof entry.timestamp === 'string' ? Date.parse(entry.timestamp) : NaN;
+    // grok chat_history.jsonl は Claude の message 包みを持たず type/content 直置き。
     turns.push({
-      role: msg.role,
+      role,
       content: text,
       turn_number: turns.length,
       timestamp: Number.isNaN(ts) ? null : ts,

package/src/turn-processor.mjs

@@ -46,7 +46,7 @@ import { readLatestUsage } from './transcript-usage.mjs';
 import { pathToFileURL } from 'node:url';
 import { recordRuntimeErrorBestEffort } from './runtime-error-store.mjs';
 import { writeCompletedTurnReceipt } from './completed-turn-receipts.mjs';
-import { isUnsupportedNonClaudeEnvelope } from './hook-envelope.mjs';
+import { hostAdapterForSessionId, normalizeHookPayload } from './hosts/index.mjs';
 
 /** 直近 N ターンは bodies を生で残し、それより古いものだけ L1 要約する。 */
 export const L2_WINDOW = 20;
@@ -191,8 +191,7 @@ export async function run() {
     process.stdin.on('end', resolve);
   });
 
-  const payload = JSON.parse(raw || '{}');
-  if (isUnsupportedNonClaudeEnvelope(payload)) return;
+  const payload = normalizeHookPayload(JSON.parse(raw || '{}'));
   const { session_id, transcript_path, cwd, last_assistant_message } = payload;
   if (!session_id) throw new Error('Missing session_id in Stop payload');
 
@@ -206,10 +205,12 @@ export async function run() {
     process.stderr.write(`[vscode-task] ${msg}\n`);
   }
 
-  await waitForClaudeStopTranscriptFlush({
-    transcriptPath: transcript_path,
-    lastAssistantMessage: last_assistant_message,
-  });
+  if (hostAdapterForSessionId(session_id).waitsForStopTranscriptFlush) {
+    await waitForClaudeStopTranscriptFlush({
+      transcriptPath: transcript_path,
+      lastAssistantMessage: last_assistant_message,
+    });
+  }
 
   // Stop hook 時点で state ファイルを更新 → token-monitor の「アクティブ行」判定が
   // アシスタント応答終了時刻まで追従する

package/src/hook-envelope.mjs

@@ -1,12 +0,0 @@
-// Grok can invoke Claude-compatible hook commands with its camelCase wire.
-// Throughline does not support Grok as a host, so this envelope is ignored
-// before DB, state, VS Code task, transcript, or runtime-error side effects.
-export function isUnsupportedNonClaudeEnvelope(payload) {
-  return payload !== null
-    && typeof payload === 'object'
-    && typeof payload.sessionId === 'string'
-    && payload.sessionId.length > 0
-    && typeof payload.hookEventName === 'string'
-    && payload.hookEventName.length > 0
-    && !Object.hasOwn(payload, 'session_id');
-}