diff --git a/apps/web/src/components/chat/TraitsPicker.test.ts b/apps/web/src/components/chat/TraitsPicker.test.ts
index f3b3c80b437d2..4efa60cf5b63f 100644
--- a/apps/web/src/components/chat/TraitsPicker.test.ts
+++ b/apps/web/src/components/chat/TraitsPicker.test.ts
@@ -4,7 +4,7 @@ import {
   ProviderDriverKind,
   type ProviderOptionDescriptor,
 } from "@t3tools/contracts";
-import { buildTraitsTriggerDisplay } from "@t3tools/shared/model";
+import { buildTraitsTriggerDisplay } from "@t3tools/client-runtime/model-traits";
 import { buildUnavailableModelOptionDescriptors } from "./TraitsPicker";
 
 function selectDescriptor(
diff --git a/packages/client-runtime/src/modelTraits.ts b/packages/client-runtime/src/modelTraits.ts
index 198d09e3a13c6..604eb38ff6dac 100644
--- a/packages/client-runtime/src/modelTraits.ts
+++ b/packages/client-runtime/src/modelTraits.ts
@@ -121,6 +121,9 @@ export function buildTraitsTriggerDisplay(input: {
       fastModeFallbackLabel = speedLabel ?? "Normal";
       continue;
     }
+    // A thread guard, not a thinking trait. Its On/Off text is long enough to
+    // push the effort label out of the composer.
+    if (descriptor.id === "stopAtSubscriptionLimit") continue;
     if (
       input.provider === "codex" &&
       descriptor.id === "serviceTier" &&