@gajae-code/coding-agent 0.1.2 → 0.2.0

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/components/skill-hud/render.ts

@@ -1,4 +1,4 @@
-import type { SkillActiveEntry } from "../../../skill-state/active-state";
+import type { SkillActiveEntry, WorkflowHudChip } from "../../../skill-state/active-state";
 
 const ANSI_RESET_FG = "\x1b[39m";
 const ANSI_RESET_BOLD = "\x1b[22m";
@@ -31,16 +31,43 @@ function compareEntries(a: SkillActiveEntry, b: SkillActiveEntry): number {
 	return a.skill.localeCompare(b.skill) || (a.phase ?? "").localeCompare(b.phase ?? "");
 }
 
+function compareChips(a: WorkflowHudChip, b: WorkflowHudChip): number {
+	return (a.priority ?? 50) - (b.priority ?? 50) || a.label.localeCompare(b.label);
+}
+
+function chipPrefix(chip: WorkflowHudChip): string {
+	if (chip.severity === "error") return "!";
+	if (chip.severity === "blocked") return "block";
+	if (chip.severity === "warning") return "warn";
+	return "";
+}
+
+function formatChip(chip: WorkflowHudChip): string | null {
+	const label = sanitizeHudPart(chip.label);
+	const value = sanitizeHudPart(chip.value);
+	if (!label) return null;
+	const body = value ? `${label}=${value}` : label;
+	const prefix = chipPrefix(chip);
+	return prefix ? `${prefix}:${body}` : body;
+}
+
+function formatEntry(entry: SkillActiveEntry): string {
+	const skill = sanitizeHudPart(entry.skill);
+	const phase = sanitizeHudPart(entry.phase);
+	const base = phase ? `${skill}:${phase}` : skill;
+	const chips = [...(entry.hud?.chips ?? [])]
+		.sort(compareChips)
+		.map(formatChip)
+		.filter((chip): chip is string => Boolean(chip));
+	if (entry.stale === true) chips.unshift("warn:stale");
+	const summary = sanitizeHudPart(entry.hud?.summary);
+	return [base, summary, ...chips].filter(Boolean).join(" ");
+}
+
 export function renderSkillHudBar(entries: readonly SkillActiveEntry[], width: number): string | null {
 	const active = entries.filter(entry => entry.active !== false && sanitizeHudPart(entry.skill)).sort(compareEntries);
 	if (active.length === 0 || width <= 0) return null;
-	const body = active
-		.map(entry => {
-			const skill = sanitizeHudPart(entry.skill);
-			const phase = sanitizeHudPart(entry.phase);
-			return phase ? `${skill}:${phase}` : skill;
-		})
-		.join(" + ");
+	const body = active.map(formatEntry).join(" + ");
 	const prefix = `${ANSI_BORDER}◆${ANSI_RESET_FG} ${ANSI_BOLD}${ANSI_ACCENT}hud${ANSI_RESET_FG}${ANSI_RESET_BOLD} `;
 	const budget = Math.max(1, width - visibleWidth(prefix));
 	return truncateToWidth(`${prefix}${ANSI_DIM}${truncateToWidth(body, budget)}${ANSI_RESET_BOLD}`, width);

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/prompts/system/system-prompt.md

@@ -20,22 +20,23 @@ Optimize for correctness first, maintainability second, and brevity third. Prefe
 <public-workflow-surface>
 GJC exposes exactly four default workflow skills. Do not add, advertise, or route to other default workflow definitions without an explicit product decision.
 
-<skill name="deep-interview" user-entrypoint="/skill:deep-interview" cli-runtime="gjc deep-interview">
+<skill name="deep-interview" user-entrypoint="/skill:deep-interview" cli-runtime="private-bridge-only: gjc deep-interview">
 Use for vague ideas that need Socratic requirements gathering, mathematical ambiguity scoring, topology confirmation, and a spec under `.gjc/specs/`. It is a requirements workflow; it must not mutate product code. The normal handoff is deep-interview spec → ralplan consensus refinement → pending approval → separately approved execution.
 </skill>
 
-<skill name="ralplan" user-entrypoint="/skill:ralplan" cli-runtime="gjc ralplan">
+<skill name="ralplan" user-entrypoint="/skill:ralplan" cli-runtime="private-bridge-only: gjc ralplan">
 Use for consensus planning when requirements are clear enough to plan but architecture, sequencing, or verification needs Planner/Architect/Critic agreement. Plans belong under `.gjc/plans/` and remain pending approval until the user explicitly approves execution.
 </skill>
 
-<skill name="ultragoal" user-entrypoint="/skill:ultragoal" cli-runtime="gjc ultragoal">
+<skill name="ultragoal" user-entrypoint="/skill:ultragoal" cli-runtime="native: gjc ultragoal">
 Use for durable multi-goal execution ledgers under `.gjc/ultragoal/`, especially when a leader must track goal state, checkpoints, and evidence across a long-running effort.
 </skill>
 
-<skill name="team" user-entrypoint="/skill:team" cli-runtime="gjc team">
+<skill name="team" user-entrypoint="/skill:team" cli-runtime="native: gjc team">
 Use for tmux-backed coordinated execution with workers, shared state under `.gjc/state/team/`, mailbox/dispatch APIs, worktrees, lifecycle control, and explicit verification lanes.
 </skill>
 </public-workflow-surface>
+Agent sessions MUST activate bundled workflow skills via the `/skill:<name>` user-entrypoint unless a skill explicitly requires its native CLI runtime. `gjc deep-interview` and `gjc ralplan` are compatibility bridges for private runtime deployments only; `gjc ultragoal` and `gjc team` are native runtime commands.
 
 <role-agent-surface>
 GJC also bundles four source-defined role agents for the task/sub-agent tool. These are not workflow skills and are not repo-visible `.gjc` defaults. They are implementation and review lanes loaded from source prompts.

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";
@@ -137,6 +138,7 @@ import type { HookCommandContext } from "../extensibility/hooks/types";
 import type { Skill, SkillWarning } from "../extensibility/skills";
 import { expandSlashCommand, type FileSlashCommand } from "../extensibility/slash-commands";
 import { buildGjcRuntimeSessionEnv, consumePendingGoalModeRequest } from "../gjc-runtime/goal-mode-request";
+import { requestGjcWorkerIntegrationAttempt } from "../gjc-runtime/team-runtime";
 import { GoalRuntime } from "../goals/runtime";
 import type { Goal, GoalModeState } from "../goals/state";
 import type { HindsightSessionState } from "../hindsight/state";
@@ -258,7 +260,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 +750,7 @@ export class AgentSession {
 
 	readonly configWarnings: string[] = [];
 
-	#scopedModels: Array<{ model: Model; thinkingLevel?: ThinkingLevel }>;
+	#scopedModels: ScopedModelSelection[];
 	#thinkingLevel: ThinkingLevel | undefined;
 	#promptTemplates: PromptTemplate[];
 	#slashCommands: FileSlashCommand[];
@@ -2577,6 +2579,11 @@ export class AgentSession {
 
 	/** Emit extension events based on session events */
 	async #emitExtensionEvent(event: AgentSessionEvent): Promise<void> {
+		if (event.type === "turn_end") {
+			await requestGjcWorkerIntegrationAttempt(this.sessionManager.getCwd(), process.env).catch(error => {
+				logger.warn("GJC team worker integration request failed", { error: String(error) });
+			});
+		}
 		if (!this.#extensionRunner) return;
 		if (event.type === "agent_start") {
 			this.#turnIndex = 0;
@@ -3749,7 +3756,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 +6452,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 +6708,10 @@ export class AgentSession {
 								initiatorOverride: "agent",
 								convertToLlm,
 								telemetry,
+								authCredentialType: this.#modelRegistry.getSessionCredentialType(
+									candidate.provider,
+									this.sessionId,
+								),
 							});
 							break;
 						} catch (error) {