Merge branch 'main' of github.com:getpaseo/paseo

packages/app/src/hooks/use-acp-provider-catalog.test.ts

@@ -37,6 +37,7 @@ describe("ACP provider catalog", () => {
   it("uses PATH commands for entries that were binary distributions upstream", () => {
     expect(findProvider("amp-acp").command).toEqual(["amp-acp"]);
     expect(findProvider("cursor").command).toEqual(["cursor-agent", "acp"]);
+    expect(findProvider("deepseek-tui").command).toEqual(["deepseek", "serve", "--acp"]);
     expect(findProvider("goose").command).toEqual(["goose", "acp"]);
     expect(findProvider("junie").command).toEqual(["junie", "--acp", "true"]);
     expect(findProvider("kiro").command).toEqual(["kiro-cli", "acp"]);

packages/app/src/hooks/use-agent-form-state.ts

@@ -8,6 +8,10 @@ import type {
 } from "@server/server/agent/agent-sdk-types";
 import { useHosts } from "@/runtime/host-runtime";
 import { buildProviderDefinitions } from "@/utils/provider-definitions";
+import {
+  buildSelectableModelSelectorProviders,
+  type ModelSelectorProvider,
+} from "@/components/combined-model-selector.utils";
 import { useProvidersSnapshot } from "./use-providers-snapshot";
 import {
   useFormPreferences,
@@ -63,6 +67,7 @@ export interface UseAgentFormStateResult {
   modeOptions: AgentMode[];
   availableModels: AgentModelDefinition[];
   allProviderModels: Map<string, AgentModelDefinition[]>;
+  modelSelectorProviders: ModelSelectorProvider[];
   isAllModelsLoading: boolean;
   availableThinkingOptions: NonNullable<AgentModelDefinition["thinkingOptions"]>;
   isModelLoading: boolean;
@@ -237,6 +242,10 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
     () => buildAllProviderModels(snapshotEntries),
     [snapshotEntries],
   );
+  const snapshotModelSelectorProviders = useMemo(
+    () => buildSelectableModelSelectorProviders(snapshotEntries),
+    [snapshotEntries],
+  );
   const snapshotSelectedEntry = useMemo(
     () =>
       formState.provider
@@ -255,6 +264,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
   const providerDefinitionMap = snapshotProviderDefinitionMap;
   const selectableProviderDefinitionMap = snapshotSelectableProviderDefinitionMap;
   const allProviderModels = snapshotAllProviderModels;
+  const modelSelectorProviders = snapshotModelSelectorProviders;
   const availableModels = snapshotSelectedProviderModels;
   const modeOptions = snapshotSelectedProviderModes;
   const isAllModelsLoading = snapshotIsLoading || selectedProviderIsLoading;
@@ -516,6 +526,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       modeOptions,
       availableModels: availableModels ?? [],
       allProviderModels,
+      modelSelectorProviders,
       isAllModelsLoading,
       availableThinkingOptions,
       isModelLoading,
@@ -548,6 +559,7 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
       modeOptions,
       availableModels,
       allProviderModels,
+      modelSelectorProviders,
       isAllModelsLoading,
       availableThinkingOptions,
       isModelLoading,

packages/app/src/hooks/use-agent-input-draft-core.ts

@@ -88,7 +88,7 @@ export function buildDraftStatusControls(input: {
     selectedModel: formState.selectedModel,
     onSelectModel: formState.setModelFromUser,
     isModelLoading: formState.isModelLoading,
-    allProviderModels: formState.allProviderModels,
+    modelSelectorProviders: formState.modelSelectorProviders,
     isAllModelsLoading: formState.isAllModelsLoading,
     onSelectProviderAndModel: formState.setProviderAndModelFromUser,
     thinkingOptions: formState.availableThinkingOptions,

packages/app/src/hooks/use-agent-input-draft.live.test.tsx

@@ -81,6 +81,22 @@ vi.mock("./use-agent-form-state", () => ({
         ],
       ],
     ]),
+    modelSelectorProviders: [
+      {
+        id: "codex",
+        label: "Codex",
+        rows: [
+          {
+            favoriteKey: "codex:gpt-5.4",
+            provider: "codex",
+            providerLabel: "Codex",
+            modelId: "gpt-5.4",
+            modelLabel: "gpt-5.4",
+            isDefault: true,
+          },
+        ],
+      },
+    ],
     isAllModelsLoading: false,
     availableThinkingOptions: [
       { id: "medium", label: "Medium" },