@cnwenf/occ 2.1.328 → 2.1.329

package/README.md

@@ -5,7 +5,7 @@
 [![npm version](https://img.shields.io/npm/v/@cnwenf/occ.svg)](https://www.npmjs.com/package/@cnwenf/occ)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](./LICENSE)
 [![Runtime: Bun](https://img.shields.io/badge/Runtime-Bun-%23000000.svg)](https://bun.sh/)
-[![Tracks: Claude Code 2.1.223](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.223-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.267](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.267-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
 
 [简体中文](./README.zh-CN.md) · **English**
 
@@ -13,7 +13,7 @@
 
 ## What is OCC
 
-**Open C Code (OCC)** is an open-source coding agent. Its capabilities are aligned with [Claude Code](https://docs.anthropic.com/en/docs/claude-code) (currently tracking `2.1.223` — 2.1.218 fully aligned, 2.1.219 + 2.1.221 + 2.1.223 partial, 2.1.222 staged, per OCC-46 gap report). The code is fully open, auditable, backdoor-free, and your data stays under your control.
+**Open C Code (OCC)** is an open-source coding agent. Its capabilities are aligned with [Claude Code](https://docs.anthropic.com/en/docs/claude-code) (currently tracking `2.1.267` — 2.1.266 fully aligned; 2.1.267 partial: settings-side effort cap + E8/E9/E10/E12/E32/E33 landed, E8-runtime-realpath / E11 / E19 / E20 / E34 / prompt-cache-snapshot staged, per OCC-121 + OCC-82 gap reports). The code is fully open, auditable, backdoor-free, and your data stays under your control.
 
 If you worry that a closed-source CLI might hide backdoors, or that your code and credentials are uploaded to unauditable services, OCC is for you: all source is open and unobfuscated, the build is reproducible from source, and API credentials are sent only to endpoints you configure.
 
@@ -62,7 +62,7 @@ Requires a valid Anthropic API Key (or AWS Bedrock / Google Vertex / Azure Found
 | **Auditability** | Line-by-line reviewable | No |
 | **Telemetry** | Minimal (analytics stubbed) | Standard |
 | **Data sovereignty** | Credentials stay on your machine; requests only to endpoints you configure | Anthropic endpoints |
-| **Capability parity** | Tracks CC `2.1.223` (partial) | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.267` (partial) | Reference implementation |
 | **Providers** | Anthropic Direct, Bedrock, Vertex, Azure | Anthropic, Bedrock, Vertex |
 | **Cost** | Free & open-source (MIT) | Subscription |
 | **Build** | Reproducible from source | N/A |
@@ -157,7 +157,7 @@ For architecture, entry/bootstrap, tool system, UI layer, and module-status deta
 
 ## Status
 
-- Tracks Claude Code **`2.1.223` (partial)** (2.1.218 fully aligned; 2.1.219 + 2.1.221 + 2.1.223 partial, 2.1.222 staged — see `docs/upstream-version-gap-occ46.md`).
+- Tracks Claude Code **`2.1.267` (partial)** (2.1.266 fully aligned; 2.1.267 partial: settings-side effort cap + E8/E9/E10/E12/E32/E33 landed, E8-runtime-realpath / E11 / E19 / E20 / E34 / prompt-cache-snapshot staged — see `docs/upstream-version-gap-occ121.md` and `docs/upstream-version-gap-occ82.md`).
 - Published to npm as [`@cnwenf/occ`](https://www.npmjs.com/package/@cnwenf/occ).
 - Many modules are intentionally stubbed or feature-flagged off — see "Disabled / stubbed" above.
 

package/README.zh-CN.md

@@ -8,7 +8,7 @@
 
 ## 这是什么
 
-**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.223`：2.1.218 已完全对齐、2.1.219 / 2.1.221 / 2.1.223 部分对齐、2.1.222 待补齐）。代码全开放、可审计、无暗门，数据由你掌控。
+**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.267`：2.1.266 已完全对齐、2.1.267 部分对齐——settings 侧 effort cap 与 E8/E9/E10/E12/E32/E33 已落地，E8-runtime-realpath / E11 / E19 / E20 / E34 / prompt-cache 快照子系统暂缓，详见 OCC-121 与 OCC-82 台账）。代码全开放、可审计、无暗门，数据由你掌控。
 
 如果你担心闭源 CLI 可能植入后门、担心代码与凭据被上传到不可审计的服务，OCC 就是为你准备的：全部源码开放、无混淆，构建产物可由源码复现，API 凭据只发往你自己配置的端点。
 
@@ -21,7 +21,7 @@
 
 ## 现状
 
-- 跟踪 Claude Code **`2.1.223`**（2.1.218 完全对齐、2.1.219 / 2.1.221 / 2.1.223 部分对齐、2.1.222 待补齐）。
+- 跟踪 Claude Code **`2.1.267`**（2.1.266 已完全对齐、2.1.267 部分对齐——settings 侧 effort cap 与 E8/E9/E10/E12/E32/E33 已落地，E8-runtime-realpath / E11 / E19 / E20 / E34 / prompt-cache 快照子系统暂缓）。
 - 代码库有约 1300 个不阻塞的 `tsc` 类型错误（大量松散的 `unknown`/`never`/`{}` 类型），**不影响 Bun 运行时执行**。门槛是 Biome lint，不是 `tsc`。
 - 所有内部 feature flag（`feature(...)`）已被 polyfill 为 `false` —— 内部功能（COORDINATOR_MODE、KAIROS、PROACTIVE 等）全部关闭。
 - 已发布到 npm：[`@cnwenf/occ`](https://www.npmjs.com/package/@cnwenf/occ)。

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.328","BINARY_NAME":"occ","BUILD_TIME":"2026-09-10T19:48:17.557Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.329","BINARY_NAME":"occ","BUILD_TIME":"2026-09-11T03:55:52.872Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -59707,6 +59707,22 @@ var init_types2 = __esm(() => {
     prUrlTemplate: exports_external.string().optional().describe('URL template for the footer PR badge (e.g. "https://internal-review.example.com/pr/{number}"). Uses {number} as the PR number placeholder. Defaults to github.com.'),
     alwaysThinkingEnabled: exports_external.boolean().optional().describe("When false, thinking is disabled. When absent or true, thinking is " + "enabled automatically for supported models."),
     effortLevel: exports_external.enum(["low", "medium", "high", "xhigh"]).optional().catch(undefined).describe("Persisted effort level for supported models."),
+    maxEffortLevel: exports_external.enum(["low", "medium", "high", "xhigh", "max"]).optional().catch(undefined).describe("Maximum effort level. Anything above it (an /effort or /model pick, --effort, CLAUDE_CODE_EFFORT_LEVEL, a model default) is clamped to it, on every provider including Bedrock, Vertex and Foundry. Combines with an organization's per-model effort cap by taking the lower of the two; across settings files the lowest value wins, and modelSettings.<model>.maxEffortLevel replaces it per model. Enforced client-side: an effort supplied through CLAUDE_CODE_EXTRA_BODY is not clamped."),
+    modelSettings: exports_external.preprocess((value) => {
+      if (typeof value !== "object" || value === null || Array.isArray(value)) {
+        return value;
+      }
+      const stripped = {};
+      for (const [key, entry] of Object.entries(value)) {
+        if (!Object.hasOwn(Object.prototype, key)) {
+          stripped[key] = entry;
+        }
+      }
+      return stripped;
+    }, exports_external.record(exports_external.string(), exports_external.object({
+      effortLevel: exports_external.enum(["low", "medium", "high", "xhigh"]).optional().catch(undefined).describe("Persisted effort level for this model."),
+      maxEffortLevel: exports_external.enum(["low", "medium", "high", "xhigh", "max"]).optional().catch(undefined).describe('Maximum effort level for this model. Within one settings file it replaces the top-level maxEffortLevel for the model ("max" exempts it); across settings files the lowest applicable value wins. Keyed like effortLevel: the canonical model name also matches its dated, [1m], Bedrock and Vertex spellings.')
+    }).passthrough().optional().catch(undefined))).optional().catch(undefined).describe("Per-model settings keyed by canonical model name."),
     dynamicWorkflowSize: exports_external.enum(["small", "medium", "large"]).optional().catch(undefined).describe("Advisory guideline for how large Claude makes dynamic workflows (small/medium/large agent counts). Not an enforced cap."),
     advisorModel: exports_external.string().optional().describe("Advisor model for the server-side advisor tool."),
     fastMode: exports_external.boolean().optional().describe("When true, fast mode is enabled. When absent or false, fast mode is off."),
@@ -203938,6 +203954,122 @@ var init_thinking = __esm(() => {
   ];
 });
 
+// src/utils/effort/cap.ts
+function effortLevelIndex(level) {
+  return EFFORT_LEVELS.indexOf(level);
+}
+function isKnownEffortLevel(value) {
+  return typeof value === "string" && EFFORT_LEVELS.includes(value);
+}
+function getSettingsEffortCap(model) {
+  const sources = getEnabledSettingSources().map((source) => getSettingsForSource(source));
+  const canonicalTarget = sources.some((settings) => Object.values(settings?.modelSettings ?? {}).some((entry) => entry?.maxEffortLevel !== undefined)) ? getCanonicalName(model) : undefined;
+  let lowest = null;
+  for (const settings of sources) {
+    if (!settings)
+      continue;
+    let perFile;
+    if (canonicalTarget !== undefined) {
+      for (const [key, entry] of Object.entries(settings.modelSettings ?? {})) {
+        if (Object.hasOwn(Object.prototype, key))
+          continue;
+        const candidate = entry?.maxEffortLevel;
+        if (candidate !== undefined && (perFile === undefined || effortLevelIndex(candidate) < effortLevelIndex(perFile)) && getCanonicalName(key) === canonicalTarget) {
+          perFile = candidate;
+        }
+      }
+    }
+    perFile ??= settings.maxEffortLevel;
+    if (perFile !== undefined && perFile !== "max" && (lowest === null || effortLevelIndex(perFile) < effortLevelIndex(lowest))) {
+      lowest = perFile;
+    }
+  }
+  return lowest;
+}
+function getEffectiveEffortCap(model) {
+  const cap = getSettingsEffortCap(model);
+  return cap === "max" ? null : cap;
+}
+function isEffortLevelAllowed(level, model) {
+  const cap = getEffectiveEffortCap(model);
+  return cap === null || effortLevelIndex(level) <= effortLevelIndex(cap);
+}
+function getAllowedEffortLevels(model) {
+  return EFFORT_LEVELS.filter((level) => isEffortLevelAllowed(level, model));
+}
+function modelSupportsEffortLevel(model, level) {
+  if (level === "xhigh")
+    return modelSupportsXhighEffort(model);
+  if (level === "max")
+    return modelSupportsMaxEffort(model);
+  return true;
+}
+function clampEffortToCap(value, model) {
+  const cap = getEffectiveEffortCap(model);
+  if (cap !== null && isKnownEffortLevel(value)) {
+    return effortLevelIndex(value) > effortLevelIndex(cap) ? cap : value;
+  }
+  return value;
+}
+function applyEffortCapabilityDowngrade(value, model) {
+  let result = value;
+  if (result === "max" && !modelSupportsMaxEffort(model))
+    result = "high";
+  if (result === "xhigh" && !modelSupportsXhighEffort(model))
+    result = "high";
+  return result;
+}
+function clampEffortValue(value, model) {
+  return applyEffortCapabilityDowngrade(clampEffortToCap(value, model), model);
+}
+function hasEffortLevelsAboveCap(model) {
+  const cap = getEffectiveEffortCap(model);
+  if (cap === null)
+    return false;
+  return EFFORT_LEVELS.some((level) => effortLevelIndex(level) > effortLevelIndex(cap) && modelSupportsEffortLevel(model, level));
+}
+function getEffortCapWarning(requested, model) {
+  if (!isKnownEffortLevel(requested))
+    return null;
+  const cap = getEffectiveEffortCap(model);
+  if (cap === null || effortLevelIndex(requested) <= effortLevelIndex(cap)) {
+    return null;
+  }
+  const using = clampEffortValue(requested, model);
+  return `Effort '${requested}' exceeds the cap for ${model} set by your settings or organization; using '${using}'.`;
+}
+function emitStartupEffortCapWarning(requestedEffort, model, outputFormat) {
+  const warning = getEffortCapWarning(requestedEffort, model);
+  if (warning === null)
+    return;
+  if (outputFormat !== "json" && outputFormat !== "stream-json" && process.env.CLAUDE_CODE_SESSION_KIND !== "bg") {
+    console.warn(source_default.yellow(warning));
+    return;
+  }
+  logForDebugging(`[effort] ${warning}`);
+}
+function isUltracodeAvailableForModel(model) {
+  return model === undefined || modelSupportsXhighEffort(model) && isEffortLevelAllowed("xhigh", model);
+}
+function formatEffortValidOptions(model) {
+  const levels = getAllowedEffortLevels(model);
+  const ultracode = isUltracodeAvailableForModel(model) ? ", ultracode" : "";
+  return `${levels.join(", ")}${ultracode}, auto`;
+}
+function buildEffortArgumentHint(open6, close, model) {
+  const levels = getAllowedEffortLevels(model);
+  const ultracode = isUltracodeAvailableForModel(model) ? "|ultracode" : "";
+  return `${open6}${levels.join("|")}${ultracode}|auto${close}`;
+}
+var init_cap = __esm(() => {
+  init_source();
+  init_debug();
+  init_model();
+  init_constants2();
+  init_settings2();
+  init_effort();
+});
+
 // src/utils/effort.ts
 function modelSupportsEffort(model) {
   const m5 = model.toLowerCase();
@@ -204026,24 +204158,30 @@ function getEffortEnvOverride() {
 }
 function resolveAppliedEffort(model, appStateEffortValue) {
   const envOverride = getEffortEnvOverride();
-  if (envOverride === null) {
+  const hasSettingsCap = getSettingsEffortCap(model) !== null;
+  if (envOverride === null && !hasSettingsCap) {
     return;
   }
-  const resolved = envOverride ?? appStateEffortValue ?? getDefaultEffortForModel(model);
-  if (resolved === "max" && !modelSupportsMaxEffort(model)) {
-    return "high";
+  const modelDefault = getDefaultEffortForModel(model);
+  let resolved = envOverride ?? (envOverride === null ? modelDefault : undefined) ?? appStateEffortValue ?? modelDefault;
+  if (typeof resolved === "number" && hasSettingsCap) {
+    resolved = "high";
   }
-  if (resolved === "xhigh" && !modelSupportsXhighEffort(model)) {
-    return "high";
+  if (resolved === undefined) {
+    return;
   }
-  return resolved;
+  return clampEffortValue(resolved, model);
 }
 function resolveConfiguredEffort(model, appStateEffortValue) {
   const envOverride = getEffortEnvOverride();
   if (envOverride === null) {
     return;
   }
-  return envOverride ?? appStateEffortValue ?? getDefaultEffortForModel(model);
+  const resolved = envOverride ?? appStateEffortValue ?? getDefaultEffortForModel(model);
+  if (resolved === undefined) {
+    return;
+  }
+  return clampEffortToCap(resolved, model);
 }
 function getDisplayedEffortLevel(model, appStateEffort) {
   const configured = resolveConfiguredEffort(model, appStateEffort) ?? "high";
@@ -204148,6 +204286,7 @@ var init_effort = __esm(() => {
   init_providers();
   init_modelSupportOverrides();
   init_envUtils();
+  init_cap();
   EFFORT_LEVELS = [
     "low",
     "medium",
@@ -560902,18 +561041,18 @@ function parseFolderPath(folderPath) {
   }
   return { platform: platform5, buildId };
 }
-var import_debug177, debugCache;
+var import_debug178, debugCache;
 var init_Cache = __esm(() => {
   init_browser_data();
   init_detectPlatform();
-  import_debug177 = __toESM(require_src(), 1);
-  debugCache = import_debug177.default("puppeteer:browsers:cache");
+  import_debug178 = __toESM(require_src(), 1);
+  debugCache = import_debug178.default("puppeteer:browsers:cache");
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/debug.js
-var import_debug178;
+var import_debug179;
 var init_debug3 = __esm(() => {
-  import_debug178 = __toESM(require_src(), 1);
+  import_debug179 = __toESM(require_src(), 1);
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/launch.js
@@ -561232,7 +561371,7 @@ var init_launch = __esm(() => {
   init_Cache();
   init_debug3();
   init_detectPlatform();
-  debugLaunch = import_debug178.default("puppeteer:browsers:launcher");
+  debugLaunch = import_debug179.default("puppeteer:browsers:launcher");
   CDP_WEBSOCKET_ENDPOINT_REGEX = /^DevTools listening on (ws:\/\/.*)$/;
   WEBDRIVER_BIDI_WEBSOCKET_ENDPOINT_REGEX = /^WebDriver BiDi listening on (ws:\/\/.*)$/;
   processListeners = new Map;
@@ -566316,10 +566455,10 @@ async function installDMG(dmgPath, folderPath) {
     spawnSync4("hdiutil", ["detach", mountPath, "-quiet"]);
   }
 }
-var import_debug180, debugFileUtil, internalConstantsForTesting;
+var import_debug181, debugFileUtil, internalConstantsForTesting;
 var init_fileUtil = __esm(() => {
-  import_debug180 = __toESM(require_src(), 1);
-  debugFileUtil = import_debug180.default("puppeteer:browsers:fileUtil");
+  import_debug181 = __toESM(require_src(), 1);
+  debugFileUtil = import_debug181.default("puppeteer:browsers:fileUtil");
   internalConstantsForTesting = {
     xz: "xz",
     bzip2: "bzip2"
@@ -566612,7 +566751,7 @@ var init_install = __esm(() => {
   init_fileUtil();
   init_httpUtil();
   import_progress = __toESM(require_node_progress(), 1);
-  debugInstall = import_debug178.default("puppeteer:browsers:install");
+  debugInstall = import_debug179.default("puppeteer:browsers:install");
   times = new Map;
 });
 
@@ -572887,7 +573026,7 @@ import fs23 from "fs";
 import os16 from "os";
 import { dirname as dirname45 } from "path";
 import { PassThrough as PassThrough4 } from "stream";
-var import_debug182, __runInitializers23 = function(thisArg, initializers, value) {
+var import_debug183, __runInitializers23 = function(thisArg, initializers, value) {
   var useValue = arguments.length > 2;
   for (var i6 = 0;i6 < initializers.length; i6++) {
     value = useValue ? initializers[i6].call(thisArg, value) : initializers[i6].call(thisArg);
@@ -572947,8 +573086,8 @@ var init_ScreenRecorder = __esm(() => {
   init_util6();
   init_decorators();
   init_disposable();
-  import_debug182 = __toESM(require_src(), 1);
-  debugFfmpeg = import_debug182.default("puppeteer:ffmpeg");
+  import_debug183 = __toESM(require_src(), 1);
+  debugFfmpeg = import_debug183.default("puppeteer:ffmpeg");
   ScreenRecorder = (() => {
     let _classSuper = PassThrough4;
     let _instanceExtraInitializers = [];
@@ -632683,7 +632822,11 @@ function should1hCacheTTL(querySource, agentCacheTtlOverride) {
   return resolvePromptCacheTtl(querySource, { agentCacheTtlOverride }).ttl === "1h";
 }
 function configureEffortParams(effortValue, outputConfig, extraBodyParams, betas, model) {
-  if (!modelSupportsEffort(model) || "effort" in outputConfig) {
+  if (!modelSupportsEffort(model)) {
+    delete outputConfig.effort;
+    return;
+  }
+  if ("effort" in outputConfig) {
     return;
   }
   if (effortValue === undefined) {
@@ -632691,12 +632834,6 @@ function configureEffortParams(effortValue, outputConfig, extraBodyParams, betas
   } else if (typeof effortValue === "string") {
     outputConfig.effort = effortValue;
     betas.push(EFFORT_BETA_HEADER);
-  } else if (process.env.USER_TYPE === "ant") {
-    const existingInternal = extraBodyParams.anthropic_internal || {};
-    extraBodyParams.anthropic_internal = {
-      ...existingInternal,
-      effort_override: effortValue
-    };
   }
 }
 function configureTaskBudgetParams(taskBudget, outputConfig, betas) {
@@ -637288,17 +637425,23 @@ function applySettingsChange(source2, setAppState) {
     const prevEffort = prev.settings.effortLevel;
     const newEffort = newSettings.effortLevel;
     const effortChanged = prevEffort !== newEffort;
+    const effortSyncModel = getMainLoopModel();
+    const effortSyncBlocked = !modelSupportsEffort(effortSyncModel) || getEffortEnvOverride() !== undefined;
+    const clampedEffort = effortSyncBlocked || newEffort === undefined ? undefined : clampEffortToCap(newEffort, effortSyncModel);
     return {
       ...prev,
       settings: newSettings,
       toolPermissionContext: newContext,
-      ...effortChanged && newEffort !== undefined ? { effortValue: newEffort } : {}
+      ...effortChanged && clampedEffort !== undefined ? { effortValue: clampedEffort } : {}
     };
   });
 }
 var init_applySettingsChange = __esm(() => {
   init_debug();
+  init_effort();
+  init_cap();
   init_hooksConfigSnapshot();
+  init_model();
   init_permissionSetup();
   init_permissions2();
   init_permissionsLoader();
@@ -649457,7 +649600,7 @@ var init_EffortIndicator = __esm(() => {
 
 // src/components/ModelPicker.tsx
 function ModelPicker(t0) {
-  const $4 = import_compiler_runtime133.c(84);
+  const $4 = import_compiler_runtime133.c(86);
   const {
     initial,
     sessionModel,
@@ -649583,6 +649726,9 @@ function ModelPicker(t0) {
     t8 = $4[22];
   }
   const focusedSupportsMax = t8;
+  const focusedModelForCap = resolveOptionModel(focusedValue);
+  const focusedCap = focusedModelForCap ? getEffectiveEffortCap(focusedModelForCap) : null;
+  const focusedCapped = focusedModelForCap ? hasEffortLevelsAboveCap(focusedModelForCap) : false;
   let t9;
   if ($4[23] !== focusedValue) {
     t9 = getDefaultEffortLevelForOption(focusedValue);
@@ -649592,13 +649738,16 @@ function ModelPicker(t0) {
     t9 = $4[24];
   }
   const focusedDefaultEffort = t9;
-  const displayEffort = effort === "max" && !focusedSupportsMax || effort === "xhigh" && !focusedSupportsXhigh ? "high" : effort;
+  const t8b = effort === "max" && !focusedSupportsMax || effort === "xhigh" && !focusedSupportsXhigh ? "high" : effort;
+  const displayEffort = t8b !== undefined && focusedModelForCap ? clampEffortToCap(t8b, focusedModelForCap) : t8b;
   let t10;
   if ($4[25] !== effortValue || $4[26] !== hasToggledEffort) {
     t10 = (value) => {
       setFocusedValue(value);
       if (!hasToggledEffort && effortValue === undefined) {
-        setEffort(getDefaultEffortLevelForOption(value));
+        const focusModel = resolveOptionModel(value);
+        const defaultEffort = getDefaultEffortLevelForOption(value);
+        setEffort(focusModel ? clampEffortToCap(defaultEffort, focusModel) : defaultEffort);
       }
     };
     $4[25] = effortValue;
@@ -649609,12 +649758,12 @@ function ModelPicker(t0) {
   }
   const handleFocus = t10;
   let t11;
-  if ($4[28] !== focusedDefaultEffort || $4[29] !== focusedSupportsEffort || $4[30] !== focusedSupportsMax || $4[83] !== focusedSupportsXhigh) {
+  if ($4[28] !== focusedDefaultEffort || $4[29] !== focusedSupportsEffort || $4[30] !== focusedSupportsMax || $4[83] !== focusedSupportsXhigh || $4[84] !== focusedCap) {
     t11 = (direction) => {
       if (!focusedSupportsEffort) {
         return;
       }
-      setEffort((prev) => cycleEffortLevel(prev ?? focusedDefaultEffort, direction, focusedSupportsMax, focusedSupportsXhigh));
+      setEffort((prev) => cycleEffortLevel(prev ?? focusedDefaultEffort, direction, focusedSupportsMax, focusedSupportsXhigh, focusedCap));
       setHasToggledEffort(true);
     };
     $4[28] = focusedDefaultEffort;
@@ -649622,6 +649771,7 @@ function ModelPicker(t0) {
     $4[30] = focusedSupportsMax;
     $4[31] = t11;
     $4[83] = focusedSupportsXhigh;
+    $4[84] = focusedCap;
   } else {
     t11 = $4[31];
   }
@@ -649662,11 +649812,14 @@ function ModelPicker(t0) {
   let t14;
   if ($4[35] !== effort || $4[36] !== hasToggledEffort || $4[37] !== onSelect || $4[38] !== setAppState || $4[39] !== skipSettingsWrite) {
     t14 = function handleSelect2(value_0) {
+      const selectedModel = resolveOptionModel(value_0);
+      const clampedSelectEffort = selectedModel && effort !== undefined ? clampEffortToCap(effort, selectedModel) : effort;
       logEvent2("tengu_model_command_menu_effort", {
-        effort
+        effort: clampedSelectEffort
       });
       if (!skipSettingsWrite) {
-        const effortLevel = resolvePickerEffortPersistence(effort, getDefaultEffortLevelForOption(value_0), getSettingsForSource("userSettings")?.effortLevel, hasToggledEffort);
+        const persistModel = selectedModel ?? getDefaultMainLoopModel();
+        const effortLevel = clampEffortToCap(resolvePickerEffortPersistence(effort, getDefaultEffortLevelForOption(value_0), getSettingsForSource("userSettings")?.effortLevel, hasToggledEffort), persistModel);
         const persistable = toPersistableEffort(effortLevel);
         if (persistable !== undefined) {
           updateSettingsForSource("userSettings", {
@@ -649678,8 +649831,7 @@ function ModelPicker(t0) {
           effortValue: effortLevel
         }));
       }
-      const selectedModel = resolveOptionModel(value_0);
-      const selectedEffort = hasToggledEffort && selectedModel && modelSupportsEffort(selectedModel) ? effort : undefined;
+      const selectedEffort = hasToggledEffort && selectedModel && modelSupportsEffort(selectedModel) ? clampedSelectEffort : undefined;
       if (value_0 === NO_PREFERENCE) {
         onSelect(null, selectedEffort);
         return;
@@ -649812,42 +649964,49 @@ function ModelPicker(t0) {
     t23 = $4[61];
   }
   let t24;
-  if ($4[62] !== displayEffort || $4[63] !== focusedDefaultEffort || $4[64] !== focusedModelName || $4[65] !== focusedSupportsEffort) {
-    t24 = /* @__PURE__ */ jsx_runtime183.jsx(ThemedBox_default, {
+  if ($4[62] !== displayEffort || $4[63] !== focusedDefaultEffort || $4[64] !== focusedModelName || $4[65] !== focusedSupportsEffort || $4[85] !== focusedCapped) {
+    t24 = /* @__PURE__ */ jsx_runtime183.jsxs(ThemedBox_default, {
       marginBottom: 1,
       flexDirection: "column",
-      children: focusedSupportsEffort ? /* @__PURE__ */ jsx_runtime183.jsxs(ThemedText, {
-        dimColor: true,
-        children: [
-          /* @__PURE__ */ jsx_runtime183.jsx(EffortLevelIndicator, {
-            effort: displayEffort
-          }),
-          " ",
-          capitalize_default(displayEffort),
-          " effort",
-          displayEffort === focusedDefaultEffort ? " (default)" : "",
-          " ",
-          /* @__PURE__ */ jsx_runtime183.jsx(ThemedText, {
-            color: "subtle",
-            children: "\u2190 \u2192 to adjust"
-          })
-        ]
-      }) : /* @__PURE__ */ jsx_runtime183.jsxs(ThemedText, {
-        color: "subtle",
-        children: [
-          /* @__PURE__ */ jsx_runtime183.jsx(EffortLevelIndicator, {
-            effort: undefined
-          }),
-          " Effort not supported",
-          focusedModelName ? ` for ${focusedModelName}` : ""
-        ]
-      })
+      children: [
+        focusedSupportsEffort ? /* @__PURE__ */ jsx_runtime183.jsxs(ThemedText, {
+          dimColor: true,
+          children: [
+            /* @__PURE__ */ jsx_runtime183.jsx(EffortLevelIndicator, {
+              effort: displayEffort
+            }),
+            " ",
+            capitalize_default(displayEffort),
+            " effort",
+            displayEffort === focusedDefaultEffort ? " (default)" : "",
+            " ",
+            /* @__PURE__ */ jsx_runtime183.jsx(ThemedText, {
+              color: "subtle",
+              children: "\u2190 \u2192 to adjust"
+            })
+          ]
+        }) : /* @__PURE__ */ jsx_runtime183.jsxs(ThemedText, {
+          color: "subtle",
+          children: [
+            /* @__PURE__ */ jsx_runtime183.jsx(EffortLevelIndicator, {
+              effort: undefined
+            }),
+            " Effort not supported",
+            focusedModelName ? ` for ${focusedModelName}` : ""
+          ]
+        }),
+        focusedCapped ? /* @__PURE__ */ jsx_runtime183.jsx(ThemedText, {
+          color: "subtle",
+          children: "Higher effort levels are capped by your settings or organization."
+        }) : null
+      ]
     });
     $4[62] = displayEffort;
     $4[63] = focusedDefaultEffort;
     $4[64] = focusedModelName;
     $4[65] = focusedSupportsEffort;
     $4[66] = t24;
+    $4[85] = focusedCapped;
   } else {
     t24 = $4[66];
   }
@@ -650031,8 +650190,9 @@ function EffortLevelIndicator(t0) {
   }
   return t4;
 }
-function cycleEffortLevel(current, direction, includeMax, includeXhigh) {
-  const levels = ["low", "medium", "high", "xhigh", "max"].filter((level) => (level !== "max" || includeMax) && (level !== "xhigh" || includeXhigh));
+function cycleEffortLevel(current, direction, includeMax, includeXhigh, cap) {
+  const capIndex = cap !== undefined && cap !== null ? EFFORT_LEVEL_ORDER.indexOf(cap) : EFFORT_LEVEL_ORDER.length - 1;
+  const levels = EFFORT_LEVEL_ORDER.filter((level, index2) => index2 <= capIndex && (level !== "max" || includeMax) && (level !== "xhigh" || includeXhigh));
   const clamped = current === "max" && !includeMax || current === "xhigh" && !includeXhigh ? "high" : current;
   const idx = levels.indexOf(clamped);
   const currentIndex = idx !== -1 ? idx : levels.length - 1;
@@ -650047,7 +650207,7 @@ function getDefaultEffortLevelForOption(value) {
   const defaultValue = getDefaultEffortForModel(resolved);
   return defaultValue !== undefined ? convertEffortValueToLevel(defaultValue) : "high";
 }
-var import_compiler_runtime133, import_react103, jsx_runtime183, NO_PREFERENCE = "__NO_PREFERENCE__";
+var import_compiler_runtime133, import_react103, jsx_runtime183, NO_PREFERENCE = "__NO_PREFERENCE__", EFFORT_LEVEL_ORDER;
 var init_ModelPicker = __esm(() => {
   init_capitalize();
   init_useExitOnCtrlCDWithKeybindings();
@@ -650057,6 +650217,7 @@ var init_ModelPicker = __esm(() => {
   init_useKeybinding();
   init_AppState();
   init_effort();
+  init_cap();
   init_model();
   init_modelOptions();
   init_settings2();
@@ -650069,6 +650230,7 @@ var init_ModelPicker = __esm(() => {
   import_compiler_runtime133 = __toESM(require_compiler_runtime(), 1);
   import_react103 = __toESM(require_react(), 1);
   jsx_runtime183 = __toESM(require_jsx_runtime(), 1);
+  EFFORT_LEVEL_ORDER = ["low", "medium", "high", "xhigh", "max"];
 });
 
 // src/components/ClaudeMdExternalIncludesDialog.tsx
@@ -716431,6 +716593,19 @@ __export(exports_effort, {
   call: () => call82
 });
 function setEffortValue(effortValue) {
+  const model = getMainLoopModel();
+  const clamped = typeof effortValue === "string" ? clampEffortToCap(effortValue, model) : effortValue;
+  if (clamped !== effortValue) {
+    logEvent2("tengu_effort_command", {
+      effort: effortValue
+    });
+    return {
+      message: `Effort '${effortValue}' exceeds the cap for ${model} set by your settings or organization; set to '${clamped}' instead (this session only): ${getEffortValueDescription(clamped)}`,
+      effortUpdate: {
+        value: clamped
+      }
+    };
+  }
   const persistable = toPersistableEffort(effortValue);
   if (persistable !== undefined) {
     const result = updateSettingsForSource("userSettings", {
@@ -716481,9 +716656,10 @@ function showCurrentEffort(appStateEffort, model) {
       message: `Effort level: auto (currently ${level})`
     };
   }
-  const description = getEffortValueDescription(effectiveValue);
+  const clamped = clampEffortToCap(effectiveValue, model);
+  const description = getEffortValueDescription(clamped);
   return {
-    message: `Current effort level: ${effectiveValue} (${description})`
+    message: `Current effort level: ${clamped} (${description})`
   };
 }
 function unsetEffortLevel() {
@@ -716515,7 +716691,17 @@ function unsetEffortLevel() {
     }
   };
 }
-function enableUltracode() {
+function enableUltracode(model) {
+  if (modelSupportsXhighEffort(model) && !isEffortLevelAllowed("xhigh", model)) {
+    return {
+      message: `Ultracode runs at xhigh effort, which is above the effort cap for ${model} set by your settings or organization. Valid options are: ${formatEffortValidOptions(model)}`
+    };
+  }
+  if (!isUltracodeAvailableForModel(model)) {
+    return {
+      message: `Ultracode runs at xhigh effort, which ${model} doesn't support \u2014 switch to an xhigh-capable model (${XHIGH_CAPABLE_MODELS_HINT}). Valid options are: ${formatEffortValidOptions(model)}`
+    };
+  }
   enableUltracodeForSession();
   logEvent2("tengu_effort_command", {
     effort: "ultracode"
@@ -716537,11 +716723,11 @@ function executeEffort(args) {
     return unsetEffortLevel();
   }
   if (normalized === "ultracode") {
-    return enableUltracode();
+    return enableUltracode(getMainLoopModel());
   }
   if (!isEffortLevel(normalized)) {
     return {
-      message: `Invalid argument: ${args}. Valid options are: low, medium, high, xhigh, max, ultracode, auto`
+      message: `Invalid argument: ${args}. Valid options are: ${formatEffortValidOptions(getMainLoopModel())}`
     };
   }
   if (isUltracodeEnabled()) {
@@ -716604,14 +716790,17 @@ function ApplyEffortAndClose(t0) {
 async function call82(onDone, _context, args) {
   args = args?.trim() || "";
   if (COMMON_HELP_ARGS2.includes(args)) {
-    onDone(`Usage: /effort [low|medium|high|xhigh|max|ultracode|auto]
-` + `- low: Quick, straightforward implementation
-` + `- medium: Balanced approach with standard testing
-` + `- high: Comprehensive implementation with extensive testing
-` + `- xhigh: Extended reasoning with thorough analysis (Fable 5, Opus 4.7+, Sonnet 5)
-` + `- max: Maximum capability with deepest reasoning (Fable 5, Opus 4.6+, Sonnet 4.6+)
-` + `- ultracode: xhigh + dynamic workflow orchestration (this session only)
-` + "- auto: Use the default effort level for your model");
+    const model = getMainLoopModel();
+    const lines2 = [buildEffortArgumentHint("Usage: /effort [", "]", model)];
+    for (const level of getAllowedEffortLevels(model)) {
+      lines2.push(`- ${level}: ${SHORT_EFFORT_HELP[level]}`);
+    }
+    if (isUltracodeAvailableForModel(model)) {
+      lines2.push("- ultracode: xhigh + dynamic workflow orchestration (this session only)");
+    }
+    lines2.push("- auto: Use the default effort level for your model");
+    onDone(lines2.join(`
+`));
     return;
   }
   if (!args || args === "current" || args === "status") {
@@ -716625,29 +716814,42 @@ async function call82(onDone, _context, args) {
     onDone
   });
 }
-var import_compiler_runtime248, React108, jsx_runtime350, COMMON_HELP_ARGS2;
+var import_compiler_runtime248, React108, jsx_runtime350, COMMON_HELP_ARGS2, XHIGH_CAPABLE_MODELS_HINT = "Fable 5, Opus 4.7+, Sonnet 5", SHORT_EFFORT_HELP;
 var init_effort2 = __esm(() => {
   init_useMainLoopModel();
   init_analytics();
   init_AppState();
   init_effort();
+  init_cap();
   init_ultracode();
+  init_model();
   init_settings2();
   import_compiler_runtime248 = __toESM(require_compiler_runtime(), 1);
   React108 = __toESM(require_react(), 1);
   jsx_runtime350 = __toESM(require_jsx_runtime(), 1);
   COMMON_HELP_ARGS2 = ["help", "-h", "--help"];
+  SHORT_EFFORT_HELP = {
+    low: "Quick, straightforward implementation",
+    medium: "Balanced approach with standard testing",
+    high: "Comprehensive implementation with extensive testing",
+    xhigh: "Extended reasoning with thorough analysis (Fable 5, Opus 4.7+, Sonnet 5)",
+    max: "Maximum capability with deepest reasoning (Fable 5, Opus 4.6+, Sonnet 4.6+)"
+  };
 });
 
 // src/commands/effort/index.ts
 var effort_default;
 var init_effort3 = __esm(() => {
+  init_cap();
   init_immediateCommand();
+  init_model();
   effort_default = {
     type: "local-jsx",
     name: "effort",
     description: "Set effort level for model usage",
-    argumentHint: "[low|medium|high|xhigh|max|ultracode|auto]",
+    get argumentHint() {
+      return buildEffortArgumentHint("[", "]", getMainLoopModel());
+    },
     get immediate() {
       return shouldInferenceConfigCommandBeImmediate();
     },
@@ -827596,6 +827798,7 @@ ${inputPrompt}` : mainThreadAgentDefinition.initialPrompt;
       effectiveMainLoopModel = ensureFableConsentSync(effectiveMainLoopModel);
       setInitialMainLoopModel(effectiveMainLoopModel);
     }
+    emitStartupEffortCapWarning(parseEffortValue(options.effort) ?? getInitialEffortSetting(), parseUserSpecifiedModel(effectiveMainLoopModel ?? getDefaultMainLoopModel()), outputFormat);
     let advisorModel;
     if (isAdvisorEnabled()) {
       const advisorOption = canUserConfigureAdvisor() ? options.advisor : undefined;
@@ -829569,6 +829772,7 @@ var init_main7 = __esm(() => {
   init_autoCompactWindow();
   init_earlyInput();
   init_effort();
+  init_cap();
   init_fastMode();
   init_managedEnv();
   init_messages3();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.328",
+  "version": "2.1.329",
   "license": "MIT",
   "type": "module",
   "bin": {