Skip to content

refactor: reduce fallback slop in zero run settings #20734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e7h4n merged 1 commit into from
Jul 8, 2026
+18 −8
Merged

refactor: reduce fallback slop in zero run settings #20734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions turbo/apps/api/src/signals/services/zero-integrations-slack-message.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ async function resolveAgentLabel(
.innerJoin(zeroAgents, eq(agentComposeVersions.composeId, zeroAgents.id))
.where(eq(agentRuns.id, runId))
.limit(1);
return row?.displayName ?? row?.name ?? undefined;
if (!row) {
return undefined;
}
return row.displayName === null ? row.name : row.displayName;
}

async function resolveSelectedModel(
Expand All @@ -40,7 +43,10 @@ async function resolveSelectedModel(
.from(zeroRuns)
.where(eq(zeroRuns.id, runId))
.limit(1);
return row?.selectedModel ?? undefined;
if (!row || row.selectedModel === null) {
return undefined;
}
return row.selectedModel;
}

async function resolveUserMention(
Expand Down
16 changes: 10 additions & 6 deletions turbo/apps/api/src/signals/services/zero-runs-create.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ interface UserInfo {
readonly agentphoneHandle?: string;
}

function optionalAgentSetting(value: string | null): string | undefined {
return value === null ? undefined : value;
}

interface ZeroRunPromptContext {
readonly userInfo: UserInfo;
readonly relationshipMemoryEnabled: boolean;
Expand Down Expand Up @@ -848,6 +852,8 @@ async function buildZeroCreateAgentRunArgs(args: {
readonly timing: ApiDispatchTimingCollector;
}): Promise<CreateAgentRunArgs> {
const command = args.command;
const agentModelProviderId = optionalAgentSetting(args.agent.modelProviderId);
const agentSelectedModel = optionalAgentSetting(args.agent.selectedModel);
const memoryRuntimeAppendSystemPrompt =
await loadMemoryRuntimeAppendSystemPrompt(args.db, {
enabled: args.relationshipMemoryRuntimeInjectionEnabled,
Expand All @@ -870,12 +876,10 @@ async function buildZeroCreateAgentRunArgs(args: {
appendSystemPrompt: command.appendSystemPrompt,
}),
apiStartTime: command.apiStartTime,
modelProviderId:
command.modelProviderId ?? args.agent.modelProviderId ?? undefined,
modelProviderId: command.modelProviderId ?? agentModelProviderId,
modelProviderCredentialScope: command.modelProviderCredentialScope,
modelProviderType: command.body.modelProvider,
selectedModelOverride:
command.selectedModelOverride ?? args.agent.selectedModel ?? undefined,
selectedModelOverride: command.selectedModelOverride ?? agentSelectedModel,
chatThreadId: command.chatThreadId,
extraEnvironment: buildZeroRunExtraEnvironment({
agentId: args.agent.id,
Expand Down Expand Up @@ -949,8 +953,8 @@ async function buildZeroIntegrationCreateAgentRunArgs(args: {
appendSystemPrompt: command.appendSystemPrompt,
}),
apiStartTime: command.apiStartTime,
modelProviderId: args.agent.modelProviderId ?? undefined,
selectedModelOverride: args.agent.selectedModel ?? undefined,
modelProviderId: optionalAgentSetting(args.agent.modelProviderId),
selectedModelOverride: optionalAgentSetting(args.agent.selectedModel),
extraEnvironment: { ZERO_AGENT_ID: args.agent.id },
callbacks: command.callbacks,
includeZeroTokenSecret: true,
Expand Down
Loading