throughline 0.10.0 → 0.10.1

package/src/hosts/identity.test.mjs

@@ -0,0 +1,65 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+
+import {
+  CODEX_SESSION_PREFIX,
+  GROK_SESSION_PREFIX,
+  NON_CLAUDE_SESSION_PREFIXES,
+  buildCodexThroughlineSessionId,
+  codexSessionIdToThreadId,
+  grokBareSessionId,
+  hostOfSessionId,
+  isCodexSessionId,
+  isGrokSessionId,
+} from './identity.mjs';
+import { hostAdapterForSessionId } from './index.mjs';
+
+test('session prefixes are the canonical wire values', () => {
+  assert.equal(CODEX_SESSION_PREFIX, 'codex:');
+  assert.equal(GROK_SESSION_PREFIX, 'grok:');
+  assert.deepEqual([...NON_CLAUDE_SESSION_PREFIXES], ['codex:', 'grok:']);
+});
+
+test('hostOfSessionId maps prefixes to hosts and defaults to claude', () => {
+  assert.equal(hostOfSessionId('codex:0199aa'), 'codex');
+  assert.equal(hostOfSessionId('grok:0199aa'), 'grok');
+  assert.equal(hostOfSessionId('0199aa-claude'), 'claude');
+  assert.equal(hostOfSessionId(undefined), 'claude');
+});
+
+test('codex session id round-trips thread id', () => {
+  assert.equal(buildCodexThroughlineSessionId(' t1 '), 'codex:t1');
+  assert.equal(codexSessionIdToThreadId('codex:t1'), 't1');
+  assert.equal(codexSessionIdToThreadId('t1'), null);
+  assert.equal(codexSessionIdToThreadId('codex:'), null);
+  assert.throws(() => buildCodexThroughlineSessionId('  '));
+});
+
+test('grokBareSessionId strips only the grok prefix', () => {
+  assert.equal(grokBareSessionId('grok:abc'), 'abc');
+  assert.equal(grokBareSessionId('abc'), 'abc');
+  assert.equal(grokBareSessionId(''), null);
+});
+
+test('isCodexSessionId / isGrokSessionId reject non-strings', () => {
+  assert.equal(isCodexSessionId(null), false);
+  assert.equal(isGrokSessionId(undefined), false);
+});
+
+test('every host adapter satisfies the shared hook contract', () => {
+  for (const sessionId of ['claude-session', 'codex:t1', 'grok:t1']) {
+    const adapter = hostAdapterForSessionId(sessionId);
+    assert.equal(typeof adapter.host, 'string');
+    assert.equal(adapter.matchesSessionId(sessionId), true);
+    assert.equal(typeof adapter.waitsForStopTranscriptFlush, 'boolean');
+    assert.equal(typeof adapter.deliverHandoffInjection, 'function');
+    assert.equal(typeof adapter.resolveCommandPrompt, 'function');
+    assert.equal(typeof adapter.afterBatonWrite, 'function');
+  }
+});
+
+test('flush barrier applies to claude and codex sessions, not grok', () => {
+  assert.equal(hostAdapterForSessionId('claude-session').waitsForStopTranscriptFlush, true);
+  assert.equal(hostAdapterForSessionId('codex:t1').waitsForStopTranscriptFlush, true);
+  assert.equal(hostAdapterForSessionId('grok:t1').waitsForStopTranscriptFlush, false);
+});

package/src/hosts/index.mjs

@@ -0,0 +1,37 @@
+/**
+ * hosts/index.mjs — host 境界の入口
+ *
+ * 共有 hook 入口 (session-start / prompt-submit / turn-processor) はここから
+ * `normalizeHookPayload` と `hostAdapterForSessionId` だけを使い、
+ * ベンダー分岐を直接書かない。
+ */
+import { hostOfSessionId, CLAUDE_HOST, CODEX_HOST, GROK_HOST } from './identity.mjs';
+import { claudeHostAdapter } from './claude.mjs';
+import { codexHostAdapter } from './codex.mjs';
+import { grokHostAdapter, isGrokEnvelope, normalizeGrokHookPayload } from './grok.mjs';
+
+export * from './identity.mjs';
+export { isGrokEnvelope, deriveGrokChatHistoryPath, normalizeGrokHookPayload } from './grok.mjs';
+
+const ADAPTERS = Object.freeze({
+  [CLAUDE_HOST]: claudeHostAdapter,
+  [CODEX_HOST]: codexHostAdapter,
+  [GROK_HOST]: grokHostAdapter,
+});
+
+/**
+ * hook stdin payload を Claude snake_case 契約へ正規化する。
+ * 現状 camelCase envelope を送るのは Grok だけ (v0.10.0 / ADR 0021)。
+ */
+export function normalizeHookPayload(payload, options = {}) {
+  if (isGrokEnvelope(payload)) return normalizeGrokHookPayload(payload, options);
+  return payload;
+}
+
+/**
+ * @param {string} sessionId
+ * @returns {typeof claudeHostAdapter}
+ */
+export function hostAdapterForSessionId(sessionId) {
+  return ADAPTERS[hostOfSessionId(sessionId)];
+}

package/src/os/macos-terminal.mjs

@@ -0,0 +1,44 @@
+/**
+ * os/macos-terminal.mjs — macOS Terminal.app で対話 process を立てる
+ *
+ * 2 つの起動形を提供する (どちらも osascript 経由):
+ *   - runTerminalScriptDetached: launch script の path を quoted form で exec
+ *     (grok-continue が使う detached 起動)
+ *   - runTerminalDoScript: shell command 1 行を do script で実行 (codex resume 用)
+ *
+ * macOS 以外では呼ばないこと。platform gate は呼び出し元の責務
+ * (explicit error にするため、ここで silent no-op にしない)。
+ */
+import { spawn, spawnSync } from 'node:child_process';
+
+import { appleString } from './shell.mjs';
+
+export function appleScriptForTerminalExec(launchScriptPath) {
+  return [
+    'tell application "Terminal"',
+    '  activate',
+    `  do script "exec " & quoted form of ${JSON.stringify(launchScriptPath)}`,
+    'end tell',
+    '',
+  ].join('\n');
+}
+
+export function runTerminalScriptDetached({ launchFile, spawnImpl = spawn }) {
+  const child = spawnImpl('osascript', ['-e', appleScriptForTerminalExec(launchFile)], {
+    detached: true,
+    stdio: 'ignore',
+  });
+  child.unref?.();
+  return child;
+}
+
+export function runTerminalDoScript(shellCommand, { spawnImpl = spawnSync } = {}) {
+  return spawnImpl('osascript', [], {
+    input: `tell application "Terminal"
+  activate
+  do script ${appleString(shellCommand)}
+end tell
+`,
+    encoding: 'utf8',
+  });
+}

package/src/os/open-url.mjs

@@ -0,0 +1,16 @@
+/**
+ * os/open-url.mjs — deep link / URL を OS 既定の handler で開く
+ *
+ * darwin: `open` / win32: `cmd /c start` / その他: `xdg-open`。
+ * 呼び出し元は result.status !== 0 を explicit failure として扱う。
+ */
+import { spawnSync } from 'node:child_process';
+
+export function openUrlWithOsHandler(url, {
+  platform = process.platform,
+  spawnImpl = spawnSync,
+} = {}) {
+  if (platform === 'darwin') return spawnImpl('open', [url], { encoding: 'utf8' });
+  if (platform === 'win32') return spawnImpl('cmd.exe', ['/c', 'start', '', url], { encoding: 'utf8' });
+  return spawnImpl('xdg-open', [url], { encoding: 'utf8' });
+}

package/src/os/paths.mjs

@@ -0,0 +1,12 @@
+/**
+ * os/paths.mjs — path 正規化の OS 依存部分
+ *
+ * Windows の filesystem は case-insensitive のため、比較・保存用の
+ * 正規化 path は win32 でだけ小文字へ畳む。この判断が state-file と
+ * project-path に別々に書かれていたため、ここへ集約する。
+ */
+import { platform } from 'node:os';
+
+export function foldPathCaseForPlatform(path, { hostPlatform = platform() } = {}) {
+  return hostPlatform === 'win32' ? path.toLowerCase() : path;
+}

package/src/os/shell.mjs

@@ -0,0 +1,16 @@
+/**
+ * os/shell.mjs — shell / AppleScript 文字列 quoting の唯一の正本
+ *
+ * grok-continue と codex-handoff-start がそれぞれ同じ POSIX single-quote
+ * escape を別実装していたため集約する。
+ */
+
+/** POSIX shell single-quote escape */
+export function shQuote(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
+/** AppleScript の string literal escape */
+export function appleString(value) {
+  return `"${String(value).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`;
+}

package/src/os/windows-acl.mjs

@@ -0,0 +1,57 @@
+/**
+ * os/windows-acl.mjs — Windows owner-only ACL の適用と検証 (唯一の正本)
+ *
+ * runtime-error-store と completed-turn-receipts が同一の PowerShell ACL
+ * 実装を別々に持っていたため (env 変数名だけ違う事故フォーク)、ここへ集約する。
+ *
+ * apply script は適用直後に同一 process 内で read-back 検証まで行う。
+ * 検証内容: owner = current SID、explicit rule が current SID の
+ * FullControl Allow 1 本だけ、継承 rule なし。
+ *
+ * CI 実測で PowerShell コールドスタートが 3.0〜3.2 秒に達し 3 秒 cap と衝突して
+ * flake したため timeout は 15 秒 (run 29586852389 / 29628634501)。
+ * explicit failure 契約は不変: 非 0 exit は例外にする。
+ *
+ * 注意: テストは `childProcess.spawnSync` を node:child_process の default
+ * export 経由で mock するため、named import に変えないこと。
+ */
+import childProcess from 'node:child_process';
+import { platform as hostPlatform } from 'node:os';
+
+export const WINDOWS_ACL_TIMEOUT_MS = 15_000;
+
+export function isWindows(env = process.env) {
+  return env.OS === 'Windows_NT' || hostPlatform() === 'win32';
+}
+
+export function applyAndVerifyWindowsAcl(path, directory) {
+  runWindowsAclScript(path, directory, WINDOWS_ACL_APPLY_SCRIPT);
+}
+
+export 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, THROUGHLINE_ACL_PATH: path, THROUGHLINE_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:THROUGHLINE_ACL_PATH; $isDir=$env:THROUGHLINE_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:THROUGHLINE_ACL_PATH; $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User
+$isDir=$env:THROUGHLINE_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;

package/src/project-path.mjs

@@ -1,7 +1,8 @@
 import { existsSync, realpathSync } from 'node:fs';
-import { platform } from 'node:os';
 import { resolve, sep } from 'node:path';
 
+import { foldPathCaseForPlatform } from './os/paths.mjs';
+
 export function normalizeProjectPathForCompare(value) {
   if (!value) return '';
   let resolved = resolve(String(value));
@@ -10,9 +11,8 @@ export function normalizeProjectPathForCompare(value) {
   } catch {
     // Fall back to the lexical path when the filesystem cannot resolve it.
   }
-  let normalized = resolved.split(sep).join('/').replace(/\/+$/, '');
-  if (platform() === 'win32') normalized = normalized.toLowerCase();
-  return normalized;
+  const normalized = resolved.split(sep).join('/').replace(/\/+$/, '');
+  return foldPathCaseForPlatform(normalized);
 }
 
 export function sameProjectPath(a, b) {

package/src/prompt-submit.mjs

@@ -42,10 +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 { GROK_SESSION_PREFIX, normalizeHookPayload } from './hook-envelope.mjs';
-import { injectGrokHandoffContext } from './grok-history-inject.mjs';
-import { readTranscript } from './transcript-reader.mjs';
-import { run as runGrokContinue } from './cli/grok-continue.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');
@@ -131,14 +128,6 @@ function isNamedSlashCommand(prompt, name) {
   return text === name || text.startsWith(`${name} `) || text.startsWith(`${name}\n`);
 }
 
-function lastUserPromptText(transcriptPath) {
-  const turns = readTranscript(transcriptPath);
-  for (let i = turns.length - 1; i >= 0; i--) {
-    if (turns[i].role === 'user') return turns[i].content;
-  }
-  return '';
-}
-
 /**
  * プロンプトが /tl バトン発動コマンドか判定する。
  * 許容: "/tl", "/tl\n", "/tl 何か"。Grok の user_query 包装も見る。
@@ -155,20 +144,6 @@ export function isClearCommand(prompt) {
   return isNamedSlashCommand(prompt, '/clear') || isNamedSlashCommand(prompt, '/new');
 }
 
-export function shouldLaunchGrokContinue({ sessionId, trigger }) {
-  return trigger === 'tl'
-    && typeof sessionId === 'string'
-    && sessionId.startsWith(GROK_SESSION_PREFIX);
-}
-
-export function launchGrokContinueAfterTl({
-  sessionId,
-  cwd,
-  continueRun = runGrokContinue,
-}) {
-  return continueRun(['--session', sessionId], { cwd });
-}
-
 export async function run() {
   let raw = '';
   await new Promise((resolve) => {
@@ -181,6 +156,7 @@ export async function run() {
 
   const payload = normalizeHookPayload(JSON.parse(raw));
   const { session_id, cwd, prompt } = payload;
+  const hostAdapter = hostAdapterForSessionId(session_id);
 
   // VSCode 新規プロジェクトへの tasks.json 自動プロビジョニング。
   // SessionStart/Stop に加えここでも呼ぶことで、どれか 1 つでも発火すれば初回メッセージ送信で
@@ -208,16 +184,13 @@ export async function run() {
     });
     if (handoff.attempted) {
       if (handoff.injectionText) {
-        if (session_id.startsWith(GROK_SESSION_PREFIX)) {
-          const injected = injectGrokHandoffContext(
-            payload.transcript_path,
-            handoff.injectionText,
-          );
-          if (!injected.injected) {
-            process.stderr.write(`[prompt-submit] grok chat_history inject skipped: ${injected.reason}\n`);
-          }
-        } else {
-          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({
@@ -238,15 +211,13 @@ export async function run() {
     }
   }
 
-  let commandPrompt = prompt;
-  if (
-    typeof session_id === 'string'
-    && session_id.startsWith(GROK_SESSION_PREFIX)
-    && !isBatonCommand(commandPrompt)
-    && !isClearCommand(commandPrompt)
-  ) {
-    commandPrompt = lastUserPromptText(payload.transcript_path);
-  }
+  // 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);
 
@@ -281,17 +252,14 @@ export async function run() {
     trigger: tlMatch ? 'tl' : 'clear',
   });
 
-  if (shouldLaunchGrokContinue({
-    sessionId: session_id,
+  // バトン書き込み後の副作用は host 依存 (Grok /tl だけ後継セッションを起動する)。
+  const afterBaton = hostAdapter.afterBatonWrite({
     trigger: tlMatch ? 'tl' : 'clear',
-  })) {
-    const code = launchGrokContinueAfterTl({
-      sessionId: session_id,
-      cwd: projectPath,
-    });
-    if (code !== 0) {
-      process.stderr.write(`[prompt-submit] grok-continue exited ${code}\n`);
-    }
+    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

@@ -4,9 +4,8 @@ import {
   commandTextFromPrompt,
   isBatonCommand,
   isClearCommand,
-  launchGrokContinueAfterTl,
-  shouldLaunchGrokContinue,
 } from './prompt-submit.mjs';
+import { hostAdapterForSessionId } from './hosts/index.mjs';
 
 test('isBatonCommand: bare /tl', () => {
   assert.equal(isBatonCommand('/tl'), true);
@@ -79,16 +78,34 @@ test('commandTextFromPrompt unwraps Grok user_query and leaves bare Claude text'
   );
 });
 
-test('shouldLaunchGrokContinue is only Grok /tl', () => {
-  assert.equal(shouldLaunchGrokContinue({ sessionId: 'grok:abc', trigger: 'tl' }), true);
-  assert.equal(shouldLaunchGrokContinue({ sessionId: 'grok:abc', trigger: 'clear' }), false);
-  assert.equal(shouldLaunchGrokContinue({ sessionId: 'old-session', trigger: 'tl' }), false);
-  assert.equal(shouldLaunchGrokContinue({ sessionId: 'codex:thread', trigger: 'tl' }), false);
+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('launchGrokContinueAfterTl calls grok-continue with the source session', () => {
+test('Grok afterBatonWrite calls grok-continue with the source session', () => {
   const calls = [];
-  const code = launchGrokContinueAfterTl({
+  const result = hostAdapterForSessionId('grok:abc').afterBatonWrite({
+    trigger: 'tl',
     sessionId: 'grok:abc',
     cwd: '/work/Throughline',
     continueRun: (argv, opts) => {
@@ -96,7 +113,7 @@ test('launchGrokContinueAfterTl calls grok-continue with the source session', ()
       return 0;
     },
   });
-  assert.equal(code, 0);
+  assert.deepEqual(result, { launched: true, exitCode: 0 });
   assert.deepEqual(calls, [{
     argv: ['--session', 'grok:abc'],
     opts: { cwd: '/work/Throughline' },

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 { normalizeHookPayload } from './hook-envelope.mjs';
+import { NON_CLAUDE_SESSION_PREFIXES, normalizeHookPayload } from './hosts/index.mjs';
 
 const ENV_DISABLE_AUTO_HANDOFF = 'THROUGHLINE_DISABLE_AUTO_HANDOFF';
 
@@ -55,18 +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:%'
-         AND session_id NOT LIKE 'grok:%'
+         ${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;
 

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';
 }