Skip to content
Draft
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export {
AGENT_MODEL_CATALOG_QUERY_KEY,
useAgentModelCatalogs,
} from "./useAgentModelCatalogs";
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import {
type AgentModelCatalog,
codexPickerModels,
getAgentModelSupport,
} from "@superset/shared/agent-models";
import { type UseQueryResult, useQueries } from "@tanstack/react-query";
import { useCallback, useMemo } from "react";
import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";

import { useCodexModels } from "renderer/stores/codex-models/store";

export const AGENT_MODEL_CATALOG_QUERY_KEY = ["host-agent-model-catalog"];

interface CatalogAgent {
id: string;
launchPresetId: string;
}

async function fetchCatalog(
hostUrl: string,
agent: string,
): Promise<AgentModelCatalog | null> {
const result = await getHostServiceClientByUrl(
hostUrl,
).agents.listModels.query({ agent });
return { models: result.models, efforts: result.efforts ?? {} };
}

export function useAgentModelCatalogs(
hostUrl: string | null,
agents: readonly CatalogAgent[],
includeHidden = true,
) {
const selectedIds = useCodexModels((state) => state.selectedIds);
const live = useMemo(
() =>
agents.filter(
(agent) => getAgentModelSupport(agent.launchPresetId)?.liveCatalog,
),
[agents],
);
const combine = useCallback(
(results: UseQueryResult<AgentModelCatalog | null>[]) => ({
rawCatalogs: Object.fromEntries(
results.flatMap((result, index) => {
const agent = live[index];
return agent && result.data && !result.isError
? [[agent.id, result.data]]
: [];
}),
) as Record<string, AgentModelCatalog>,
isPending: results.some((result) => result.isLoading),
error: results.find((result) => result.error)?.error,
}),
[live],
);
const results = useQueries({
combine,
queries: live.map((agent) => ({
queryKey: [...AGENT_MODEL_CATALOG_QUERY_KEY, hostUrl, agent.id],
queryFn: () =>
hostUrl ? fetchCatalog(hostUrl, agent.id) : Promise.resolve(null),
enabled: !!hostUrl,
staleTime: 0,
refetchInterval: 60_000,
retry: false,
})),
});
const { rawCatalogs } = results;
const catalogs = useMemo(
() =>
Object.fromEntries(
Object.entries(rawCatalogs).map(([id, catalog]) => [
id,
{
...catalog,
models: codexPickerModels(
catalog.models,
selectedIds,
includeHidden,
),
},
]),
),
[rawCatalogs, selectedIds, includeHidden],
);
return { ...results, catalogs };
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { getAgentModelSupport } from "@superset/shared/agent-models";
import {
type AgentModelCatalog,
getAgentModels,
isCuratedAgentModel,
} from "@superset/shared/agent-models";
import { useCallback, useEffect, useState } from "react";

function readStoredMap(storageKey: string): Record<string, string> {
Expand All @@ -22,14 +26,17 @@ function readStoredMap(storageKey: string): Record<string, string> {
function readStoredModel(
storageKey: string,
presetId: string | null,
catalog: AgentModelCatalog | null,
): string | null {
if (!presetId) return null;
const stored = readStoredMap(storageKey)[presetId];
if (!stored) return null;
// Drop ids that fell out of the curated registry — "Default" beats a
// flag value the CLI no longer accepts.
const support = getAgentModelSupport(presetId);
return support?.models.some((model) => model.id === stored) ? stored : null;
// Drop ids the picker no longer offers — "Default" beats a flag value the
// CLI no longer accepts.
const offered = catalog
? getAgentModels(presetId, catalog).some((model) => model.id === stored)
: isCuratedAgentModel(presetId, stored);
return offered ? stored : null;
}

/**
Expand All @@ -41,14 +48,15 @@ function readStoredModel(
export function useAgentModelPreference(
storageKey: string,
presetId: string | null,
catalog: AgentModelCatalog | null = null,
) {
const [selectedModel, setSelectedModelState] = useState<string | null>(() =>
readStoredModel(storageKey, presetId),
readStoredModel(storageKey, presetId, catalog),
);

useEffect(() => {
setSelectedModelState(readStoredModel(storageKey, presetId));
}, [storageKey, presetId]);
setSelectedModelState(readStoredModel(storageKey, presetId, catalog));
}, [storageKey, presetId, catalog]);

const setSelectedModel = useCallback(
(model: string | null) => {
Expand All @@ -70,5 +78,11 @@ export function useAgentModelPreference(
[storageKey, presetId],
);

return { selectedModel, setSelectedModel };
const offered = presetId === "codex" ? (catalog?.models ?? []) : null;
const effectiveModel = offered
? offered.some((model) => model.id === selectedModel)
? selectedModel
: ((offered.find((model) => model.isDefault) ?? offered[0])?.id ?? null)
: selectedModel;
return { selectedModel: effectiveModel, setSelectedModel };
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
export const PERSISTED_KEY_REGISTRY: ReadonlyArray<
readonly [file: string, keys: readonly string[]]
> = [
["src/renderer/stores/codex-models/store.ts", ["codex-picker-models"]],
["src/renderer/stores/getting-started/store.ts", ["pro-getting-started-v1"]],
[
"src/renderer/routes/_authenticated/providers/CollectionsProvider/collections.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Trans, useLingui } from "@lingui/react/macro";
import { acpHarnessForPreset } from "@superset/chat/core";
import { AGENT_DEFAULT_MODE, type UserContent } from "@superset/chat/protocol";
import { errorMessage } from "@superset/i18n/errors";
import { getAgentModelSupport } from "@superset/shared/agent-models";
import { getAgentModels } from "@superset/shared/agent-models";
import {
buildChatRewindPrompt,
buildChatSessionHandoffPrompt,
Expand All @@ -16,6 +16,7 @@ import type { ReactNode } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTerminalAgentBindings } from "renderer/hooks/host-service/useTerminalAgentBindings";
import { useWorkspaceEvent } from "renderer/hooks/host-service/useWorkspaceEvent";
import { useAgentModelCatalogs } from "renderer/hooks/useAgentModelCatalogs";
import { useV2AgentConfigs } from "renderer/hooks/useV2AgentConfigs";
import { isUnrestrictedMode } from "renderer/routes/_authenticated/utils/isUnrestrictedMode";
import { useChatTurnSnapshotsEnabled } from "renderer/stores/chat-turn-snapshots";
Expand Down Expand Up @@ -130,6 +131,19 @@ export function AcpChatPane({
const { forkToWorktree, canForkToWorktree } = useForkChat(workspaceId);
const { hostUrl } = useWorkspaceClient();
const { data: agentConfigs } = useV2AgentConfigs(hostUrl);
const catalogAgents = useMemo(
() =>
(agentConfigs ?? []).map((config) => ({
id: config.id,
launchPresetId: config.presetId,
})),
[agentConfigs],
);
const { catalogs: modelCatalogs } = useAgentModelCatalogs(
hostUrl,
catalogAgents,
false,
);
const agentLabel = agentConfigs?.find(
(config) => config.id === agent?.id,
)?.label;
Expand Down Expand Up @@ -360,9 +374,13 @@ export function AcpChatPane({
label:
agentConfigs?.find((config) => config.presetId === presetId)?.label ??
presetId,
models: (getAgentModelSupport(presetId)?.models ?? []).map(
({ id, label }) => ({ id, label }),
),
models: getAgentModels(
presetId,
modelCatalogs[
agentConfigs?.find((config) => config.presetId === presetId)?.id ??
""
],
).map(({ id, label }) => ({ id, label })),
})),
onSwitch: async (
presetId: string,
Expand Down Expand Up @@ -434,6 +452,7 @@ export function AcpChatPane({
}, [
agent,
agentConfigs,
modelCatalogs,
onSwitchAgent,
onOpenAgentChat,
sessionId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import type {
AvailableCommand,
Decision,
SessionConfigOption,
SessionState,
UserContent,
UserMessage,
Expand All @@ -25,6 +24,7 @@ import {
import { ComposerDropZone } from "@superset/chat-ui/ComposerDropZone";
import { MessageScroller } from "@superset/chat-ui/MessageScroller";
import type { ComposerDraft } from "@superset/chat-ui/PromptInput";
import { errorMessage } from "@superset/i18n/errors";
import { ChatHistorySidebarScroller } from "@superset/ui/chat-history-sidebar";
import { toast } from "@superset/ui/sonner";
import type { ReactNode } from "react";
Expand All @@ -35,6 +35,7 @@ import { useWorkspaceHostUrl } from "renderer/hooks/host-service/useWorkspaceHos
import { usePluginMentionOptions } from "renderer/hooks/usePluginMentionOptions";
import { useStableList } from "renderer/hooks/useStableList";
import { useChatTurnSnapshotsEnabled } from "renderer/stores/chat-turn-snapshots";
import { useCodexModels } from "renderer/stores/codex-models/store";
import type { OpenFile } from "../../../../../../types";
import {
ChatPaneActionsProvider,
Expand Down Expand Up @@ -77,6 +78,7 @@ import {
type SwitchableAgent,
UsageLimitNotice,
} from "./components/UsageLimitNotice";
import { useCodexPickerOptions } from "./hooks/useCodexPickerOptions";
import { useFailureRecovery } from "./hooks/useFailureRecovery";
import { useMainSend } from "./hooks/useMainSend";
import { useMoveToBackground } from "./hooks/useMoveToBackground";
Expand All @@ -90,7 +92,6 @@ import { setupEnvironmentId } from "./utils/setupEnvironmentLink";

const RESUME_FOLLOW_PX = 24;
const NO_COMMANDS: AvailableCommand[] = [];
const NO_CONFIG_OPTIONS: SessionConfigOption[] = [];

const MODEL_OPTIONS_GRACE_MS = 1000;

Expand Down Expand Up @@ -256,6 +257,7 @@ export function SessionView({
);

const configOptions = session.snapshot.session?.configOptions;
const selectedCodexModels = useCodexModels((state) => state.selectedIds);
const agentStatus = session.snapshot.session?.status;
const [modelSettled, setModelSettled] = useState(
preferredModelLabel === undefined,
Expand Down Expand Up @@ -654,6 +656,24 @@ export function SessionView({
sendPrompt,
setConfigOption,
});
const onModelReconciliationError = useCallback(
(error: unknown) => toast.error(errorMessage(error)),
[],
);
const pickerConfigOptions = useCodexPickerOptions({
enabled: presetId === "codex",
blocked:
!loaded ||
booting ||
held !== undefined ||
runningTurnId !== null ||
approvals.length > 0 ||
outbox.length > 0,
configOptions,
selectedIds: selectedCodexModels,
onSelect: setConfigOption,
onError: onModelReconciliationError,
});
const composerQueue = heldQueue ?? (held ? undefined : promptQueue);
const drawerQueue = subagent.target === undefined ? composerQueue : undefined;

Expand Down Expand Up @@ -774,7 +794,7 @@ export function SessionView({
sessionId={client.sessionId}
agentSwitcher={agentSwitcher}
availableCommands={sessionState?.availableCommands ?? NO_COMMANDS}
configOptions={sessionState?.configOptions ?? NO_CONFIG_OPTIONS}
configOptions={pickerConfigOptions}
onSetConfigOption={onSetConfigOption}
onModelPickerOpenChange={onModelPickerOpenChange}
modes={sessionState?.availableModes}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { useCodexPickerOptions } from "./useCodexPickerOptions";
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { expect, mock, test } from "bun:test";
import type { SessionConfigOption } from "@superset/chat/protocol";
import { renderHook } from "@testing-library/react";
import { useCodexPickerOptions } from "./useCodexPickerOptions";

function modelOptions(currentValue: string): SessionConfigOption[] {
return [
{
id: "model",
label: "Model",
category: "model",
currentValue,
options: [
{ id: "alpha", label: "Alpha" },
{ id: "beta", label: "Beta" },
],
},
];
}

test("reconciles repeated deselection cycles after the previous change is acknowledged", () => {
const onSelect = mock(async (_configId: string, _value: string) => {});
const onError = mock((_error: unknown) => {});
const hook = renderHook(
({ currentValue }) =>
useCodexPickerOptions({
enabled: true,
blocked: false,
configOptions: modelOptions(currentValue),
selectedIds: ["beta"],
onSelect,
onError,
}),
{ initialProps: { currentValue: "alpha" } },
);
expect(hook.result.current[0]?.options.map((option) => option.id)).toEqual([
"beta",
]);
expect(onSelect.mock.calls).toEqual([["model", "beta"]]);
hook.rerender({ currentValue: "alpha" });
expect(onSelect).toHaveBeenCalledTimes(1);
hook.rerender({ currentValue: "beta" });
hook.rerender({ currentValue: "alpha" });
expect(onSelect.mock.calls).toEqual([
["model", "beta"],
["model", "beta"],
]);
});

test("defers model changes while a turn is busy and leaves other agents untouched", () => {
const onSelect = mock(async (_configId: string, _value: string) => {});
const onError = mock((_error: unknown) => {});
const hook = renderHook(
({ enabled, blocked }) =>
useCodexPickerOptions({
enabled,
blocked,
configOptions: modelOptions("alpha"),
selectedIds: ["beta"],
onSelect,
onError,
}),
{ initialProps: { enabled: false, blocked: false } },
);
expect(hook.result.current[0]?.options).toHaveLength(2);
expect(onSelect).not.toHaveBeenCalled();
hook.rerender({ enabled: true, blocked: true });
expect(onSelect).not.toHaveBeenCalled();
hook.rerender({ enabled: true, blocked: false });
expect(onSelect.mock.calls).toEqual([["model", "beta"]]);
});
Loading
Loading