@gajae-code/coding-agent 0.12.7 → 0.12.8

package/src/config/resolve-config-value.ts

@@ -16,22 +16,24 @@ const commandInFlight = new Map<string, Promise<string | undefined>>();
  * Resolve a config value (API key, header value, etc.) to an actual value.
  * - If starts with "!", executes the rest as a shell command and uses stdout (cached)
  * - Otherwise checks environment variable first, then treats as literal (not cached)
+ * - `cacheScope` isolates command-cache entries when a caller rotates its config
  */
-export async function resolveConfigValue(config: string): Promise<string | undefined> {
+export async function resolveConfigValue(config: string, cacheScope?: string): Promise<string | undefined> {
 	if (config.startsWith("!")) {
-		return await executeCommand(config);
+		return await executeCommand(config, cacheScope);
 	}
 	const envValue = process.env[config];
 	return envValue || config;
 }
 
-async function executeCommand(commandConfig: string): Promise<string | undefined> {
-	const cached = commandResultCache.get(commandConfig);
+async function executeCommand(commandConfig: string, cacheScope?: string): Promise<string | undefined> {
+	const cacheKey = cacheScope === undefined ? commandConfig : `${cacheScope}\u0000${commandConfig}`;
+	const cached = commandResultCache.get(cacheKey);
 	if (cached !== undefined) {
 		return cached;
 	}
 
-	const existing = commandInFlight.get(commandConfig);
+	const existing = commandInFlight.get(cacheKey);
 	if (existing) {
 		return await existing;
 	}
@@ -40,15 +42,15 @@ async function executeCommand(commandConfig: string): Promise<string | undefined
 	const promise = runShellCommand(command, 10_000)
 		.then(result => {
 			if (result !== undefined) {
-				commandResultCache.set(commandConfig, result);
+				commandResultCache.set(cacheKey, result);
 			}
 			return result;
 		})
 		.finally(() => {
-			commandInFlight.delete(commandConfig);
+			commandInFlight.delete(cacheKey);
 		});
 
-	commandInFlight.set(commandConfig, promise);
+	commandInFlight.set(cacheKey, promise);
 	return await promise;
 }
 

package/src/config/settings-schema.ts

@@ -149,7 +149,7 @@ export type AnyUiMetadata = UiBase & {
 
 interface BooleanDef {
 	type: "boolean";
-	default: boolean;
+	default?: boolean;
 	ui?: UiBoolean;
 }
 
@@ -285,6 +285,7 @@ export const SETTINGS_SCHEMA = {
 
 	// Notifications (shared daemon with Telegram/Discord/Slack presentation adapters)
 	"notifications.enabled": { type: "boolean", default: false },
+	"notifications.telegram.enabled": { type: "boolean" },
 	"notifications.telegram.botToken": {
 		type: "string",
 		default: undefined,
@@ -336,10 +337,12 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 	"notifications.telegram.topics.nameTemplate": { type: "string", default: undefined },
+	"notifications.discord.enabled": { type: "boolean" },
 	"notifications.discord.botToken": { type: "string", default: undefined },
 	"notifications.discord.applicationId": { type: "string", default: undefined },
 	"notifications.discord.guildId": { type: "string", default: undefined },
 	"notifications.discord.parentChannelId": { type: "string", default: undefined },
+	"notifications.slack.enabled": { type: "boolean" },
 	"notifications.slack.botToken": { type: "string", default: undefined },
 	"notifications.slack.appToken": { type: "string", default: undefined },
 	"notifications.slack.workspaceId": { type: "string", default: undefined },
@@ -3646,25 +3649,28 @@ type Schema = typeof SETTINGS_SCHEMA;
 export type SettingPath = keyof Schema;
 
 /** Infer the value type for a setting path */
-export type SettingValue<P extends SettingPath> = Schema[P] extends { type: "boolean" }
+export type SettingValue<P extends SettingPath> = Schema[P] extends { type: "boolean"; default: boolean }
 	? boolean
-	: Schema[P] extends { type: "string" }
-		? string | undefined
-		: Schema[P] extends { type: "number" }
-			? number
-			: Schema[P] extends { type: "enum"; values: infer V }
-				? V extends readonly string[]
-					? V[number]
-					: never
-				: Schema[P] extends { type: "array"; default: infer D }
-					? D
-					: Schema[P] extends { type: "record"; default: infer D }
+	: Schema[P] extends { type: "boolean" }
+		? boolean | undefined
+		: Schema[P] extends { type: "string" }
+			? string | undefined
+			: Schema[P] extends { type: "number" }
+				? number
+				: Schema[P] extends { type: "enum"; values: infer V }
+					? V extends readonly string[]
+						? V[number]
+						: never
+					: Schema[P] extends { type: "array"; default: infer D }
 						? D
-						: never;
+						: Schema[P] extends { type: "record"; default: infer D }
+							? D
+							: never;
 
 /** Get the default value for a setting path */
 export function getDefault<P extends SettingPath>(path: P): SettingValue<P> {
-	return SETTINGS_SCHEMA[path].default as SettingValue<P>;
+	const definition = SETTINGS_SCHEMA[path];
+	return ("default" in definition ? definition.default : undefined) as SettingValue<P>;
 }
 
 /** Check if a path has UI metadata (should appear in settings panel) */
@@ -3991,6 +3997,7 @@ export interface MemoryGuardSettings {
 export interface NotificationsSettings {
 	enabled: boolean;
 	telegram: {
+		enabled?: boolean;
 		botToken: string | undefined;
 		chatId: string | undefined;
 		sound: "all" | "important" | "none";
@@ -4014,16 +4021,19 @@ export interface NotificationsSettings {
 		};
 	};
 	discord: {
+		enabled?: boolean;
 		botToken: string | undefined;
 		applicationId: string | undefined;
 		guildId: string | undefined;
 		parentChannelId: string | undefined;
 	};
 	slack: {
+		enabled?: boolean;
 		botToken: string | undefined;
 		appToken: string | undefined;
 		workspaceId: string | undefined;
 		channelId: string | undefined;
+		authorizedUserId: string | undefined;
 	};
 	redact: boolean;
 	verbosity: "lean" | "verbose";

package/src/config/settings.ts

@@ -98,7 +98,7 @@ type DurableBatchRevision = {
 };
 type NotificationValidationState = {
 	malformedConfigRoot: boolean;
-	invalidNotificationConfiguration: boolean;
+	invalidNotificationGlobal: boolean;
 	generation: number;
 };
 type NotificationValidationRestoreGuard = {
@@ -378,7 +378,7 @@ export class Settings implements NotificationSettingsReader {
 	#hasMalformedConfigRoot = false;
 	/** YAML syntax was unrecoverable, so the loaded defaults are read-only until config.yml is repaired. */
 	#hasRecoveredConfigSyntax = false;
-	#hasInvalidNotificationConfiguration = false;
+	#hasInvalidNotificationGlobal = false;
 	#notificationValidationGeneration = 0;
 	/** Notification subtree fingerprint from the last raw durable config read. */
 	#durableNotificationFingerprint: string | undefined;
@@ -513,7 +513,7 @@ export class Settings implements NotificationSettingsReader {
 	 */
 	getNotificationSettingsSnapshot(): NotificationSettingsSnapshot {
 		return parseNotificationSettingsSnapshot(
-			this.#hasMalformedConfigRoot || this.#hasInvalidNotificationConfiguration ? null : this.#global,
+			this.#hasMalformedConfigRoot || this.#hasInvalidNotificationGlobal ? null : this.#rawNotificationConfig,
 		);
 	}
 
@@ -895,7 +895,7 @@ export class Settings implements NotificationSettingsReader {
 		cloned.#futureSchemaVersion = this.#futureSchemaVersion;
 		cloned.#hasMalformedConfigRoot = this.#hasMalformedConfigRoot;
 		cloned.#hasRecoveredConfigSyntax = this.#hasRecoveredConfigSyntax;
-		cloned.#hasInvalidNotificationConfiguration = this.#hasInvalidNotificationConfiguration;
+		cloned.#hasInvalidNotificationGlobal = this.#hasInvalidNotificationGlobal;
 		cloned.#notificationValidationGeneration = this.#notificationValidationGeneration;
 		cloned.#global = structuredClone(this.#global);
 		cloned.#rawNotificationConfig = structuredClone(this.#rawNotificationConfig);
@@ -1149,7 +1149,7 @@ export class Settings implements NotificationSettingsReader {
 	#resetYamlLoadState(): void {
 		this.#hasMalformedConfigRoot = false;
 		this.#hasRecoveredConfigSyntax = false;
-		this.#hasInvalidNotificationConfiguration = false;
+		this.#hasInvalidNotificationGlobal = false;
 		this.#schemaReport = { issues: [], valid: true };
 		this.#schemaMigrationPending = false;
 		this.#futureSchemaVersion = false;
@@ -1211,7 +1211,7 @@ export class Settings implements NotificationSettingsReader {
 				parseNotificationSettingsSnapshot(parsedRaw);
 			} catch (error) {
 				if (!(error instanceof Error) || error.message !== "gjc_notify_daemon_invalid_configuration") throw error;
-				this.#hasInvalidNotificationConfiguration = true;
+				this.#hasInvalidNotificationGlobal = true;
 			}
 		}
 		this.#futureSchemaVersion =
@@ -1875,7 +1875,7 @@ export class Settings implements NotificationSettingsReader {
 	#notificationValidationState(): NotificationValidationState {
 		return {
 			malformedConfigRoot: this.#hasMalformedConfigRoot,
-			invalidNotificationConfiguration: this.#hasInvalidNotificationConfiguration,
+			invalidNotificationGlobal: this.#hasInvalidNotificationGlobal,
 			generation: this.#notificationValidationGeneration,
 		};
 	}
@@ -1900,7 +1900,7 @@ export class Settings implements NotificationSettingsReader {
 	}
 	#restoreNotificationValidationState(state: NotificationValidationState): void {
 		this.#hasMalformedConfigRoot = state.malformedConfigRoot;
-		this.#hasInvalidNotificationConfiguration = state.invalidNotificationConfiguration;
+		this.#hasInvalidNotificationGlobal = state.invalidNotificationGlobal;
 	}
 	#rejectAtomicNotificationRepairForMalformedRoot(patches: readonly AtomicYamlPatch[], root: unknown): void {
 		if (
@@ -1951,17 +1951,17 @@ export class Settings implements NotificationSettingsReader {
 	#recomputeNotificationValidationFromRaw(): void {
 		if (this.#rawNotificationConfig === undefined) {
 			this.#hasMalformedConfigRoot = true;
-			this.#hasInvalidNotificationConfiguration = false;
+			this.#hasInvalidNotificationGlobal = false;
 			return;
 		}
 		try {
 			parseNotificationSettingsSnapshot(this.#rawNotificationConfig);
 			this.#hasMalformedConfigRoot = false;
-			this.#hasInvalidNotificationConfiguration = false;
+			this.#hasInvalidNotificationGlobal = false;
 		} catch (error) {
 			if (error instanceof Error && error.message === "gjc_notify_daemon_invalid_configuration") {
 				this.#hasMalformedConfigRoot = false;
-				this.#hasInvalidNotificationConfiguration = true;
+				this.#hasInvalidNotificationGlobal = true;
 				return;
 			}
 			throw error;
@@ -1973,10 +1973,10 @@ export class Settings implements NotificationSettingsReader {
 		try {
 			parseNotificationSettingsSnapshot(this.#rawNotificationConfig);
 			this.#hasMalformedConfigRoot = false;
-			this.#hasInvalidNotificationConfiguration = false;
+			this.#hasInvalidNotificationGlobal = false;
 		} catch (error) {
 			if (error instanceof Error && error.message === "gjc_notify_daemon_invalid_configuration") {
-				this.#hasInvalidNotificationConfiguration = true;
+				this.#hasInvalidNotificationGlobal = true;
 				return;
 			}
 			throw error;
@@ -2054,9 +2054,9 @@ export class Settings implements NotificationSettingsReader {
 // Setting Hooks
 // ═══════════════════════════════════════════════════════════════════════════
 
-type SettingHook<P extends SettingPath> = (value: SettingValue<P>, prev: SettingValue<P>) => void;
+type SettingHook = (value: unknown, prev: unknown) => void;
 
-const SETTING_HOOKS: Partial<Record<SettingPath, SettingHook<any>>> = {
+const SETTING_HOOKS: Partial<Record<SettingPath, SettingHook>> = {
 	"theme.dark": value => {
 		if (typeof value === "string") {
 			setAutoThemeMapping("dark", value);

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

@@ -5,7 +5,7 @@ import * as path from "node:path";
 import type { AssistantMessage } from "@gajae-code/ai";
 import { normalizePathForComparison, postmortem } from "@gajae-code/utils";
 import { withFileLock } from "../config/file-lock";
-import { sessionRuntimeDir } from "./session-layout";
+import { sessionRoot, sessionRuntimeDir } from "./session-layout";
 import {
 	isValidOwnerIntent,
 	lifecyclePaths,
@@ -1022,6 +1022,7 @@ export async function persistCoordinatorRuntimeStateFromPostmortem(
 	const stateFile = runtimeStateFileForContext(context);
 	if (!stateFile) return;
 	const identity = normalizedIdentity(context);
+	const ownerSessionRoot = sessionRoot(context.cwd, identity.sessionId);
 	const ownerTerminalVerdict = context.ownerTerminal
 		? await observeOwnerTerminalPostmortem(reason, context.ownerTerminal, identity.sessionId)
 		: null;
@@ -1091,7 +1092,16 @@ export async function persistCoordinatorRuntimeStateFromPostmortem(
 						await writeStateFileSync(stateFile, payload);
 					}),
 			),
-	);
+	).catch(error => {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+			try {
+				fsSync.lstatSync(ownerSessionRoot);
+			} catch (rootError) {
+				if ((rootError as NodeJS.ErrnoException).code === "ENOENT") return;
+			}
+		}
+		throw error;
+	});
 }
 
 export function registerCoordinatorRuntimeStateFinalizer(context: RuntimeStateContext): () => void {