@gajae-code/coding-agent 0.11.6 → 0.11.8

package/src/modes/controllers/runtime-mcp-command-controller.ts

@@ -4,6 +4,7 @@
  * Handles /mcp subcommands for managing MCP servers.
  */
 import * as path from "node:path";
+import { resolveMCPOAuthResourceOrigin, resolveMCPOAuthTokenEndpoint } from "@gajae-code/ai";
 import { Spacer, Text } from "@gajae-code/tui";
 import { getMCPConfigPath, getProjectDir } from "@gajae-code/utils";
 import type { SourceMeta } from "../../capability/types";
@@ -61,6 +62,7 @@ function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string)
  */
 interface OAuthFlowResult {
 	credentialId: string;
+	tokenEndpoint: string;
 	clientId?: string;
 	clientSecret?: string;
 }
@@ -423,6 +425,7 @@ export class MCPCommandController {
 						try {
 							const oauthClientSecret = finalConfig.oauth?.clientSecret ?? "";
 							const oauthResult = await this.#handleOAuthFlow(
+								finalConfig.url,
 								oauth.authorizationUrl,
 								oauth.tokenUrl,
 								oauth.clientId ?? finalConfig.oauth?.clientId ?? "",
@@ -439,7 +442,7 @@ export class MCPCommandController {
 								auth: {
 									type: "oauth",
 									credentialId: oauthResult.credentialId,
-									tokenUrl: oauth.tokenUrl,
+									tokenUrl: oauthResult.tokenEndpoint,
 									clientId: persistedClientId,
 									clientSecret: persistedClientSecret,
 								},
@@ -480,8 +483,15 @@ export class MCPCommandController {
 				done();
 				this.#handleWizardCancel();
 			},
-			async (authUrl: string, tokenUrl: string, clientId: string, clientSecret: string, scopes: string) => {
-				return await this.#handleOAuthFlow(authUrl, tokenUrl, clientId, clientSecret, scopes);
+			async (
+				endpointUrl: string,
+				authUrl: string,
+				tokenUrl: string,
+				clientId: string,
+				clientSecret: string,
+				scopes: string,
+			) => {
+				return await this.#handleOAuthFlow(endpointUrl, authUrl, tokenUrl, clientId, clientSecret, scopes);
 			},
 			async (config: MCPServerConfig) => {
 				return await this.#handleTestConnection(config);
@@ -503,6 +513,7 @@ export class MCPCommandController {
 	 * Handle OAuth authentication flow for MCP server
 	 */
 	async #handleOAuthFlow(
+		endpointUrl: string,
 		authUrl: string,
 		tokenUrl: string,
 		clientId: string,
@@ -514,11 +525,13 @@ export class MCPCommandController {
 	): Promise<OAuthFlowResult> {
 		const authStorage = this.ctx.session.modelRegistry.authStorage;
 		let parsedAuthUrl: URL;
+		const resourceOrigin = resolveMCPOAuthResourceOrigin(endpointUrl);
+		const tokenEndpoint = resolveMCPOAuthTokenEndpoint(tokenUrl);
+		if (!resourceOrigin || !tokenEndpoint) throw new Error("Invalid MCP OAuth configuration.");
 
 		// Validate OAuth URLs
 		try {
 			parsedAuthUrl = new URL(authUrl);
-			new URL(tokenUrl);
 		} catch (_error) {
 			throw new Error(
 				`Invalid OAuth URLs. Please check:\n  Authorization URL: ${authUrl}\n  Token URL: ${tokenUrl}`,
@@ -533,7 +546,7 @@ export class MCPCommandController {
 			const flow = new MCPOAuthFlow(
 				{
 					authorizationUrl: authUrl,
-					tokenUrl: tokenUrl,
+					tokenUrl: tokenEndpoint,
 					clientId: resolvedClientId,
 					clientSecret: resolvedClientSecret,
 					scopes: scopes || undefined,
@@ -618,6 +631,10 @@ export class MCPCommandController {
 			const oauthCredential: OAuthCredential = {
 				type: "oauth",
 				...credentials,
+				mcpBinding: {
+					resourceOrigin,
+					tokenEndpoint,
+				},
 			};
 
 			// Store under a synthetic provider name
@@ -625,6 +642,7 @@ export class MCPCommandController {
 
 			return {
 				credentialId,
+				tokenEndpoint,
 				clientId: flow.resolvedClientId,
 				clientSecret: flow.registeredClientSecret,
 			};
@@ -1328,6 +1346,10 @@ export class MCPCommandController {
 				this.ctx.showError(`Server "${name}" is disabled. Run /mcp enable ${name} first.`);
 				return;
 			}
+			if (found.config.type !== "http" && found.config.type !== "sse") {
+				this.ctx.showError(`Server "${name}" does not use a remote MCP transport.`);
+				return;
+			}
 
 			const currentAuth = (found.config as MCPServerConfig & { auth?: MCPAuthConfig }).auth;
 			if (currentAuth?.type === "oauth") {
@@ -1341,6 +1363,7 @@ export class MCPCommandController {
 			this.#showMessage(["", theme.fg("muted", `Reauthorizing "${name}"...`), ""].join("\n"));
 
 			const oauthResult = await this.#handleOAuthFlow(
+				found.config.url,
 				oauth.authorizationUrl,
 				oauth.tokenUrl,
 				oauth.clientId ?? found.config.oauth?.clientId ?? "",
@@ -1359,7 +1382,7 @@ export class MCPCommandController {
 				auth: {
 					type: "oauth",
 					credentialId: oauthResult.credentialId,
-					tokenUrl: oauth.tokenUrl,
+					tokenUrl: oauthResult.tokenEndpoint,
 					clientId: persistedClientId,
 					clientSecret: persistedClientSecret,
 				},

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

@@ -5,7 +5,7 @@ import type { OAuthProvider } from "@gajae-code/ai/utils/oauth/types";
 import type { Component, OverlayHandle, SlashCommand } from "@gajae-code/tui";
 import { Input, isPetMode, Loader, Spacer, Text } from "@gajae-code/tui";
 import { getAgentDbPath, getProjectDir, logger, VERSION } from "@gajae-code/utils";
-import { type AppKeybinding, formatKeyHints } from "../../config/keybindings";
+import type { AppKeybinding } from "../../config/keybindings";
 import {
 	activateModelProfile,
 	type MaterializeModelProfileForDeletionResult,
@@ -64,7 +64,7 @@ import {
 import type { NotificationSessionStatus } from "../../sdk/bus/session-control";
 import {
 	ensureTelegramDaemonRunningDetailed,
-	readDaemonState,
+	resolveTelegramSetupPreflight,
 	unregisterNotificationRoot,
 } from "../../sdk/bus/telegram-daemon";
 import { TelegramDaemonController } from "../../sdk/bus/telegram-daemon-control";
@@ -101,8 +101,10 @@ import {
 } from "../../setup/model-onboarding-guidance";
 import { addApiCompatibleProvider, formatProviderSetupResult } from "../../setup/provider-onboarding";
 import {
+	IMAGE_PROVIDER_DEFAULTS,
 	isConfigurableSearchProviderId,
 	isSearchProviderPreference,
+	setConfiguredImageModel,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	setSearchFallbackProviders,
@@ -190,6 +192,7 @@ export function buildStatusLineSettings(settingsInstance: Settings): StatusLineS
 		rightSegments: settingsInstance.get("statusLine.rightSegments"),
 		separator: settingsInstance.get("statusLine.separator"),
 		showHookStatus: settingsInstance.get("statusLine.showHookStatus"),
+		showActionHints: settingsInstance.get("statusLine.showActionHints"),
 		sessionAccent: settingsInstance.get("statusLine.sessionAccent"),
 		maxRows: settingsInstance.get("statusLine.maxRows"),
 		segmentOptions: settingsInstance.get("statusLine.segmentOptions"),
@@ -223,6 +226,7 @@ export interface NotificationsEditorOperationDependencies {
 	sanitizeDiagnostic: typeof sanitizeDiagnostic;
 	ensureTelegramDaemonRunningDetailed: typeof ensureTelegramDaemonRunningDetailed;
 	runTelegramSetup: typeof runTelegramSetup;
+	resolveTelegramSetupPreflight: typeof resolveTelegramSetupPreflight;
 	proposedTelegramIdentity: typeof proposedTelegramIdentity;
 	reconcileCommittedTelegramConfiguration: typeof reconcileCommittedTelegramConfiguration;
 	saveTelegramInactive: typeof saveTelegramInactive;
@@ -247,6 +251,7 @@ const notificationEditorOperationDependencies: NotificationsEditorOperationDepen
 	sanitizeDiagnostic,
 	ensureTelegramDaemonRunningDetailed,
 	runTelegramSetup,
+	resolveTelegramSetupPreflight,
 	proposedTelegramIdentity,
 	reconcileCommittedTelegramConfiguration,
 	saveTelegramInactive,
@@ -303,33 +308,8 @@ export function createNotificationsEditorOperations(
 			cwd: ctx.sessionManager.getCwd(),
 			sessionId: ctx.sessionManager.getSessionId(),
 		});
-	const telegramSetupPreflight = async (): Promise<TelegramSetupPreflight> => {
-		const storedChatId = services.getNotificationConfig(ctx.settings).chatId;
-		try {
-			const state = await readDaemonState(ctx.settings);
-			const validPid = Number.isSafeInteger(state?.pid) && (state?.pid ?? 0) > 0;
-			if (!state || !validPid) return { storedChatId };
-			let live = false;
-			try {
-				process.kill(state.pid, 0);
-				live = true;
-			} catch (error) {
-				live = (error as NodeJS.ErrnoException).code === "EPERM";
-			}
-			return live
-				? {
-						storedChatId,
-						daemon: {
-							live,
-							tokenFingerprint: typeof state.tokenFingerprint === "string" ? state.tokenFingerprint : undefined,
-							chatId: typeof state.chatId === "string" && state.chatId.trim() ? state.chatId.trim() : undefined,
-						},
-					}
-				: { storedChatId };
-		} catch {
-			return { storedChatId };
-		}
-	};
+	const telegramSetupPreflight = async (): Promise<TelegramSetupPreflight> =>
+		await services.resolveTelegramSetupPreflight(ctx.settings);
 
 	return {
 		loadState: async () => {
@@ -835,7 +815,7 @@ export class SelectorController {
 				id: `action:${action.id}`,
 				label: action.label,
 				description: action.id,
-				keybinding: formatKeyHints(this.ctx.keybindings.getKeys(action.id as AppKeybinding)) || undefined,
+				keybinding: this.ctx.keybindings.getDisplayString(action.id as AppKeybinding) || undefined,
 				searchText: action.id,
 				handler: action.handler,
 			})),
@@ -1103,6 +1083,75 @@ export class SelectorController {
 		}
 	}
 
+	async #handleImageGenerationConfig(): Promise<void> {
+		const provider = await this.ctx.showHookInput(
+			"Image Generation provider (auto, openai, gemini, openrouter, antigravity, alibaba, custom)",
+			"auto",
+		);
+		if (provider === undefined) return;
+		const normalized = provider.trim().toLowerCase();
+		const validProviders = ["auto", "openai", "gemini", "openrouter", "antigravity", "alibaba", "custom"];
+		if (!validProviders.includes(normalized)) {
+			this.ctx.showStatus(`Invalid image provider: ${normalized}. Valid: ${validProviders.join(", ")}`);
+			return;
+		}
+		let model: string | undefined;
+		if (normalized !== "auto" && normalized !== "custom") {
+			const defaultModel = IMAGE_PROVIDER_DEFAULTS[normalized];
+			model = await this.ctx.showHookInput(`Image model for ${normalized} (default: ${defaultModel})`, defaultModel);
+			if (model === undefined) return;
+			model = model.trim() || defaultModel;
+		}
+		let customUrl: string | undefined;
+		let customKey: string | undefined;
+		if (normalized === "custom") {
+			customUrl = await this.ctx.showHookInput("Custom image endpoint base URL");
+			if (!customUrl?.trim()) {
+				this.ctx.showStatus("Custom image endpoint requires a base URL");
+				return;
+			}
+			model = await this.ctx.showHookInput("Custom image model", IMAGE_PROVIDER_DEFAULTS.openai);
+			if (model === undefined) return;
+			model = model.trim() || IMAGE_PROVIDER_DEFAULTS.openai;
+			customKey = await this.ctx.showHookInput("Custom image endpoint API key");
+		}
+		const scope = await this.ctx.showHookInput(
+			"Scope: 'session' (this session only) or 'default' (persist)",
+			"session",
+		);
+		if (scope === undefined) return;
+		const persistDefault = scope.trim().toLowerCase() === "default";
+
+		const imageProvider = normalized as
+			| "auto"
+			| "openai"
+			| "gemini"
+			| "openrouter"
+			| "antigravity"
+			| "alibaba"
+			| "custom";
+		setPreferredImageProvider(imageProvider === "custom" ? "auto" : imageProvider);
+		setConfiguredImageModel({
+			provider: imageProvider,
+			model: model ?? null,
+			customUrl: customUrl?.trim(),
+			customKey: customKey?.trim(),
+		});
+
+		if (persistDefault) {
+			this.ctx.settings.set("providers.image", imageProvider);
+			if (model) this.ctx.settings.set("providers.imageModel", model);
+			if (customUrl?.trim()) this.ctx.settings.set("providers.imageCustomUrl", customUrl.trim());
+			if (customKey?.trim()) this.ctx.settings.set("providers.imageCustomKey", customKey.trim());
+		}
+
+		const displayModel =
+			model ?? (normalized !== "auto" && normalized !== "custom" ? IMAGE_PROVIDER_DEFAULTS[normalized] : undefined);
+		const label = normalized === "auto" ? "Auto" : `${normalized}${displayModel ? ` (${displayModel})` : ""}`;
+		this.ctx.showStatus(`Image Generation: ${label}${persistDefault ? " (default)" : " (session)"}`);
+		this.ctx.ui.requestRender();
+	}
+
 	showCustomProviderWizard(): void {
 		this.showSelector(done => {
 			let wizard: CustomProviderWizardComponent;
@@ -1516,6 +1565,7 @@ export class SelectorController {
 			case "statusLine.separator":
 			case "statusLineShowHooks":
 			case "statusLine.showHookStatus":
+			case "statusLine.showActionHints":
 			case "statusLine.sessionAccent":
 			case "statusLine.maxRows":
 			case "statusLine.leftSegments":
@@ -1563,16 +1613,35 @@ export class SelectorController {
 				}
 				break;
 			case "providers.image":
+			case "providers.imageModel":
+			case "providers.imageCustomUrl":
+			case "providers.imageCustomKey":
+			case "providers.imageCustomKeyEnv": {
+				const imgProvider = this.ctx.settings.get("providers.image");
+				const imgModel = this.ctx.settings.get("providers.imageModel");
+				const imgCustomUrl = this.ctx.settings.get("providers.imageCustomUrl");
+				const imgCustomKey = this.ctx.settings.get("providers.imageCustomKey");
+				const imgCustomKeyEnv = this.ctx.settings.get("providers.imageCustomKeyEnv");
 				if (
-					value === "auto" ||
-					value === "openai" ||
-					value === "gemini" ||
-					value === "openrouter" ||
-					value === "antigravity"
+					imgProvider === "auto" ||
+					imgProvider === "openai" ||
+					imgProvider === "gemini" ||
+					imgProvider === "openrouter" ||
+					imgProvider === "antigravity" ||
+					imgProvider === "alibaba" ||
+					imgProvider === "custom"
 				) {
-					setPreferredImageProvider(value);
+					setPreferredImageProvider(imgProvider === "custom" ? "auto" : imgProvider);
+					setConfiguredImageModel({
+						provider: imgProvider,
+						model: imgModel ?? null,
+						customUrl: imgCustomUrl,
+						customKey: imgCustomKey,
+						customKeyEnv: imgCustomKeyEnv,
+					});
 				}
 				break;
+			}
 
 			// MCP update injection - live subscribe/unsubscribe
 			case "mcp.notifications":
@@ -1610,6 +1679,14 @@ export class SelectorController {
 	showModelSelector(options?: { temporaryOnly?: boolean }): void {
 		this.showSelector(done => {
 			let modelSelector: ModelSelectorComponent;
+			const refreshRoleAssignments = () => {
+				modelSelector.refreshRoleAssignments({
+					currentModel: this.ctx.session.model,
+					currentThinkingLevel: this.ctx.session.thinkingLevel,
+					activeModelProfile:
+						this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
+				});
+			};
 			modelSelector = new ModelSelectorComponent(
 				this.ctx.ui,
 				this.ctx.session.model,
@@ -1617,6 +1694,8 @@ export class SelectorController {
 				this.ctx.session.modelRegistry,
 				this.ctx.session.scopedModels,
 				async selection => {
+					const isTrackedSingleAssignment =
+						selection.kind === "assignment" && selection.role !== null && selection.roles === undefined;
 					try {
 						if (selection.kind === "createProfile") {
 							done();
@@ -1631,6 +1710,11 @@ export class SelectorController {
 							await this.#deleteCustomModelPreset(selection.profileName, modelSelector);
 							return;
 						}
+						if (selection.kind === "imageGeneration") {
+							done();
+							await this.#handleImageGenerationConfig();
+							return;
+						}
 						if (selection.kind === "profile") {
 							await this.#applyModelProfile(selection.profileName, selection.setDefault);
 							done();
@@ -1652,7 +1736,7 @@ export class SelectorController {
 							this.ctx.showStatus(`Temporary model: ${selectedSelector ?? model.id}`);
 							done();
 							this.ctx.ui.requestRender();
-						} else if (selection.roles) {
+						} else if (selection.roles !== undefined) {
 							const targetRoles: readonly GjcModelAssignmentTargetId[] = selection.roles;
 							const includesDefault = targetRoles.includes("default");
 							const includesRoleAgent = targetRoles.some(targetRole => targetRole !== "default");
@@ -1730,25 +1814,23 @@ export class SelectorController {
 								selectedSelector ?? `${model.provider}/${model.id}`,
 								thinkingLevel,
 							);
-							materializeActiveModelProfileAssignment({
-								session: this.ctx.session,
-								settings: this.ctx.settings,
-								role,
-								selector: value,
-							});
+							if (
+								!materializeActiveModelProfileAssignment({
+									session: this.ctx.session,
+									settings: this.ctx.settings,
+									role,
+									selector: value,
+								})
+							) {
+								this.ctx.settings.setModelRole(role, value);
+							}
 							if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
 								this.ctx.session.setThinkingLevel(thinkingLevel);
 							}
-							modelSelector.refreshRoleAssignments({
-								currentModel: this.ctx.session.model,
-								currentThinkingLevel: this.ctx.session.thinkingLevel,
-								activeModelProfile:
-									this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
-							});
+							refreshRoleAssignments();
 							this.ctx.statusLine.invalidate();
 							this.ctx.updateEditorBorderColor();
 							this.ctx.showStatus(`Default model: ${selectedSelector ?? model.id}`);
-							done();
 							this.ctx.ui.requestRender();
 						} else {
 							const apiKey = await this.ctx.session.modelRegistry.getApiKey(model, this.ctx.session.sessionId);
@@ -1771,22 +1853,21 @@ export class SelectorController {
 									this.ctx.settings.setAgentModelOverride(role, value);
 								}
 							}
-							modelSelector.refreshRoleAssignments({
-								currentModel: this.ctx.session.model,
-								currentThinkingLevel: this.ctx.session.thinkingLevel,
-								activeModelProfile:
-									this.ctx.session.getActiveModelProfile?.() ?? this.ctx.settings.get("modelProfile.default"),
-							});
+							refreshRoleAssignments();
 							this.ctx.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 							this.ctx.statusLine.invalidate();
 							this.ctx.updateEditorBorderColor();
 							await this.ctx.notifyConfigChanged?.();
 							this.ctx.showStatus(`${role} agent model: ${value}`);
-							done();
 							this.ctx.ui.requestRender();
 						}
 					} catch (error) {
 						this.ctx.showError(error instanceof Error ? error.message : String(error));
+						if (isTrackedSingleAssignment) {
+							refreshRoleAssignments();
+							this.ctx.ui.requestRender();
+							throw error;
+						}
 					}
 				},
 				() => {
@@ -2057,10 +2138,7 @@ export class SelectorController {
 	}
 
 	async showSessionSelector(): Promise<void> {
-		const sessions = await SessionManager.listForResumePickerReadOnly(
-			this.ctx.sessionManager.getCwd(),
-			this.ctx.sessionManager.getSessionDir(),
-		);
+		const sessions = await this.ctx.sessionManager.listForResumePickerReadOnly();
 		this.showSelector(done => {
 			const selector = new SessionSelectorComponent(
 				sessions,
@@ -2156,8 +2234,16 @@ export class SelectorController {
 		this.#clearTransientSessionUi();
 		const migrationPolicy =
 			this.ctx.settings?.get("session.directoryMigration") === "disabled" ? "disabled" : "copy-retain";
-		const writableSessionPath = await SessionManager.prepareManagedCandidateForWrite(sessionPath, migrationPolicy);
-
+		let writableSessionPath = sessionPath;
+		if (this.ctx.sessionManager.isManagedDestination()) {
+			const inspection = await SessionManager.inspectSessionTailReadOnly(sessionPath);
+			if (inspection.kind === "error") throw new Error(`Could not inspect selected session: ${inspection.reason}`);
+			writableSessionPath = await this.ctx.sessionManager.prepareManagedCandidateForStrictAdoption(
+				sessionPath,
+				migrationPolicy,
+				inspection.identity,
+			);
+		}
 		// Switch session via AgentSession (emits hook and tool session events)
 		if (!(await this.ctx.session.switchSession(writableSessionPath))) return;
 		const switchingToDifferentSession = previousSessionId !== this.ctx.sessionManager.getSessionId();