@cnwenf/occ 2.1.290 → 2.1.292

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.218](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.218-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.219](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.219-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.218`). 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.219` — 2.1.218 fully aligned, 2.1.219 partial per OCC-43 gap report). 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.218` | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.219` (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.218`**.
+- Tracks Claude Code **`2.1.219` (partial)**.
 - 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.218`）。代码全开放、可审计、无暗门，数据由你掌控。
+**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.219`：2.1.218 已完全对齐、2.1.219 部分对齐）。代码全开放、可审计、无暗门，数据由你掌控。
 
 如果你担心闭源 CLI 可能植入后门、担心代码与凭据被上传到不可审计的服务，OCC 就是为你准备的：全部源码开放、无混淆，构建产物可由源码复现，API 凭据只发往你自己配置的端点。
 
@@ -21,7 +21,7 @@
 
 ## 现状
 
-- 跟踪 Claude Code **`2.1.218`**。
+- 跟踪 Claude Code **`2.1.219`**（2.1.218 完全对齐、2.1.219 部分对齐）。
 - 代码库有约 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.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":""};
+globalThis.MACRO={"VERSION":"2.1.292","BINARY_NAME":"occ","BUILD_TIME":"2026-08-03T20:56:55.105Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -57625,6 +57625,7 @@ var init_sandboxTypes = __esm(() => {
     allowedDomains: exports_external.array(exports_external.string()).optional(),
     deniedDomains: exports_external.array(exports_external.string()).optional().describe("Domains to block even when a broader allowedDomains wildcard would otherwise permit them."),
     allowManagedDomainsOnly: exports_external.boolean().optional().describe("When true (and set in managed settings), only allowedDomains and WebFetch(domain:...) allow rules from managed settings are respected. " + "User, project, local, and flag settings domains are ignored. Denied domains are still respected from all sources."),
+    strictAllowlist: exports_external.boolean().optional().describe("When true, the sandbox runtime deterministically denies hosts not in allowedDomains instead of prompting. " + "Enforced for sandboxed commands only \u2014 in-process tools such as WebFetch are not gated by this setting. " + "Only honored from user, managed/policy, or CLI (--settings) settings \u2014 " + "project settings (.claude/settings.json and .claude/settings.local.json) are ignored."),
     allowUnixSockets: exports_external.array(exports_external.string()).optional().describe("macOS only: Unix socket paths to allow. Ignored on Linux (seccomp cannot filter by path)."),
     allowAllUnixSockets: exports_external.boolean().optional().describe("If true, allow all Unix sockets (disables blocking on both platforms)."),
     allowLocalBinding: exports_external.boolean().optional(),
@@ -58237,7 +58238,7 @@ var init_hooks = __esm(() => {
 });
 
 // src/services/mcp/types.ts
-var ConfigScopeSchema, TransportSchema, McpStdioServerConfigSchema, McpXaaConfigSchema, McpOAuthConfigSchema, McpSSEServerConfigSchema, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema, McpWebSocketServerConfigSchema, McpSdkServerConfigSchema, McpClaudeAIProxyServerConfigSchema, McpServerConfigSchema, McpJsonConfigSchema;
+var ConfigScopeSchema, TransportSchema, McpStdioServerConfigSchema, McpXaaConfigSchema, McpOAuthConfigSchema, McpSSEServerConfigSchema, McpSSEIDEServerConfigSchema, McpWebSocketIDEServerConfigSchema, McpHTTPServerConfigSchema, McpWebSocketServerConfigSchema, McpSdkServerConfigSchema, McpClaudeAIProxyServerConfigSchema, McpServerConfigSchema, McpJsonConfigSchema, McpJsonConfigShapeSchema, MCP_SERVER_TYPE_SCHEMA_REGISTRY;
 var init_types = __esm(() => {
   init_v4();
   ConfigScopeSchema = lazySchema(() => exports_external.enum([
@@ -58274,7 +58275,9 @@ var init_types = __esm(() => {
     headersHelper: exports_external.string().optional(),
     oauth: McpOAuthConfigSchema().optional(),
     alwaysLoad: exports_external.boolean().optional(),
-    request_timeout_ms: exports_external.number().int().positive().optional()
+    request_timeout_ms: exports_external.number().int().positive().optional(),
+    configError: exports_external.string().optional(),
+    configErrorReason: exports_external.string().optional()
   }));
   McpSSEIDEServerConfigSchema = lazySchema(() => exports_external.object({
     type: exports_external.literal("sse-ide"),
@@ -58290,13 +58293,15 @@ var init_types = __esm(() => {
     ideRunningInWindows: exports_external.boolean().optional()
   }));
   McpHTTPServerConfigSchema = lazySchema(() => exports_external.object({
-    type: exports_external.literal("http"),
+    type: exports_external.enum(["http", "streamable-http"]).transform(() => "http"),
     url: exports_external.string(),
     headers: exports_external.record(exports_external.string(), exports_external.string()).optional(),
     headersHelper: exports_external.string().optional(),
     oauth: McpOAuthConfigSchema().optional(),
     alwaysLoad: exports_external.boolean().optional(),
-    request_timeout_ms: exports_external.number().int().positive().optional()
+    request_timeout_ms: exports_external.number().int().positive().optional(),
+    configError: exports_external.string().optional(),
+    configErrorReason: exports_external.string().optional()
   }));
   McpWebSocketServerConfigSchema = lazySchema(() => exports_external.object({
     type: exports_external.literal("ws"),
@@ -58304,7 +58309,9 @@ var init_types = __esm(() => {
     headers: exports_external.record(exports_external.string(), exports_external.string()).optional(),
     headersHelper: exports_external.string().optional(),
     alwaysLoad: exports_external.boolean().optional(),
-    request_timeout_ms: exports_external.number().int().positive().optional()
+    request_timeout_ms: exports_external.number().int().positive().optional(),
+    configError: exports_external.string().optional(),
+    configErrorReason: exports_external.string().optional()
   }));
   McpSdkServerConfigSchema = lazySchema(() => exports_external.object({
     type: exports_external.literal("sdk"),
@@ -58329,6 +58336,18 @@ var init_types = __esm(() => {
   McpJsonConfigSchema = lazySchema(() => exports_external.object({
     mcpServers: exports_external.record(exports_external.string(), McpServerConfigSchema())
   }));
+  McpJsonConfigShapeSchema = lazySchema(() => exports_external.object({
+    mcpServers: exports_external.record(exports_external.string(), exports_external.unknown())
+  }));
+  MCP_SERVER_TYPE_SCHEMA_REGISTRY = {
+    stdio: McpStdioServerConfigSchema,
+    sse: McpSSEServerConfigSchema,
+    http: McpHTTPServerConfigSchema,
+    "streamable-http": McpHTTPServerConfigSchema,
+    ws: McpWebSocketServerConfigSchema,
+    sdk: McpSdkServerConfigSchema,
+    "claudeai-proxy": McpClaudeAIProxyServerConfigSchema
+  };
 });
 
 // src/utils/plugins/schemas.ts
@@ -201072,6 +201091,7 @@ Usage notes:
 // src/utils/sandbox/sandbox-adapter.ts
 var exports_sandbox_adapter = {};
 __export(exports_sandbox_adapter, {
+  shouldEnforceStrictAllowlist: () => shouldEnforceStrictAllowlist,
   shouldAllowManagedSandboxDomainsOnly: () => shouldAllowManagedSandboxDomainsOnly,
   resolveSandboxFilesystemPath: () => resolveSandboxFilesystemPath,
   resolvePathPatternForSandbox: () => resolvePathPatternForSandbox,
@@ -201119,6 +201139,14 @@ function resolveSandboxFilesystemPath(pattern, source) {
 function shouldAllowManagedSandboxDomainsOnly() {
   return getSettingsForSource("policySettings")?.sandbox?.network?.allowManagedDomainsOnly === true;
 }
+function shouldEnforceStrictAllowlist() {
+  const honoredSources = [
+    "userSettings",
+    "flagSettings",
+    "policySettings"
+  ];
+  return honoredSources.some((source) => getSettingsForSource(source)?.sandbox?.network?.strictAllowlist === true);
+}
 function shouldAllowManagedReadPathsOnly() {
   return getSettingsForSource("policySettings")?.sandbox?.filesystem?.allowManagedReadPathsOnly === true;
 }
@@ -201480,6 +201508,10 @@ async function initialize3(sandboxAskCallback) {
       logForDebugging(`[sandbox] Blocked network request to ${hostPattern.host} (allowManagedDomainsOnly)`);
       return false;
     }
+    if (shouldEnforceStrictAllowlist()) {
+      logForDebugging(`[sandbox] Blocked network request to ${hostPattern.host} (strictAllowlist)`);
+      return false;
+    }
     return sandboxAskCallback(hostPattern);
   } : undefined;
   initializationPromise2 = (async () => {
@@ -386578,6 +386610,7 @@ function filterMcpServersByPolicy(configs) {
 }
 function expandEnvVars(config6) {
   const missingVars = [];
+  let urlExpandedToEmpty = false;
   function expandString(str2) {
     const { expanded: expanded2, missingVars: vars } = expandEnvVarsInString(str2);
     missingVars.push(...vars);
@@ -386600,9 +386633,11 @@ function expandEnvVars(config6) {
     case "http":
     case "ws": {
       const remoteConfig = config6;
+      const expandedUrl = expandString(remoteConfig.url);
+      urlExpandedToEmpty = remoteConfig.url.trim() !== "" && expandedUrl.trim() === "";
       expanded = {
         ...remoteConfig,
-        url: expandString(remoteConfig.url),
+        url: expandedUrl,
         headers: remoteConfig.headers ? mapValues_default(remoteConfig.headers, expandString) : undefined
       };
       break;
@@ -386620,7 +386655,8 @@ function expandEnvVars(config6) {
   }
   return {
     expanded,
-    missingVars: [...new Set(missingVars)]
+    missingVars: [...new Set(missingVars)],
+    urlExpandedToEmpty
   };
 }
 async function addMcpConfig(name3, config6, scope) {
@@ -387095,6 +387131,19 @@ function parseMcpConfig(params) {
 }
 function parseMcpConfigFromFilePath(params) {
   const { filePath, expandVars, scope } = params;
+  const read = readMcpConfigFileContents({ filePath, scope });
+  if (read.errors) {
+    return { config: null, errors: read.errors };
+  }
+  return parseMcpConfig({
+    configObject: read.parsedJson,
+    expandVars,
+    scope,
+    filePath
+  });
+}
+function readMcpConfigFileContents(params) {
+  const { filePath, scope } = params;
   const fs17 = getFsImplementation();
   let configContent;
   try {
@@ -387103,7 +387152,6 @@ function parseMcpConfigFromFilePath(params) {
     const code = getErrnoCode(error52);
     if (code === "ENOENT") {
       return {
-        config: null,
         errors: [
           {
             file: filePath,
@@ -387120,7 +387168,6 @@ function parseMcpConfigFromFilePath(params) {
     }
     logForDebugging(`MCP config read error for ${filePath} (scope=${scope}): ${error52}`, { level: "error" });
     return {
-      config: null,
       errors: [
         {
           file: filePath,
@@ -387139,7 +387186,6 @@ function parseMcpConfigFromFilePath(params) {
   if (!parsedJson) {
     logForDebugging(`MCP config is not valid JSON: ${filePath} (scope=${scope}, length=${configContent.length}, first100=${jsonStringify(configContent.slice(0, 100))})`, { level: "error" });
     return {
-      config: null,
       errors: [
         {
           file: filePath,
@@ -387154,8 +387200,145 @@ function parseMcpConfigFromFilePath(params) {
       ]
     };
   }
-  return parseMcpConfig({
-    configObject: parsedJson,
+  return { parsedJson };
+}
+function isReservedMcpServerName(name3) {
+  return isClaudeInChromeMCPServer(name3) || isComputerUseMCPServer(name3) || isReservedClaudeBrowserName(name3) || name3 === "workspace";
+}
+function findMcpConfigWhitespaceIssues(config6) {
+  const issues = [];
+  function check3(label, value) {
+    if (value !== value.trim()) {
+      issues.push(label);
+    }
+  }
+  if ("command" in config6) {
+    check3("command", config6.command);
+  }
+  if ("url" in config6) {
+    check3("url", config6.url);
+  }
+  if ("args" in config6 && config6.args) {
+    config6.args.forEach((arg, index2) => check3(`args[${index2}]`, arg));
+  }
+  if ("env" in config6 && config6.env) {
+    for (const [envName, envValue] of Object.entries(config6.env)) {
+      if (envName !== envName.trim()) {
+        issues.push(`env name ${jsonStringify(envName)}`);
+      }
+      check3(`env.${envName}`, envValue);
+    }
+  }
+  if ("headers" in config6 && config6.headers) {
+    for (const [headerName, headerValue] of Object.entries(config6.headers)) {
+      if (headerName !== headerName.trim()) {
+        issues.push(`header name ${jsonStringify(headerName)}`);
+      }
+      check3(`headers.${headerName}`, headerValue);
+    }
+  }
+  return issues;
+}
+function parseDynamicMcpConfig(params) {
+  const { configObject, expandVars, scope, filePath } = params;
+  const shapeResult = McpJsonConfigShapeSchema().safeParse(configObject);
+  if (!shapeResult.success) {
+    const foundServersKeyInstead = configObject !== null && typeof configObject === "object" && "servers" in configObject && !("mcpServers" in configObject);
+    return {
+      config: null,
+      errors: shapeResult.error.issues.map((issue2) => ({
+        ...filePath && { file: filePath },
+        path: issue2.path.join("."),
+        message: foundServersKeyInstead ? 'Missing "mcpServers" \u2014 found "servers" instead. Claude Code reads MCP servers from the "mcpServers" key.' : issue2.message,
+        ...foundServersKeyInstead && {
+          suggestion: `Rename the top-level "servers" key to "mcpServers" in ${filePath ?? "your MCP config"}.`
+        },
+        mcpErrorMetadata: {
+          scope,
+          severity: "fatal"
+        }
+      }))
+    };
+  }
+  const errors8 = [];
+  const validatedServers = {};
+  function pushEntryError(serverName, message, suggestion, skipReason) {
+    errors8.push({
+      ...filePath && { file: filePath },
+      path: `mcpServers.${serverName}`,
+      message,
+      ...suggestion && { suggestion },
+      mcpErrorMetadata: {
+        scope,
+        serverName,
+        severity: "warning",
+        ...skipReason && { skipReason }
+      }
+    });
+  }
+  const rawServers = configObject.mcpServers;
+  if (Object.hasOwn(rawServers, "__proto__") && !Object.hasOwn(shapeResult.data.mcpServers, "__proto__")) {
+    pushEntryError("__proto__", '"__proto__" is a reserved MCP server name and was not loaded', 'Rename this server in your MCP config \u2014 "__proto__" cannot be used as a server name', "reserved_name");
+  }
+  for (const [name3, rawEntry] of Object.entries(shapeResult.data.mcpServers)) {
+    const declaredType = rawEntry && typeof rawEntry === "object" && "type" in rawEntry && typeof rawEntry.type === "string" ? rawEntry.type : "stdio";
+    const schemaGetter = Object.hasOwn(MCP_SERVER_TYPE_SCHEMA_REGISTRY, declaredType) ? MCP_SERVER_TYPE_SCHEMA_REGISTRY[declaredType] : undefined;
+    if (!schemaGetter) {
+      pushEntryError(name3, `Skipped \u2014 unknown MCP server type "${declaredType}" for server "${name3}"`, "Valid types are: stdio, sse, http (or streamable-http), ws, sdk", "unknown_type");
+      continue;
+    }
+    const entryResult = schemaGetter().safeParse(rawEntry);
+    if (!entryResult.success) {
+      if (rawEntry !== null && typeof rawEntry === "object" && !("type" in rawEntry) && "url" in rawEntry && !("command" in rawEntry)) {
+        pushEntryError(name3, `Skipped \u2014 MCP server "${name3}" has a "url" but no "type"; add "type": "http" (or "sse" / "ws") to this entry`, undefined, "url_missing_type");
+        continue;
+      }
+      const details = entryResult.error.issues.map((issue2) => {
+        const issueMessage = issue2.message.replace(/^Invalid input: /, "");
+        return `${issue2.path.join(".") || "(root)"}: ${issueMessage}`;
+      }).join("; ");
+      pushEntryError(name3, `Skipped \u2014 invalid MCP server config for "${name3}": ${details}`, undefined, "invalid_config");
+      continue;
+    }
+    const validated = entryResult.data;
+    if (isReservedMcpServerName(name3) && validated.type !== "sdk") {
+      pushEntryError(name3, `"${name3}" is a reserved MCP server name and was not loaded`, `Rename this server in your MCP config \u2014 "${name3}" is reserved for internal use`, "reserved_name");
+      continue;
+    }
+    const whitespaceIssues = findMcpConfigWhitespaceIssues(validated);
+    if (whitespaceIssues.length > 0) {
+      pushEntryError(name3, `Leading or trailing whitespace in: ${whitespaceIssues.join(", ")}`, `Remove the whitespace from these values in the "${name3}" entry \u2014 they are used exactly as written`, undefined);
+    }
+    let serverConfig = validated;
+    if (expandVars) {
+      const { expanded, missingVars, urlExpandedToEmpty } = expandEnvVars(validated);
+      if (missingVars.length > 0) {
+        pushEntryError(name3, `Missing environment variables: ${missingVars.join(", ")}`, `Set the following environment variables: ${missingVars.join(", ")}`, undefined);
+      }
+      serverConfig = expanded;
+      if (urlExpandedToEmpty && "url" in validated) {
+        serverConfig = {
+          ...expanded,
+          configError: `'url' ${jsonStringify(validated.url)} expanded to an empty string. Set the referenced environment variable, or update the server's config and reconnect.`,
+          configErrorReason: "url_invalid"
+        };
+      }
+    }
+    validatedServers[name3] = serverConfig;
+  }
+  return {
+    config: { mcpServers: validatedServers },
+    errors: errors8
+  };
+}
+function parseDynamicMcpConfigFromFile(params) {
+  const { filePath, expandVars, scope } = params;
+  const read = readMcpConfigFileContents({ filePath, scope });
+  if (read.errors) {
+    return { config: null, errors: read.errors };
+  }
+  return parseDynamicMcpConfig({
+    configObject: read.parsedJson,
     expandVars,
     scope,
     filePath
@@ -387215,6 +387398,7 @@ var init_config6 = __esm(() => {
   init_memoize();
   init_platform2();
   init_common4();
+  init_common();
   init_config4();
   init_cwd2();
   init_debug();
@@ -578430,10 +578614,15 @@ function getSonnet46Option() {
     descriptionForModel: "Sonnet 4.6 - previous Sonnet version"
   };
 }
+function shouldUseCustomModelOptions() {
+  const provider5 = getAPIProvider();
+  const isAnthropicOwned = provider5 === "firstParty" || provider5 === "anthropic_aws" || provider5 === "gateway";
+  const isAwsOrGoogleCloud = provider5 === "anthropic_aws";
+  return !isAnthropicOwned || isAwsOrGoogleCloud || !isFirstPartyAnthropicBaseUrl();
+}
 function getCustomFableOption() {
-  const is3P = getAPIProvider() !== "firstParty";
   const customFableModel = process.env.ANTHROPIC_DEFAULT_FABLE_MODEL;
-  if (is3P && customFableModel) {
+  if (shouldUseCustomModelOptions() && customFableModel) {
     return {
       value: "fable",
       label: process.env.ANTHROPIC_DEFAULT_FABLE_MODEL_NAME ?? customFableModel,
@@ -578456,9 +578645,8 @@ function getFable5Option() {
   };
 }
 function getCustomSonnetOption() {
-  const is3P = getAPIProvider() !== "firstParty";
   const customSonnetModel = process.env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-  if (is3P && customSonnetModel) {
+  if (shouldUseCustomModelOptions() && customSonnetModel) {
     const is1m = has1mContext(customSonnetModel);
     return {
       value: "sonnet",
@@ -578469,9 +578657,8 @@ function getCustomSonnetOption() {
   }
 }
 function getCustomOpusOption() {
-  const is3P = getAPIProvider() !== "firstParty";
   const customOpusModel = process.env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  if (is3P && customOpusModel) {
+  if (shouldUseCustomModelOptions() && customOpusModel) {
     const is1m = has1mContext(customOpusModel);
     return {
       value: "opus",
@@ -578544,9 +578731,8 @@ function getOpus46_1MOption(fastMode = false) {
   };
 }
 function getCustomHaikuOption() {
-  const is3P = getAPIProvider() !== "firstParty";
   const customHaikuModel = process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-  if (is3P && customHaikuModel) {
+  if (shouldUseCustomModelOptions() && customHaikuModel) {
     return {
       value: "haiku",
       label: process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME ?? customHaikuModel,
@@ -578663,6 +578849,33 @@ function getModelOptionsBase(fastMode = false) {
     return standardOptions;
   }
   if (getAPIProvider() === "firstParty") {
+    const customOpus2 = getCustomOpusOption();
+    const customSonnet2 = getCustomSonnetOption();
+    const customHaiku2 = getCustomHaikuOption();
+    const customFable = getCustomFableOption();
+    if (customOpus2 || customSonnet2 || customHaiku2 || customFable) {
+      const customOptions = [getDefaultOptionForUser(fastMode)];
+      if (customOpus2 !== undefined) {
+        customOptions.push(customOpus2);
+      } else if (isOpus1mMergeEnabled()) {
+        customOptions.push(getMergedOpus1MOption(fastMode));
+      } else {
+        customOptions.push(getOpus5Option(fastMode));
+        if (checkOpus1mAccess()) {
+          customOptions.push(getOpus5_1MOption(fastMode));
+        }
+      }
+      if (customFable !== undefined) {
+        customOptions.push(customFable);
+      }
+      if (customSonnet2 !== undefined) {
+        customOptions.push(customSonnet2);
+      } else if (checkSonnet1mAccess()) {
+        customOptions.push(getSonnet5_1MOption());
+      }
+      customOptions.push(customHaiku2 ?? getHaiku45Option());
+      return customOptions;
+    }
     const payg1POptions = [getDefaultOptionForUser(fastMode)];
     if (checkSonnet1mAccess()) {
       payg1POptions.push(getSonnet5_1MOption());
@@ -812658,6 +812871,18 @@ var init_xaaIdpCommand = __esm(() => {
   init_settings2();
 });
 
+// src/services/mcp/skippedMcpServerErrors.ts
+function recordSkippedMcpServerErrors(errors8) {
+  skippedMcpServerErrors.push(...errors8);
+}
+function getSkippedMcpServerErrors() {
+  return skippedMcpServerErrors;
+}
+var skippedMcpServerErrors;
+var init_skippedMcpServerErrors = __esm(() => {
+  skippedMcpServerErrors = [];
+});
+
 // src/utils/cliArgs.ts
 function eagerParseCliFlag(flagName, argv = process.argv) {
   for (let i6 = 0;i6 < argv.length; i6++) {
@@ -814911,7 +815136,7 @@ class QueryEngine {
     yield buildSystemInitMessage({
       tools,
       mcpClients,
-      mcpServerErrors: [],
+      mcpServerErrors: getSkippedMcpServerErrors(),
       model: mainLoopModel,
       permissionMode: initialAppState.toolPermissionContext.mode,
       commands: commands7,
@@ -815458,6 +815683,7 @@ var init_QueryEngine = __esm(() => {
   init_paths();
   init_query2();
   init_errors10();
+  init_skippedMcpServerErrors();
   init_Tool();
   init_SyntheticOutputTool();
   init_pointer();
@@ -823631,13 +823857,14 @@ ${addendum}` : addendum;
     if (mcpConfig && mcpConfig.length > 0) {
       const processedConfigs = mcpConfig.map((config8) => config8.trim()).filter((config8) => config8.length > 0);
       let allConfigs = {};
-      const allErrors = [];
+      const fatalErrors = [];
+      const skippedCandidates = [];
       for (const configItem of processedConfigs) {
         let configs = null;
         let errors8 = [];
         const parsedJson = safeParseJSON(configItem);
         if (parsedJson) {
-          const result = parseMcpConfig({
+          const result = parseDynamicMcpConfig({
             configObject: parsedJson,
             filePath: "command line",
             expandVars: true,
@@ -823645,35 +823872,48 @@ ${addendum}` : addendum;
           });
           if (result.config) {
             configs = result.config.mcpServers;
-          } else {
-            errors8 = result.errors;
           }
+          errors8 = result.errors;
         } else {
           const configPath = resolve63(configItem);
-          const result = parseMcpConfigFromFilePath({
+          const result = parseDynamicMcpConfigFromFile({
             filePath: configPath,
             expandVars: true,
             scope: "dynamic"
           });
           if (result.config) {
             configs = result.config.mcpServers;
-          } else {
-            errors8 = result.errors;
           }
+          errors8 = result.errors;
         }
-        if (errors8.length > 0) {
-          allErrors.push(...errors8);
-        } else if (configs) {
+        if (configs) {
           allConfigs = {
             ...allConfigs,
             ...configs
           };
+          if (errors8.length > 0) {
+            logForDebugging(`--mcp-config: ${errors8.length} entry warning(s): ${errors8.map((err2) => `${err2.path ? err2.path + ": " : ""}${err2.message}`).join("; ")}`, {
+              level: "warn"
+            });
+            for (const err2 of errors8) {
+              const metadata = err2.mcpErrorMetadata;
+              if (metadata?.skipReason && metadata.serverName != null) {
+                skippedCandidates.push({
+                  name: metadata.serverName,
+                  type: metadata.skipReason,
+                  message: err2.message
+                });
+              }
+            }
+          }
+        } else {
+          fatalErrors.push(...errors8);
         }
       }
-      if (allErrors.length > 0) {
-        const formattedErrors = allErrors.map((err2) => `${err2.path ? err2.path + ": " : ""}${err2.message}`).join(`
+      if (fatalErrors.length > 0) {
+        const formattedErrors = fatalErrors.map((err2) => `${err2.path ? err2.path + ": " : ""}${err2.message}`).join(`
 `);
-        logForDebugging(`--mcp-config validation failed (${allErrors.length} errors): ${formattedErrors}`, {
+        logForDebugging(`--mcp-config validation failed (${fatalErrors.length} errors): ${formattedErrors}`, {
           level: "error"
         });
         process.stderr.write(`Error: Invalid MCP configuration:
@@ -823681,25 +823921,27 @@ ${formattedErrors}
 `);
         process.exit(1);
       }
-      if (Object.keys(allConfigs).length > 0) {
-        const nonSdkConfigNames = Object.entries(allConfigs).filter(([, config8]) => config8.type !== "sdk").map(([name3]) => name3);
-        let reservedNameError = null;
-        if (nonSdkConfigNames.some(isClaudeInChromeMCPServer)) {
-          reservedNameError = `Invalid MCP configuration: "${CLAUDE_IN_CHROME_MCP_SERVER_NAME}" is a reserved MCP name.`;
-        } else if (feature("CHICAGO_MCP")) {
-          const {
-            isComputerUseMCPServer: isComputerUseMCPServer3,
-            COMPUTER_USE_MCP_SERVER_NAME: COMPUTER_USE_MCP_SERVER_NAME2
-          } = await Promise.resolve().then(() => (init_common(), exports_common));
-          if (nonSdkConfigNames.some(isComputerUseMCPServer3)) {
-            reservedNameError = `Invalid MCP configuration: "${COMPUTER_USE_MCP_SERVER_NAME2}" is a reserved MCP name.`;
-          }
+      const skippedByName = new Map;
+      for (const candidate of skippedCandidates) {
+        if (!Object.hasOwn(allConfigs, candidate.name)) {
+          skippedByName.set(candidate.name, candidate);
         }
-        if (reservedNameError) {
-          process.stderr.write(`Error: ${reservedNameError}
+      }
+      if (skippedByName.size > 0) {
+        const skipped = Array.from(skippedByName.values());
+        recordSkippedMcpServerErrors(skipped);
+        if (process.stderr.isTTY) {
+          const sanitize = (message) => {
+            const stripped = typeof Bun !== "undefined" && typeof Bun.stripANSI === "function" ? Bun.stripANSI(message) : message;
+            return stripped.replace(/[\x00-\x1f\x7f-\x9f]+/g, " ").trim();
+          };
+          process.stderr.write(`Warning: ${skipped.length} ${plural(skipped.length, "MCP server")} skipped due to invalid config:
+${skipped.map((err2) => `  - ${sanitize(err2.message)}`).join(`
+`)}
 `);
-          process.exit(1);
         }
+      }
+      if (Object.keys(allConfigs).length > 0) {
         const scopedConfigs = mapValues_default(allConfigs, (config8) => ({
           ...config8,
           scope: "dynamic"
@@ -826138,7 +826380,7 @@ var init_main7 = __esm(() => {
   init_xaaIdpLogin();
   init_tipRegistry();
   init_api4();
-  init_common4();
+  init_skippedMcpServerErrors();
   init_cleanupRegistry();
   init_commitAttribution();
   init_concurrentSessions();

package/package.json

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