fix(coding-agent): improve auth setup warnings
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
|
||||
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
||||
import { basename, dirname, join, resolve } from "node:path";
|
||||
import { basename, dirname, resolve } from "node:path";
|
||||
import type {
|
||||
Agent,
|
||||
AgentEvent,
|
||||
@@ -25,10 +25,10 @@ import type {
|
||||
} from "@mariozechner/pi-agent-core";
|
||||
import type { AssistantMessage, ImageContent, Message, Model, TextContent } from "@mariozechner/pi-ai";
|
||||
import { isContextOverflow, modelsAreEqual, resetApiProviders, supportsXhigh } from "@mariozechner/pi-ai";
|
||||
import { getDocsPath } from "../config.js";
|
||||
import { theme } from "../modes/interactive/theme/theme.js";
|
||||
import { stripFrontmatter } from "../utils/frontmatter.js";
|
||||
import { sleep } from "../utils/sleep.js";
|
||||
import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
|
||||
import { type BashResult, executeBashWithOperations } from "./bash-executor.js";
|
||||
import {
|
||||
type CompactionResult,
|
||||
@@ -341,6 +341,9 @@ export class AgentSession {
|
||||
}> {
|
||||
const result = await this._modelRegistry.getApiKeyAndHeaders(model);
|
||||
if (!result.ok) {
|
||||
if (result.error.startsWith("No API key found")) {
|
||||
throw new Error(formatNoApiKeyFoundMessage(model.provider));
|
||||
}
|
||||
throw new Error(result.error);
|
||||
}
|
||||
if (result.apiKey) {
|
||||
@@ -355,10 +358,7 @@ export class AgentSession {
|
||||
`Run '/login ${model.provider}' to re-authenticate.`,
|
||||
);
|
||||
}
|
||||
throw new Error(
|
||||
`No API key found for ${model.provider}.\n\n` +
|
||||
`Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`,
|
||||
);
|
||||
throw new Error(formatNoApiKeyFoundMessage(model.provider));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1002,11 +1002,7 @@ export class AgentSession {
|
||||
|
||||
// Validate model
|
||||
if (!this.model) {
|
||||
throw new Error(
|
||||
"No model selected.\n\n" +
|
||||
`Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}\n\n` +
|
||||
"Then use /model to select a model.",
|
||||
);
|
||||
throw new Error(formatNoModelSelectedMessage());
|
||||
}
|
||||
|
||||
if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
|
||||
@@ -1018,10 +1014,7 @@ export class AgentSession {
|
||||
`Run '/login ${this.model.provider}' to re-authenticate.`,
|
||||
);
|
||||
}
|
||||
throw new Error(
|
||||
`No API key found for ${this.model.provider}.\n\n` +
|
||||
`Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`,
|
||||
);
|
||||
throw new Error(formatNoApiKeyFoundMessage(this.model.provider));
|
||||
}
|
||||
|
||||
// Check if we need to compact before sending (catches aborted responses)
|
||||
@@ -1610,7 +1603,7 @@ export class AgentSession {
|
||||
|
||||
try {
|
||||
if (!this.model) {
|
||||
throw new Error("No model selected");
|
||||
throw new Error(formatNoModelSelectedMessage());
|
||||
}
|
||||
|
||||
const { apiKey, headers } = await this._getRequiredRequestAuth(this.model);
|
||||
|
||||
25
packages/coding-agent/src/core/auth-guidance.ts
Normal file
25
packages/coding-agent/src/core/auth-guidance.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
import { join } from "node:path";
|
||||
import { getDocsPath } from "../config.js";
|
||||
|
||||
const UNKNOWN_PROVIDER = "unknown";
|
||||
|
||||
export function getProviderLoginHelp(): string {
|
||||
return [
|
||||
"Use /login to log into a provider via OAuth or API key. See:",
|
||||
` ${join(getDocsPath(), "providers.md")}`,
|
||||
` ${join(getDocsPath(), "models.md")}`,
|
||||
].join("\n");
|
||||
}
|
||||
|
||||
export function formatNoModelsAvailableMessage(): string {
|
||||
return `No models available. ${getProviderLoginHelp()}`;
|
||||
}
|
||||
|
||||
export function formatNoModelSelectedMessage(): string {
|
||||
return `No model selected.\n\n${getProviderLoginHelp()}\n\nThen use /model to select a model.`;
|
||||
}
|
||||
|
||||
export function formatNoApiKeyFoundMessage(provider: string): string {
|
||||
const providerDisplay = provider === UNKNOWN_PROVIDER ? "the selected model" : provider;
|
||||
return `No API key found for ${providerDisplay}.\n\n${getProviderLoginHelp()}`;
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
import { join } from "node:path";
|
||||
import { Agent, type AgentMessage, type ThinkingLevel } from "@mariozechner/pi-agent-core";
|
||||
import { type Message, type Model, streamSimple } from "@mariozechner/pi-ai";
|
||||
import { getAgentDir, getDocsPath } from "../config.js";
|
||||
import { getAgentDir } from "../config.js";
|
||||
import { AgentSession } from "./agent-session.js";
|
||||
import { formatNoModelsAvailableMessage } from "./auth-guidance.js";
|
||||
import { AuthStorage } from "./auth-storage.js";
|
||||
import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
|
||||
import type { ExtensionRunner, LoadExtensionsResult, SessionStartEvent, ToolDefinition } from "./extensions/index.js";
|
||||
@@ -227,7 +228,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
|
||||
});
|
||||
model = result.model;
|
||||
if (!model) {
|
||||
modelFallbackMessage = `No models available. Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}. Then use /model to select a model.`;
|
||||
modelFallbackMessage = formatNoModelsAvailableMessage();
|
||||
} else if (modelFallbackMessage) {
|
||||
modelFallbackMessage += `. Using ${model.provider}/${model.id}`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user