@gajae-code/coding-agent 0.12.8 → 0.12.10

package/src/modes/components/extensions/inspector-panel.ts

@@ -9,6 +9,10 @@ import { theme } from "../../../modes/theme/theme";
 import { shortenPath } from "../../../tools/render-utils";
 import type { Extension, ExtensionState } from "./types";
 
+function renderSeparator(width: number): string {
+	return theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.max(0, Math.min(width - 2, 40))));
+}
+
 export class InspectorPanel implements Component {
 	#extension: Extension | null = null;
 
@@ -106,7 +110,7 @@ export class InspectorPanel implements Component {
 	#renderFilePreview(raw: unknown, width: number): string[] {
 		const lines: string[] = [];
 		lines.push(theme.fg("muted", "Preview:"));
-		lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
+		lines.push(renderSeparator(width));
 
 		const content = this.#getContextFileContent(raw);
 		if (!content) {
@@ -164,7 +168,7 @@ export class InspectorPanel implements Component {
 	#renderToolArgs(raw: unknown, width: number): string[] {
 		const lines: string[] = [];
 		lines.push(theme.fg("muted", "Arguments:"));
-		lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
+		lines.push(renderSeparator(width));
 
 		try {
 			const tool = raw as any;
@@ -203,7 +207,7 @@ export class InspectorPanel implements Component {
 	#renderSkillContent(raw: unknown, width: number): string[] {
 		const lines: string[] = [];
 		lines.push(theme.fg("muted", "Instruction:"));
-		lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
+		lines.push(renderSeparator(width));
 
 		try {
 			const skill = raw as any;
@@ -232,7 +236,7 @@ export class InspectorPanel implements Component {
 	#renderMcpDetails(raw: unknown, width: number): string[] {
 		const lines: string[] = [];
 		lines.push(theme.fg("muted", "Connection:"));
-		lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
+		lines.push(renderSeparator(width));
 
 		try {
 			const mcp = raw as any;
@@ -271,7 +275,7 @@ export class InspectorPanel implements Component {
 		// Show trigger pattern if present
 		if (ext.trigger) {
 			lines.push(theme.fg("muted", "Trigger:"));
-			lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
+			lines.push(renderSeparator(width));
 			lines.push(`  ${theme.fg("accent", ext.trigger)}`);
 			lines.push("");
 		}

package/src/modes/controllers/selector-controller.ts

@@ -201,6 +201,11 @@ const CALLBACK_SERVER_PROVIDERS = new Set<string>([
 
 const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
 
+/** Providers whose authorization server can display a code for `/login <provider> --manual`. */
+const MANUAL_CODE_PROVIDERS = new Set<string>(["anthropic"]);
+
+const MANUAL_CODE_LOGIN_TIP = "Tip: You can complete pairing with /login <code>.";
+
 function isThemePreviewSuperseded(result: { success: boolean; error?: string }): boolean {
 	return !result.success && result.error?.includes("superseded by a newer request") === true;
 }
@@ -2945,7 +2950,14 @@ export class SelectorController {
 		});
 	}
 
-	async #handleOAuthLogin(providerId: string): Promise<void> {
+	async #handleOAuthLogin(providerId: string, options?: OAuthSelectorOptions): Promise<void> {
+		const manualCode = options?.manualCode === true;
+		if (manualCode && !MANUAL_CODE_PROVIDERS.has(providerId)) {
+			this.ctx.showError(
+				`${providerId} has no paste-a-code login. Supported: ${[...MANUAL_CODE_PROVIDERS].join(", ")}.`,
+			);
+			return;
+		}
 		this.ctx.showStatus(`Logging in to ${providerId}…`);
 		const manualInput = this.ctx.oauthManualInput;
 		const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
@@ -2953,51 +2965,57 @@ export class SelectorController {
 			this.ctx.showStatus("Checking the local OpenCodex proxy…");
 		}
 		try {
-			await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
-				onAuth: (info: { url: string; instructions?: string }) => {
-					this.ctx.chatContainer.addChild(new Spacer(1));
-					this.ctx.chatContainer.addChild(new Text(theme.fg("dim", info.url), 1, 0));
-					const hyperlink = `\x1b]8;;${info.url}\x07Click here to login\x1b]8;;\x07`;
-					this.ctx.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
-					if (info.instructions) {
+			await this.ctx.session.modelRegistry.authStorage.login(
+				providerId as OAuthProvider,
+				{
+					onAuth: (info: { url: string; instructions?: string }) => {
 						this.ctx.chatContainer.addChild(new Spacer(1));
-						this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
-					}
-					if (useManualInput) {
+						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", info.url), 1, 0));
+						const hyperlink = `\x1b]8;;${info.url}\x07Click here to login\x1b]8;;\x07`;
+						this.ctx.chatContainer.addChild(new Text(theme.fg("accent", hyperlink), 1, 0));
+						if (info.instructions) {
+							this.ctx.chatContainer.addChild(new Spacer(1));
+							this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
+						}
+						if (useManualInput) {
+							this.ctx.chatContainer.addChild(new Spacer(1));
+							this.ctx.chatContainer.addChild(
+								new Text(theme.fg("dim", manualCode ? MANUAL_CODE_LOGIN_TIP : MANUAL_LOGIN_TIP), 1, 0),
+							);
+						}
+						this.ctx.ui.requestRender();
+						this.ctx.openInBrowser(info.url);
+					},
+					onPrompt: async (prompt: { message: string; placeholder?: string }) => {
 						this.ctx.chatContainer.addChild(new Spacer(1));
-						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", MANUAL_LOGIN_TIP), 1, 0));
-					}
-					this.ctx.ui.requestRender();
-					this.ctx.openInBrowser(info.url);
-				},
-				onPrompt: async (prompt: { message: string; placeholder?: string }) => {
-					this.ctx.chatContainer.addChild(new Spacer(1));
-					this.ctx.chatContainer.addChild(new Text(theme.fg("warning", prompt.message), 1, 0));
-					if (prompt.placeholder) {
-						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", prompt.placeholder), 1, 0));
-					}
-					this.ctx.ui.requestRender();
-					const { promise, resolve } = Promise.withResolvers<string>();
-					const codeInput = new Input();
-					codeInput.onSubmit = () => {
-						const code = codeInput.getValue();
+						this.ctx.chatContainer.addChild(new Text(theme.fg("warning", prompt.message), 1, 0));
+						if (prompt.placeholder) {
+							this.ctx.chatContainer.addChild(new Text(theme.fg("dim", prompt.placeholder), 1, 0));
+						}
+						this.ctx.ui.requestRender();
+						const { promise, resolve } = Promise.withResolvers<string>();
+						const codeInput = new Input();
+						codeInput.onSubmit = () => {
+							const code = codeInput.getValue();
+							this.ctx.editorContainer.clear();
+							this.ctx.editorContainer.addChild(this.ctx.editor);
+							this.ctx.ui.setFocus(this.ctx.editor);
+							resolve(code);
+						};
 						this.ctx.editorContainer.clear();
-						this.ctx.editorContainer.addChild(this.ctx.editor);
-						this.ctx.ui.setFocus(this.ctx.editor);
-						resolve(code);
-					};
-					this.ctx.editorContainer.clear();
-					this.ctx.editorContainer.addChild(codeInput);
-					this.ctx.ui.setFocus(codeInput);
-					this.ctx.ui.requestRender();
-					return promise;
-				},
-				onProgress: (message: string) => {
-					this.ctx.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
-					this.ctx.ui.requestRender();
+						this.ctx.editorContainer.addChild(codeInput);
+						this.ctx.ui.setFocus(codeInput);
+						this.ctx.ui.requestRender();
+						return promise;
+					},
+					onProgress: (message: string) => {
+						this.ctx.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
+						this.ctx.ui.requestRender();
+					},
+					onManualCodeInput: useManualInput ? () => manualInput.waitForInput(providerId) : undefined,
 				},
-				onManualCodeInput: useManualInput ? () => manualInput.waitForInput(providerId) : undefined,
-			});
+				{ manualCode },
+			);
 			await this.ctx.session.modelRegistry.refresh();
 			this.ctx.chatContainer.addChild(new Spacer(1));
 			const successMessage =
@@ -3050,7 +3068,7 @@ export class SelectorController {
 				return;
 			}
 			if (mode === "login") {
-				await this.#handleOAuthLogin(providerId);
+				await this.#handleOAuthLogin(providerId, options);
 			} else {
 				await this.#handleOAuthLogout(providerId);
 			}

package/src/modes/print-mode.ts

@@ -198,6 +198,9 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	let unsubscribe: (() => void) | undefined;
 
 	try {
+		for (const warning of new Set(session.configWarnings)) {
+			await writeStderrAndQuiesce(`Warning: ${warning}\n`);
+		}
 		// Emit session header for JSON mode.
 		if (mode === "json") {
 			const header = session.sessionManager.getHeader();

package/src/modes/types.ts

@@ -495,4 +495,10 @@ export interface OAuthSelectorOptions {
 	allowExternalCredentialDiscovery?: boolean;
 	trigger?: "bare-login";
 	externalCredentialDiscover?: CredentialAutoImportOptions["discover"];
+	/**
+	 * Pair by pasting the code the provider displays instead of waiting on the
+	 * loopback callback. Set by `/login <provider> --manual` for browsers that
+	 * cannot reach this machine.
+	 */
+	manualCode?: boolean;
 }

package/src/prompts/system/system-prompt.md

@@ -97,6 +97,7 @@ Do not claim a web search, browser action, integration, or subagent ran without
 <inputs>
 - Keep tool inputs concise where possible.
 - For `path` or path-like fields, prefer relative paths.
+- Write non-ASCII text in tool inputs as literal UTF-8, NEVER as hand-spelled `\uXXXX` escapes, including JSON serialized into a string field (no `ensure_ascii`-style output there). Escapes that are the intended source syntax of the file you are writing — character-class ranges, codepoint bounds — are unaffected.
 {{#if intentTracing}}
 - Most tools have a `{{intentField}}` parameter. Fill it with a concise intent in present participle form, 2-6 words, no period, capitalized.
 {{/if}}

package/src/sdk/bus/daemon-paths.ts

@@ -16,6 +16,7 @@ export interface DaemonPaths {
 	ownership: string;
 	roots: string;
 	steal: string;
+	diagnostic: string;
 	aliases: string;
 	seenUpdates: string;
 }
@@ -31,6 +32,7 @@ export function daemonPaths(agentDir: string): DaemonPaths {
 		roots: path.join(dir, "telegram-daemon.roots.json"),
 		steal: path.join(dir, "telegram-daemon.steal"),
 		aliases: path.join(dir, "telegram-callback-aliases.json"),
+		diagnostic: path.join(dir, "telegram-daemon.diagnostics.json"),
 		seenUpdates: path.join(dir, "telegram-seen-updates.json"),
 	};
 }

package/src/sdk/bus/notification-service.ts

@@ -63,6 +63,49 @@ export function sanitizeDiagnostic(text: string, token?: string): string {
 	return out.replace(TELEGRAM_TOKEN_PATTERN, "<redacted>");
 }
 
+export interface NotificationDiagnosticEvent {
+	timestamp: string;
+	operation: string;
+	phase: string;
+	outcome: string;
+	reason: string;
+	pid?: number;
+	incarnation?: string;
+	ageMs?: number;
+	detail?: string;
+}
+
+/** Append a bounded, private, secret-safe daemon diagnostic event. */
+export async function writeNotificationDiagnostic(
+	settings: Pick<Settings, "getAgentDir">,
+	event: Omit<NotificationDiagnosticEvent, "timestamp"> & { timestamp?: string },
+): Promise<void> {
+	const file = daemonPaths(settings.getAgentDir()).diagnostic;
+	const dir = path.dirname(file);
+	let events: NotificationDiagnosticEvent[] = [];
+	try {
+		const parsed = JSON.parse(await fsPromises.readFile(file, "utf8")) as { events?: unknown };
+		if (Array.isArray(parsed.events)) events = parsed.events as NotificationDiagnosticEvent[];
+	} catch {
+		// A missing or corrupt diagnostic history must not block notification recovery.
+	}
+	const safe: NotificationDiagnosticEvent = {
+		timestamp: event.timestamp ?? new Date().toISOString(),
+		operation: event.operation.slice(0, 80),
+		phase: event.phase.slice(0, 80),
+		outcome: event.outcome.slice(0, 80),
+		reason: event.reason.slice(0, 120),
+		...(event.pid === undefined ? {} : { pid: event.pid }),
+		...(event.incarnation === undefined ? {} : { incarnation: event.incarnation.slice(0, 120) }),
+		...(event.ageMs === undefined ? {} : { ageMs: Math.max(0, Math.floor(event.ageMs)) }),
+		...(event.detail === undefined ? {} : { detail: sanitizeDiagnostic(event.detail).slice(0, 512) }),
+	};
+	await fsPromises.mkdir(dir, { recursive: true, mode: 0o700 });
+	await fsPromises.writeFile(file, `${JSON.stringify({ version: 1, events: [...events, safe].slice(-64) })}\n`, {
+		mode: 0o600,
+	});
+}
+
 function sanitizeProviderDiagnostic(text: string, cfg: NotificationConfig, provider: NotificationProvider): string {
 	const secrets =
 		provider === "telegram"
@@ -182,6 +225,7 @@ export interface NotificationServiceDeps {
 	fs?: NotificationServiceFs;
 	now?: () => number;
 	pidAlive?: (pid: number) => boolean;
+	pidIncarnation?: (pid: number) => string | undefined;
 	fetchImpl?: typeof fetch;
 	apiBase?: string;
 	createDiscordDiagnostic?: (config: { applicationId: string; botToken: string }) => DiscordDiagnosticProvider;
@@ -1126,6 +1170,9 @@ export interface NotificationRecoveryReport {
 		action: DaemonRecoveryAction;
 		detail: string;
 		ownerId: string | undefined;
+		blockingReason?: string;
+		markerAgeMs?: number;
+		forceCommand?: string;
 		pid: number | undefined;
 	};
 }
@@ -1134,6 +1181,7 @@ export interface RecoveryOptions {
 	settings: Settings;
 	stateRoot?: string;
 	deps?: NotificationServiceDeps;
+	forceDaemonLock?: boolean;
 }
 
 export interface DaemonTransitionLock {
@@ -1167,6 +1215,7 @@ type TransitionMarkerFs = {
 	writeFile?(file: string, data: string, opts?: WriteFileOptions): Promise<void>;
 	readEndpointFile?(file: string): Promise<NotificationEndpointFile>;
 	exactUnlink?(file: string, identity: NotificationEndpointFileIdentity): Promise<NotificationExactUnlinkResult>;
+	stat?(file: string): Promise<{ mtimeMs: number }>;
 };
 
 async function readTransitionMarker(
@@ -1318,6 +1367,36 @@ function defaultTransitionPidIncarnation(pid: number): string | undefined {
 	return processIncarnation(pid);
 }
 
+const TRANSITION_MARKER_GRACE_MS = 3 * HEARTBEAT_TTL_MS;
+
+async function detachStaleTransitionMarker(input: {
+	fs: TransitionMarkerFs;
+	path: string;
+	now: number;
+	pidAlive: (pid: number) => boolean;
+	pidIncarnation: (pid: number) => string | undefined;
+}): Promise<boolean> {
+	const snapshot = await readTransitionMarker(input.fs, input.path);
+	if (!snapshot) return false;
+	let marker: unknown;
+	try {
+		marker = JSON.parse(snapshot.raw);
+	} catch {
+		return false;
+	}
+	if (!isDaemonTransitionLock(marker)) return false;
+	const currentIncarnation = input.pidIncarnation(marker.pid);
+	if (
+		input.pidAlive(marker.pid) ||
+		!isProcessIncarnation(marker.incarnation) ||
+		(isProcessIncarnation(currentIncarnation) && currentIncarnation === marker.incarnation)
+	)
+		return false;
+	const ageMs = input.now - marker.createdAt;
+	if (!Number.isFinite(ageMs) || ageMs <= TRANSITION_MARKER_GRACE_MS) return false;
+	return await detachTransitionMarker(input.fs, input.path, snapshot);
+}
+
 /**
  * Owner-bound removal of a dead daemon's lock. Closes the classic
  * check-then-unlink TOCTOU: a naive `unlink(lock)` after observing a dead owner
@@ -1332,20 +1411,36 @@ async function removeDeadOwnerLock(
 	paths: DaemonPaths,
 	pidAlive: (pid: number) => boolean,
 	expected: NormalizedDaemonState,
+	now: () => number,
+	pidIncarnation: (pid: number) => string | undefined,
 ): Promise<"cleared" | "contended" | "superseded" | "now-alive" | "unlink-failed"> {
-	const transition = await acquireDaemonTransitionLock({
+	let transition = await acquireDaemonTransitionLock({
 		fs,
 		path: paths.steal,
 		pid: process.pid,
 		pidAlive: defaultTransitionPidAlive,
 		pidIncarnation: defaultTransitionPidIncarnation,
 	});
+	if (!transition) {
+		await detachStaleTransitionMarker({
+			fs,
+			path: paths.steal,
+			now: now(),
+			pidAlive,
+			pidIncarnation,
+		});
+		transition = await acquireDaemonTransitionLock({
+			fs,
+			path: paths.steal,
+			pid: process.pid,
+			pidAlive: defaultTransitionPidAlive,
+			pidIncarnation: defaultTransitionPidIncarnation,
+		});
+	}
 	if (!transition) return "contended";
 	try {
 		const current = await readDaemonStateFile(fs, paths.state);
-		if (!current || current.ownerId !== expected.ownerId || current.pid !== expected.pid) {
-			return "superseded";
-		}
+		if (!current || current.ownerId !== expected.ownerId || current.pid !== expected.pid) return "superseded";
 		if (pidAlive(current.pid)) return "now-alive";
 		if (!(await daemonTransitionLockIsHeld({ fs, path: paths.steal, lock: transition }))) return "contended";
 		try {
@@ -1373,6 +1468,7 @@ export async function recoverNotifications(opts: RecoveryOptions): Promise<Notif
 	const deps = opts.deps ?? {};
 	const fs = deps.fs ?? nodeServiceFs;
 	const pidAlive = deps.pidAlive ?? defaultPidAlive;
+	const now = deps.now ?? Date.now;
 	const stateRoot = opts.stateRoot ?? defaultStateRoot();
 
 	const dir = endpointDir(stateRoot);
@@ -1472,7 +1568,14 @@ export async function recoverNotifications(opts: RecoveryOptions): Promise<Notif
 			pid: state.pid,
 		};
 	} else if (hasLock) {
-		const outcome = await removeDeadOwnerLock(fs, paths, pidAlive, state);
+		const outcome = await removeDeadOwnerLock(
+			fs,
+			paths,
+			pidAlive,
+			state,
+			now,
+			deps.pidIncarnation ?? defaultTransitionPidIncarnation,
+		);
 		const action: DaemonRecoveryAction =
 			outcome === "cleared"
 				? "cleared-dead-owner-lock"
@@ -1491,9 +1594,35 @@ export async function recoverNotifications(opts: RecoveryOptions): Promise<Notif
 					: outcome === "superseded"
 						? "a new daemon owner took over during recovery; lock left untouched"
 						: outcome === "contended"
-							? "another daemon is starting or stealing the lock; lock left untouched"
+							? `recovery blocked by transition marker; lock left untouched${opts.forceDaemonLock ? " even after forced stale-marker retry" : ""}`
 							: `could not remove lock of dead owner pid ${state.pid}`;
-		daemon = { action, detail, ownerId: state.ownerId, pid: state.pid };
+		const blockingReason = outcome === "contended" ? "transition-marker-unavailable-or-contended" : undefined;
+		const markerAgeMs =
+			blockingReason && fs.stat
+				? (await fs.stat(paths.steal).catch(() => undefined))?.mtimeMs
+					? now() - (await fs.stat(paths.steal).catch(() => undefined))!.mtimeMs
+					: undefined
+				: undefined;
+		if (blockingReason) {
+			await writeNotificationDiagnostic(opts.settings, {
+				operation: "notify.recovery",
+				phase: "recovery",
+				outcome: action,
+				reason: blockingReason,
+				pid: state.pid,
+				ageMs: markerAgeMs,
+				detail,
+			});
+		}
+		daemon = {
+			action,
+			detail,
+			ownerId: state.ownerId,
+			pid: state.pid,
+			...(blockingReason
+				? { blockingReason, markerAgeMs, forceCommand: "gjc notify recovery --force-daemon-lock" }
+				: {}),
+		};
 	} else {
 		daemon = {
 			action: "none",
@@ -1533,5 +1662,9 @@ export function formatNotificationRecoveryReport(report: NotificationRecoveryRep
 	for (const unknown of report.endpointsRetainedUnknown ?? [])
 		lines.push(`    - retained unverified cleanup path ${unknown}`);
 	lines.push(`  daemon: ${report.daemon.action} — ${report.daemon.detail}`);
+	if (report.daemon.blockingReason) lines.push(`    - blocking reason: ${report.daemon.blockingReason}`);
+	if (report.daemon.markerAgeMs !== undefined)
+		lines.push(`    - transition marker age: ${report.daemon.markerAgeMs}ms`);
+	if (report.daemon.forceCommand) lines.push(`    - safe escape: ${report.daemon.forceCommand}`);
 	return lines.join("\n");
 }

package/src/sdk/bus/telegram-daemon-contract.ts

@@ -55,10 +55,10 @@ export const NOTIFICATION_PROTOCOL_VERSION = 3;
  * ownership, settlement, and descendant cleanup authority. Generation 38 also
  * adds durable provider-intent admission without changing owner, reclaim,
  * signal, or spawn authority.
- * Generation 41 applies first-class provider-settings admission to Telegram
+ * Generation 42 applies first-class provider-settings admission to Telegram
  * lifecycle controls.
  */
-export const DAEMON_GENERATION = 41;
+export const DAEMON_GENERATION = 42;
 
 /**
  * Serving-compatibility boundary for daemon lifecycle requests. Epoch 1 covers

package/src/sdk/session.ts

@@ -136,6 +136,7 @@ import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	buildSystemPromptToolMetadata,
 	loadProjectContextFiles as loadContextFilesInternal,
+	loadProjectContextFilesResult as loadContextFilesResultInternal,
 } from "../system-prompt";
 import { AgentOutputManager } from "../task/output-manager";
 import { parseThinkingLevel, resolveThinkingLevelForModel, toReasoningEffort } from "../thinking";
@@ -1166,10 +1167,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		// Independent discoveries that depend only on cwd/agentDir — kicked off in parallel and awaited
 		// at their respective consumer sites. Their work can overlap with model resolution, secret loading,
 		// session-context build, tool creation, MCP discovery, and extension discovery.
-		const contextFilesPromise = options.contextFiles
-			? Promise.resolve(options.contextFiles)
-			: logger.time("discoverContextFiles", discoverContextFiles, cwd, agentDir);
-		contextFilesPromise.catch(() => {});
+		const contextFilesResultPromise = options.contextFiles
+			? Promise.resolve({ contextFiles: options.contextFiles, warnings: [] })
+			: logger.time("discoverContextFiles", loadContextFilesResultInternal, { cwd });
+		contextFilesResultPromise.catch(() => {});
 		const promptTemplatesPromise = options.promptTemplates
 			? Promise.resolve(options.promptTemplates)
 			: logger.time("discoverPromptTemplates", discoverPromptTemplates, cwd, agentDir);
@@ -1465,10 +1466,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			}
 			return result;
 		};
-		const [contextFiles, resolvedWorkspaceTree] = await Promise.all([
-			contextFilesPromise,
+		const [contextFilesResult, resolvedWorkspaceTree] = await Promise.all([
+			contextFilesResultPromise,
 			raceWithDeadline("buildWorkspaceTree", workspaceTreePromise),
 		]);
+		const contextFiles = contextFilesResult.contextFiles;
+		const discoveredContextFileWarnings = contextFilesResult.warnings;
 
 		const backgroundJobsEnabled = isBackgroundJobSupportEnabled(settings);
 		const asyncMaxJobs = Math.min(100, Math.max(1, settings.get("async.maxJobs") ?? 100));
@@ -2233,6 +2236,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			settings.get("tools.intentTracing"),
 			options.hasUI ?? false,
 		);
+		const emittedContextFileWarnings = new Set(discoveredContextFileWarnings);
+		const contextFileWarnings = [...discoveredContextFileWarnings];
+		for (const warning of discoveredContextFileWarnings) {
+			logger.warn("Context file discovery warning", { warning });
+		}
 		const intentField = intentTracingEnabled ? INTENT_FIELD : undefined;
 		const rebuildSystemPrompt = async (
 			toolNames: string[],
@@ -2311,14 +2319,22 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				subagent: options.parentTaskPrefix !== undefined,
 			});
 
+			for (const warning of defaultPrompt.warnings) {
+				if (emittedContextFileWarnings.has(warning)) continue;
+				emittedContextFileWarnings.add(warning);
+				contextFileWarnings.push(warning);
+				if (hasSession) session.configWarnings.push(warning);
+				logger.warn("Context file discovery warning", { warning });
+			}
 			if (options.systemPrompt === undefined) {
 				return defaultPrompt;
 			}
 			if (Array.isArray(options.systemPrompt)) {
-				return { systemPrompt: options.systemPrompt };
+				return { systemPrompt: options.systemPrompt, warnings: defaultPrompt.warnings };
 			}
 			return {
 				systemPrompt: options.systemPrompt(defaultPrompt.systemPrompt),
+				warnings: defaultPrompt.warnings,
 			};
 		};
 
@@ -2797,6 +2813,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			forkContextSeed: options.forkContextSeed,
 			providerSessionState: options.providerSessionState,
 		});
+		session.configWarnings.push(...contextFileWarnings);
 		hasSession = true;
 		if (asyncJobManager) {
 			session.yieldQueue.register<AsyncResultEntry>("async-result", {