@gajae-code/coding-agent 0.10.0 → 0.10.1

package/src/config/settings.ts

@@ -55,6 +55,12 @@ export interface RawSettings {
 	[key: string]: unknown;
 }
 
+type SettingsPatch = {
+	readonly path: string;
+	readonly value: unknown;
+	readonly generation: number;
+};
+
 export interface SettingsOptions {
 	/** Current working directory for project settings discovery */
 	cwd?: string;
@@ -207,12 +213,14 @@ export class Settings {
 	/** Merged view (global + project + overrides) */
 	#merged: RawSettings = {};
 
-	/** Paths modified during this session (for partial save) */
-	#modified = new Set<string>();
+	/** Latest dirty patch for each path, owned by its generation. */
+	#modified = new Map<string, SettingsPatch>();
+	#nextGeneration = 0;
 
 	/** Pending save (debounced) */
 	#saveTimer?: NodeJS.Timeout;
-	#savePromise?: Promise<void>;
+	#saveTail: Promise<void> = Promise.resolve();
+	#globalModelRoleTail: Promise<void> = Promise.resolve();
 
 	/** Whether to persist changes */
 	#persist: boolean;
@@ -320,9 +328,13 @@ export class Settings {
 	 */
 	set<P extends SettingPath>(path: P, value: SettingValue<P>): void {
 		const prev = this.get(path);
-		const segments = path.split(".");
-		setByPath(this.#global, segments, value);
-		this.#modified.add(path);
+		const patch: SettingsPatch = {
+			path,
+			value: structuredClone(value),
+			generation: ++this.#nextGeneration,
+		};
+		setByPath(this.#global, path.split("."), structuredClone(patch.value));
+		this.#modified.set(path, patch);
 		this.#rebuildMerged();
 		this.#queueSave();
 
@@ -366,12 +378,8 @@ export class Settings {
 			clearTimeout(this.#saveTimer);
 			this.#saveTimer = undefined;
 		}
-		if (this.#savePromise) {
-			await this.#savePromise;
-		}
-		if (this.#modified.size > 0) {
-			await this.#saveNow();
-		}
+		const save = this.#modified.size > 0 ? this.#saveNow() : this.#saveTail;
+		await save;
 	}
 
 	/**
@@ -385,12 +393,8 @@ export class Settings {
 			clearTimeout(this.#saveTimer);
 			this.#saveTimer = undefined;
 		}
-		if (this.#savePromise) {
-			await this.#savePromise;
-		}
-		if (this.#modified.size > 0) {
-			await this.#saveNow({ throwOnError: true });
-		}
+		const save = this.#modified.size > 0 ? this.#saveNow({ throwOnError: true }) : this.#saveTail;
+		await save;
 	}
 
 	async cloneForCwd(cwd: string): Promise<Settings> {
@@ -480,7 +484,6 @@ export class Settings {
 	 * Set a model role (helper for modelRoles record).
 	 */
 	setModelRole(role: ModelRole | string, modelId: string): void {
-		const current = shallowStringRecord(getByPath(this.#global, ["modelRoles"]));
 		const runtimeOverrides = getByPath(this.#overrides, ["modelRoles"]);
 		const updateRuntimeOverride =
 			!!runtimeOverrides &&
@@ -488,12 +491,55 @@ export class Settings {
 			!Array.isArray(runtimeOverrides) &&
 			Object.hasOwn(runtimeOverrides, role);
 
-		this.set("modelRoles", { ...current, [role]: modelId });
+		this.setGlobalModelRole(role, modelId);
 
 		if (updateRuntimeOverride) {
 			this.override("modelRoles", { ...shallowStringRecord(runtimeOverrides), [role]: modelId });
 		}
 	}
+
+	setGlobalModelRole(role: ModelRole | string, modelId: string | undefined): void {
+		const current = shallowStringRecord(getByPath(this.#global, ["modelRoles"]));
+		if (modelId === undefined) {
+			const { [role]: _removed, ...remaining } = current;
+			this.set("modelRoles", remaining);
+			return;
+		}
+		this.set("modelRoles", { ...current, [role]: modelId });
+	}
+
+	setGlobalModelRoleAndFlush(role: ModelRole | string, modelId: string | undefined): Promise<void> {
+		const transaction = this.#globalModelRoleTail.then(async () => {
+			const hadModelRoles = Object.hasOwn(this.#global, "modelRoles");
+			const previousModelRoles = structuredClone(this.#global.modelRoles);
+			const previousPatch = this.#modified.get("modelRoles");
+			this.setGlobalModelRole(role, modelId);
+			const generation = this.#modified.get("modelRoles")?.generation;
+			if (this.#saveTimer) {
+				clearTimeout(this.#saveTimer);
+				this.#saveTimer = undefined;
+			}
+			const save = this.#saveNow({ throwOnError: true });
+			try {
+				await save;
+			} catch (error) {
+				const currentPatch = this.#modified.get("modelRoles");
+				if (currentPatch?.generation === generation) {
+					if (hadModelRoles) this.#global.modelRoles = previousModelRoles;
+					else delete this.#global.modelRoles;
+					if (previousPatch) this.#modified.set("modelRoles", previousPatch);
+					else this.#modified.delete("modelRoles");
+					this.#rebuildMerged();
+				}
+				throw error;
+			}
+		});
+		this.#globalModelRoleTail = transaction.then(
+			() => undefined,
+			() => undefined,
+		);
+		return transaction;
+	}
 	/**
 	 * Set an agent model override while keeping any live runtime override aligned.
 	 *
@@ -824,15 +870,10 @@ export class Settings {
 	#queueSave(): void {
 		if (!this.#persist || !this.#configPath) return;
 
-		// Debounce: wait 100ms for more changes
-		if (this.#saveTimer) {
-			clearTimeout(this.#saveTimer);
-		}
+		if (this.#saveTimer) clearTimeout(this.#saveTimer);
 		this.#saveTimer = setTimeout(() => {
 			this.#saveTimer = undefined;
-			this.#saveNow().catch(err => {
-				logger.warn("Settings: background save failed", { error: String(err) });
-			});
+			void this.#saveNow();
 		}, 100);
 	}
 
@@ -840,30 +881,40 @@ export class Settings {
 		if (!this.#persist || !this.#configPath || this.#modified.size === 0) return;
 
 		const configPath = this.#configPath;
-		const modifiedPaths = [...this.#modified];
-		this.#modified.clear();
+		const patches = [...this.#modified.values()];
 
-		try {
-			await withFileLock(configPath, async () => {
-				// Re-read to preserve external changes
+		const save = this.#saveTail.then(() =>
+			withFileLock(configPath, async () => {
 				const current = await this.#loadYaml(configPath);
-
-				// Apply only our modified paths
-				for (const modPath of modifiedPaths) {
-					const segments = modPath.split(".");
-					const value = getByPath(this.#global, segments);
-					setByPath(current, segments, value);
+				for (const patch of patches) {
+					setByPath(current, patch.path.split("."), patch.value);
+				}
+				await Bun.write(configPath, YAML.stringify(current, null, 2));
+				for (const patch of patches) {
+					if (this.#modified.get(patch.path)?.generation === patch.generation) {
+						this.#modified.delete(patch.path);
+					}
 				}
-
-				// Update our global with any external changes we preserved
 				this.#global = current;
-				await Bun.write(configPath, YAML.stringify(this.#global, null, 2));
-			});
+				for (const patch of this.#modified.values()) {
+					setByPath(this.#global, patch.path.split("."), structuredClone(patch.value));
+				}
+			}),
+		);
+		this.#saveTail = save.then(
+			() => undefined,
+			() => undefined,
+		);
+
+		try {
+			await save;
 		} catch (error) {
 			logger.warn("Settings: save failed", { error: String(error) });
-			// Re-add failed paths for retry
-			for (const p of modifiedPaths) {
-				this.#modified.add(p);
+			for (const patch of patches) {
+				const currentPatch = this.#modified.get(patch.path);
+				if (currentPatch?.generation === patch.generation) {
+					this.#modified.set(patch.path, patch);
+				}
 			}
 			if (options.throwOnError) {
 				this.#rebuildMerged();

package/src/coordinator/contract.ts

@@ -12,6 +12,7 @@ export const COORDINATOR_MCP_TOOL_NAMES = [
 	"gjc_coordinator_watch_events",
 	"gjc_coordinator_register_session",
 	"gjc_coordinator_start_session",
+	"gjc_coordinator_stop_session",
 	"gjc_coordinator_send_prompt",
 	"gjc_coordinator_submit_question_answer",
 	"gjc_coordinator_read_turn",

package/src/coordinator-mcp/policy.ts

@@ -1,6 +1,12 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { coordinatorMcpStateRoot, gjcRoot } from "../gjc-runtime/session-layout";
+import {
+	DEFAULT_SESSION_IDLE_TTL_MS,
+	DEFAULT_SESSION_SWEEP_INTERVAL_MS,
+	MIN_SESSION_IDLE_TTL_MS,
+	MIN_SESSION_SWEEP_INTERVAL_MS,
+} from "./session-reaper";
 
 export type CoordinatorMutationClass = "sessions" | "questions" | "reports";
 
@@ -16,6 +22,9 @@ export interface CoordinatorMcpConfig {
 	namespace: CoordinatorNamespace;
 	stateRoot: string;
 	sessionCommand: string | null;
+	sessionIdleTtlMs: number;
+	sessionSweepIntervalMs: number;
+	forceStopEnabled: boolean;
 }
 
 export interface CoordinatorMutationRequest {
@@ -32,6 +41,16 @@ const LEGACY_MUTATION_CLASS_ALIASES = new Map<string, CoordinatorMutationClass>(
 	["report", "reports"],
 ]);
 
+function parsePositiveIntMs(value: string | undefined, fallback: number, floor: number): number {
+	const parsed = Number.parseInt((value ?? "").trim(), 10);
+	if (!Number.isFinite(parsed) || parsed <= 0) return fallback;
+	return Math.max(floor, parsed);
+}
+
+function parseBool(value: string | undefined): boolean {
+	return /^(1|true|yes|on)$/i.test((value ?? "").trim());
+}
+
 function parseList(value: string | undefined): string[] {
 	return (value ?? "")
 		.split(/[\n,;:]+/)
@@ -98,6 +117,17 @@ export function buildCoordinatorMcpConfig(env: NodeJS.ProcessEnv = process.env):
 		},
 		stateRoot: path.resolve(stateRoot),
 		sessionCommand: env.GJC_COORDINATOR_MCP_SESSION_COMMAND?.trim() || null,
+		sessionIdleTtlMs: parsePositiveIntMs(
+			env.GJC_COORDINATOR_MCP_SESSION_IDLE_TTL_MS,
+			DEFAULT_SESSION_IDLE_TTL_MS,
+			MIN_SESSION_IDLE_TTL_MS,
+		),
+		sessionSweepIntervalMs: parsePositiveIntMs(
+			env.GJC_COORDINATOR_MCP_SESSION_SWEEP_INTERVAL_MS,
+			DEFAULT_SESSION_SWEEP_INTERVAL_MS,
+			MIN_SESSION_SWEEP_INTERVAL_MS,
+		),
+		forceStopEnabled: parseBool(env.GJC_COORDINATOR_MCP_FORCE_STOP),
 	};
 }