Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions assistant/src/daemon/approval-generators.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { loadConfig } from "../config/loader.js";
import { CallSiteRoutingProvider } from "../providers/call-site-routing.js";
import { getProvider, listProviders } from "../providers/registry.js";
import type { Provider } from "../providers/types.js";
import {
APPROVAL_COPY_MAX_TOKENS,
APPROVAL_COPY_SYSTEM_PROMPT,
Expand Down Expand Up @@ -89,12 +91,15 @@ const VALID_DISPOSITIONS: ReadonlySet<string> = new Set([
export function createApprovalCopyGenerator(): ApprovalCopyGenerator {
return async (context, options = {}) => {
const config = loadConfig();
let provider;
let baseProvider: Provider;
try {
provider = getProvider(config.llm.default.provider);
baseProvider = getProvider(config.llm.default.provider);
} catch {
return null;
}
// Wrap so per-call `callSite` can route to an alternative provider
// transport when `llm.callSites.<id>.provider` overrides the default.
const provider = wrapWithCallSiteRouting(baseProvider);
Comment thread
siddseethepalli marked this conversation as resolved.

const fallbackText =
options.fallbackText?.trim() || getFallbackMessage(context);
Expand Down Expand Up @@ -145,7 +150,9 @@ export function createApprovalConversationGenerator(): ApprovalConversationGener
if (!listProviders().includes(config.llm.default.provider)) {
throw new Error("No provider available for approval conversation");
}
const provider = getProvider(config.llm.default.provider);
const provider = wrapWithCallSiteRouting(
getProvider(config.llm.default.provider),
);

const pendingDescription = context.pendingApprovals
.map((p) => `- Request ${p.requestId}: tool "${p.toolName}"`)
Expand Down Expand Up @@ -215,3 +222,19 @@ export function createApprovalConversationGenerator(): ApprovalConversationGener
return result;
};
}

/**
* Wrap a base Provider so per-call `callSite` metadata can route the actual
* transport to a different provider when `llm.callSites.<id>.provider`
* differs from the default. Without this wrapper, only request metadata
* reflects the callSite — the HTTP transport stays bound to the default.
*/
function wrapWithCallSiteRouting(base: Provider): Provider {
return new CallSiteRoutingProvider(base, (name) => {
try {
return getProvider(name);
} catch {
return undefined;
}
});
}
32 changes: 28 additions & 4 deletions assistant/src/daemon/guardian-action-generators.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { CallSiteRoutingProvider } from "../providers/call-site-routing.js";
import { getConfiguredProvider } from "../providers/provider-send-message.js";
import { getProvider } from "../providers/registry.js";
import type { Provider } from "../providers/types.js";
import {
buildGuardianActionGenerationPrompt,
getGuardianActionFallbackMessage,
Expand All @@ -25,8 +28,12 @@ import type {
*/
export function createGuardianActionCopyGenerator(): GuardianActionCopyGenerator {
return async (context, options = {}) => {
const provider = await getConfiguredProvider("guardianQuestionCopy");
if (!provider) return null;
const baseProvider = await getConfiguredProvider("guardianQuestionCopy");
if (!baseProvider) return null;
// Wrap so the per-call `callSite` can route to a different provider
// transport when `llm.callSites.guardianQuestionCopy.provider` overrides
// the default. Without this, callSite only affects request metadata.
const provider = wrapWithCallSiteRouting(baseProvider);

const fallbackText =
options.fallbackText?.trim() || getGuardianActionFallbackMessage(context);
Expand Down Expand Up @@ -124,10 +131,11 @@ const VALID_FOLLOWUP_DISPOSITIONS: ReadonlySet<string> = new Set([
*/
export function createGuardianFollowUpConversationGenerator(): GuardianFollowUpConversationGenerator {
return async (context) => {
const provider = await getConfiguredProvider("guardianQuestionCopy");
if (!provider) {
const baseProvider = await getConfiguredProvider("guardianQuestionCopy");
if (!baseProvider) {
throw new Error("No configured provider available for follow-up conversation");
}
const provider = wrapWithCallSiteRouting(baseProvider);

const userPrompt = [
`Original question from the voice call: "${context.questionText}"`,
Expand Down Expand Up @@ -184,3 +192,19 @@ export function createGuardianFollowUpConversationGenerator(): GuardianFollowUpC
return result;
};
}

/**
* Wrap a base Provider so per-call `callSite` metadata can route the actual
* transport to a different provider when `llm.callSites.<id>.provider`
* differs from the default. Without this wrapper, only request metadata
* reflects the callSite — the HTTP transport stays bound to the default.
*/
function wrapWithCallSiteRouting(base: Provider): Provider {
return new CallSiteRoutingProvider(base, (name) => {
try {
return getProvider(name);
} catch {
return undefined;
}
});
}
2 changes: 1 addition & 1 deletion skills/vellum-self-knowledge/scripts/self-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ async function main(): Promise<void> {
let config: { model?: string; provider?: string; mode?: string };
if (raw === "(not set)" || raw === "") {
config = {
model: "claude-opus-4-6",
model: "claude-opus-4-7",
provider: "anthropic",
mode: "your-own",
};
Expand Down
Loading