@cnwenf/occ 2.1.288 → 2.1.290

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.288","BINARY_NAME":"occ","BUILD_TIME":"2026-07-27T17:54:44.726Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.290","BINARY_NAME":"occ","BUILD_TIME":"2026-07-29T17:58:05.806Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -59376,7 +59376,11 @@ var init_types2 = __esm(() => {
     message: 'Entry must have exactly one of "serverName", "serverCommand", or "serverUrl"'
   }));
   DeniedMcpServerEntrySchema = lazySchema(() => exports_external.object({
-    serverName: exports_external.string().regex(/^[a-zA-Z0-9_-]+$/, "Server name can only contain letters, numbers, hyphens, and underscores").optional().describe("Name of the MCP server that is explicitly blocked"),
+    serverName: exports_external.string().min(1, "Server name must be non-empty").refine((name) => name.trim().length > 0, {
+      message: "Server name must not be whitespace-only"
+    }).refine((name) => name === name.trim(), {
+      message: "Server name has leading or trailing whitespace and will never match (names are compared verbatim)"
+    }).optional().describe("Name of the MCP server that is explicitly blocked"),
     serverCommand: exports_external.array(exports_external.string()).min(1, "Server command must have at least one element (the command)").optional().describe("Command array [command, ...args] to match exactly for blocked stdio servers"),
     serverUrl: exports_external.string().optional().describe('URL pattern with wildcard support (e.g., "https://*.example.com/*") for blocked remote MCP servers')
   }).refine((data) => {
@@ -100325,7 +100329,7 @@ function isFastModeSupportedByModel(modelSetting) {
   const model = modelSetting ?? getDefaultMainLoopModelSetting();
   const parsedModel = parseUserSpecifiedModel(model);
   const lower = parsedModel.toLowerCase();
-  return lower.includes("opus-4-6") || lower.includes("opus-4-7") || lower === "opus";
+  return lower.includes("opus-4-7") || lower.includes("opus-4-8") || lower.includes("opus-5");
 }
 function getFastModeChangeAnnouncement(previousEnabled, newEnabled, model) {
   if (Boolean(previousEnabled) === newEnabled) {
@@ -100567,6 +100571,12 @@ function getOpus46CostTier(fastMode) {
   }
   return COST_TIER_5_25;
 }
+function getOpus5CostTier(fastMode) {
+  if (isFastModeEnabled() && fastMode) {
+    return COST_TIER_10_50;
+  }
+  return COST_TIER_5_25;
+}
 function tokensToUSDCost(modelCosts, usage) {
   return usage.input_tokens / 1e6 * modelCosts.inputTokens + usage.output_tokens / 1e6 * modelCosts.outputTokens + (usage.cache_read_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheReadTokens + (usage.cache_creation_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheWriteTokens + (usage.server_tool_use?.web_search_requests ?? 0) * modelCosts.webSearchRequests;
 }
@@ -100576,6 +100586,10 @@ function getModelCosts(model, usage) {
     const isFastMode = usage.speed === "fast";
     return getOpus46CostTier(isFastMode);
   }
+  if (shortName === firstPartyNameToCanonical(CLAUDE_OPUS_5_CONFIG.firstParty)) {
+    const isFastMode = usage.speed === "fast";
+    return getOpus5CostTier(isFastMode);
+  }
   const costs = MODEL_COSTS[shortName];
   if (!costs) {
     trackUnknownModelCost(model, shortName);
@@ -100612,7 +100626,7 @@ function formatPrice(price) {
 function formatModelPricing(costs) {
   return `${formatPrice(costs.inputTokens)}/${formatPrice(costs.outputTokens)} per Mtok`;
 }
-var COST_TIER_3_15, COST_TIER_15_75, COST_TIER_5_25, COST_TIER_30_150, COST_HAIKU_35, COST_HAIKU_45, DEFAULT_UNKNOWN_MODEL_COST, MODEL_COSTS;
+var COST_TIER_3_15, COST_TIER_15_75, COST_TIER_5_25, COST_TIER_30_150, COST_TIER_10_50, COST_HAIKU_35, COST_HAIKU_45, DEFAULT_UNKNOWN_MODEL_COST, MODEL_COSTS;
 var init_modelCost = __esm(() => {
   init_analytics();
   init_state();
@@ -100623,6 +100637,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 3,
     outputTokens: 15,
     promptCacheWriteTokens: 3.75,
+    promptCacheWrite1hTokens: 6,
     promptCacheReadTokens: 0.3,
     webSearchRequests: 0.01
   };
@@ -100630,6 +100645,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 15,
     outputTokens: 75,
     promptCacheWriteTokens: 18.75,
+    promptCacheWrite1hTokens: 30,
     promptCacheReadTokens: 1.5,
     webSearchRequests: 0.01
   };
@@ -100637,6 +100653,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 5,
     outputTokens: 25,
     promptCacheWriteTokens: 6.25,
+    promptCacheWrite1hTokens: 10,
     promptCacheReadTokens: 0.5,
     webSearchRequests: 0.01
   };
@@ -100644,13 +100661,23 @@ var init_modelCost = __esm(() => {
     inputTokens: 30,
     outputTokens: 150,
     promptCacheWriteTokens: 37.5,
+    promptCacheWrite1hTokens: 60,
     promptCacheReadTokens: 3,
     webSearchRequests: 0.01
   };
+  COST_TIER_10_50 = {
+    inputTokens: 10,
+    outputTokens: 50,
+    promptCacheWriteTokens: 12.5,
+    promptCacheWrite1hTokens: 20,
+    promptCacheReadTokens: 1,
+    webSearchRequests: 0.01
+  };
   COST_HAIKU_35 = {
     inputTokens: 0.8,
     outputTokens: 4,
     promptCacheWriteTokens: 1,
+    promptCacheWrite1hTokens: 1.6,
     promptCacheReadTokens: 0.08,
     webSearchRequests: 0.01
   };
@@ -100658,6 +100685,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 1,
     outputTokens: 5,
     promptCacheWriteTokens: 1.25,
+    promptCacheWrite1hTokens: 2,
     promptCacheReadTokens: 0.1,
     webSearchRequests: 0.01
   };
@@ -100673,7 +100701,8 @@ var init_modelCost = __esm(() => {
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_CONFIG.firstParty)]: COST_TIER_15_75,
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_1_CONFIG.firstParty)]: COST_TIER_15_75,
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_5_CONFIG.firstParty)]: COST_TIER_5_25,
-    [firstPartyNameToCanonical(CLAUDE_OPUS_4_6_CONFIG.firstParty)]: COST_TIER_5_25
+    [firstPartyNameToCanonical(CLAUDE_OPUS_4_6_CONFIG.firstParty)]: COST_TIER_5_25,
+    [firstPartyNameToCanonical(CLAUDE_OPUS_5_CONFIG.firstParty)]: COST_TIER_5_25
   };
 });
 
@@ -100937,7 +100966,11 @@ function getDefaultOpusModel() {
   if (process.env.ANTHROPIC_DEFAULT_OPUS_MODEL) {
     return process.env.ANTHROPIC_DEFAULT_OPUS_MODEL;
   }
-  if (getAPIProvider() === "gateway") {
+  const provider3 = getAPIProvider();
+  if (provider3 === "foundry") {
+    return getModelStrings2().opus46;
+  }
+  if (provider3 === "gateway") {
     return getModelStrings2().opus47;
   }
   return getModelStrings2().opus5;
@@ -139911,7 +139944,7 @@ function modelSupportsContextManagement(model) {
   if (provider5 === "firstParty") {
     return !canonical.includes("claude-3-");
   }
-  return canonical.includes("claude-opus-4") || canonical.includes("claude-sonnet-4") || canonical.includes("claude-haiku-4");
+  return canonical.includes("claude-opus-4") || canonical.includes("claude-sonnet-4") || canonical.includes("claude-haiku-4") || canonical.includes("claude-opus-5");
 }
 function modelSupportsStructuredOutputs(model) {
   const canonical = getCanonicalName(model);
@@ -203285,7 +203318,7 @@ function modelSupportsAdaptiveThinking(model) {
     return supported3P;
   }
   const canonical = getCanonicalName(model);
-  if (canonical.includes("opus-4-6") || canonical.includes("sonnet-4-6")) {
+  if (canonical.includes("opus-4-6") || canonical.includes("sonnet-4-6") || canonical.includes("opus-5")) {
     return true;
   }
   if (canonical.includes("opus") || canonical.includes("sonnet") || canonical.includes("haiku")) {
@@ -203343,7 +203376,7 @@ function modelSupportsEffort(model) {
   if (supported3P !== undefined) {
     return supported3P;
   }
-  if (m5.includes("opus-4-6") || m5.includes("sonnet-4-6")) {
+  if (m5.includes("opus-4-6") || m5.includes("sonnet-4-6") || m5.includes("opus-5")) {
     return true;
   }
   if (m5.includes("haiku") || m5.includes("sonnet") || m5.includes("opus")) {
@@ -203356,7 +203389,7 @@ function modelSupportsMaxEffort(model) {
   if (supported3P !== undefined) {
     return supported3P;
   }
-  if (model.toLowerCase().includes("opus-4-6")) {
+  if (model.toLowerCase().includes("opus-4-6") || model.toLowerCase().includes("opus-5")) {
     return true;
   }
   if (process.env.USER_TYPE === "ant" && resolveAntModel(model)) {
@@ -203370,7 +203403,7 @@ function modelSupportsXhighEffort(model) {
     return supported3P;
   }
   const lower = model.toLowerCase();
-  if (lower.includes("opus-4-7") || lower.includes("opus-4-8")) {
+  if (lower.includes("opus-4-7") || lower.includes("opus-4-8") || lower.includes("opus-5")) {
     return true;
   }
   if (process.env.USER_TYPE === "ant" && resolveAntModel(model)) {
@@ -263050,11 +263083,11 @@ function getExperimentAdvisorModels() {
 }
 function modelSupportsAdvisor(model) {
   const m5 = model.toLowerCase();
-  return m5.includes("opus-4-6") || m5.includes("sonnet-4-6") || process.env.USER_TYPE === "ant";
+  return m5.includes("opus-4-6") || m5.includes("sonnet-4-6") || m5.includes("opus-5") || process.env.USER_TYPE === "ant";
 }
 function isValidAdvisorModel(model) {
   const m5 = model.toLowerCase();
-  return m5.includes("opus-4-6") || m5.includes("sonnet-4-6") || process.env.USER_TYPE === "ant";
+  return m5.includes("opus-4-6") || m5.includes("sonnet-4-6") || m5.includes("opus-5") || process.env.USER_TYPE === "ant";
 }
 function getInitialAdvisorSetting() {
   if (!isAdvisorEnabled()) {
@@ -452621,6 +452654,11 @@ var init_coreSchemas = __esm(() => {
       name: exports_external.string(),
       status: exports_external.string()
     })),
+    mcp_server_errors: exports_external.array(exports_external.object({
+      name: exports_external.string(),
+      type: exports_external.string(),
+      message: exports_external.string()
+    })).optional().describe("@internal MCP server config errors collected during connection"),
     model: exports_external.string(),
     permissionMode: PermissionModeSchema(),
     slash_commands: exports_external.array(exports_external.string()),
@@ -578367,6 +578405,13 @@ function getDefaultOptionForUser(fastMode = false) {
     description: `Use the default model (currently ${renderDefaultModelSetting(getDefaultMainLoopModelSetting())})${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`
   };
 }
+function getOpus5PricingSuffix(fastMode) {
+  if (getAPIProvider() !== "firstParty")
+    return "";
+  const pricing = formatModelPricing(getOpus5CostTier(fastMode));
+  const fastModeIndicator = fastMode ? ` (${LIGHTNING_BOLT})` : "";
+  return ` \xB7${fastModeIndicator} ${pricing}`;
+}
 function getSonnet5Option() {
   const is3P = getAPIProvider() !== "firstParty";
   return {
@@ -578453,13 +578498,13 @@ function getOpus46Option(fastMode = false) {
     descriptionForModel: "Opus 4.6 - previous Opus version"
   };
 }
-function getOpus48Option(fastMode = false) {
+function getOpus5Option(fastMode = false) {
   const is3P = getAPIProvider() !== "firstParty";
   return {
-    value: is3P ? getModelStrings2().opus48 : "opus",
+    value: is3P ? getModelStrings2().opus5 : "opus",
     label: "Opus",
-    description: `Opus 4.8 \xB7 Best for everyday, complex tasks${getOpus46PricingSuffix(fastMode)}`,
-    descriptionForModel: "Opus 4.8 - best for everyday, complex tasks"
+    description: `Opus 5 \xB7 Best for everyday, complex tasks${getOpus5PricingSuffix(fastMode)}`,
+    descriptionForModel: "Opus 5 - best for everyday, complex tasks"
   };
 }
 function getSonnet5_1MOption() {
@@ -578480,13 +578525,13 @@ function getSonnet46_1MOption() {
     descriptionForModel: "Sonnet 4.6 with 1M context window - for long sessions with large codebases"
   };
 }
-function getOpus48_1MOption(fastMode = false) {
+function getOpus5_1MOption(fastMode = false) {
   const is3P = getAPIProvider() !== "firstParty";
   return {
-    value: is3P ? getModelStrings2().opus48 + "[1m]" : "opus[1m]",
+    value: is3P ? getModelStrings2().opus5 + "[1m]" : "opus[1m]",
     label: "Opus (1M context)",
-    description: `Opus 4.8 for long sessions${getOpus46PricingSuffix(fastMode)}`,
-    descriptionForModel: "Opus 4.8 with 1M context window - for long sessions with large codebases"
+    description: `Opus 5 for long sessions${getOpus5PricingSuffix(fastMode)}`,
+    descriptionForModel: "Opus 5 with 1M context window - for long sessions with large codebases"
   };
 }
 function getOpus46_1MOption(fastMode = false) {
@@ -578536,7 +578581,7 @@ function getMaxOpusOption(fastMode = false) {
   return {
     value: "opus",
     label: "Opus",
-    description: `Opus 4.8 \xB7 Best for everyday, complex tasks${fastMode ? getOpus46PricingSuffix(true) : ""}`
+    description: `Opus 5 \xB7 Best for everyday, complex tasks${fastMode ? getOpus5PricingSuffix(true) : ""}`
   };
 }
 function getMaxSonnet5_1MOption() {
@@ -578548,21 +578593,21 @@ function getMaxSonnet5_1MOption() {
     description: `Sonnet 5 with 1M context${billingInfo}${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`
   };
 }
-function getMaxOpus48_1MOption(fastMode = false) {
+function getMaxOpus5_1MOption(fastMode = false) {
   const billingInfo = isClaudeAISubscriber() ? " \xB7 Billed as extra usage" : "";
   return {
     value: "opus[1m]",
     label: "Opus (1M context)",
-    description: `Opus 4.8 with 1M context${billingInfo}${getOpus46PricingSuffix(fastMode)}`
+    description: `Opus 5 with 1M context${billingInfo}${getOpus5PricingSuffix(fastMode)}`
   };
 }
 function getMergedOpus1MOption(fastMode = false) {
   const is3P = getAPIProvider() !== "firstParty";
   return {
-    value: is3P ? getModelStrings2().opus48 + "[1m]" : "opus[1m]",
+    value: is3P ? getModelStrings2().opus5 + "[1m]" : "opus[1m]",
     label: "Opus (1M context)",
-    description: `Opus 4.8 with 1M context \xB7 Best for everyday, complex tasks${!is3P && fastMode ? getOpus46PricingSuffix(fastMode) : ""}`,
-    descriptionForModel: "Opus 4.8 with 1M context - best for everyday, complex tasks"
+    description: `Opus 5 with 1M context \xB7 Best for everyday, complex tasks${!is3P && fastMode ? getOpus5PricingSuffix(fastMode) : ""}`,
+    descriptionForModel: "Opus 5 with 1M context - best for everyday, complex tasks"
   };
 }
 function getOpusPlanOption() {
@@ -578593,7 +578638,7 @@ function getModelOptionsBase(fastMode = false) {
     if (isMaxSubscriber() || isTeamPremiumSubscriber()) {
       const premiumOptions = [getDefaultOptionForUser(fastMode)];
       if (!isOpus1mMergeEnabled() && checkOpus1mAccess()) {
-        premiumOptions.push(getMaxOpus48_1MOption(fastMode));
+        premiumOptions.push(getMaxOpus5_1MOption(fastMode));
       }
       premiumOptions.push(MaxSonnet5Option);
       if (checkSonnet1mAccess()) {
@@ -578611,7 +578656,7 @@ function getModelOptionsBase(fastMode = false) {
     } else {
       standardOptions.push(getMaxOpusOption(fastMode));
       if (checkOpus1mAccess()) {
-        standardOptions.push(getMaxOpus48_1MOption(fastMode));
+        standardOptions.push(getMaxOpus5_1MOption(fastMode));
       }
     }
     standardOptions.push(MaxHaiku45Option);
@@ -578626,9 +578671,9 @@ function getModelOptionsBase(fastMode = false) {
     if (isOpus1mMergeEnabled()) {
       payg1POptions.push(getMergedOpus1MOption(fastMode));
     } else {
-      payg1POptions.push(getOpus48Option(fastMode));
+      payg1POptions.push(getOpus5Option(fastMode));
       if (checkOpus1mAccess()) {
-        payg1POptions.push(getOpus48_1MOption(fastMode));
+        payg1POptions.push(getOpus5_1MOption(fastMode));
       }
     }
     payg1POptions.push(getHaiku45Option());
@@ -578784,6 +578829,7 @@ var init_modelOptions = __esm(() => {
   init_auth6();
   init_modelStrings();
   init_modelCost();
+  init_figures2();
   init_settings2();
   init_check1mAccess();
   init_providers();
@@ -738403,6 +738449,8 @@ function sdkCompatToolName(name3) {
 function buildSystemInitMessage(inputs) {
   const settings = getSettings_DEPRECATED();
   const outputStyle = settings?.outputStyle ?? DEFAULT_OUTPUT_STYLE_NAME;
+  const mcpClientNames = new Set(inputs.mcpClients.map((client8) => client8.name));
+  const filteredMcpServerErrors = inputs.mcpServerErrors.filter((error52) => !mcpClientNames.has(error52.name));
   const initMessage = {
     type: "system",
     subtype: "init",
@@ -738413,6 +738461,13 @@ function buildSystemInitMessage(inputs) {
       name: client8.name,
       status: client8.type
     })),
+    ...filteredMcpServerErrors.length > 0 && {
+      mcp_server_errors: filteredMcpServerErrors.map((error52) => ({
+        name: error52.name,
+        type: error52.type,
+        message: error52.message
+      }))
+    },
     model: inputs.model,
     permissionMode: inputs.permissionMode,
     slash_commands: inputs.commands.filter((c9) => c9.userInvocable !== false).map((c9) => c9.name),
@@ -742851,6 +742906,7 @@ function useReplBridge(messages, setMessages, abortControllerRef, commands7, mai
                       handleRef.current?.writeSdkMessages([buildSystemInitMessage({
                         tools: [],
                         mcpClients: [],
+                        mcpServerErrors: [],
                         model: mainLoopModelRef.current,
                         permissionMode: state_0.toolPermissionContext.mode,
                         commands: commandsRef.current.filter(isBridgeSafeCommand),
@@ -811847,8 +811903,10 @@ var init_claudeApiContent = __esm(() => {
   init_streaming6();
   init_tool_use2();
   SKILL_MODEL_VARS = {
-    OPUS_ID: "claude-opus-4-6",
-    OPUS_NAME: "Claude Opus 4.6",
+    OPUS_ID: "claude-opus-5",
+    OPUS_NAME: "Claude Opus 5",
+    PREV_OPUS_ID: "claude-opus-4-8",
+    PREV_OPUS_NAME: "Claude Opus 4.8",
     SONNET_ID: "claude-sonnet-4-6",
     SONNET_NAME: "Claude Sonnet 4.6",
     HAIKU_ID: "claude-haiku-4-5",
@@ -814853,6 +814911,7 @@ class QueryEngine {
     yield buildSystemInitMessage({
       tools,
       mcpClients,
+      mcpServerErrors: [],
       model: mainLoopModel,
       permissionMode: initialAppState.toolPermissionContext.mode,
       commands: commands7,

package/package.json

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