refactor: remove retired agent provider integration

This commit is contained in:
2026-11-12 15:53:33 -08:00
parent d88018fd64
commit 91c7c0310e
42 changed files with 271 additions and 245 deletions
-10
View File
@@ -11,13 +11,6 @@ const OptionalUrlSchema = z.preprocess(
z.string().trim().url().optional()
);
const DEFAULT_HERMES_AGENT_API_BASE_URL = "http://127.0.0.1:8642/v1";
const HermesAgentApiBaseUrlSchema = z.preprocess(
(value) => (typeof value === "string" && value.trim() === "" ? undefined : value),
z.string().trim().url().default(DEFAULT_HERMES_AGENT_API_BASE_URL)
);
const ChatWebSearchEngineSchema = z.preprocess(
(value) => {
if (typeof value !== "string") return value;
@@ -67,9 +60,6 @@ const EnvSchema = z.object({
ANTHROPIC_API_KEY: z.string().optional(),
XAI_API_KEY: z.string().optional(),
GEMINI_API_KEY: z.string().optional(),
HERMES_AGENT_API_BASE_URL: HermesAgentApiBaseUrlSchema,
HERMES_AGENT_API_KEY: OptionalTrimmedStringSchema,
HERMES_AGENT_MODEL: OptionalTrimmedStringSchema,
SYBIL_AGENT_BASE_URL: z.string().url().default("http://sybil-agent:8788"),
SYBIL_AGENT_API_KEY: OptionalTrimmedStringSchema,
// Off until a deliberate server opt-in plus per-installation user consent.
+1 -3
View File
@@ -1,7 +1,6 @@
import type { FastifyBaseLogger } from "fastify";
import {
fetchProviderCatalogModels,
getProviderCatalogFallbackModels,
listModelCatalogProviders,
} from "./provider-adapters.js";
import type { Provider } from "./types.js";
@@ -49,9 +48,8 @@ async function refreshProviderModels(provider: Provider, logger?: FastifyBaseLog
} catch (err: any) {
const message = err?.message ?? String(err);
const previous = modelCatalog[provider];
const fallbackModels = getProviderCatalogFallbackModels(provider);
modelCatalog[provider] = {
models: previous?.models.length ? previous.models : fallbackModels,
models: previous?.models ?? [],
loadedAt: previous?.loadedAt ?? null,
error: message,
};
+4 -9
View File
@@ -2,12 +2,7 @@ import { performance } from "node:perf_hooks";
import { prisma } from "../db.js";
import { buildToolLogMessageData } from "./chat-tools.js";
import { getProviderChatAdapter } from "./provider-adapters.js";
import { toPrismaProvider } from "./provider-ids.js";
import type { MultiplexRequest, MultiplexResponse, Provider } from "./types.js";
function asProviderEnum(p: Provider) {
return toPrismaProvider(p);
}
import type { MultiplexRequest, MultiplexResponse } from "./types.js";
export async function runMultiplex(req: MultiplexRequest): Promise<MultiplexResponse> {
const t0 = performance.now();
@@ -17,7 +12,7 @@ export async function runMultiplex(req: MultiplexRequest): Promise<MultiplexResp
const call = await prisma.llmCall.create({
data: {
chatId,
provider: asProviderEnum(req.provider) as any,
provider: req.provider,
model: req.model,
request: req as any,
},
@@ -28,14 +23,14 @@ export async function runMultiplex(req: MultiplexRequest): Promise<MultiplexResp
prisma.chat.update({
where: { id: chatId },
data: {
lastUsedProvider: asProviderEnum(req.provider) as any,
lastUsedProvider: req.provider,
lastUsedModel: req.model,
},
}),
prisma.chat.updateMany({
where: { id: chatId, initiatedProvider: null },
data: {
initiatedProvider: asProviderEnum(req.provider) as any,
initiatedProvider: req.provider,
initiatedModel: req.model,
},
}),
+3 -33
View File
@@ -8,8 +8,7 @@ import { completeWithChatCompletionsApi, streamWithChatCompletionsApi } from "./
import { completeWithGeminiApi, streamWithGeminiApi } from "./protocols/gemini-api.js";
import { completeWithMessagesApi, streamWithMessagesApi } from "./protocols/messages-api.js";
import { completeWithResponsesApi, streamWithResponsesApi } from "./protocols/responses-api.js";
import { env } from "../env.js";
import { anthropicClient, geminiClient, hermesAgentClient, isHermesAgentConfigured, openaiClient, xaiClient } from "./providers.js";
import { anthropicClient, geminiClient, openaiClient, xaiClient } from "./providers.js";
import type { ChatMessage, Provider } from "./types.js";
type ProviderAdapterParams = {
@@ -37,9 +36,7 @@ type ChatProtocol = {
};
type ModelCatalogSpec = {
enabled?: () => boolean;
fetchModels(client: any): Promise<string[]>;
fallbackModels?: () => string[];
sortModels?: (models: string[]) => string[];
};
@@ -48,7 +45,7 @@ type ProviderBackendSpec = {
plainProtocol: ChatProtocol;
toolProtocol?: ChatProtocol;
managedTools?: boolean;
modelCatalog?: ModelCatalogSpec;
modelCatalog: ModelCatalogSpec;
};
const chatCompletionsProtocol: ChatProtocol = {
@@ -226,23 +223,6 @@ const backendSpecs: Record<Provider, ProviderBackendSpec> = {
sortModels: preferGeminiModels,
},
},
"hermes-agent": {
createClient: hermesAgentClient,
plainProtocol: chatCompletionsProtocol,
managedTools: false,
modelCatalog: {
enabled: isHermesAgentConfigured,
async fetchModels(client) {
const page = await client.models.list();
const models = modelIdsFromListResponse(page);
if (env.HERMES_AGENT_MODEL) models.push(env.HERMES_AGENT_MODEL);
return models;
},
fallbackModels() {
return env.HERMES_AGENT_MODEL ? [env.HERMES_AGENT_MODEL] : [];
},
},
},
};
const providerChatAdapters: Record<Provider, ProviderChatAdapter> = Object.fromEntries(
@@ -264,21 +244,11 @@ export function describeProviderChatBackend(provider: Provider, enabledTools?: s
}
export function listModelCatalogProviders(): Provider[] {
return (Object.entries(backendSpecs) as [Provider, ProviderBackendSpec][])
.filter(([, spec]) => {
const catalog = spec.modelCatalog;
return catalog !== undefined && catalog.enabled?.() !== false;
})
.map(([provider]) => provider);
return Object.keys(backendSpecs) as Provider[];
}
export async function fetchProviderCatalogModels(provider: Provider) {
const spec = backendSpecs[provider].modelCatalog;
if (!spec) return [];
const models = uniqSorted(await spec.fetchModels(backendSpecs[provider].createClient()));
return spec.sortModels ? spec.sortModels(models) : models;
}
export function getProviderCatalogFallbackModels(provider: Provider) {
return uniqSorted(backendSpecs[provider].modelCatalog?.fallbackModels?.() ?? []);
}
+8 -30
View File
@@ -1,43 +1,21 @@
import type { Provider } from "./types.js";
import { PROVIDERS, type Provider } from "./types.js";
type PrismaProvider = Exclude<Provider, "hermes-agent"> | "hermes_agent";
const apiToPrismaProvider = {
openai: "openai",
anthropic: "anthropic",
xai: "xai",
gemini: "gemini",
"hermes-agent": "hermes_agent",
} as const satisfies Record<Provider, PrismaProvider>;
const prismaToApiProvider = {
openai: "openai",
anthropic: "anthropic",
xai: "xai",
gemini: "gemini",
hermes_agent: "hermes-agent",
"hermes-agent": "hermes-agent",
} as const satisfies Record<PrismaProvider | "hermes-agent", Provider>;
export function toPrismaProvider(provider: Provider): PrismaProvider {
return apiToPrismaProvider[provider];
}
export function fromPrismaProvider(provider: unknown): Provider | null {
if (provider === null || provider === undefined) return null;
return prismaToApiProvider[provider as keyof typeof prismaToApiProvider] ?? null;
export function parseProvider(provider: unknown): Provider | null {
return typeof provider === "string" && PROVIDERS.includes(provider as Provider) ? provider as Provider : null;
}
export function serializeProviderFields<T extends Record<string, any>>(value: T): T {
const next: Record<string, any> = { ...value };
if ("initiatedProvider" in next) {
next.initiatedProvider = fromPrismaProvider(next.initiatedProvider);
next.initiatedProvider = parseProvider(next.initiatedProvider);
if (!next.initiatedProvider && "initiatedModel" in next) next.initiatedModel = null;
}
if ("lastUsedProvider" in next) {
next.lastUsedProvider = fromPrismaProvider(next.lastUsedProvider);
next.lastUsedProvider = parseProvider(next.lastUsedProvider);
if (!next.lastUsedProvider && "lastUsedModel" in next) next.lastUsedModel = null;
}
if ("provider" in next) {
next.provider = fromPrismaProvider(next.provider);
next.provider = parseProvider(next.provider);
}
if (Array.isArray(next.calls)) {
next.calls = next.calls.map((call: Record<string, any>) => serializeProviderFields(call));
-12
View File
@@ -21,18 +21,6 @@ export function geminiClient() {
};
}
export function isHermesAgentConfigured() {
return Boolean(env.HERMES_AGENT_API_KEY);
}
export function hermesAgentClient() {
if (!env.HERMES_AGENT_API_KEY) throw new Error("HERMES_AGENT_API_KEY not set");
return new OpenAI({
apiKey: env.HERMES_AGENT_API_KEY,
baseURL: env.HERMES_AGENT_API_BASE_URL,
});
}
export function anthropicClient() {
if (!env.ANTHROPIC_API_KEY) throw new Error("ANTHROPIC_API_KEY not set");
return new Anthropic({ apiKey: env.ANTHROPIC_API_KEY });
+3 -4
View File
@@ -5,7 +5,6 @@ import {
type ToolExecutionEvent,
} from "./chat-tools.js";
import { getProviderChatAdapter } from "./provider-adapters.js";
import { toPrismaProvider } from "./provider-ids.js";
import type { MultiplexRequest, Provider } from "./types.js";
type StreamUsage = {
@@ -36,7 +35,7 @@ export async function* runMultiplexStream(req: MultiplexRequest): AsyncGenerator
? await prisma.llmCall.create({
data: {
chatId,
provider: toPrismaProvider(req.provider) as any,
provider: req.provider,
model: req.model,
request: req as any,
},
@@ -49,14 +48,14 @@ export async function* runMultiplexStream(req: MultiplexRequest): AsyncGenerator
prisma.chat.update({
where: { id: chatId },
data: {
lastUsedProvider: toPrismaProvider(req.provider) as any,
lastUsedProvider: req.provider,
lastUsedModel: req.model,
},
}),
prisma.chat.updateMany({
where: { id: chatId, initiatedProvider: null },
data: {
initiatedProvider: toPrismaProvider(req.provider) as any,
initiatedProvider: req.provider,
initiatedModel: req.model,
},
}),
+1 -1
View File
@@ -1,4 +1,4 @@
export const PROVIDERS = ["openai", "anthropic", "xai", "gemini", "hermes-agent"] as const;
export const PROVIDERS = ["openai", "anthropic", "xai", "gemini"] as const;
export type Provider = (typeof PROVIDERS)[number];
+2 -2
View File
@@ -1,4 +1,4 @@
import { fromPrismaProvider } from "./llm/provider-ids.js";
import { parseProvider } from "./llm/provider-ids.js";
function record(value: unknown): Record<string, unknown> {
return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
@@ -18,7 +18,7 @@ export function withMessageGenerations<T extends { role: string; metadata: unkno
for (const call of calls) {
const requestId = record(call.request).clientRequestId;
if (typeof requestId !== "string" || !requestId || call.error !== null || call.latencyMs === null) continue;
const provider = fromPrismaProvider(call.provider);
const provider = parseProvider(call.provider);
if (!provider || !call.model.trim()) continue;
byRequest.set(requestId, byRequest.has(requestId) ? null : { provider, model: call.model });
}
+9 -9
View File
@@ -17,13 +17,13 @@ import { getAvailableChatTools, normalizeEnabledChatTools } from "./llm/chat-too
import { getModelCatalogSnapshot } from "./llm/model-catalog.js";
import { buildQuickQuestionMultiplexRequest } from "./llm/quick-question.js";
import { openaiClient } from "./llm/providers.js";
import { serializeProviderFields, toPrismaProvider } from "./llm/provider-ids.js";
import { serializeProviderFields } from "./llm/provider-ids.js";
import { exaClient } from "./search/exa.js";
import { isFreshSearchCacheHit, normalizeSearchQuery } from "./search-cache.js";
import { searchWorkspace } from "./workspace-search.js";
import type { ChatAttachment } from "./llm/types.js";
import { PROVIDERS, type ChatAttachment } from "./llm/types.js";
const ProviderSchema = z.enum(["openai", "anthropic", "xai", "gemini", "hermes-agent"]);
const ProviderSchema = z.enum(PROVIDERS);
const MAX_ADDITIONAL_SYSTEM_PROMPT_CHARS = 12_000;
const MAX_FORK_MESSAGE_SNIPPET_CHARS = 48;
const EnabledToolsSchema = z.array(z.string().trim().min(1).max(80)).max(20).transform((value) => normalizeEnabledChatTools(value));
@@ -335,7 +335,7 @@ function executeActiveAgentAsideStream(chatId: string, body: z.infer<typeof Comp
type: "meta",
chatId,
callId: null,
provider: "hermes-agent",
provider: "sybil-agent",
model: "sybil-agent",
agentAside: true,
});
@@ -815,7 +815,7 @@ function completeChatSubmissionStream(
type: "meta",
chatId,
callId: null,
provider: agentAside ? "hermes-agent" : body.provider,
provider: agentAside ? "sybil-agent" : body.provider,
model: agentAside ? "sybil-agent" : body.model,
...(agentAside ? { agentAside: true } : {}),
});
@@ -1129,9 +1129,9 @@ export async function registerRoutes(app: FastifyInstance, options: { agentInlin
const chat = await prisma.chat.create({
data: {
title: body.title,
initiatedProvider: body.provider ? (toPrismaProvider(body.provider) as any) : undefined,
initiatedProvider: body.provider,
initiatedModel: body.model,
lastUsedProvider: body.provider ? (toPrismaProvider(body.provider) as any) : undefined,
lastUsedProvider: body.provider,
lastUsedModel: body.model,
additionalSystemPrompt: normalizeAdditionalSystemPrompt(body.additionalSystemPrompt),
enabledTools: body.enabledTools as any,
@@ -1761,7 +1761,7 @@ export async function registerRoutes(app: FastifyInstance, options: { agentInlin
const completedAgentAside = Boolean((completed.metadata as Record<string, unknown> | null)?.agentAside === true);
return {
chatId: body.chatId,
provider: completedAgentAside ? "hermes-agent" : body.provider,
provider: completedAgentAside ? "sybil-agent" : body.provider,
model: completedAgentAside ? "sybil-agent" : body.model,
message: {
role: "assistant",
@@ -1778,7 +1778,7 @@ export async function registerRoutes(app: FastifyInstance, options: { agentInlin
await storeAgentAsideReply(body.chatId, content, body.clientRequestId);
return {
chatId: body.chatId,
provider: "hermes-agent",
provider: "sybil-agent",
model: "sybil-agent",
message: { role: "assistant", content, name: "Sybil Agent", agentAside: true },
};