throughline 0.10.0 → 0.10.2

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

@@ -10,11 +10,13 @@ import {
   writeFileSync,
 } from 'node:fs';
 import childProcess from 'node:child_process';
-import { arch as hostArch, homedir, platform as hostPlatform } from 'node:os';
+import { arch as hostArch, platform as hostPlatform } from 'node:os';
 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';
+import { windowsLocalAppData, xdgConfigHome, xdgStateHome } from './os/app-dirs.mjs';
 
 const require = createRequire(import.meta.url);
 const PACKAGE_VERSION = require('../package.json').version;
@@ -25,8 +27,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');
 
@@ -54,19 +54,17 @@ const DEFINITIONS = Object.freeze({
 });
 
 export function defaultFactoryReporterConfigPath(env = process.env) {
-  const home = env.HOME || env.USERPROFILE || homedir();
-  if ((env.OS === 'Windows_NT' || hostPlatform() === 'win32')) {
-    return join(env.LOCALAPPDATA || join(home, 'AppData', 'Local'), 'dotagents', 'factory-reporter', 'config.json');
+  if (isWindows(env)) {
+    return join(windowsLocalAppData(env), 'dotagents', 'factory-reporter', 'config.json');
   }
-  return join(env.XDG_CONFIG_HOME || join(home, '.config'), 'dotagents', 'factory-reporter.json');
+  return join(xdgConfigHome(env), 'dotagents', 'factory-reporter.json');
 }
 
 export function defaultRuntimeErrorStorePath(env = process.env) {
-  const home = env.HOME || env.USERPROFILE || homedir();
-  if ((env.OS === 'Windows_NT' || hostPlatform() === 'win32')) {
-    return join(env.LOCALAPPDATA || join(home, 'AppData', 'Local'), 'throughline', 'runtime-errors.json');
+  if (isWindows(env)) {
+    return join(windowsLocalAppData(env), 'throughline', 'runtime-errors.json');
   }
-  return join(env.XDG_STATE_HOME || join(home, '.local', 'state'), 'throughline', 'runtime-errors.json');
+  return join(xdgStateHome(env), 'throughline', 'runtime-errors.json');
 }
 
 export function isRuntimeErrorCollectionEnabled({ env = process.env, configPath } = {}) {
@@ -412,10 +410,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 +549,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';
 }
 

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/trim-model.mjs

@@ -1,4 +1,5 @@
 import { inspectCodexPlannedRollbackRestoreSafety } from './codex-rollout-memory.mjs';
+import { CLAUDE_HOST, CODEX_HOST } from './hosts/identity.mjs';
 import { buildHandoffRecord, N_RECENT_L2 } from './handoff-record.mjs';
 import { sameProjectPath } from './project-path.mjs';
 import { estimateTokens } from './token-estimator.mjs';
@@ -48,7 +49,7 @@ export function findLatestSessionIdForProject(db, projectPath) {
 
 function resolveDefaultSessionId({ sessionId, host, codexThreadId, db, projectPath }) {
   if (sessionId) return sessionId;
-  if (host === 'codex') {
+  if (host === CODEX_HOST) {
     return codexThreadId ? `codex:${codexThreadId}` : null;
   }
   return findLatestSessionIdForProject(db, projectPath);
@@ -79,7 +80,7 @@ function countDistinctCapturedTurns(db, sessionId) {
 }
 
 export function describeTrimHost(host) {
-  if (host === 'claude') {
+  if (host === CLAUDE_HOST) {
     return {
       host,
       automaticRollback: false,
@@ -94,7 +95,7 @@ export function describeTrimHost(host) {
     };
   }
 
-  if (host === 'codex') {
+  if (host === CODEX_HOST) {
     return {
       host,
       automaticRollback: true,
@@ -123,7 +124,7 @@ export function describeTrimHost(host) {
 }
 
 function buildSafeContinuation({ host, hostIdentity }) {
-  if (host !== 'codex') return null;
+  if (host !== CODEX_HOST) return null;
 
   const threadId = hostIdentity?.codexThreadId ?? '<thread-id>';
   const sessionId = threadId === '<thread-id>' ? 'codex:<thread-id>' : `codex:${threadId}`;
@@ -561,7 +562,7 @@ function buildPlanSession({ resolvedSessionId, session, trimSource, projectPath
 }
 
 function buildHostIdentity({ host, codexThreadId, codexThreadIdSource = null }) {
-  if (host !== 'codex') {
+  if (host !== CODEX_HOST) {
     return {
       host,
       codexThreadId: null,

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 { normalizeHookPayload } from './hook-envelope.mjs';
+import { hostAdapterForSessionId, normalizeHookPayload } from './hosts/index.mjs';
 
 /** 直近 N ターンは bodies を生で残し、それより古いものだけ L1 要約する。 */
 export const L2_WINDOW = 20;
@@ -205,7 +205,7 @@ export async function run() {
     process.stderr.write(`[vscode-task] ${msg}\n`);
   }
 
-  if (!session_id.startsWith('grok:')) {
+  if (hostAdapterForSessionId(session_id).waitsForStopTranscriptFlush) {
     await waitForClaudeStopTranscriptFlush({
       transcriptPath: transcript_path,
       lastAssistantMessage: last_assistant_message,

package/src/hook-envelope.mjs

@@ -1,51 +0,0 @@
-// 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.
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-export const GROK_SESSION_PREFIX = 'grok:';
-
-export function isGrokEnvelope(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');
-}
-
-export function grokBareSessionId(sessionId) {
-  if (typeof sessionId !== 'string' || sessionId.length === 0) return null;
-  return sessionId.startsWith(GROK_SESSION_PREFIX)
-    ? sessionId.slice(GROK_SESSION_PREFIX.length)
-    : sessionId;
-}
-
-export function deriveGrokChatHistoryPath(projectPath, sessionId, { home = homedir() } = {}) {
-  const bare = grokBareSessionId(sessionId);
-  if (!projectPath || !bare) return null;
-  return join(home, '.grok', 'sessions', encodeURIComponent(projectPath), bare, 'chat_history.jsonl');
-}
-
-export function normalizeHookPayload(payload, { home = homedir() } = {}) {
-  if (!isGrokEnvelope(payload)) return payload;
-  const cwd = typeof payload.cwd === 'string' && payload.cwd.length > 0
-    ? payload.cwd
-    : (typeof payload.workspaceRoot === 'string' ? payload.workspaceRoot : undefined);
-  // 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 });
-  return {
-    ...payload,
-    session_id: `${GROK_SESSION_PREFIX}${payload.sessionId}`,
-    cwd,
-    source: payload.source,
-    prompt: payload.prompt,
-    hook_event_name: payload.hookEventName,
-    transcript_path: transcriptPath,
-    last_assistant_message: payload.lastAssistantMessage,
-  };
-}