@gajae-code/coding-agent 0.1.2 → 0.1.3

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [0.1.3] - 2026-05-28
+
+### Changed
+
+- Released the current dev branch fixes with refreshed 0.1.3 package metadata.
+
+## [0.1.2] - 2026-05-28
+
+### Changed
+
+- Updated package metadata for the Gajae Code npm publication.
+
 ### Fixed
 
 - Fixed slash-command autocomplete so skill command matches no longer hide built-in fuzzy candidates like `/model` while typing `/mode`.
@@ -12,7 +24,6 @@
 
 - Restored `gjc team` multi-worker GJC-team parity orchestration with current-window worker panes, GJC-scoped state/API semantics, and `N:agent-type` launches.
 - Ported GJC team worker-worktree integration parity so `status`/`resume` auto-checkpoint dirty workers, merge or cherry-pick worker commits, cross-rebase idle workers, and record conflicts under `.gjc` integration artifacts.
-- Restored `gjc team` multi-worker OMX-parity orchestration with current-window worker panes, GJC-scoped state/API semantics, and `N:agent-type` launches.
 
 ### Added
 

package/dist/types/config/model-registry.d.ts

@@ -327,6 +327,7 @@ export declare class ModelRegistry {
      * Check if a model is using OAuth credentials (subscription).
      */
     isUsingOAuth(model: Model<Api>): boolean;
+    getSessionCredentialType(provider: string, sessionId?: string): "api_key" | "oauth" | undefined;
     /**
      * Remove custom API/OAuth registrations for a specific extension source.
      */

package/dist/types/config/model-resolver.d.ts

@@ -7,9 +7,12 @@ import { type ModelRegistry, type ModelRole } from "./model-registry";
 import type { Settings } from "./settings";
 /** Default model IDs for each known provider */
 export declare const defaultModelPerProvider: Record<KnownProvider, string>;
-export interface ScopedModel {
+export interface ScopedModelSelection {
     model: Model<Api>;
     thinkingLevel?: ThinkingLevel;
+    explicitThinkingLevel?: boolean;
+}
+export interface ScopedModel extends ScopedModelSelection {
     explicitThinkingLevel: boolean;
 }
 /**

package/dist/types/gjc-runtime/team-runtime.d.ts

@@ -3,6 +3,7 @@ export type GjcTeamTaskStatus = "pending" | "blocked" | "in_progress" | "complet
 export type GjcWorkerStatusState = "idle" | "working" | "blocked" | "done" | "failed" | "draining" | "unknown";
 export declare const GJC_TEAM_DEFAULT_WORKERS = 3;
 export declare const GJC_TEAM_MAX_WORKERS = 20;
+export type GjcTeamWorkerCli = "gjc";
 export interface GjcTeamLeader {
     session_id: string;
     pane_id: string;
@@ -71,6 +72,7 @@ export interface GjcTeamConfig {
     max_workers: number;
     state_root: string;
     worker_command: string;
+    worker_cli_plan: GjcTeamWorkerCli[];
     tmux_command: string;
     tmux_session: string;
     tmux_session_name: string;
@@ -138,6 +140,9 @@ export interface GjcTeamMailboxMessage {
     delivered_at?: string;
     notified_at?: string;
 }
+export declare function resolveGjcTeamWorkerCli(env?: NodeJS.ProcessEnv): GjcTeamWorkerCli;
+export declare function resolveGjcTeamWorkerCliPlan(workerCount: number, env?: NodeJS.ProcessEnv): GjcTeamWorkerCli[];
+export declare function translateGjcWorkerLaunchArgsForCli(workerCli: GjcTeamWorkerCli, args: string[]): string[];
 interface GjcTeamEvent {
     event_id: string;
     ts: string;

package/dist/types/modes/components/model-selector.d.ts

@@ -2,11 +2,9 @@ import { ThinkingLevel } from "@gajae-code/agent-core";
 import { type Model } from "@gajae-code/ai";
 import { Container, Input, type TUI } from "@gajae-code/tui";
 import type { GjcModelAssignmentTargetId, ModelRegistry } from "../../config/model-registry";
+import { type ScopedModelSelection } from "../../config/model-resolver";
 import type { Settings } from "../../config/settings";
-interface ScopedModelItem {
-    model: Model;
-    thinkingLevel?: ThinkingLevel;
-}
+type ScopedModelItem = ScopedModelSelection;
 /**
  * Component that renders a canonical model selector with provider tabs.
  * - Tab/Arrow Left/Right: Switch between provider tabs

package/dist/types/modes/interactive-mode.d.ts

@@ -132,6 +132,7 @@ export declare class InteractiveMode implements InteractiveModeContext {
     cancelPendingSubmission(): boolean;
     markPendingSubmissionStarted(input: SubmittedUserInput): boolean;
     finishPendingSubmission(input: SubmittedUserInput): void;
+    updateEditorChrome(): void;
     updateEditorBorderColor(): void;
     updateEditorTopBorder(): void;
     rebuildChatFromMessages(): void;

package/dist/types/sdk.d.ts

@@ -2,6 +2,7 @@ import { type AgentTelemetryConfig, type ThinkingLevel } from "@gajae-code/agent
 import { type Model } from "@gajae-code/ai";
 import { type Rule } from "./capability/rule";
 import { ModelRegistry } from "./config/model-registry";
+import { type ScopedModelSelection } from "./config/model-resolver";
 import { type PromptTemplate } from "./config/prompt-templates";
 import { Settings, type SkillsSettings } from "./config/settings";
 import "./discovery";
@@ -40,10 +41,7 @@ export interface CreateAgentSessionOptions {
     /** Thinking selector. Default: from settings, else unset */
     thinkingLevel?: ThinkingLevel;
     /** Models available for cycling (Ctrl+P in interactive mode) */
-    scopedModels?: Array<{
-        model: Model;
-        thinkingLevel?: ThinkingLevel;
-    }>;
+    scopedModels?: ScopedModelSelection[];
     /** System prompt blocks. Array replaces default, function receives default blocks and returns final blocks. */
     systemPrompt?: string[] | ((defaultPrompt: string[]) => string[]);
     /** Optional provider-facing session identifier for prompt caches and sticky auth selection.

package/dist/types/session/agent-session.d.ts

@@ -18,7 +18,7 @@ import type { AssistantMessage, Effort, ImageContent, Message, MessageAttributio
 import { type AsyncJob, type AsyncJobDeliveryState, AsyncJobManager } from "../async";
 import type { Rule } from "../capability/rule";
 import { type ModelRegistry } from "../config/model-registry";
-import { type ResolvedModelRoleValue } from "../config/model-resolver";
+import { type ResolvedModelRoleValue, type ScopedModelSelection } from "../config/model-resolver";
 import { type PromptTemplate } from "../config/prompt-templates";
 import type { Settings, SkillsSettings } from "../config/settings";
 import { RawSseDebugBuffer } from "../debug/raw-sse-buffer";
@@ -119,10 +119,7 @@ export interface AgentSessionConfig {
     sessionManager: SessionManager;
     settings: Settings;
     /** Models to cycle through with Ctrl+P (from --models flag) */
-    scopedModels?: Array<{
-        model: Model;
-        thinkingLevel?: ThinkingLevel;
-    }>;
+    scopedModels?: ScopedModelSelection[];
     /** Initial session thinking selector. */
     thinkingLevel?: ThinkingLevel;
     /** Prompt templates for expansion */
@@ -446,10 +443,7 @@ export declare class AgentSession {
     /** Current session display name, if set */
     get sessionName(): string | undefined;
     /** Scoped models for cycling (from --models flag) */
-    get scopedModels(): ReadonlyArray<{
-        model: Model;
-        thinkingLevel?: ThinkingLevel;
-    }>;
+    get scopedModels(): ReadonlyArray<ScopedModelSelection>;
     /** Prompt templates */
     getPlanModeState(): PlanModeState | undefined;
     setPlanModeState(state: PlanModeState | undefined): void;

package/package.json

@@ -1,10 +1,10 @@
 {
 	"type": "module",
 	"name": "@gajae-code/coding-agent",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"description": "Gajae Code CLI with read, bash, edit, write tools and session management",
-	"homepage": "https://gajae-code.dev",
-	"author": "Can Boluk",
+	"homepage": "https://gaebal-gajae.dev",
+	"author": "Yeachan-Heo",
 	"contributors": [
 		"Mario Zechner"
 	],
@@ -48,12 +48,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@gajae-code/stats": "0.1.2",
-		"@gajae-code/agent-core": "0.1.2",
-		"@gajae-code/ai": "0.1.2",
-		"@gajae-code/natives": "0.1.2",
-		"@gajae-code/tui": "0.1.2",
-		"@gajae-code/utils": "0.1.2",
+		"@gajae-code/stats": "0.1.3",
+		"@gajae-code/agent-core": "0.1.3",
+		"@gajae-code/ai": "0.1.3",
+		"@gajae-code/natives": "0.1.3",
+		"@gajae-code/tui": "0.1.3",
+		"@gajae-code/utils": "0.1.3",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/config/model-registry.ts

@@ -2170,6 +2170,10 @@ export class ModelRegistry {
 		return this.authStorage.hasOAuth(model.provider);
 	}
 
+	getSessionCredentialType(provider: string, sessionId?: string): "api_key" | "oauth" | undefined {
+		return this.authStorage.getSessionCredentialType(provider, sessionId);
+	}
+
 	#clearRuntimeProviderState(providerName: string): void {
 		this.#runtimeProviderApiKeys.delete(providerName);
 		this.#runtimeProviderOverrides.delete(providerName);

package/src/config/model-resolver.ts

@@ -23,9 +23,13 @@ import type { Settings } from "./settings";
 /** Default model IDs for each known provider */
 export const defaultModelPerProvider: Record<KnownProvider, string> = DEFAULT_MODEL_PER_PROVIDER;
 
-export interface ScopedModel {
+export interface ScopedModelSelection {
 	model: Model<Api>;
 	thinkingLevel?: ThinkingLevel;
+	explicitThinkingLevel?: boolean;
+}
+
+export interface ScopedModel extends ScopedModelSelection {
 	explicitThinkingLevel: boolean;
 }
 

package/src/defaults/gjc/skills/team/SKILL.md

@@ -155,6 +155,7 @@ Important:
 
 - Leader remains in the existing left pane.
 - Worker panes are independent full GJC worker CLI sessions on the right side of a leader-left/worker-right split.
+- Worker CLI selection is teammate-only: `GJC_TEAM_WORKER_CLI` and `GJC_TEAM_WORKER_CLI_MAP` accept only `auto` or `gjc`; legacy/provider values such as `codex`, `claude`, or `gemini` are rejected before launch.
 - The worker may run in a dedicated git worktree (`gjc team --worktree[=<name>]`) while sharing the team state root.
 - `shutdown` kills only the recorded worker pane after confirming it still belongs to the stored tmux target and is not the leader pane. It never kills the tmux session.
 

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

@@ -8,6 +8,11 @@ export type GjcWorkerStatusState = "idle" | "working" | "blocked" | "done" | "fa
 
 export const GJC_TEAM_DEFAULT_WORKERS = 3;
 export const GJC_TEAM_MAX_WORKERS = 20;
+const GJC_TEAM_WORKER_CLI_ENV = "GJC_TEAM_WORKER_CLI";
+const GJC_TEAM_WORKER_CLI_MAP_ENV = "GJC_TEAM_WORKER_CLI_MAP";
+
+export type GjcTeamWorkerCli = "gjc";
+type GjcTeamWorkerCliMode = "auto" | GjcTeamWorkerCli;
 
 export interface GjcTeamLeader {
 	session_id: string;
@@ -75,6 +80,7 @@ export interface GjcTeamConfig {
 	max_workers: number;
 	state_root: string;
 	worker_command: string;
+	worker_cli_plan: GjcTeamWorkerCli[];
 	tmux_command: string;
 	tmux_session: string;
 	tmux_session_name: string;
@@ -159,6 +165,70 @@ export interface GjcTeamMailboxMessage {
 interface FsError {
 	code?: string;
 }
+
+function normalizeGjcTeamWorkerCliMode(
+	raw: string | undefined,
+	sourceEnv = GJC_TEAM_WORKER_CLI_ENV,
+): GjcTeamWorkerCliMode {
+	const normalized = String(raw ?? "auto")
+		.trim()
+		.toLowerCase();
+	if (normalized === "" || normalized === "auto") return "auto";
+	if (normalized === "gjc") return "gjc";
+	if (normalized === "codex" || normalized === "claude" || normalized === "gemini") {
+		throw new Error(`Unsupported ${sourceEnv} value "${raw}". GJC team launches GJC teammate sessions only.`);
+	}
+	throw new Error(`Invalid ${sourceEnv} value "${raw}". Expected: auto or gjc`);
+}
+
+export function resolveGjcTeamWorkerCli(env: NodeJS.ProcessEnv = process.env): GjcTeamWorkerCli {
+	const mode = normalizeGjcTeamWorkerCliMode(env[GJC_TEAM_WORKER_CLI_ENV]);
+	return mode === "auto" ? "gjc" : mode;
+}
+
+export function resolveGjcTeamWorkerCliPlan(
+	workerCount: number,
+	env: NodeJS.ProcessEnv = process.env,
+): GjcTeamWorkerCli[] {
+	if (!Number.isInteger(workerCount) || workerCount < 1) {
+		throw new Error(`workerCount must be >= 1 (got ${workerCount})`);
+	}
+	normalizeGjcTeamWorkerCliMode(env[GJC_TEAM_WORKER_CLI_ENV]);
+	const rawMap = String(env[GJC_TEAM_WORKER_CLI_MAP_ENV] ?? "").trim();
+	if (rawMap === "") {
+		const cli = resolveGjcTeamWorkerCli(env);
+		return Array.from({ length: workerCount }, () => cli);
+	}
+	const entries = rawMap.split(",").map(entry => entry.trim());
+	if (entries.length === 0 || entries.every(entry => entry.length === 0)) {
+		throw new Error(
+			`Invalid ${GJC_TEAM_WORKER_CLI_MAP_ENV} value "${env[GJC_TEAM_WORKER_CLI_MAP_ENV]}". Expected: auto or gjc`,
+		);
+	}
+	if (entries.some(entry => entry.length === 0)) {
+		throw new Error(
+			`Invalid ${GJC_TEAM_WORKER_CLI_MAP_ENV} value "${env[GJC_TEAM_WORKER_CLI_MAP_ENV]}". Empty entries are not allowed.`,
+		);
+	}
+	if (entries.length !== 1 && entries.length !== workerCount) {
+		throw new Error(
+			`Invalid ${GJC_TEAM_WORKER_CLI_MAP_ENV} length ${entries.length}; expected 1 or ${workerCount} comma-separated values.`,
+		);
+	}
+	const expanded = entries.length === 1 ? Array.from({ length: workerCount }, () => entries[0] ?? "") : entries;
+	return expanded.map(entry => {
+		const mode = normalizeGjcTeamWorkerCliMode(entry, GJC_TEAM_WORKER_CLI_MAP_ENV);
+		return mode === "auto" ? "gjc" : mode;
+	});
+}
+
+export function translateGjcWorkerLaunchArgsForCli(workerCli: GjcTeamWorkerCli, args: string[]): string[] {
+	if (workerCli !== "gjc") {
+		throw new Error(`Unsupported team worker CLI "${workerCli}". GJC team launches GJC teammate sessions only.`);
+	}
+	return [...args];
+}
+
 interface GjcTmuxLeaderContext {
 	sessionName: string;
 	windowIndex: string;
@@ -341,6 +411,7 @@ async function readConfig(dir: string): Promise<GjcTeamConfig> {
 		tmux_target: config.tmux_target ?? config.tmux_session ?? tmuxSessionName,
 		leader_cwd: config.leader_cwd ?? config.leader.cwd,
 		team_state_root: config.team_state_root ?? config.state_root,
+		worker_cli_plan: config.worker_cli_plan ?? Array.from({ length: config.worker_count }, () => "gjc"),
 	};
 }
 async function readPhase(dir: string): Promise<GjcTeamPhase> {
@@ -1227,6 +1298,7 @@ export async function startGjcTeam(options: GjcTeamStartOptions): Promise<GjcTea
 	const env = options.env ?? process.env;
 	if (!Number.isInteger(options.workerCount) || options.workerCount < 1 || options.workerCount > GJC_TEAM_MAX_WORKERS)
 		throw new Error(`invalid_team_worker_count:${options.workerCount}:expected_1_${GJC_TEAM_MAX_WORKERS}`);
+	const workerCliPlan = resolveGjcTeamWorkerCliPlan(options.workerCount, env);
 	const stateRoot = resolveGjcTeamStateRoot(cwd, env);
 	const teamName = sanitizeName(options.teamName ?? makeTeamName(options.task, env));
 	const displayName = sanitizeName(options.teamName ?? options.task).slice(0, 30) || teamName;
@@ -1256,6 +1328,7 @@ export async function startGjcTeam(options: GjcTeamStartOptions): Promise<GjcTea
 		max_workers: GJC_TEAM_MAX_WORKERS,
 		state_root: stateRoot,
 		worker_command: resolveGjcWorkerCommand(cwd, env),
+		worker_cli_plan: workerCliPlan,
 		tmux_command: tmuxCommand,
 		tmux_session: tmuxContext.sessionName,
 		tmux_session_name: tmuxContext.sessionName,
@@ -1279,6 +1352,7 @@ export async function startGjcTeam(options: GjcTeamStartOptions): Promise<GjcTea
 		tmux_session_name: config.tmux_session_name,
 		tmux_target: config.tmux_target,
 		worker_command: config.worker_command,
+		worker_cli_plan: config.worker_cli_plan,
 		tmux_command: config.tmux_command,
 		leader: config.leader,
 		workers: config.workers,
@@ -1296,7 +1370,12 @@ export async function startGjcTeam(options: GjcTeamStartOptions): Promise<GjcTea
 	await appendTelemetry(dir, {
 		type: "team_runtime",
 		message: "Native gjc team runtime initialized",
-		data: { state_root: stateRoot, worker_command: config.worker_command, workspace_mode: config.workspace_mode },
+		data: {
+			state_root: stateRoot,
+			worker_command: config.worker_command,
+			worker_cli_plan: workerCliPlan,
+			workspace_mode: config.workspace_mode,
+		},
 	});
 	let tmuxWorkers: GjcTeamWorker[];
 	try {

package/src/main.ts

@@ -601,6 +601,7 @@ async function buildSessionOptions(
 			thinkingLevel: scopedModel.explicitThinkingLevel
 				? (scopedModel.thinkingLevel ?? defaultThinkingLevel)
 				: defaultThinkingLevel,
+			explicitThinkingLevel: scopedModel.explicitThinkingLevel,
 		}));
 	}
 

package/src/modes/components/model-selector.ts

@@ -1,5 +1,5 @@
 import { ThinkingLevel } from "@gajae-code/agent-core";
-import { type Model, modelsAreEqual } from "@gajae-code/ai";
+import { getSupportedEfforts, type Model, modelsAreEqual } from "@gajae-code/ai";
 import {
 	Container,
 	fuzzyFilter,
@@ -14,11 +14,15 @@ import {
 } from "@gajae-code/tui";
 import type { GjcModelAssignmentTargetId, ModelRegistry } from "../../config/model-registry";
 import { GJC_MODEL_ASSIGNMENT_TARGET_IDS, GJC_MODEL_ASSIGNMENT_TARGETS } from "../../config/model-registry";
-import { formatModelSelectorValue, resolveModelRoleValue } from "../../config/model-resolver";
+import {
+	formatModelSelectorValue,
+	resolveModelRoleValue,
+	type ScopedModelSelection,
+} from "../../config/model-resolver";
 import type { Settings } from "../../config/settings";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 import { formatModelOnboardingInlineHint } from "../../setup/model-onboarding-guidance";
-import { getThinkingLevelMetadata } from "../../thinking";
+import { getThinkingLevelMetadata, parseThinkingLevel } from "../../thinking";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -54,6 +58,7 @@ interface ModelItem {
 	model: Model;
 	selector: string;
 	thinkingLevel?: ThinkingLevel;
+	explicitThinkingLevel?: boolean;
 }
 
 interface CanonicalModelItem {
@@ -66,18 +71,22 @@ interface CanonicalModelItem {
 	normalizedSearchText: string;
 	compactSearchText: string;
 	thinkingLevel?: ThinkingLevel;
+	explicitThinkingLevel?: boolean;
 }
 
-interface ScopedModelItem {
-	model: Model;
-	thinkingLevel?: ThinkingLevel;
-}
+type ScopedModelItem = ScopedModelSelection;
 
 interface RoleAssignment {
 	model: Model;
 	thinkingLevel: ThinkingLevel;
 }
 
+interface PendingThinkingChoice {
+	item: ModelItem | CanonicalModelItem;
+	role: GjcModelAssignmentTargetId | null;
+	levels: ThinkingLevel[];
+}
+
 type RoleSelectCallback = (
 	model: Model,
 	role: GjcModelAssignmentTargetId | null,
@@ -134,6 +143,8 @@ export class ModelSelectorComponent extends Container {
 	#temporaryOnly: boolean;
 	#pendingActionItem?: ModelItem | CanonicalModelItem;
 	#selectedActionIndex: number = 0;
+	#pendingThinkingChoice?: PendingThinkingChoice;
+	#selectedThinkingIndex: number = 0;
 
 	// Tab state
 	#providers: ProviderTabState[] = STATIC_PROVIDER_TABS;
@@ -349,6 +360,7 @@ export class ModelSelectorComponent extends Container {
 				model: scoped.model,
 				selector: `${scoped.model.provider}/${scoped.model.id}`,
 				thinkingLevel: scoped.thinkingLevel,
+				explicitThinkingLevel: scoped.explicitThinkingLevel,
 			}));
 		} else {
 			// Reload config and cached discovery state without blocking on live provider refresh
@@ -418,6 +430,10 @@ export class ModelSelectorComponent extends Container {
 				if (scopedThinkingLevel !== undefined) {
 					item.thinkingLevel = scopedThinkingLevel;
 				}
+				const scopedModel = models.find(model => `${model.model.provider}/${model.model.id}` === selectedSelector);
+				if (scopedModel?.explicitThinkingLevel !== undefined) {
+					item.explicitThinkingLevel = scopedModel.explicitThinkingLevel;
+				}
 				return item;
 			})
 			.filter((item): item is CanonicalModelItem => item !== undefined);
@@ -722,11 +738,14 @@ export class ModelSelectorComponent extends Container {
 			this.#listContainer.addChild(
 				new Text(theme.fg("muted", `  Model Name: ${selected.model.name}${suffix}`), 0, 0),
 			);
-			if (this.#pendingActionItem) {
+			if (this.#pendingThinkingChoice) {
+				this.#renderThinkingMenu(this.#pendingThinkingChoice);
+			} else if (this.#pendingActionItem) {
 				this.#renderActionMenu(this.#pendingActionItem);
 			}
 		}
 	}
+
 	#renderActionMenu(item: ModelItem | CanonicalModelItem): void {
 		this.#listContainer.addChild(new Spacer(1));
 		this.#listContainer.addChild(new Text(theme.fg("muted", `  Action for: ${item.model.id}`), 0, 0));
@@ -742,6 +761,24 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#renderThinkingMenu(choice: PendingThinkingChoice): void {
+		const targetLabel = choice.role === null ? "temporary model" : GJC_MODEL_ASSIGNMENT_TARGETS[choice.role].name;
+		this.#listContainer.addChild(new Spacer(1));
+		this.#listContainer.addChild(
+			new Text(theme.fg("muted", `  Reasoning for ${targetLabel}: ${choice.item.model.id}`), 0, 0),
+		);
+		this.#listContainer.addChild(new Spacer(1));
+		for (let i = 0; i < choice.levels.length; i++) {
+			const level = choice.levels[i];
+			const metadata = getThinkingLevelMetadata(level);
+			const prefix = i === this.#selectedThinkingIndex ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
+			const label = `${metadata.label} — ${metadata.description}`;
+			this.#listContainer.addChild(
+				new Text(`${prefix}${i === this.#selectedThinkingIndex ? theme.fg("accent", label) : label}`, 0, 0),
+			);
+		}
+	}
+
 	#getCurrentRoleThinkingLevel(role: string): ThinkingLevel {
 		return this.#roles[role]?.thinkingLevel ?? ThinkingLevel.Inherit;
 	}
@@ -753,6 +790,10 @@ export class ModelSelectorComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
+		if (this.#pendingThinkingChoice) {
+			this.#handleThinkingMenuInput(keyData);
+			return;
+		}
 		if (this.#pendingActionItem) {
 			this.#handleActionMenuInput(keyData);
 			return;
@@ -839,12 +880,50 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
+	#handleThinkingMenuInput(keyData: string): void {
+		const choice = this.#pendingThinkingChoice;
+		if (!choice) return;
+		if (matchesKey(keyData, "up")) {
+			this.#selectedThinkingIndex =
+				this.#selectedThinkingIndex === 0 ? choice.levels.length - 1 : this.#selectedThinkingIndex - 1;
+			this.#updateList();
+			return;
+		}
+		if (matchesKey(keyData, "down")) {
+			this.#selectedThinkingIndex = (this.#selectedThinkingIndex + 1) % choice.levels.length;
+			this.#updateList();
+			return;
+		}
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
+			const level = choice.levels[this.#selectedThinkingIndex];
+			if (!level) return;
+			this.#pendingThinkingChoice = undefined;
+			this.#handleSelect(choice.item, choice.role, level);
+			return;
+		}
+		if (getKeybindings().matches(keyData, "tui.select.cancel")) {
+			this.#pendingThinkingChoice = undefined;
+			if (choice.role !== null) {
+				this.#pendingActionItem = choice.item;
+				this.#selectedActionIndex = Math.max(0, GJC_MODEL_ASSIGNMENT_TARGET_IDS.indexOf(choice.role));
+			}
+			this.#updateList();
+		}
+	}
+
 	#handleSelect(
 		item: ModelItem | CanonicalModelItem,
 		role: GjcModelAssignmentTargetId | null,
 		thinkingLevel?: ThinkingLevel,
 	): void {
 		const itemThinkingLevel = thinkingLevel ?? item.thinkingLevel;
+		const hasExplicitThinkingChoice = thinkingLevel !== undefined || item.explicitThinkingLevel === true;
+		if (!hasExplicitThinkingChoice && requiresExplicitThinkingChoice(item.model)) {
+			this.#pendingThinkingChoice = { item, role, levels: getSelectableThinkingLevels(item.model) };
+			this.#selectedThinkingIndex = 0;
+			this.#updateList();
+			return;
+		}
 
 		// For temporary role, don't save to settings - just notify caller
 		if (role === null) {
@@ -871,6 +950,27 @@ export class ModelSelectorComponent extends Container {
 	}
 }
 
+function requiresExplicitThinkingChoice(model: Model): boolean {
+	return model.reasoning === true && (model.provider === "openai" || model.provider === "openai-codex");
+}
+
+function getSelectableThinkingLevels(model: Model): ThinkingLevel[] {
+	const levels: ThinkingLevel[] = [ThinkingLevel.Off];
+	let efforts: readonly string[];
+	try {
+		efforts = getSupportedEfforts(model);
+	} catch {
+		return levels;
+	}
+	for (const effort of efforts) {
+		const level = parseThinkingLevel(effort);
+		if (level && !levels.includes(level)) {
+			levels.push(level);
+		}
+	}
+	return levels;
+}
+
 /** Extract the first version number from a model ID (e.g. "gemini-2.5-pro" → 2.5, "Anthropic model-sonnet-4-6" → 4.6). */
 function extractVersionNumber(id: string): number {
 	// Dot-separated version: "gemini-2.5-pro" → 2.5

package/src/modes/interactive-mode.ts

@@ -121,9 +121,14 @@ const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 };
 
 function configureDefaultComposerChrome(editor: CustomEditor): void {
-	editor.setBorderVisible(false);
-	editor.setPromptGutter(`${theme.fg("accent", "›")} `);
+	editor.setBorderVisible(true);
+	editor.setBorderStyle("sharp");
+	editor.setClosedBorderBox(true);
+	editor.setPromptGutter(undefined);
+	editor.setInputPrefix(`${theme.fg("accent", ">")} `);
+	editor.setPlaceholder("Type your message...");
 	editor.setPaddingX(1);
+	editor.setTopBorder(undefined);
 }
 
 interface WorkingMessageAccent {
@@ -376,7 +381,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#syncEditorMaxHeight();
 		this.#resizeHandler = () => {
 			this.#syncEditorMaxHeight();
-			this.updateEditorTopBorder();
+			this.updateEditorChrome();
 		};
 		process.stdout.on("resize", this.#resizeHandler);
 		try {
@@ -500,7 +505,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.addChild(this.statusContainer);
 		this.ui.addChild(this.todoContainer);
 		this.ui.addChild(this.btwContainer);
-		this.ui.addChild(this.statusLine); // Main status rail + hook statuses; composer stays borderless.
+		this.ui.addChild(this.statusLine); // Main status rail + hook statuses; composer chrome is rendered by the editor.
 		this.ui.addChild(this.hookWidgetContainerAbove);
 		this.ui.addChild(this.editorContainer);
 		this.ui.addChild(this.hookWidgetContainerBelow);
@@ -526,7 +531,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.start();
 		pushTerminalTitle();
 		setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
-		this.updateEditorBorderColor();
+		this.updateEditorChrome();
 		this.#syncEditorMaxHeight();
 		this.isInitialized = true;
 		this.ui.requestRender(true);
@@ -544,7 +549,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			const draft = await this.sessionManager.consumeDraft();
 			if (draft && !this.editor.getText()) {
 				this.editor.setText(draft);
-				this.updateEditorBorderColor();
+				this.updateEditorChrome();
 				this.ui.requestRender();
 			}
 		} catch (err) {
@@ -564,7 +569,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			clearRenderCache();
 			configureDefaultComposerChrome(this.editor);
 			this.ui.invalidate();
-			this.updateEditorBorderColor();
+			this.updateEditorChrome();
 			this.ui.requestRender();
 		});
 
@@ -577,12 +582,12 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Set up git branch watcher
 		this.statusLine.watchBranch(() => {
-			this.updateEditorTopBorder();
+			this.updateEditorChrome();
 			this.ui.requestRender();
 		});
 
 		// Initial top border update
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 	}
 
 	/** Reload slash commands and autocomplete for the provided working directory. */
@@ -749,7 +754,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.loopLimit = undefined;
 		this.#cancelLoopAutoSubmit();
 		this.statusLine.setLoopModeStatus(undefined);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		if (wasEnabled) {
 			this.showStatus(message);
@@ -780,7 +785,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.loopPrompt = undefined;
 		this.loopLimit = createLoopLimitRuntime(parsedLimit);
 		this.statusLine.setLoopModeStatus({ enabled: true });
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		const limitSuffix = parsedLimit ? ` Limited to ${describeLoopLimit(parsedLimit)}.` : "";
 		const remainingSuffix = this.loopLimit ? ` ${describeLoopLimitRuntime(this.loopLimit)}.` : "";
@@ -874,7 +879,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.rebuildChatFromMessages();
 			this.editor.setText(submission.text);
 		}
-		this.updateEditorBorderColor();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 		return true;
 	}
@@ -921,7 +926,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.setMaxHeight(this.#computeEditorMaxHeight());
 	}
 
-	updateEditorBorderColor(): void {
+	updateEditorChrome(): void {
 		if (this.isBashMode) {
 			this.editor.borderColor = theme.getBashModeBorderColor();
 		} else if (this.isPythonMode) {
@@ -938,13 +943,21 @@ export class InteractiveMode implements InteractiveModeContext {
 				this.editor.borderColor = theme.getThinkingBorderColor(level);
 			}
 		}
-		this.updateEditorTopBorder();
+		this.#setComposerTopBorder();
 		this.ui.requestRender();
 	}
 
+	updateEditorBorderColor(): void {
+		this.updateEditorChrome();
+	}
+
 	updateEditorTopBorder(): void {
-		// The opencode-style composer is intentionally borderless. Keep status-line
-		// rendering out of the input area so the prompt remains a simple gutter + body.
+		this.#setComposerTopBorder();
+	}
+
+	#setComposerTopBorder(): void {
+		// Keep the composer as a plain closed input rectangle; status-line
+		// rendering stays outside the input area.
 		this.editor.setTopBorder(undefined);
 	}
 
@@ -1048,7 +1061,7 @@ export class InteractiveMode implements InteractiveModeContext {
 					}
 				: undefined;
 		this.statusLine.setPlanModeStatus(status);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -1058,7 +1071,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				? { enabled: this.goalModeEnabled, paused: this.goalModePaused }
 				: undefined;
 		this.statusLine.setGoalModeStatus(status);
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -1650,7 +1663,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			const applied = await this.sessionManager.setSessionName(seededName, "auto");
 			if (applied) {
 				setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
-				this.updateEditorBorderColor();
+				this.updateEditorChrome();
 			}
 		}
 
@@ -2121,8 +2134,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			logger.warn("Failed to refresh slash command state for custom editor", { error: String(error) });
 		});
 
-		this.updateEditorBorderColor();
-		this.updateEditorTopBorder();
+		this.updateEditorChrome();
 		this.ui.requestRender();
 	}
 
@@ -2417,7 +2429,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				} else {
 					this.#cleanupMicAnimation();
 				}
-				this.updateEditorTopBorder();
+				this.updateEditorChrome();
 				this.ui.requestRender();
 			},
 		});

package/src/sdk.ts

@@ -40,6 +40,7 @@ import {
 	parseModelString,
 	resolveAllowedModels,
 	resolveModelRoleValue,
+	type ScopedModelSelection,
 } from "./config/model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
 import { Settings, type SkillsSettings } from "./config/settings";
@@ -230,7 +231,7 @@ export interface CreateAgentSessionOptions {
 	/** Thinking selector. Default: from settings, else unset */
 	thinkingLevel?: ThinkingLevel;
 	/** Models available for cycling (Ctrl+P in interactive mode) */
-	scopedModels?: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	scopedModels?: ScopedModelSelection[];
 
 	/** System prompt blocks. Array replaces default, function receives default blocks and returns final blocks. */
 	systemPrompt?: string[] | ((defaultPrompt: string[]) => string[]);
@@ -1760,6 +1761,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				}
 				return key;
 			},
+			getAuthCredentialType: provider => modelRegistry.getSessionCredentialType(provider, agent.sessionId),
 			streamFn: (streamModel, context, streamOptions) =>
 				streamSimple(streamModel, context, {
 					...streamOptions,

package/src/session/agent-session.ts

@@ -95,6 +95,7 @@ import {
 	parseModelString,
 	type ResolvedModelRoleValue,
 	resolveModelRoleValue,
+	type ScopedModelSelection,
 } from "../config/model-resolver";
 import { expandPromptTemplate, type PromptTemplate } from "../config/prompt-templates";
 import type { Settings, SkillsSettings } from "../config/settings";
@@ -258,7 +259,7 @@ export interface AgentSessionConfig {
 	sessionManager: SessionManager;
 	settings: Settings;
 	/** Models to cycle through with Ctrl+P (from --models flag) */
-	scopedModels?: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	scopedModels?: ScopedModelSelection[];
 	/** Initial session thinking selector. */
 	thinkingLevel?: ThinkingLevel;
 	/** Prompt templates for expansion */
@@ -748,7 +749,7 @@ export class AgentSession {
 
 	readonly configWarnings: string[] = [];
 
-	#scopedModels: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	#scopedModels: ScopedModelSelection[];
 	#thinkingLevel: ThinkingLevel | undefined;
 	#promptTemplates: PromptTemplate[];
 	#slashCommands: FileSlashCommand[];
@@ -3749,7 +3750,7 @@ export class AgentSession {
 	}
 
 	/** Scoped models for cycling (from --models flag) */
-	get scopedModels(): ReadonlyArray<{ model: Model; thinkingLevel?: ThinkingLevel }> {
+	get scopedModels(): ReadonlyArray<ScopedModelSelection> {
 		return this.#scopedModels;
 	}
 
@@ -6445,6 +6446,7 @@ export class AgentSession {
 					metadata: this.agent.metadataForProvider(candidate.provider),
 					convertToLlm,
 					telemetry,
+					authCredentialType: this.#modelRegistry.getSessionCredentialType(candidate.provider, this.sessionId),
 				});
 			} catch (error) {
 				if (!this.#isCompactionAuthFailure(error)) {
@@ -6700,6 +6702,10 @@ export class AgentSession {
 								initiatorOverride: "agent",
 								convertToLlm,
 								telemetry,
+								authCredentialType: this.#modelRegistry.getSessionCredentialType(
+									candidate.provider,
+									this.sessionId,
+								),
 							});
 							break;
 						} catch (error) {

package/src/tools/image-gen.ts

@@ -44,6 +44,7 @@ interface ImageApiKey {
 	apiKey: string;
 	projectId?: string;
 	model?: Model;
+	authCredentialType?: "api_key" | "oauth";
 }
 
 const responseModalitySchema = z.enum(["IMAGE", "TEXT"] as const);
@@ -441,6 +442,7 @@ async function findOpenAIHostedImageCredentials(
 		provider: getOpenAIHostedImageProvider(activeModel),
 		apiKey,
 		model: activeModel,
+		authCredentialType: modelRegistry.getSessionCredentialType?.(activeModel.provider, sessionId),
 	};
 }
 
@@ -700,16 +702,21 @@ function getOpenAIResponseErrorMessage(rawText: string): string {
 	}
 }
 
-function getOpenAIBaseUrl(model: Model): string {
-	const fallback =
-		model.api === "openai-codex-responses" || model.provider === "openai-codex"
-			? CODEX_BASE_URL
-			: DEFAULT_OPENAI_BASE_URL;
-	return (model.baseUrl || fallback).replace(/\/+$/, "");
+function getOpenAIBaseUrl(model: Model, authCredentialType?: "api_key" | "oauth"): string {
+	if (model.api === "openai-codex-responses" || model.provider === "openai-codex") {
+		return (model.baseUrl || CODEX_BASE_URL).replace(/\/+$/, "");
+	}
+	if (authCredentialType === "oauth") return DEFAULT_OPENAI_BASE_URL;
+	const envBaseUrl = $env.OPENAI_BASE_URL?.trim();
+	const configuredBaseUrl = model.baseUrl?.trim();
+	if (envBaseUrl && (!configuredBaseUrl || configuredBaseUrl.toLowerCase().includes("api.openai.com"))) {
+		return envBaseUrl.replace(/\/+$/, "");
+	}
+	return (configuredBaseUrl || envBaseUrl || DEFAULT_OPENAI_BASE_URL).replace(/\/+$/, "");
 }
 
-function getOpenAIResponsesUrl(model: Model): string {
-	const baseUrl = getOpenAIBaseUrl(model);
+function getOpenAIResponsesUrl(model: Model, authCredentialType?: "api_key" | "oauth"): string {
+	const baseUrl = getOpenAIBaseUrl(model, authCredentialType);
 	if (model.api !== "openai-codex-responses" && model.provider !== "openai-codex") {
 		return `${baseUrl}/responses`;
 	}
@@ -782,11 +789,12 @@ async function generateOpenAIHostedImage(
 	inputImages: InlineImageData[],
 	signal: AbortSignal | undefined,
 	sessionId: string | undefined,
+	options?: { authCredentialType?: "api_key" | "oauth" },
 ): Promise<OpenAIHostedImageResult> {
 	const promptText = assemblePrompt(params);
 	const stream = model.api === "openai-codex-responses" || model.provider === "openai-codex";
 	const requestBody = buildOpenAIHostedImageRequest(model, promptText, params, inputImages, stream);
-	const response = await fetch(getOpenAIResponsesUrl(model), {
+	const response = await fetch(getOpenAIResponsesUrl(model, options?.authCredentialType), {
 		method: "POST",
 		headers: buildOpenAIImageHeaders(model, apiKey, sessionId),
 		body: JSON.stringify(requestBody),
@@ -946,6 +954,7 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 					resolvedImages,
 					requestSignal,
 					sessionId,
+					{ authCredentialType: apiKey.authCredentialType },
 				);
 
 				if (parsed.images.length === 0) {
@@ -1075,7 +1084,7 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 					headers: {
 						"Content-Type": "application/json",
 						Authorization: `Bearer ${apiKey.apiKey}`,
-						"HTTP-Referer": "https://gajae-code.dev/",
+						"HTTP-Referer": "https://gaebal-gajae.dev/",
 						"X-OpenRouter-Title": "Gajae Code",
 						"X-OpenRouter-Categories": "cli-agent",
 					},