fix: normalize xhigh effort for Claude CLI and extract shared prompt-injected descriptor lookup

- Add normalizeClaudeEffortForCli() in ClaudeProvider.ts to map xhigh->max
  and filter ultrathink before passing to CLI/SDK
- Apply normalization in ClaudeTextGeneration.ts (was missing, producing
  invalid --effort xhigh CLI flag for Opus 4.7)
- Refactor getEffectiveClaudeAgentEffort in ClaudeAdapter.ts to delegate
  to the new shared normalizer
- Extract findPromptInjectedDescriptor() into @t3tools/shared/model to
  deduplicate the .find() logic between ClaudeAdapter and ChatView

Author: cursoragent

apps/server/src/git/Layers/ClaudeTextGeneration.ts

@@ -31,6 +31,7 @@ import {
 import { getProviderOptionCurrentValue, getProviderOptionDescriptors } from "@t3tools/shared/model";
 import {
   getClaudeModelCapabilities,
+  normalizeClaudeEffortForCli,
   resolveClaudeApiModelId,
   resolveClaudeEffort,
 } from "../../provider/Layers/ClaudeProvider.ts";
@@ -95,7 +96,7 @@ const makeClaudeTextGeneration = Effect.gen(function* () {
     const findDescriptor = (id: string) => descriptors.find((descriptor) => descriptor.id === id);
     const rawEffortValue = getProviderOptionCurrentValue(findDescriptor("effort"));
     const rawEffort = typeof rawEffortValue === "string" ? rawEffortValue : undefined;
-    const resolvedEffort = resolveClaudeEffort(caps, rawEffort);
+    const resolvedEffort = normalizeClaudeEffortForCli(resolveClaudeEffort(caps, rawEffort));
     const thinkingDescriptor = findDescriptor("thinking");
     const fastModeDescriptor = findDescriptor("fastMode");
     const thinking =

apps/server/src/provider/Layers/ClaudeAdapter.ts

@@ -43,6 +43,7 @@ import {
 } from "@t3tools/contracts";
 import {
   applyClaudePromptEffortPrefix,
+  findPromptInjectedDescriptor,
   getProviderOptionDescriptors,
   getModelSelectionOptionValue,
   trimOrNull,
@@ -67,6 +68,7 @@ import { ServerConfig } from "../../config.ts";
 import { ServerSettingsService } from "../../serverSettings.ts";
 import {
   getClaudeModelCapabilities,
+  normalizeClaudeEffortForCli,
   resolveClaudeApiModelId,
   resolveClaudeEffort,
 } from "./ClaudeProvider.ts";
@@ -220,16 +222,8 @@ function normalizeClaudeStreamMessages(cause: Cause.Cause<Error>): ReadonlyArray
 }
 
 function getEffectiveClaudeAgentEffort(effort: string | null | undefined): ClaudeSdkEffort | null {
-  if (!effort) {
-    return null;
-  }
-  if (effort === "ultrathink") {
-    return null;
-  }
-  if (effort === "xhigh") {
-    return "max";
-  }
-  return effort as ClaudeSdkEffort;
+  const normalized = normalizeClaudeEffortForCli(effort);
+  return normalized ? (normalized as ClaudeSdkEffort) : null;
 }
 
 function isClaudeInterruptedMessage(message: string): boolean {
@@ -569,23 +563,10 @@ function buildPromptText(input: ProviderSendTurnInput): string {
     input.modelSelection?.provider === "claudeAgent" ? input.modelSelection.model : undefined;
   const caps = getClaudeModelCapabilities(claudeModel);
 
-  // For prompt injection, we check if the raw effort is a prompt-injected level (e.g. "ultrathink").
-  // Normal Claude effort resolution strips prompt-injected values back to the model default,
-  // so prompt formatting must look at the raw selection value directly.
   const trimmedEffort = trimOrNull(rawEffort);
-  const promptInjectedDescriptor = getProviderOptionDescriptors({ caps }).find(
-    (descriptor) =>
-      descriptor.type === "select" &&
-      (descriptor.id === "effort" ||
-        descriptor.id === "reasoningEffort" ||
-        descriptor.id === "reasoning" ||
-        descriptor.id === "variant") &&
-      (descriptor.promptInjectedValues?.length ?? 0) > 0,
-  );
+  const promptInjectedDescriptor = findPromptInjectedDescriptor(caps);
   const promptEffort =
-    trimmedEffort &&
-    promptInjectedDescriptor?.type === "select" &&
-    promptInjectedDescriptor.promptInjectedValues?.includes(trimmedEffort)
+    trimmedEffort && promptInjectedDescriptor?.promptInjectedValues?.includes(trimmedEffort)
       ? trimmedEffort
       : null;
   return applyClaudePromptEffortPrefix(input.input?.trim() ?? "", promptEffort);

apps/server/src/provider/Layers/ClaudeProvider.ts

@@ -221,6 +221,20 @@ export function resolveClaudeEffort(
   return typeof value === "string" ? value : undefined;
 }
 
+/**
+ * Maps a T3-internal effort value to a Claude CLI/SDK-compatible effort value.
+ * - `"xhigh"` (T3-internal level between high and max) maps to `"max"`.
+ * - `"ultrathink"` is prompt-injected only; returns `undefined` so the CLI
+ *    flag is omitted entirely.
+ * - All other values pass through unchanged.
+ */
+export function normalizeClaudeEffortForCli(effort: string | null | undefined): string | undefined {
+  if (!effort) return undefined;
+  if (effort === "ultrathink") return undefined;
+  if (effort === "xhigh") return "max";
+  return effort;
+}
+
 export function resolveClaudeApiModelId(modelSelection: ClaudeModelSelection): string {
   switch (getModelSelectionOptionValue(modelSelection, "contextWindow")) {
     case "1m":

apps/web/src/components/ChatView.tsx

@@ -28,7 +28,7 @@ import {
 import {
   applyClaudePromptEffortPrefix,
   createModelSelection,
-  getProviderOptionDescriptors,
+  findPromptInjectedDescriptor,
 } from "@t3tools/shared/model";
 import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts";
 import { truncate } from "@t3tools/shared/String";
@@ -309,20 +309,8 @@ function formatOutgoingPrompt(params: {
   text: string;
 }): string {
   const caps = getProviderModelCapabilities(params.models, params.model, params.provider);
-  const promptInjectedDescriptor = getProviderOptionDescriptors({ caps }).find(
-    (descriptor) =>
-      descriptor.type === "select" &&
-      (descriptor.id === "reasoningEffort" ||
-        descriptor.id === "effort" ||
-        descriptor.id === "reasoning" ||
-        descriptor.id === "variant") &&
-      (descriptor.promptInjectedValues?.length ?? 0) > 0,
-  );
-  if (
-    params.effort &&
-    promptInjectedDescriptor?.type === "select" &&
-    promptInjectedDescriptor.promptInjectedValues?.includes(params.effort)
-  ) {
+  const promptInjectedDescriptor = findPromptInjectedDescriptor(caps);
+  if (params.effort && promptInjectedDescriptor?.promptInjectedValues?.includes(params.effort)) {
     return applyClaudePromptEffortPrefix(params.text, params.effort);
   }
   return params.text;

packages/shared/src/model.ts

@@ -292,6 +292,25 @@ export function createModelSelection(
   } as ModelSelection;
 }
 
+const PROMPT_INJECTED_DESCRIPTOR_IDS = new Set([
+  "effort",
+  "reasoningEffort",
+  "reasoning",
+  "variant",
+]);
+
+export function findPromptInjectedDescriptor(
+  caps: ModelCapabilities,
+): Extract<ProviderOptionDescriptor, { type: "select" }> | undefined {
+  const descriptor = getProviderOptionDescriptors({ caps }).find(
+    (d) =>
+      d.type === "select" &&
+      PROMPT_INJECTED_DESCRIPTOR_IDS.has(d.id) &&
+      (d.promptInjectedValues?.length ?? 0) > 0,
+  );
+  return descriptor?.type === "select" ? descriptor : undefined;
+}
+
 export function applyClaudePromptEffortPrefix(
   text: string,
   effort: string | null | undefined,