fix(acp): expose and preserve later model choices

apps/mobile/src/features/threads/ThreadSettingsSheet.tsx

@@ -530,6 +530,9 @@ function ThreadSettingsSessionProvider(
   };
 
   const applyOptionChange = (id: string, value: string | boolean) => {
+    const savedSelections = pendingModel
+      ? pendingModel.selection.options
+      : props.selectedModel?.options;
     const descriptor = displayedDescriptors.find((entry) => entry.id === id);
     const change =
       descriptor?.type === "select" && typeof value === "string"
@@ -538,6 +541,7 @@ function ThreadSettingsSessionProvider(
             descriptor,
             displayedPrompt,
             value,
+            savedSelections,
           )
         : null;
     if (descriptor?.type === "select") {
@@ -552,7 +556,7 @@ function ThreadSettingsSessionProvider(
     }
     const next = change
       ? (change.modelOptions ?? [])
-      : applyProviderOptionSelection(displayedDescriptors, { id, value });
+      : applyProviderOptionSelection(displayedDescriptors, { id, value }, savedSelections);
     if (!next) {
       return;
     }

apps/mobile/src/lib/modelOptions.test.ts

@@ -144,6 +144,46 @@ describe("mobile model options", () => {
     expect(explicitOption?.selection.options).toEqual([{ id: "serviceTier", value: "priority" }]);
   });
 
+  it("keeps an ACP model's saved model choice before that model has run", () => {
+    const instanceId = ProviderInstanceId.make("acpRegistry_cline");
+    const config = {
+      providers: [
+        {
+          instanceId,
+          driver: "acpRegistry",
+          displayName: "Cline",
+          enabled: true,
+          installed: true,
+          auth: { status: "authenticated" },
+          models: [
+            {
+              slug: "cline-pass",
+              name: "ClinePass",
+              isCustom: false,
+              // Borrowed tuning options: the model choice is not described yet.
+              capabilities: {
+                optionDescriptors: [
+                  { id: "auto_approve", label: "Auto-approve tools", type: "boolean" },
+                ],
+              },
+            },
+          ],
+        },
+      ],
+    } as unknown as ServerConfig;
+    const saved: ModelSelection = {
+      instanceId,
+      model: "cline-pass",
+      options: [
+        { id: "model", value: "cline-pass/muse-spark-1.3-contributor" },
+        { id: "auto_approve", value: true },
+      ],
+    };
+
+    const [option] = buildModelOptions(config, saved, undefined, null);
+    expect(option?.selection).toEqual(saved);
+  });
+
   it("limits existing threads to their provider while new tasks keep every provider", () => {
     const providers = ["codex", "claudeAgent"].map((instanceId) => ({
       instanceId,

apps/mobile/src/lib/modelOptions.ts

@@ -20,6 +20,7 @@ import {
 import {
   buildExplicitProviderOptionSelectionsFromDescriptors,
   getProviderOptionDescriptors,
+  withUndescribedSelections,
 } from "@t3tools/shared/model";
 import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
 
@@ -137,20 +138,26 @@ function isDriverDisallowed(config: T3ServerConfig | null | undefined, driver: s
 function normalizeSelectionOptions(
   selection: ModelSelection,
   capabilities: ModelCapabilities | null,
+  driver: string,
 ): ModelSelection {
   if (!capabilities) {
     return selection;
   }
   if (!selection.options?.length) {
     return { instanceId: selection.instanceId, model: selection.model };
   }
-  const options = buildExplicitProviderOptionSelectionsFromDescriptors(
-    getProviderOptionDescriptors({
-      caps: capabilities,
-      selections: selection.options,
-    }),
+  const descriptors = getProviderOptionDescriptors({
+    caps: capabilities,
+    selections: selection.options,
+  });
+  const explicit = buildExplicitProviderOptionSelectionsFromDescriptors(
+    descriptors,
     selection.options,
   );
+  const options =
+    driver === "acpRegistry"
+      ? withUndescribedSelections(descriptors, explicit, selection.options)
+      : explicit;
   return options
     ? { ...selection, options }
     : {
@@ -389,6 +396,7 @@ export function buildModelOptions(
             model: model.slug,
           },
           model.capabilities,
+          provider.driver,
         ),
       });
     }
@@ -413,7 +421,11 @@ export function buildModelOptions(
         selection:
           existing.providerDriver === "antigravity"
             ? fallbackModelSelection
-            : normalizeSelectionOptions(fallbackModelSelection, existing.capabilities),
+            : normalizeSelectionOptions(
+                fallbackModelSelection,
+                existing.capabilities,
+                existing.providerDriver,
+              ),
       });
     } else {
       const provider = config?.providers.find(

apps/mobile/src/lib/providerOptions.ts

@@ -4,7 +4,7 @@ import type {
   ProviderOptionSelection,
 } from "@t3tools/contracts";
 import {
-  buildProviderOptionSelectionsFromDescriptors,
+  buildProviderOptionSelectionsAfterChange,
   getProviderOptionDescriptors,
 } from "@t3tools/shared/model";
 
@@ -24,6 +24,7 @@ export function resolveProviderOptionDescriptors(input: {
 export function applyProviderOptionSelection(
   descriptors: ReadonlyArray<ProviderOptionDescriptor>,
   change: ProviderOptionSelection,
+  savedSelections: ReadonlyArray<ProviderOptionSelection> | null | undefined,
 ): ReadonlyArray<ProviderOptionSelection> | null {
   const descriptor = descriptors.find((candidate) => candidate.id === change.id);
   if (!descriptor) {
@@ -47,5 +48,7 @@ export function applyProviderOptionSelection(
       : candidate,
   ) as ReadonlyArray<ProviderOptionDescriptor>;
 
-  return buildProviderOptionSelectionsFromDescriptors(nextDescriptors) ?? [];
+  return (
+    buildProviderOptionSelectionsAfterChange(nextDescriptors, change.id, savedSelections) ?? []
+  );
 }