@gajae-code/coding-agent 0.18.0 → 0.18.1

package/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 ## [Unreleased]
 
+## [0.18.1] - 2026-09-29
+
+### Fixed
+
+- `./install.sh --dev` and `gjc doctor` no longer treat this checkout's own `gjc` and `가재씨` links as foreign after a macOS reboot. The ownership receipt still binds the link by inode, but no longer compares the recorded `st_dev`, which APFS changes across boots. A receipt left behind after its link was removed by hand is recognized as this checkout's and replaced, while a receipt that names another checkout is refused before either link is touched.
+
+- Loading `search` or `eval` for the first time no longer changes its advertised tool description, so the provider-visible `tools` block and the prompt-cache prefix stay stable. Before the implementation loads, the description is now rendered from the session (hashline or line-number display for `search`, the allowed Python/JavaScript backends for `eval`), instead of taking the stub-session text from the generated catalog.
+
+- Keep the provider-visible `task` description stable before and after the tool loads by rendering it from session settings without listing configured agent names; unknown-agent errors continue to list all visible agents. IRC guidance is now independent of whether the IRC tool becomes available mid-session.
+
+- Windows binary update via exactReplaceRetained now succeeds with owner-only ACL enforcement. The retained update path required READ_CONTROL on both the staged source and current destination handles to query ACL ownership, but the handles were opened without READ_CONTROL, causing every real Windows update to fail with acl_unavailable. (#6096)
+
+- Reduced macOS idle CPU from the bash shell guardian: the Darwin ancestry poll now reads kernel process identities first and validates only new descendants with `Process.fromPid`, instead of querying every process on each scan. A descendant whose validation fails transiently is retried on the next poll rather than dropped from cleanup.
+
+- User-cancelled turns (ACP session/cancel, SDK turn.abort) settle as `cancelled` again instead of a failed terminal (regression from 0.18.0).
+
+- ACP cancels received before SDK prompt admission now stay attached to the waiter: the prompt is not dispatched, or a real terminal abort is retried after admission, rather than letting the turn continue.
+
+- ACP MCP launch failures now retain the broker lifecycle cause and a bounded, credential-free diagnostic, while SDK transport failures keep their original retry code.
+
+- `gjc doctor --fix --repair service.restart-owned` on the SDK broker now reports a broker refusal, such as `restart_busy` while any session is live, as `blocked` with reason `prepare_refused:<code>` and no side effect. It was previously reported as `uncertain` / `repair_execution_unverified` with `sideEffectStarted: true`. A refused commit now also cancels its prepared reservation instead of leaving new work refused until the lease expires.
+
+- Treat cooperative SDK prompt pauses as successful terminal stops instead of unreported failures.
+
+- A displayed extension message sent from `session_start` (such as a handoff summary) now appears once at startup instead of twice, and startup notices shown before the first paint are no longer wiped. Transcript rebuilds requested before the initial transcript paint are skipped; the first paint renders the full session.
+
+### Documentation
+
+- Updated: Clarified that human reviewers only need to approve the current head on GitHub; body verdict lines are required only for agent reviewers and owner self-approval.
+
+### Bug fixes
+
+- Fixed: Human approval now works when a PR has no verdict line in its body. GJC checks GitHub reviews for human approval on the current head instead.
+- Fixed: A valid PR contract with no approval yet now shows a "Waiting for approval" notice instead of an error.
+
 ## [0.18.0] - 2026-09-27
 
 ### Added

package/dist/types/config/settings-schema.d.ts

@@ -2183,11 +2183,11 @@ export declare const SETTINGS_SCHEMA: {
         readonly ui: {
             readonly tab: "context";
             readonly label: "Compaction Threshold";
-            readonly description: "Percent threshold for context maintenance; set to Default to use legacy reserve-based behavior";
+            readonly description: "Percent threshold for context maintenance; the 300,000-token default cap applies only with adaptive mode disabled (except during context promotion)";
             readonly options: readonly [{
                 readonly value: "default";
                 readonly label: "Default";
-                readonly description: "Legacy reserve-based threshold";
+                readonly description: "300,000-token default cap applies only with adaptive mode disabled (except during context promotion)";
             }, {
                 readonly value: "10";
                 readonly label: "10%";

package/dist/types/gjc-runtime/session-state-sidecar.d.ts

@@ -39,6 +39,7 @@ export declare const __sessionStateSidecarTestHooks: {
     beforeRescopeJournalWrite?: (cwd: string) => void | Promise<void>;
     beforePersistFromEvent?: (eventType: string, cwd: string) => void | Promise<void>;
     beforeRescopePublish?: () => void | Promise<void>;
+    disableCoordinatorFileSyncForTests?: boolean;
 };
 interface RuntimeStateEvent {
     type: string;

package/dist/types/sdk/acp/adapter.d.ts

@@ -61,7 +61,9 @@ export declare class AcpSdkAdapterError extends Error {
 }
 /**
  * The error an ACP session launch must throw once a lifecycle request that carried MCP
- * servers has failed.
+ * servers has failed. Broker transport failures from the SDK client are preserved verbatim;
+ * other failures keep the adapter's `unavailable` code while carrying a bounded, credential-free
+ * copy of the original code and message as their cause diagnostic.
  */
 export declare function acpMcpLaunchFailure(error: unknown, mcpServers: SessionLifecycleMcpServer[]): unknown;
 export type AcpReconnectFailedHandler = (error: SdkClientError) => void;

package/dist/types/sdk/bus/telegram-daemon-contract.d.ts

@@ -292,7 +292,7 @@ export declare const SDK_LIFECYCLE_ROUTER_PROTOCOL_VERSION = 1;
  * Generation 193 gates streamed content on negotiated observer capabilities,
  * so existing owners are replaced before exposing the new observer path.
  */
-export declare const DAEMON_GENERATION = 196;
+export declare const DAEMON_GENERATION = 197;
 /**
  * Serving-compatibility boundary for daemon lifecycle requests. Epoch 7
  * requires durable publication receipts and acknowledged attachment dispatch,

package/dist/types/sdk/client/client.d.ts

@@ -2,6 +2,8 @@ export type SdkErrorCode = "invalid_input" | "unknown_operation" | "not_found" |
 export declare class SdkClientError extends Error {
     readonly code: SdkErrorCode;
     readonly details: unknown;
+    /** True only when the SDK client itself reported a transport failure, never for a server error frame. */
+    readonly transport: boolean;
     /**
      * Reconnect-cycle diagnostics, separate from `details` because `details` is an
      * established contract: callers read the terminating transport error straight off
@@ -10,7 +12,9 @@ export declare class SdkClientError extends Error {
      * break every such reader, so the new attribution rides alongside it instead.
      */
     readonly reconnect?: SdkReconnectExhaustedDetails;
-    constructor(code: SdkErrorCode, message: string, details?: unknown, reconnect?: SdkReconnectExhaustedDetails);
+    constructor(code: SdkErrorCode, message: string, details?: unknown, reconnect?: SdkReconnectExhaustedDetails, options?: {
+        transport?: boolean;
+    });
 }
 /** A prepared transport operation failed before any wire handoff. */
 export declare class SdkPreparedDispatchError extends SdkClientError {

package/dist/types/session/agent-session.d.ts

@@ -1940,6 +1940,8 @@ export declare class AgentSession {
      * Get session statistics.
      */
     getSessionStats(): SessionStats;
+    /** Current auto-compaction threshold, including active model-promotion policy. */
+    getAutoCompactionThresholdTokens(contextTokens?: number): number;
     /**
      * Get current context usage statistics.
      * Uses the last assistant message's usage data when available,

package/dist/types/task/index.d.ts

@@ -51,7 +51,6 @@ export declare class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskT
      */
     get parameters(): TaskToolSchemaInstance;
     renderCall(args: unknown, options: Parameters<typeof renderTaskCall>[1], theme: Theme): import("@gajae-code/tui").Component;
-    /** Dynamic description that reflects current disabled-agent settings */
     get description(): string;
     private constructor();
     /**

package/dist/types/tools/descriptors.d.ts

@@ -17,6 +17,11 @@ export interface ToolDescriptorMetadata {
     readonly intent?: AgentTool<any, any, any>["intent"];
     readonly parametersForSession?: (session?: ToolSession) => TSchema;
     readonly parameters?: TSchema;
+    /**
+     * Renders the description the loaded tool will report for this session. Tools whose prompt text
+     * depends on session settings need it, or the advertised text changes on first load (#5992).
+     */
+    readonly descriptionForSession?: (session: ToolSession) => string;
     readonly description?: string;
     readonly label?: string;
     readonly customWireName?: string;

package/dist/types/tools/eval-backends.d.ts

@@ -0,0 +1,37 @@
+import type { ToolSession } from ".";
+export interface EvalBackendsAllowance {
+    python: boolean;
+    js: boolean;
+}
+/**
+ * Parse the `GJC_PY` multi-value token into per-backend booleans.
+ *
+ * Tokens (case-insensitive):
+ * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
+ * - `1` / `py`   → Python only (`{ py: true, js: false }`)
+ * - `js`         → JavaScript only (`{ py: false, js: true }`)
+ * - `mix` / `both` → both backends (`{ py: true, js: true }`)
+ *
+ * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
+ * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
+ * per-key settings. This matches the documented contract that invalid values
+ * are ignored.
+ */
+export declare function parseGjcPy(env: Record<string, string | undefined>): {
+    py: boolean;
+    js: boolean;
+} | null;
+/**
+ * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
+ * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
+ * Returns `null` when no env override is set so the caller can defer to settings.
+ */
+export declare function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null;
+/** Read per-backend allowance from settings (defaults true). */
+export declare function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance;
+/**
+ * Materialize the active eval backend allowance. `GJC_PY` takes precedence
+ * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
+ * per-key settings (defaults true). When no env override is set, settings win.
+ */
+export declare function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance;

package/dist/types/tools/eval.d.ts

@@ -42,11 +42,7 @@ export type EvalToolResult = {
     details: EvalToolDetails | undefined;
 };
 export type EvalProxyExecutor = (params: EvalToolParams, signal?: AbortSignal) => Promise<EvalToolResult>;
-export interface EvalToolDescriptionOptions {
-    py?: boolean;
-    js?: boolean;
-}
-export declare function getEvalToolDescription(options?: EvalToolDescriptionOptions): string;
+export { type EvalToolDescriptionOptions, getEvalToolDescription } from "./session-descriptions";
 export interface EvalToolOptions {
     proxyExecutor?: EvalProxyExecutor;
 }
@@ -105,4 +101,3 @@ export declare const evalToolRenderer: {
     mergeCallAndResult: boolean;
     inline: boolean;
 };
-export {};

package/dist/types/tools/index.d.ts

@@ -405,42 +405,7 @@ export interface BuiltinCapabilityCatalogEntry {
 }
 export declare const BUILTIN_CAPABILITY_CATALOG: readonly BuiltinCapabilityCatalogEntry[];
 export type ToolName = keyof typeof BUILTIN_TOOLS;
-export interface EvalBackendsAllowance {
-    python: boolean;
-    js: boolean;
-}
-/**
- * Parse the `GJC_PY` multi-value token into per-backend booleans.
- *
- * Tokens (case-insensitive):
- * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
- * - `1` / `py`   → Python only (`{ py: true, js: false }`)
- * - `js`         → JavaScript only (`{ py: false, js: true }`)
- * - `mix` / `both` → both backends (`{ py: true, js: true }`)
- *
- * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
- * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
- * per-key settings. This matches the documented contract that invalid values
- * are ignored.
- */
-export declare function parseGjcPy(env: Record<string, string | undefined>): {
-    py: boolean;
-    js: boolean;
-} | null;
-/**
- * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
- * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
- * Returns `null` when no env override is set so the caller can defer to settings.
- */
-export declare function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null;
-/** Read per-backend allowance from settings (defaults true). */
-export declare function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance;
-/**
- * Materialize the active eval backend allowance. `GJC_PY` takes precedence
- * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
- * per-key settings (defaults true). When no env override is set, settings win.
- */
-export declare function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance;
+export { type EvalBackendsAllowance, parseGjcPy, readEvalBackendsAllowance, resolveEvalBackends, resolveEvalBackendsFromEnv, } from "./eval-backends";
 /**
  * Create tools from the descriptor registry.
  */

package/dist/types/tools/session-descriptions.d.ts

@@ -0,0 +1,22 @@
+import { type TaskToolSchemaInstance } from "../task/types";
+interface DescriptionSettings {
+    get(key: "task.maxConcurrency" | "task.isolation.mode" | "task.simple" | "task.disabledAgents" | "eval.py" | "eval.js" | "readLineNumbers" | "readHashLines" | "edit.mode"): unknown;
+    getEffectiveAutorouting(): {
+        active: boolean;
+    };
+}
+interface DescriptionSession {
+    settings: DescriptionSettings;
+    getSessionSpawns?: () => string | null;
+    hasEditTool?: boolean;
+}
+export interface EvalToolDescriptionOptions {
+    py?: boolean;
+    js?: boolean;
+}
+export declare function getEvalToolDescription(options?: EvalToolDescriptionOptions): string;
+export declare function evalToolDescriptionForSession(session: DescriptionSession | null | undefined): string;
+export declare function searchToolDescriptionForSession(session: DescriptionSession): string;
+export declare function renderTaskDescription(session: DescriptionSession): string;
+export declare function taskParametersForSession(session?: DescriptionSession): TaskToolSchemaInstance;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/coding-agent",
-	"version": "0.18.0",
+	"version": "0.18.1",
 	"description": "Gajae Code CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -57,12 +57,12 @@
 		"@agentclientprotocol/sdk": "1.3.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@gajae-code/stats": "0.18.0",
-		"@gajae-code/agent-core": "0.18.0",
-		"@gajae-code/ai": "0.18.0",
-		"@gajae-code/natives": "0.18.0",
-		"@gajae-code/tui": "0.18.0",
-		"@gajae-code/utils": "0.18.0",
+		"@gajae-code/stats": "0.18.1",
+		"@gajae-code/agent-core": "0.18.1",
+		"@gajae-code/ai": "0.18.1",
+		"@gajae-code/natives": "0.18.1",
+		"@gajae-code/tui": "0.18.1",
+		"@gajae-code/utils": "0.18.1",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/scripts/generate-sdk-operation-inventory.ts

@@ -203,6 +203,8 @@ const LOCKED_EXCLUSIONS: Readonly<Record<string, string>> = {
 	"agent_session:queueDeferredMessage": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:queueDeferredMessageForTests": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:getContextUsageObservabilityForTests": "test-only observability, not a user-facing control seam",
+	"agent_session:getAutoCompactionThresholdTokens":
+		"internal compaction-threshold accessor feeding the /context breakdown; exposed through context.get, not an independent SDK operation",
 	"agent_session:purgeQueuedCustomMessages": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:clearQueue": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:popLastQueuedMessage": "internal accessor/plumbing, not a user-facing control seam",

package/src/cli/doctor/managed-link.ts

@@ -217,11 +217,11 @@ export async function describeManagedLink(
 	const parent = await fs.lstat(parentPath, { bigint: true }).catch(() => undefined);
 	const trustedReceipt =
 		!!body && ownedReceipt(receipt) && publicCandidates.some(candidate => candidate.path === body.source);
+	// The recorded st_dev is not compared: macOS APFS gives the same volume a new st_dev after a reboot,
+	// which made every pre-reboot receipt look foreign (#5990). The inode binds the link, and the volume
+	// is re-derived from the parent directory observed in the same snapshot.
 	const identityMatches =
-		!!body &&
-		!!link &&
-		body.identity.dev === link.stat.dev.toString() &&
-		body.identity.ino === link.stat.ino.toString();
+		!!body && !!link && body.identity.ino === link.stat.ino.toString() && link.stat.dev === link.parent.dev;
 	const owned = trustedReceipt && (link ? identityMatches : occupant === undefined);
 	const recordedCandidate = body && publicCandidates.find(candidate => candidate.path === body.source);
 	let status: ManagedLinkDescriptor["status"] = "unknown";

package/src/cli/doctor/repairs.ts

@@ -892,7 +892,15 @@ export async function executeSelectedDoctorRepair(
 				outcome =
 					result.kind === "restarted"
 						? { kind: result.kind, successorIncarnation: result.successor.incarnation }
-						: { kind: result.kind, ...("reason" in result ? { reason: result.reason } : {}) };
+						: {
+								kind: result.kind,
+								// A broker refusal carries the broker's own code (e.g. restart_busy).
+								...("reason" in result
+									? { reason: result.reason }
+									: "code" in result
+										? { reason: result.code }
+										: {}),
+							};
 			} else {
 				settings = await Settings.loadForScope({ cwd: context.cwd, agentDir: context.agentRoot.locator });
 				const result = await restartDaemonForDoctor({

package/src/config/settings-schema.ts

@@ -2050,9 +2050,15 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "context",
 			label: "Compaction Threshold",
-			description: "Percent threshold for context maintenance; set to Default to use legacy reserve-based behavior",
+			description:
+				"Percent threshold for context maintenance; the 300,000-token default cap applies only with adaptive mode disabled (except during context promotion)",
 			options: [
-				{ value: "default", label: "Default", description: "Legacy reserve-based threshold" },
+				{
+					value: "default",
+					label: "Default",
+					description:
+						"300,000-token default cap applies only with adaptive mode disabled (except during context promotion)",
+				},
 				{ value: "10", label: "10%", description: "Extremely early maintenance" },
 				{ value: "20", label: "20%", description: "Very early maintenance" },
 				{ value: "30", label: "30%", description: "Early maintenance" },

package/src/exec/bash-shell-guardian.ts

@@ -175,18 +175,28 @@ function createDarwinAncestryTracker(owned: Map<string, NativeProcess>): DarwinA
 			},
 		});
 		const knownUniqueIds = new Set<bigint>();
+		// Ancestry evidence (knownUniqueIds) and successful retention are tracked
+		// separately: a descendant whose process validation fails stays known, so its
+		// own children still chain, but it is retried on every poll until retained.
+		const retainedUniqueIds = new Set<bigint>();
 		const { Process } = require("@gajae-code/natives") as NativeProcessBindings;
+		// Reuse buffer across poll iterations to avoid allocations inside the loop.
+		const identityBuffer = new Uint8Array(56);
+		const identityView = new DataView(identityBuffer.buffer);
 		const uniqueIdentity = (pid: number): { uniqueId: bigint; parentUniqueId: bigint } | undefined => {
-			const info = new Uint8Array(56);
-			if (proc.symbols.proc_pidinfo(pid, 17, 0, ptr(info), info.byteLength) !== info.byteLength) return undefined;
-			const view = new DataView(info.buffer);
-			return { uniqueId: view.getBigUint64(16, true), parentUniqueId: view.getBigUint64(24, true) };
+			const bytes = proc.symbols.proc_pidinfo(pid, 17, 0, ptr(identityBuffer), identityBuffer.byteLength);
+			if (bytes !== identityBuffer.byteLength) return undefined;
+			return {
+				uniqueId: identityView.getBigUint64(16, true),
+				parentUniqueId: identityView.getBigUint64(24, true),
+			};
 		};
 		const track = (processRef: NativeProcess, signedUniqueId?: bigint): boolean => {
 			const identity = signedUniqueId === undefined ? uniqueIdentity(processRef.pid) : undefined;
 			const uniqueId = signedUniqueId ?? identity?.uniqueId;
 			if (uniqueId === undefined) return false;
 			knownUniqueIds.add(uniqueId);
+			retainedUniqueIds.add(uniqueId);
 			retainOwnedProcess(owned, processRef);
 			return true;
 		};
@@ -201,23 +211,29 @@ function createDarwinAncestryTracker(owned: Map<string, NativeProcess>): DarwinA
 				const pids = new Int32Array(capacity + 64);
 				const count = proc.symbols.proc_listallpids(ptr(pids), pids.byteLength);
 				if (count <= 0) return false;
-				const candidates = new Map<
-					number,
-					{ uniqueId: bigint; parentUniqueId: bigint; processRef: NativeProcess }
-				>();
+				// First pass: collect identities for all pids, avoiding Process.fromPid calls.
+				const identities = new Map<number, { uniqueId: bigint; parentUniqueId: bigint }>();
 				for (let index = 0; index < count; index++) {
 					const pid = pids[index]!;
-					const processRef = Process.fromPid(pid);
-					if (!processRef) continue;
+					const identity = uniqueIdentity(pid);
+					if (identity) identities.set(pid, identity);
+				}
+				// Extend ancestry evidence, then validate every listed pid that is known but
+				// not yet retained: new descendants plus earlier ones whose Process.fromPid
+				// check failed (it can return null for a live pid it could not query). A pid
+				// whose identity changed between the listing and the check was reused; skip it.
+				extendOwnedDarwinAncestry(knownUniqueIds, identities);
+				for (const [pid, listed] of identities) {
+					if (!knownUniqueIds.has(listed.uniqueId) || retainedUniqueIds.has(listed.uniqueId)) continue;
+					const before = Process.fromPid(pid);
+					if (!before) continue;
 					const identity = uniqueIdentity(pid);
 					const after = Process.fromPid(pid);
-					if (identity && after?.incarnation === processRef.incarnation) {
-						candidates.set(pid, { ...identity, processRef });
+					if (identity?.uniqueId === listed.uniqueId && after?.incarnation === before.incarnation) {
+						retainOwnedProcess(owned, after);
+						retainedUniqueIds.add(listed.uniqueId);
 					}
 				}
-				for (const pid of extendOwnedDarwinAncestry(knownUniqueIds, candidates)) {
-					retainOwnedProcess(owned, candidates.get(pid)!.processRef);
-				}
 				return true;
 			},
 			close() {

package/src/gjc-runtime/session-state-sidecar.ts

@@ -12,6 +12,7 @@ import {
 import { normalizePathForComparison, postmortem } from "@gajae-code/utils";
 import { withFileLock } from "../config/file-lock";
 import {
+	type CoordinatorAtomicWriteOptions,
 	ensureCoordinatorDirectory,
 	syncCoordinatorDirectory,
 	syncCoordinatorFile,
@@ -177,8 +178,25 @@ export const __sessionStateSidecarTestHooks: {
 	beforeRescopeJournalWrite?: (cwd: string) => void | Promise<void>;
 	beforePersistFromEvent?: (eventType: string, cwd: string) => void | Promise<void>;
 	beforeRescopePublish?: () => void | Promise<void>;
+	disableCoordinatorFileSyncForTests?: boolean;
 } = {};
 
+/** Create coordinator atomic write options with test hook support for disabling fsync. */
+function coordinatorAtomicWriteOptionsForTests<T extends CoordinatorAtomicWriteOptions>(
+	overrides?: T,
+): CoordinatorAtomicWriteOptions {
+	const options = overrides ?? ({} as T);
+	if (!__sessionStateSidecarTestHooks.disableCoordinatorFileSyncForTests) {
+		return options;
+	}
+	return {
+		...options,
+		syncFile: async () => {
+			/* skip fsync in tests */
+		},
+	};
+}
+
 interface RuntimeStateEvent {
 	type: string;
 	messages?: unknown[];
@@ -1806,35 +1824,39 @@ async function writeStateFileSyncConditional(
 	expectedDestination: NativeExactFileIdentity | null,
 ): Promise<void> {
 	const contents = `${JSON.stringify(finalizeSidecarPayload(payload, keyId))}\n`;
-	await writeCoordinatorAtomic(stateFile, contents, {
-		rename: async (source, destination) => {
-			if (!expectedDestination) {
-				const published = renameNoReplacePath(source, destination);
-				if (!published.ok) throw new PreviousRuntimeStateReadError();
-				return;
-			}
-			const stat = fsSync.lstatSync(source, { bigint: true });
-			const parent = fsSync.lstatSync(path.dirname(source), { bigint: true });
-			if (!stat.isFile() || stat.isSymbolicLink() || !parent.isDirectory() || parent.isSymbolicLink())
-				throw new PreviousRuntimeStateReadError();
-			const replaced = exactReplacePath(
-				source,
-				destination,
-				{
-					dev: stat.dev,
-					ino: stat.ino,
-					nlink: stat.nlink,
-					parentDev: parent.dev,
-					parentIno: parent.ino,
-					size: stat.size,
-					mtimeNs: stat.mtimeNs,
-					sha256: createHash("sha256").update(contents).digest("hex"),
-				},
-				expectedDestination,
-			);
-			if (!replaced.ok) throw new PreviousRuntimeStateReadError();
-		},
-	});
+	await writeCoordinatorAtomic(
+		stateFile,
+		contents,
+		coordinatorAtomicWriteOptionsForTests({
+			rename: async (source: string, destination: string) => {
+				if (!expectedDestination) {
+					const published = renameNoReplacePath(source, destination);
+					if (!published.ok) throw new PreviousRuntimeStateReadError();
+					return;
+				}
+				const stat = fsSync.lstatSync(source, { bigint: true });
+				const parent = fsSync.lstatSync(path.dirname(source), { bigint: true });
+				if (!stat.isFile() || stat.isSymbolicLink() || !parent.isDirectory() || parent.isSymbolicLink())
+					throw new PreviousRuntimeStateReadError();
+				const replaced = exactReplacePath(
+					source,
+					destination,
+					{
+						dev: stat.dev,
+						ino: stat.ino,
+						nlink: stat.nlink,
+						parentDev: parent.dev,
+						parentIno: parent.ino,
+						size: stat.size,
+						mtimeNs: stat.mtimeNs,
+						sha256: createHash("sha256").update(contents).digest("hex"),
+					},
+					expectedDestination,
+				);
+				if (!replaced.ok) throw new PreviousRuntimeStateReadError();
+			},
+		}),
+	);
 }
 
 /**
@@ -1967,7 +1989,7 @@ async function withStateFileLocks<T>(stateFiles: readonly string[], operation: (
 }
 
 async function writeStateFile(stateFile: string, payload: Record<string, unknown>): Promise<void> {
-	await writeCoordinatorAtomic(stateFile, `${JSON.stringify(payload)}\n`);
+	await writeCoordinatorAtomic(stateFile, `${JSON.stringify(payload)}\n`, coordinatorAtomicWriteOptionsForTests());
 }
 
 function contextWithManagedOwnerGeneration(context: RuntimeStateContext): RuntimeStateContext {
@@ -2471,12 +2493,16 @@ export async function prepareCoordinatorRuntimeStateRescope(input: {
 					).toString("base64");
 				}
 				const writeJournal = async (journalFile: string): Promise<void> => {
-					await writeCoordinatorAtomic(journalFile, `${JSON.stringify(journal)}\n`, {
-						rename: async (source, destination) => {
-							const published = renameNoReplacePath(source, destination);
-							if (!published.ok) throw new PreviousRuntimeStateReadError();
-						},
-					});
+					await writeCoordinatorAtomic(
+						journalFile,
+						`${JSON.stringify(journal)}\n`,
+						coordinatorAtomicWriteOptionsForTests({
+							rename: async (source: string, destination: string) => {
+								const published = renameNoReplacePath(source, destination);
+								if (!published.ok) throw new PreviousRuntimeStateReadError();
+							},
+						}),
+					);
 				};
 				await __sessionStateSidecarTestHooks.beforeRescopeJournalWrite?.(previousCwd);
 				assertPinnedDirectoryIdentity(input.previousCwd, previousCwdIdentity);
@@ -2532,28 +2558,32 @@ export async function markCoordinatorRuntimeStateRescopePublishing(
 			).toString("base64");
 		}
 		const contents = `${JSON.stringify(journal)}\n`;
-		await writeCoordinatorAtomic(journalFile, contents, {
-			rename: async (source, destination) => {
-				const sourceStat = fsSync.lstatSync(source, { bigint: true });
-				const sourceParent = fsSync.lstatSync(path.dirname(source), { bigint: true });
-				const replaced = exactReplacePath(
-					source,
-					destination,
-					{
-						dev: sourceStat.dev,
-						ino: sourceStat.ino,
-						nlink: sourceStat.nlink,
-						parentDev: sourceParent.dev,
-						parentIno: sourceParent.ino,
-						size: sourceStat.size,
-						mtimeNs: sourceStat.mtimeNs,
-						sha256: createHash("sha256").update(contents).digest("hex"),
-					},
-					observed.identity,
-				);
-				if (!replaced.ok) throw new PreviousRuntimeStateReadError();
-			},
-		});
+		await writeCoordinatorAtomic(
+			journalFile,
+			contents,
+			coordinatorAtomicWriteOptionsForTests({
+				rename: async (source: string, destination: string) => {
+					const sourceStat = fsSync.lstatSync(source, { bigint: true });
+					const sourceParent = fsSync.lstatSync(path.dirname(source), { bigint: true });
+					const replaced = exactReplacePath(
+						source,
+						destination,
+						{
+							dev: sourceStat.dev,
+							ino: sourceStat.ino,
+							nlink: sourceStat.nlink,
+							parentDev: sourceParent.dev,
+							parentIno: sourceParent.ino,
+							size: sourceStat.size,
+							mtimeNs: sourceStat.mtimeNs,
+							sha256: createHash("sha256").update(contents).digest("hex"),
+						},
+						observed.identity,
+					);
+					if (!replaced.ok) throw new PreviousRuntimeStateReadError();
+				},
+			}),
+		);
 	}
 }