throughline 0.10.8 → 0.10.10

package/CHANGELOG.md

@@ -10,6 +10,26 @@ 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
+
+- `handoff-context --supplement-file`は、capture済みsessionに会話本文がまだ無い場合でも、
+  同じprojectに束縛された補足記憶だけを9,500字予算内で返す。Cursorの初回Workspace
+  Trust直後など、session行だけが先に作られたBotも記憶付きで再起動できる。
+- Windowsの子プロセスとowner-only ACL処理を、工場標準のPowerShell 7へ統一した。
+  製品CIも現行の3環境（macOS・Linux workstation・Windows native）を直接検証する。
+
 ## [0.10.8] — 2026-09-01
 
 ### Added
@@ -1387,7 +1407,9 @@ two attempts, instrument first instead of patching again.
 
 ---
 
-[Unreleased]: https://github.com/kitepon/Throughline/compare/v0.10.8...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
 [0.10.6]: https://github.com/kitepon/Throughline/compare/v0.10.5...v0.10.6

package/README.md

@@ -817,7 +817,7 @@ entry to the `tasks` array yourself:
 
 ## Commands
 
-**The current release is v0.10.8.** 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,
@@ -924,7 +924,9 @@ inheritance text used by SessionStart. A launcher may append
 ```
 
 The supplement is included only when `projectPath` matches the source session
-and shares the 9,500-character budget with conversation memory. The command does not create or migrate a
+and shares the 9,500-character budget with conversation memory. If the captured
+session has no dialogue context yet, a valid project-bound supplement is returned
+by itself. The command does not create or migrate a
 database, consume a baton, merge sessions, infer a latest session, change
 `sessions.merged_into`, or reassign L1/L2/L3 rows. AIterm uses this boundary for
 its optional cross-harness portable fork; the Observer feed is a separate

package/docs/04_public_release_plan.md

@@ -6,7 +6,7 @@
 
 ## 現行状態
 
-- release candidateのpackage版は `0.10.8`。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.8",
+    "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) {
@@ -82,11 +82,11 @@ export function readHandoffContext(sessionId, {
       isInheritance: true,
       maxChars: INJECTION_BUDGET_CHARS - (supplementContext?.length ?? 0) - separator.length,
     })?.text ?? null;
-    if (!context) return null;
+    if (!context && !supplementContext) return null;
 
-    const combined = supplementContext
+    const combined = supplementContext && context
       ? `${supplementContext}${separator}${context}`
-      : context;
+      : supplementContext ?? context;
     if (combined.length > INJECTION_BUDGET_CHARS) {
       throw new RangeError('handoff context exceeds injection budget');
     }
@@ -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/handoff-context.test.mjs

@@ -169,6 +169,40 @@ test('handoff-context adds a project-bound supplement inside the shared budget',
   }
 });
 
+test('handoff-context returns a project-bound supplement when the captured session has no dialogue yet', () => {
+  const home = mkdtempSync(join(tmpdir(), 'tl-handoff-supplement-only-'));
+  try {
+    const { db, dbPath } = createFixture(home);
+    db.exec('DELETE FROM details; DELETE FROM bodies; DELETE FROM skeletons;');
+    const before = ownershipSnapshot(db);
+    db.close();
+    const supplementFile = join(home, 'supplement.json');
+    writeFileSync(supplementFile, JSON.stringify({
+      schema: 'throughline.handoff_supplement.v1',
+      projectPath: '/work/project',
+      sections: [{ title: 'Botプロフィール', content: '名前はCursor確認担当' }],
+    }));
+
+    const result = runCli(home, [
+      'handoff-context', '--session', SESSION_ID, '--json',
+      '--supplement-file', supplementFile,
+    ]);
+    assert.equal(result.status, 0, result.stderr);
+    assert.deepEqual(JSON.parse(result.stdout), {
+      schema: 'throughline.handoff_context.v1',
+      status: 'ready',
+      sessionId: SESSION_ID,
+      context: '## このBotの長期記憶と関連知識\n\n### Botプロフィール\n名前はCursor確認担当',
+    });
+
+    const verify = new DatabaseSync(dbPath, { readOnly: true });
+    assert.deepEqual(ownershipSnapshot(verify), before);
+    verify.close();
+  } finally {
+    rmSync(home, { recursive: true, force: true });
+  }
+});
+
 test('handoff-context refuses a supplement from another bot project', () => {
   const home = mkdtempSync(join(tmpdir(), 'tl-handoff-supplement-scope-'));
   try {

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,7 +1,9 @@
 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 } from 'node:path';
+import { join, resolve } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
 import test from 'node:test';
 
@@ -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();
@@ -49,7 +83,7 @@ test('readyとemptyをJSONで返す', () => {
   assert.deepEqual(JSON.parse(stdout.read()), {
     schema: 'throughline.latest_session.v1',
     status: 'ready',
-    projectPath: '/bots/a',
+    projectPath: resolve('/bots/a'),
     sessionId: 'claude:abc',
     updatedAt: 'now',
   });

package/src/cli/self-update.mjs

@@ -1,6 +1,6 @@
 import { createRequire } from 'node:module';
 import { realpathSync } from 'node:fs';
-import { dirname, isAbsolute, join, win32 } from 'node:path';
+import { dirname, join, posix, win32 } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 import { spawnPortableSync } from '../os/portable-spawn-sync.mjs';
@@ -94,7 +94,7 @@ export function resolveGlobalCliPath(result, platform = process.platform) {
   if (!succeeded(result) || typeof result.stdout !== 'string') return null;
   const lines = result.stdout.split(/\r?\n/u).map((line) => line.trim()).filter(Boolean);
   if (lines.length !== 1) return null;
-  const path = platform === 'win32' ? win32 : { isAbsolute, join };
+  const path = platform === 'win32' ? win32 : posix;
   if (!path.isAbsolute(lines[0])) return null;
   return path.join(lines[0], 'throughline', 'bin', 'throughline.mjs');
 }
@@ -110,7 +110,7 @@ export function validateSelfUpdateIdentity(value, {
   if (Object.keys(value).sort().join('\0') !== exact.sort().join('\0')) return false;
   if (value.schema !== SELF_UPDATE_IDENTITY_SCHEMA || value.version !== version ||
     typeof value.cliPath !== 'string') return false;
-  const path = platform === 'win32' ? win32 : { isAbsolute };
+  const path = platform === 'win32' ? win32 : posix;
   if (!path.isAbsolute(value.cliPath) || !path.isAbsolute(cliPath ?? '')) return false;
   try {
     const actual = canonicalizePath(value.cliPath);

package/src/cli/self-update.test.mjs

@@ -118,6 +118,7 @@ test('self-update delegates post-install work to the newly installed CLI', () =>
     env: { PATH: '/fixture/bin' },
     runner,
     packageVersion: '0.10.4',
+    platform: 'linux',
     nodePath: '/node',
     cliPath: '/old-throughline.mjs',
     canonicalizePath: fakeCanonicalizePath,
@@ -160,6 +161,7 @@ test('new CLI completes install, migration, and diagnostics in order', () => {
     },
     runner,
     packageVersion: '0.10.5',
+    platform: 'linux',
     nodePath: '/node',
     cliPath: '/throughline.mjs',
   }), 0);
@@ -257,6 +259,7 @@ test('old CLI help with exit 0 cannot satisfy the post-install protocol', () =>
     stderr: sink(),
     runner,
     packageVersion: '0.10.4',
+    platform: 'linux',
     nodePath: '/node',
     canonicalizePath: fakeCanonicalizePath,
   }), 1);
@@ -293,6 +296,7 @@ test('post-install non-JSON failure preserves child stderr as the cause', () =>
     stderr,
     runner,
     packageVersion: '0.10.4',
+    platform: 'linux',
     nodePath: '/node',
     canonicalizePath: fakeCanonicalizePath,
   }), 1);
@@ -330,6 +334,7 @@ test('post-install structured failure preserves its stage and stderr', () => {
     stderr,
     runner,
     packageVersion: '0.10.4',
+    platform: 'linux',
     nodePath: '/node',
     canonicalizePath: fakeCanonicalizePath,
   }), 7);

package/src/completed-turn-receipts.test.mjs

@@ -148,7 +148,7 @@ test('completed turn receipt: one Windows mutation spends ACL processes only on
   try {
     writeCompletedTurnReceipt(input(1), options);
     assert.equal(calls.length, 3, 'new directory, lock, and store each require one apply+verify process');
-    assert.ok(calls.every((call) => call.command === 'powershell.exe'));
+    assert.ok(calls.every((call) => call.command === 'pwsh.exe'));
     calls.length = 0;
 
     writeCompletedTurnReceipt(input(2), options);

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/docs-contract.test.mjs

@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
 import { test } from 'node:test';
 import { fileURLToPath } from 'node:url';
 
@@ -8,6 +7,7 @@ import {
   extractMarkdownTargets,
   findMissingPackedTargets,
 } from '../scripts/verify-pack-markdown-links.mjs';
+import { spawnPortableSync } from './os/portable-spawn-sync.mjs';
 
 test('Markdown-only CI runs the product-owned documentation contract', () => {
   const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
@@ -36,7 +36,7 @@ test('Markdown-only CI runs the product-owned documentation contract', () => {
   );
 
   const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  const result = spawnSync(npmCommand, ['run', 'verify:docs', '--silent'], {
+  const result = spawnPortableSync(npmCommand, ['run', 'verify:docs', '--silent'], {
     cwd: fileURLToPath(new URL('..', import.meta.url)),
     encoding: 'utf8',
   });

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/os/portable-spawn-sync.mjs

@@ -43,7 +43,7 @@ export function spawnPortableSync(command, args, options = {}) {
     return spawnSync(process.execPath, [resolved, ...args], spawnOptions);
   }
   if (extension === '.ps1') {
-    return spawnSync('powershell.exe', [
+    return spawnSync('pwsh.exe', [
       '-NoLogo',
       '-NoProfile',
       '-NonInteractive',

package/src/os/windows-acl-test-helper.mjs

@@ -16,9 +16,9 @@ $acl.SetOwner($sid); $acl.SetAccessRuleProtection($true,$false)
 $inherit=if($isDir){[System.Security.AccessControl.InheritanceFlags]'ContainerInherit,ObjectInherit'}else{[System.Security.AccessControl.InheritanceFlags]::None}
 $rule=New-Object System.Security.AccessControl.FileSystemAccessRule($sid,'FullControl',$inherit,[System.Security.AccessControl.PropagationFlags]::None,[System.Security.AccessControl.AccessControlType]::Allow)
 $acl.AddAccessRule($rule)
-if($isDir){[System.IO.Directory]::SetAccessControl($target,$acl)}else{[System.IO.File]::SetAccessControl($target,$acl)}
+Set-Acl -LiteralPath $target -AclObject $acl
 `;
-  const result = spawnSync('powershell.exe', [
+  const result = spawnSync('pwsh.exe', [
     '-NoLogo', '-NoProfile', '-NonInteractive', '-Command', script,
   ], {
     encoding: 'utf8',
@@ -39,7 +39,7 @@ export function verifyWindowsPrivateAcl(path, directory = false) {
 $ErrorActionPreference='Stop'
 $target=$env:THROUGHLINE_TEST_ACL_PATH; $isDir=$env:THROUGHLINE_TEST_ACL_DIRECTORY -eq '1'
 $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User.Value
-$acl=if($isDir){[System.IO.Directory]::GetAccessControl($target)}else{[System.IO.File]::GetAccessControl($target)}
+$acl=Get-Acl -LiteralPath $target
 $owner=$acl.GetOwner([System.Security.Principal.SecurityIdentifier]).Value
 if($owner -ne $sid){exit 41}
 $rules=@($acl.GetAccessRules($true,$true,[System.Security.Principal.SecurityIdentifier]))
@@ -47,7 +47,7 @@ if($rules.Count -ne 1){exit 42}
 $rule=$rules[0]
 if($rule.IdentityReference.Value -ne $sid -or $rule.AccessControlType -ne 'Allow' -or $rule.IsInherited -or ($rule.FileSystemRights -band [System.Security.AccessControl.FileSystemRights]::FullControl) -ne [System.Security.AccessControl.FileSystemRights]::FullControl){exit 43}
 `;
-  const result = spawnSync('powershell.exe', [
+  const result = spawnSync('pwsh.exe', [
     '-NoLogo', '-NoProfile', '-NonInteractive', '-Command', script,
   ], {
     encoding: 'utf8',

package/src/os/windows-acl.mjs

@@ -33,7 +33,7 @@ export function verifyWindowsAcl(path, directory) {
 }
 
 function runWindowsAclScript(path, directory, script) {
-  const result = childProcess.spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
+  const result = childProcess.spawnSync('pwsh.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,
   });
@@ -42,7 +42,7 @@ function runWindowsAclScript(path, directory, script) {
 
 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)}
+$acl=Get-Acl -LiteralPath $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}
@@ -53,5 +53,5 @@ $p=$env:THROUGHLINE_ACL_PATH; $sid=[System.Security.Principal.WindowsIdentity]::
 $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)}
+$acl.SetOwner($sid); $acl.AddAccessRule($rule); Set-Acl -LiteralPath $p -AclObject $acl
 ` + WINDOWS_ACL_VERIFY_SCRIPT;

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/runtime-error-store.test.mjs

@@ -123,7 +123,7 @@ test('runtime error store: one Windows mutation spends ACL processes only on dis
 
   assert.equal(observeRuntimeError({ code: 'HOOK_CODEX_FAILED' }, options).status, 'recorded');
   assert.equal(calls.length, 3, 'new directory, lock, and store each require one apply+verify process');
-  assert.ok(calls.every((call) => call.command === 'powershell.exe'));
+  assert.ok(calls.every((call) => call.command === 'pwsh.exe'));
   calls.length = 0;
 
   assert.equal(observeRuntimeError({ code: 'HOOK_CODEX_FAILED' }, options).status, 'recorded');

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/test-env.mjs

@@ -15,8 +15,9 @@ process.env.NODE_NO_WARNINGS = '1';
 // app-server fixtures.  Run their .mjs bodies with this test runner's Node
 // executable, preserving the command arguments the production code sends.
 import childProcess from 'node:child_process';
-import { readFileSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { syncBuiltinESMExports } from 'node:module';
+import { basename, dirname, extname, join } from 'node:path';
 
 const { spawn: nativeSpawn, spawnSync: nativeSpawnSync } = childProcess;
 
@@ -25,6 +26,16 @@ function normalizeNodeFixture(command, args = []) {
     return [command, args];
   }
   if (command.endsWith('.mjs')) return [process.execPath, [command, ...args]];
+  const extension = extname(command).toLowerCase();
+  if (extension === '.cmd' || extension === '.bat') {
+    const sibling = join(dirname(command), `${basename(command, extension)}.ps1`);
+    if (existsSync(sibling)) {
+      return ['pwsh.exe', ['-NoLogo', '-NoProfile', '-NonInteractive', '-File', sibling, ...args]];
+    }
+  }
+  if (extension === '.ps1') {
+    return ['pwsh.exe', ['-NoLogo', '-NoProfile', '-NonInteractive', '-File', command, ...args]];
+  }
   try {
     const header = readFileSync(command, 'utf8').slice(0, 128);
     if (/^#!.*\bnode(?:\.exe)?\b/.test(header)) return [process.execPath, [command, ...args]];

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