getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-15 18:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: enhance model cycling with thinking level support

Browse source 
- Add exact match support with '/' prefix (/gpt-5.1-codex or /provider/model)
- Prefer exact ID matches over partial matches in fuzzy search
- Parse thinking levels from --models flag (pattern:level format)
- Use first scoped model as initial model with its thinking level
- Auto-apply thinking when cycling with Ctrl+P
- Track manual thinking changes to disable auto-switching
- Clear model scope when using /model command
- Support mixed configs: --models sonnet:high,haiku,opus:low
- Silently ignore thinking for models that don't support it
- Only allow Ctrl+P cycling when --models is explicitly provided
- Update help text with examples
- Improve code organization by resolving scope early
This commit is contained in:
Tino Ehrich 2025-11-21 12:02:56 +01:00
parent e7a5ca144c
commit ea4e234f66
2 changed files with 166 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

87
packages/coding-agent/src/main.ts
View file

@ -139,6 +139,9 @@ ${chalk.bold("Examples:")}
# Limit model cycling to specific models
pi --models claude-sonnet,claude-haiku,gpt-4o
# Cycle models with fixed thinking levels
pi --models sonnet:high,haiku:low
${chalk.bold("Environment Variables:")}
ANTHROPIC_API_KEY - Anthropic Claude API key
ANTHROPIC_OAUTH_TOKEN - Anthropic OAuth token (alternative to API key)
@ -343,12 +346,15 @@ async function checkForNewVersion(currentVersion: string): Promise<string | null
}
/**
* Resolve model patterns to actual Model objects
* Resolve model patterns to actual Model objects with optional thinking levels
* Format: "pattern:level" where :level is optional
* For each pattern, finds all matching models and picks the best version:
* 1. Prefer alias (e.g., claude-sonnet-4-5) over dated versions (claude-sonnet-4-5-20250929)
* 2. If no alias, pick the latest dated version
*/
async function resolveModelScope(patterns: string[]): Promise<Model<Api>[]> {
async function resolveModelScope(
patterns: string[],
): Promise<Array<{ model: Model<Api>; thinkingLevel: ThinkingLevel }>> {
const { models: availableModels, error } = await getAvailableModels();
if (error) {
@ -356,17 +362,34 @@ async function resolveModelScope(patterns: string[]): Promise<Model<Api>[]> {
return [];
}
const scopedModels: Model<Api>[] = [];
const scopedModels: Array<{ model: Model<Api>; thinkingLevel: ThinkingLevel }> = [];
for (const pattern of patterns) {
// Parse pattern:level format
const parts = pattern.split(":");
const modelPattern = parts[0];
let thinkingLevel: ThinkingLevel = "off";
if (parts.length > 1) {
const level = parts[1];
if (level === "off" || level === "minimal" || level === "low" || level === "medium" || level === "high") {
thinkingLevel = level;
} else {
console.warn(
chalk.yellow(`Warning: Invalid thinking level "${level}" in pattern "${pattern}". Using "off" instead.`),
);
}
}
// Find all models matching this pattern (case-insensitive partial match)
const matches = availableModels.filter(
(m) =>
m.id.toLowerCase().includes(pattern.toLowerCase()) || m.name?.toLowerCase().includes(pattern.toLowerCase()),
m.id.toLowerCase().includes(modelPattern.toLowerCase()) ||
m.name?.toLowerCase().includes(modelPattern.toLowerCase()),
);
if (matches.length === 0) {
console.warn(chalk.yellow(`Warning: No models match pattern "${pattern}"`));
console.warn(chalk.yellow(`Warning: No models match pattern "${modelPattern}"`));
continue;
}
@ -398,8 +421,8 @@ async function resolveModelScope(patterns: string[]): Promise<Model<Api>[]> {
}
// Avoid duplicates
if (!scopedModels.find((m) => m.id === bestMatch.id && m.provider === bestMatch.provider)) {
scopedModels.push(bestMatch);
if (!scopedModels.find((sm) => sm.model.id === bestMatch.id && sm.model.provider === bestMatch.provider)) {
scopedModels.push({ model: bestMatch, thinkingLevel });
}
}
@ -443,7 +466,7 @@ async function runInteractiveMode(
changelogMarkdown: string | null = null,
modelFallbackMessage: string | null = null,
newVersion: string | null = null,
scopedModels: Model<Api>[] = [],
scopedModels: Array<{ model: Model<Api>; thinkingLevel: ThinkingLevel }> = [],
): Promise<void> {
const renderer = new TuiRenderer(
agent,
@ -588,13 +611,21 @@ export async function main(args: string[]) {
sessionManager.setSessionFile(selectedSession);
}
// Resolve model scope early if provided (needed for initial model selection)
let scopedModels: Array<{ model: Model<Api>; thinkingLevel: ThinkingLevel }> = [];
if (parsed.models && parsed.models.length > 0) {
scopedModels = await resolveModelScope(parsed.models);
}
// Determine initial model using priority system:
// 1. CLI args (--provider and --model)
// 2. Restored from session (if --continue or --resume)
// 3. Saved default from settings.json
// 4. First available model with valid API key
// 5. null (allowed in interactive mode)
// 2. First model from --models scope
// 3. Restored from session (if --continue or --resume)
// 4. Saved default from settings.json
// 5. First available model with valid API key
// 6. null (allowed in interactive mode)
let initialModel: Model<Api> | null = null;
let initialThinking: ThinkingLevel = "off";
if (parsed.provider && parsed.model) {
// 1. CLI args take priority
@ -608,8 +639,12 @@ export async function main(args: string[]) {
process.exit(1);
}
initialModel = model;
} else if (scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
// 2. Use first model from --models scope (skip if continuing/resuming session)
initialModel = scopedModels[0].model;
initialThinking = scopedModels[0].thinkingLevel;
} else if (parsed.continue || parsed.resume) {
// 2. Restore from session (will be handled below after loading session)
// 3. Restore from session (will be handled below after loading session)
// Leave initialModel as null for now
}
@ -766,7 +801,7 @@ export async function main(args: string[]) {
initialState: {
systemPrompt,
model: initialModel as any, // Can be null
thinkingLevel: "off",
thinkingLevel: initialThinking,
tools: codingTools,
},
queueMode: settingsManager.getQueueMode(),
@ -795,6 +830,11 @@ export async function main(args: string[]) {
}),
});
// If initial thinking was requested but model doesn't support it, silently reset to off
if (initialThinking !== "off" && initialModel && !initialModel.reasoning) {
agent.setThinkingLevel("off");
}
// Track if we had to fall back from saved model (to show in chat later)
let modelFallbackMessage: string | null = null;
@ -903,16 +943,15 @@ export async function main(args: string[]) {
}
}
// Resolve model scope if provided
let scopedModels: Model<Api>[] = [];
if (parsed.models && parsed.models.length > 0) {
scopedModels = await resolveModelScope(parsed.models);
if (scopedModels.length > 0) {
console.log(
chalk.dim(`Model scope: ${scopedModels.map((m) => m.id).join(", ")} ${chalk.gray("(Ctrl+P to cycle)")}`),
);
}
// Show model scope if provided
if (scopedModels.length > 0) {
const modelList = scopedModels
.map((sm) => {
const thinkingStr = sm.thinkingLevel !== "off" ? `:${sm.thinkingLevel}` : "";
return `${sm.model.id}${thinkingStr}`;
})
.join(", ");
console.log(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
}
// No messages and not RPC - use TUI

144
packages/coding-agent/src/tui/tui-renderer.ts
View file

@ -89,7 +89,10 @@ export class TuiRenderer {
private isFirstUserMessage = true;
// Model scope for quick cycling
private scopedModels: Model<any>[] = [];
private scopedModels: Array<{ model: Model<any>; thinkingLevel: ThinkingLevel }> = [];
// Track if user manually changed thinking (disables auto-thinking from model cycling)
private autoThinkingDisabled = false;
// Tool output expansion state
private toolOutputExpanded = false;
@ -101,7 +104,7 @@ export class TuiRenderer {
version: string,
changelogMarkdown: string | null = null,
newVersion: string | null = null,
scopedModels: Model<any>[] = [],
scopedModels: Array<{ model: Model<any>; thinkingLevel: ThinkingLevel }> = [],
) {
this.agent = agent;
this.sessionManager = sessionManager;
@ -754,6 +757,9 @@ export class TuiRenderer {
// Apply the new thinking level
this.agent.setThinkingLevel(nextLevel);
// Disable auto-thinking since user manually changed it
this.autoThinkingDisabled = true;
// Save thinking level change to session
this.sessionManager.saveThinkingLevelChange(nextLevel);
@ -768,57 +774,107 @@ export class TuiRenderer {
private async cycleModel(): Promise<void> {
// Use scoped models if available, otherwise all available models
let modelsToUse: Model<any>[];
if (this.scopedModels.length > 0) {
modelsToUse = this.scopedModels;
// Use scoped models with thinking levels
if (this.scopedModels.length === 1) {
this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new Text(theme.fg("dim", "Only one model in scope"), 1, 0));
this.ui.requestRender();
return;
}
const currentModel = this.agent.state.model;
let currentIndex = this.scopedModels.findIndex(
(sm) => sm.model.id === currentModel?.id && sm.model.provider === currentModel?.provider,
);
// If current model not in scope, start from first
if (currentIndex === -1) {
currentIndex = 0;
}
const nextIndex = (currentIndex + 1) % this.scopedModels.length;
const nextEntry = this.scopedModels[nextIndex];
const nextModel = nextEntry.model;
const nextThinking = nextEntry.thinkingLevel;
// Validate API key
const apiKey = await getApiKeyForModel(nextModel);
if (!apiKey) {
this.showError(`No API key for ${nextModel.provider}/${nextModel.id}`);
return;
}
// Switch model
this.agent.setModel(nextModel);
// Apply thinking level if not disabled and model supports it
if (!this.autoThinkingDisabled && nextModel.reasoning) {
this.agent.setThinkingLevel(nextThinking);
this.sessionManager.saveThinkingLevelChange(nextThinking);
this.updateEditorBorderColor();
} else if (!this.autoThinkingDisabled && !nextModel.reasoning && nextThinking !== "off") {
// Model doesn't support thinking but user requested it - silently ignore
this.agent.setThinkingLevel("off");
this.sessionManager.saveThinkingLevelChange("off");
this.updateEditorBorderColor();
}
// Show notification
this.chatContainer.addChild(new Spacer(1));
const thinkingStr = nextModel.reasoning && nextThinking !== "off" ? ` (thinking: ${nextThinking})` : "";
this.chatContainer.addChild(
new Text(theme.fg("dim", `Switched to ${nextModel.name || nextModel.id}${thinkingStr}`), 1, 0),
);
this.ui.requestRender();
} else {
// Fallback to all available models (no thinking level changes)
const { models: availableModels, error } = await getAvailableModels();
if (error) {
this.showError(`Failed to load models: ${error}`);
return;
}
modelsToUse = availableModels;
}
if (modelsToUse.length === 0) {
this.showError("No models available to cycle");
return;
}
if (availableModels.length === 0) {
this.showError("No models available to cycle");
return;
}
if (modelsToUse.length === 1) {
if (availableModels.length === 1) {
this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new Text(theme.fg("dim", "Only one model in scope"), 1, 0));
this.ui.requestRender();
return;
}
const currentModel = this.agent.state.model;
let currentIndex = availableModels.findIndex(
(m) => m.id === currentModel?.id && m.provider === currentModel?.provider,
);
// If current model not in scope, start from first
if (currentIndex === -1) {
currentIndex = 0;
}
const nextIndex = (currentIndex + 1) % availableModels.length;
const nextModel = availableModels[nextIndex];
// Validate API key
const apiKey = await getApiKeyForModel(nextModel);
if (!apiKey) {
this.showError(`No API key for ${nextModel.provider}/${nextModel.id}`);
return;
}
// Switch model
this.agent.setModel(nextModel);
// Show notification
this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new Text(theme.fg("dim", "Only one model in scope"), 1, 0));
this.chatContainer.addChild(new Text(theme.fg("dim", `Switched to ${nextModel.name || nextModel.id}`), 1, 0));
this.ui.requestRender();
return;
}
const currentModel = this.agent.state.model;
let currentIndex = modelsToUse.findIndex(
(m) => m.id === currentModel?.id && m.provider === currentModel?.provider,
);
// If current model not in scope, start from first
if (currentIndex === -1) {
currentIndex = 0;
}
const nextIndex = (currentIndex + 1) % modelsToUse.length;
const nextModel = modelsToUse[nextIndex];
// Validate API key
const apiKey = await getApiKeyForModel(nextModel);
if (!apiKey) {
this.showError(`No API key for ${nextModel.provider}/${nextModel.id}`);
return;
}
// Switch model
this.agent.setModel(nextModel);
// Show notification
this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new Text(theme.fg("dim", `Switched to ${nextModel.name || nextModel.id}`), 1, 0));
this.ui.requestRender();
}
private toggleToolOutputExpansion(): void {
@ -861,6 +917,9 @@ export class TuiRenderer {
// Apply the selected thinking level
this.agent.setThinkingLevel(level);
// Disable auto-thinking since user manually changed it
this.autoThinkingDisabled = true;
// Save thinking level change to session
this.sessionManager.saveThinkingLevelChange(level);
@ -1016,6 +1075,9 @@ export class TuiRenderer {
// Apply the selected model
this.agent.setModel(model);
// Clear scoped models since user manually selected a model
this.scopedModels = [];
// Save model change to session
this.sessionManager.saveModelChange(model.provider, model.id);