@gajae-code/coding-agent 0.18.6 → 0.18.7

package/src/config/settings.ts

@@ -1104,6 +1104,41 @@ export class Settings implements NotificationSettingsReader {
 		if (saveError !== undefined) throw saveError;
 	}
 
+	/** Copy execution settings without reloading, persisting, or sharing mutable layers. */
+	snapshot(): Settings {
+		const cloned = new Settings({ cwd: this.#cwd, agentDir: this.#agentDir, inMemory: true });
+		cloned.#global = structuredClone(this.#global);
+		cloned.#project = structuredClone(this.#project);
+		cloned.#overrides = structuredClone(this.#overrides);
+		cloned.#merged = structuredClone(this.#merged);
+		cloned.#schemaReport = structuredClone(this.#schemaReport);
+		cloned.#autoroutingEffective = structuredClone(this.#autoroutingEffective);
+		cloned.#autoroutingLocalIssues = structuredClone(this.#autoroutingLocalIssues);
+		cloned.#schemaMigrationPending = this.#schemaMigrationPending;
+		cloned.#futureSchemaVersion = this.#futureSchemaVersion;
+		cloned.#hasMalformedConfigRoot = this.#hasMalformedConfigRoot;
+		cloned.#hasRecoveredConfigSyntax = this.#hasRecoveredConfigSyntax;
+		cloned.#hasInvalidNotificationGlobal = this.#hasInvalidNotificationGlobal;
+		cloned.#notificationValidationGeneration = this.#notificationValidationGeneration;
+		cloned.#rawNotificationConfig = structuredClone(this.#rawNotificationConfig);
+		cloned.#durableRawNotificationConfig = structuredClone(this.#durableRawNotificationConfig);
+		cloned.#durableNotificationFingerprint = this.#durableNotificationFingerprint;
+		return cloned;
+	}
+
+	/** Resolve a retained execution's project layer without persistence or global hooks. */
+	async snapshotForCwd(cwd: string): Promise<Settings> {
+		const cloned = this.snapshot();
+		if (path.resolve(cwd) === path.resolve(this.#cwd)) return cloned;
+		cloned.#cwd = path.resolve(cwd);
+		cloned.#readonly = true;
+		cloned.#project = {};
+		cloned.#rebuildMerged();
+		cloned.#project = await cloned.#loadProjectSettings(true);
+		await cloned.#normalizeAfterLoad(false);
+		return cloned;
+	}
+
 	async cloneForCwd(cwd: string): Promise<Settings> {
 		// A clone shares the same config queue. Settle an already-reserved local
 		// debounce before the clone can enqueue a durable selector, preventing it
@@ -1572,9 +1607,14 @@ export class Settings implements NotificationSettingsReader {
 		return reconciled.settings;
 	}
 
-	async #loadProjectSettings(): Promise<RawSettings> {
+	async #loadProjectSettings(bypassCache = false): Promise<RawSettings> {
 		try {
-			const result = await loadCapability(settingsCapability.id, { cwd: this.#cwd, settings: this });
+			const result = await loadCapability(settingsCapability.id, {
+				cwd: this.#cwd,
+				agentDir: this.#agentDir,
+				settings: this,
+				bypassCache,
+			});
 			let merged: RawSettings = {};
 			for (const item of result.items as SettingsCapabilityItem[]) {
 				if (item.level !== "project") continue;
@@ -1637,7 +1677,7 @@ export class Settings implements NotificationSettingsReader {
 		return settings;
 	}
 
-	async #normalizeAfterLoad(): Promise<void> {
+	async #normalizeAfterLoad(publishHooks = true): Promise<void> {
 		this.#sanitizeModelSelectorRecords();
 		this.#rebuildMerged();
 		if (!this.#futureSchemaVersion) {
@@ -1653,7 +1693,7 @@ export class Settings implements NotificationSettingsReader {
 		await this.flush();
 		this.#sanitizeModelSelectorRecords();
 		this.#rebuildMerged();
-		this.#fireAllHooks();
+		if (publishHooks) this.#fireAllHooks();
 	}
 
 	#sanitizeModelSelectorRecords(): void {

package/src/discovery/helpers.ts

@@ -203,10 +203,13 @@ export function getProjectPath(ctx: LoadContext, source: SourceId, subpath: stri
 
 /** Build the filesystem authority for a provider read. */
 export function getReadOptions(
-	ctx: Pick<LoadContext, "home" | "isolatedHome" | "userAgentDir" | "homeIdentity" | "userAgentIdentity">,
+	ctx: Pick<
+		LoadContext,
+		"home" | "isolatedHome" | "userAgentDir" | "homeIdentity" | "userAgentIdentity" | "bypassCache"
+	>,
 	scope: ReadScope,
 ): ReadFileOptions | undefined {
-	if (!ctx.isolatedHome) return undefined;
+	if (!ctx.isolatedHome) return ctx.bypassCache ? { bypassCache: true } : undefined;
 	return {
 		isolatedHome: true,
 		home: ctx.home,
@@ -219,7 +222,10 @@ export function getReadOptions(
 }
 
 export async function getReadOptionsForContainment(
-	ctx: Pick<LoadContext, "home" | "isolatedHome" | "userAgentDir" | "homeIdentity" | "userAgentIdentity">,
+	ctx: Pick<
+		LoadContext,
+		"home" | "isolatedHome" | "userAgentDir" | "homeIdentity" | "userAgentIdentity" | "bypassCache"
+	>,
 	scope: ReadScope,
 	containmentRoot?: string,
 ): Promise<ReadFileOptions | undefined> {

package/src/discovery/ssh.ts

@@ -34,9 +34,14 @@ interface SSHConfigFile {
 
 function parsePort(value: number | string | undefined): number | undefined {
 	if (value === undefined) return undefined;
-	if (typeof value === "number") return Number.isFinite(value) ? value : undefined;
-	const parsed = Number.parseInt(value, 10);
-	return Number.isNaN(parsed) ? undefined : parsed;
+	// The JSON is not validated against SSHConfigFile, so anything else (e.g. an
+	// array, which parseInt would coerce: parseInt([2222]) === 2222) is rejected.
+	if (typeof value !== "number" && typeof value !== "string") return undefined;
+	// `Number.parseInt` accepts trailing garbage (parseInt("22oops") === 22), so a
+	// string must be plain digits.
+	if (typeof value === "string" && !/^\d+$/.test(value)) return undefined;
+	const port = typeof value === "number" ? value : Number.parseInt(value, 10);
+	return Number.isInteger(port) && port >= 1 && port <= 65535 ? port : undefined;
 }
 
 function parseCompat(value: boolean | string | undefined): boolean | undefined {

package/src/gjc-runtime/gc-runtime.ts

@@ -30,7 +30,8 @@ import {
 	listCanonicalBlobs,
 	removeCanonicalBlob,
 } from "../session/blob-store";
-import { FileSessionStorage, probeSessionRetirement, retireSessionTranscript } from "../session/session-storage";
+import { probeSessionRetirement, retireSessionTranscript } from "../session/session-retirement";
+import { FileSessionStorage } from "../session/session-storage";
 import {
 	collectEmptyDeleteReceipts,
 	type EmptyDeleteGcRecord,

package/src/hindsight/config.ts

@@ -62,11 +62,17 @@ function envBool(value: string | undefined): boolean | undefined {
 	return ["true", "1", "yes"].includes(value.toLowerCase());
 }
 
-/** Coerce an env var value into an int, returning undefined for non-numeric input. */
+/**
+ * Coerce an env var value into a non-negative int, returning undefined (so the
+ * settings value applies) for anything that is not plain digits. `parseInt`
+ * alone would read "5turns" as 5, "1e3" as 1 and "-3" as -3.
+ */
 function envInt(value: string | undefined): number | undefined {
 	if (value === undefined) return undefined;
-	const n = Number.parseInt(value, 10);
-	return Number.isFinite(n) ? n : undefined;
+	const trimmed = value.trim();
+	if (!/^\d+$/.test(trimmed)) return undefined;
+	const n = Number(trimmed);
+	return Number.isSafeInteger(n) ? n : undefined;
 }
 
 function envString(value: string | undefined): string | undefined {