@cnwenf/occ 2.1.291 → 2.1.293

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.219](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.219-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.221](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.221-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.219` — 2.1.218 fully aligned, 2.1.219 partial per OCC-39 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.221` — 2.1.218 fully aligned, 2.1.219 + 2.1.221 partial per OCC-44 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.219` (partial) | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.221` (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.219` (partial)**.
+- Tracks Claude Code **`2.1.221` (partial)** (2.1.218 fully aligned; 2.1.219 + 2.1.221 partial — see `docs/upstream-version-gap-occ44.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.218`）。代码全开放、可审计、无暗门，数据由你掌控。
+**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.221`：2.1.218 已完全对齐、2.1.219 与 2.1.221 部分对齐）。代码全开放、可审计、无暗门，数据由你掌控。
 
 如果你担心闭源 CLI 可能植入后门、担心代码与凭据被上传到不可审计的服务，OCC 就是为你准备的：全部源码开放、无混淆，构建产物可由源码复现，API 凭据只发往你自己配置的端点。
 
@@ -21,7 +21,7 @@
 
 ## 现状
 
-- 跟踪 Claude Code **`2.1.218`**。
+- 跟踪 Claude Code **`2.1.221`**（2.1.218 完全对齐、2.1.219 与 2.1.221 部分对齐）。
 - 代码库有约 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.291","BINARY_NAME":"occ","BUILD_TIME":"2026-07-30T17:31:04.907Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.293","BINARY_NAME":"occ","BUILD_TIME":"2026-08-04T22:30:21.732Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -58238,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([
@@ -58275,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"),
@@ -58291,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"),
@@ -58305,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"),
@@ -58330,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
@@ -359967,9 +359985,7 @@ function collectCommands(node, commands7, varScope) {
         loopVar = child.text;
       } else if (child.type === "do_group") {
         doGroup = child;
-      } else if (child.type === "for" || child.type === "in" || child.type === "select" || child.type === ";") {
-        continue;
-      } else if (child.type === "command_substitution") {
+      } else if (child.type === "for" || child.type === "in" || child.type === "select" || child.type === ";") {} else if (child.type === "command_substitution") {
         const err2 = collectCommandSubstitution(child, commands7, varScope);
         if (err2)
           return err2;
@@ -360156,9 +360172,93 @@ function walkTestExpr(node, argv, innerCommands, varScope) {
       argv.push(node.text);
       return null;
     case "regex":
-    case "extglob_pattern":
+    case "extglob_pattern": {
+      if (/\$[({[\w#?!*@$'"+~^=-]|`|[<>]\(/.test(node.text)) {
+        return {
+          kind: "too-complex",
+          reason: `[[ ]] ${node.type} contains expansion / command / process substitution`,
+          nodeType: node.type
+        };
+      }
+      if (node.type === "extglob_pattern") {
+        const text2 = node.text;
+        let i6 = 0;
+        while (i6 < text2.length) {
+          if (text2[i6] === "\\" && i6 + 1 < text2.length) {
+            i6 += 2;
+            continue;
+          }
+          if (text2[i6] === "&") {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] pattern contains unquoted & (zsh splits the word at & at any depth)"
+            };
+          }
+          i6++;
+        }
+      }
+      if (node.type === "regex") {
+        const text2 = node.text;
+        let parenDepth = 0;
+        let i6 = 0;
+        while (i6 < text2.length) {
+          const ch2 = text2[i6];
+          if (ch2 === "\\" && i6 + 1 < text2.length) {
+            i6 += 2;
+            continue;
+          }
+          if (parenDepth === 0 && ch2 === "|" && text2[i6 + 1] === ch2) {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] regex contains glued || (zsh splits it as a cond operator)",
+              nodeType: node.type
+            };
+          }
+          if (ch2 === "&") {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] regex contains unquoted & (zsh splits the word at & at any depth)",
+              nodeType: node.type
+            };
+          }
+          if (ch2 === '"' || ch2 === "'") {
+            const quote2 = ch2;
+            i6++;
+            while (i6 < text2.length && text2[i6] !== quote2) {
+              if (quote2 === '"' && text2[i6] === "\\" && i6 + 1 < text2.length) {
+                i6++;
+              }
+              i6++;
+            }
+            if (i6 < text2.length)
+              i6++;
+            continue;
+          }
+          if (ch2 === "(") {
+            parenDepth++;
+          } else if (ch2 === ")") {
+            parenDepth--;
+            if (parenDepth < 0) {
+              return {
+                kind: "too-complex",
+                reason: "[[ ]] regex has unbalanced parentheses (parser desync)",
+                nodeType: node.type
+              };
+            }
+          }
+          i6++;
+        }
+        if (parenDepth !== 0) {
+          return {
+            kind: "too-complex",
+            reason: "[[ ]] regex has unbalanced parentheses (parser desync)",
+            nodeType: node.type
+          };
+        }
+      }
       argv.push(node.text);
       return null;
+    }
     default: {
       const arg = walkArgument(node, innerCommands, varScope);
       if (typeof arg !== "string")
@@ -360600,7 +360700,6 @@ function walkVariableAssignment(node, innerCommands, varScope) {
       name3 = child.text;
     } else if (child.type === "=" || child.type === "+=") {
       isAppend = child.type === "+=";
-      continue;
     } else if (child.type === "command_substitution") {
       const err2 = collectCommandSubstitution(child, innerCommands, varScope);
       if (err2)
@@ -360657,7 +360756,7 @@ function walkVariableAssignment(node, innerCommands, varScope) {
     if (!/^[A-Za-z0-9 _+:./=[\]-]*$/.test(value.replace(/\$\{[A-Za-z_][A-Za-z0-9_]*\}/g, ""))) {
       return {
         kind: "too-complex",
-        reason: "PS4 value outside safe charset \u2014 only ${VAR} refs and [A-Za-z0-9 _+:.=/[]-] allowed",
+        reason: `PS4 value outside safe charset \u2014 only \${VAR} refs and [A-Za-z0-9 _+:.=/[]-] allowed`,
         nodeType: "variable_assignment"
       };
     }
@@ -362013,6 +362112,7 @@ var init_killShellTasks = __esm(() => {
 });
 
 // src/tasks/LocalShellTask/LocalShellTask.tsx
+import { statSync as statSync12 } from "fs";
 import { stat as stat21 } from "fs/promises";
 function looksLikePrompt(tail) {
   const lastLine2 = tail.trimEnd().split(`
@@ -362073,6 +362173,16 @@ The command is likely blocked on an interactive prompt. Kill this task and re-ru
     clearInterval(timer);
   };
 }
+function monitorCompletedSummary(description, exitCode, outputBytes) {
+  return outputBytes === 0 ? `Monitor "${description}" ended without producing output${exitCode !== undefined ? ` (exit ${exitCode})` : ""}` : `Monitor "${description}" stream ended`;
+}
+function readMonitorOutputBytes(outputPath) {
+  try {
+    return statSync12(outputPath).size;
+  } catch (e4) {
+    return e4.code === "ENOENT" ? 0 : undefined;
+  }
+}
 function enqueueShellNotification(taskId, description, status, exitCode, setAppState, toolUseId, kind = "bash", agentId) {
   let shouldEnqueue = false;
   updateTaskState(taskId, setAppState, (task) => {
@@ -362089,12 +362199,15 @@ function enqueueShellNotification(taskId, description, status, exitCode, setAppS
     return;
   }
   abortSpeculation(setAppState);
+  const outputPath = getTaskOutputPath(taskId);
   let summary;
   if (feature("MONITOR_TOOL") && kind === "monitor") {
     switch (status) {
-      case "completed":
-        summary = `Monitor "${description}" stream ended`;
+      case "completed": {
+        const outputBytes = readMonitorOutputBytes(outputPath);
+        summary = monitorCompletedSummary(description, exitCode, outputBytes);
         break;
+      }
       case "failed":
         summary = `Monitor "${description}" script failed${exitCode !== undefined ? ` (exit ${exitCode})` : ""}`;
         break;
@@ -362115,7 +362228,6 @@ function enqueueShellNotification(taskId, description, status, exitCode, setAppS
         break;
     }
   }
-  const outputPath = getTaskOutputPath(taskId);
   const toolUseIdLine = toolUseId ? `
 <${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : "";
   const message = `<${TASK_NOTIFICATION_TAG}>
@@ -386592,6 +386704,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);
@@ -386614,9 +386727,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;
@@ -386634,7 +386749,8 @@ function expandEnvVars(config6) {
   }
   return {
     expanded,
-    missingVars: [...new Set(missingVars)]
+    missingVars: [...new Set(missingVars)],
+    urlExpandedToEmpty
   };
 }
 async function addMcpConfig(name3, config6, scope) {
@@ -387109,6 +387225,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 {
@@ -387117,7 +387246,6 @@ function parseMcpConfigFromFilePath(params) {
     const code = getErrnoCode(error52);
     if (code === "ENOENT") {
       return {
-        config: null,
         errors: [
           {
             file: filePath,
@@ -387134,7 +387262,6 @@ function parseMcpConfigFromFilePath(params) {
     }
     logForDebugging(`MCP config read error for ${filePath} (scope=${scope}): ${error52}`, { level: "error" });
     return {
-      config: null,
       errors: [
         {
           file: filePath,
@@ -387153,7 +387280,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,
@@ -387168,8 +387294,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
@@ -387229,6 +387492,7 @@ var init_config6 = __esm(() => {
   init_memoize();
   init_platform2();
   init_common4();
+  init_common();
   init_config4();
   init_cwd2();
   init_debug();
@@ -564653,10 +564917,10 @@ var init_cliui = __esm(() => {
 
 // node_modules/.bun/escalade@3.2.0/node_modules/escalade/sync/index.mjs
 import { dirname as dirname43, resolve as resolve38 } from "path";
-import { readdirSync as readdirSync7, statSync as statSync12 } from "fs";
+import { readdirSync as readdirSync7, statSync as statSync13 } from "fs";
 function sync_default(start, callback) {
   let dir = resolve38(".", start);
-  let tmp, stats = statSync12(dir);
+  let tmp, stats = statSync13(dir);
   if (!stats.isDirectory()) {
     dir = dirname43(dir);
   }
@@ -565683,7 +565947,7 @@ var init_yerror = __esm(() => {
 });
 
 // node_modules/.bun/y18n@5.0.8/node_modules/y18n/build/lib/platform-shims/node.js
-import { readFileSync as readFileSync23, statSync as statSync13, writeFile as writeFile28 } from "fs";
+import { readFileSync as readFileSync23, statSync as statSync14, writeFile as writeFile28 } from "fs";
 import { format as format5 } from "util";
 import { resolve as resolve40 } from "path";
 var node_default2;
@@ -565697,7 +565961,7 @@ var init_node12 = __esm(() => {
     resolve: resolve40,
     exists: (file2) => {
       try {
-        return statSync13(file2).isFile();
+        return statSync14(file2).isFile();
       } catch (err2) {
         return false;
       }
@@ -578444,10 +578708,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,
@@ -578470,9 +578739,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",
@@ -578483,9 +578751,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",
@@ -578558,9 +578825,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,
@@ -578677,6 +578943,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());
@@ -583732,7 +584025,7 @@ __export(exports_workflowDiscovery, {
   USER_WORKFLOWS_DIR: () => USER_WORKFLOWS_DIR,
   PROJECT_WORKFLOWS_DIR: () => PROJECT_WORKFLOWS_DIR
 });
-import { existsSync as existsSync16, readdirSync as readdirSync8, statSync as statSync14 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync8, statSync as statSync15 } from "fs";
 import { homedir as homedir31 } from "os";
 import { join as join109 } from "path";
 function isWorkflowsEnabled() {
@@ -583759,7 +584052,7 @@ function listScripts(dir, source2) {
       continue;
     const full = join109(dir, entry);
     try {
-      if (!statSync14(full).isFile())
+      if (!statSync15(full).isFile())
         continue;
     } catch {
       continue;
@@ -583788,7 +584081,7 @@ function resolveWorkflowScript(name3, source2, cwd2 = process.cwd()) {
     const full = join109(dir, `${name3}.js`);
     if (existsSync16(full)) {
       try {
-        if (statSync14(full).isFile())
+        if (statSync15(full).isFile())
           return full;
       } catch {}
     }
@@ -639184,7 +639477,7 @@ var init_process2 = () => {};
 
 // src/daemon/lockfile.ts
 import { open as open13, readFile as readFile50, unlink as unlink22, writeFile as writeFile43 } from "fs/promises";
-import { existsSync as existsSync18, statSync as statSync15 } from "fs";
+import { existsSync as existsSync18, statSync as statSync16 } from "fs";
 import { join as join135 } from "path";
 function getDaemonLockfilePath() {
   return join135(getClaudeConfigHomeDir(), "daemon.lock");
@@ -639329,7 +639622,7 @@ async function displaceHolder() {
 }
 function lockfileMtime() {
   try {
-    return statSync15(getDaemonLockfilePath()).mtimeMs;
+    return statSync16(getDaemonLockfilePath()).mtimeMs;
   } catch {
     return null;
   }
@@ -640512,7 +640805,7 @@ __export(exports_supervisor, {
   daemonInstall: () => daemonInstall,
   checkBinaryIdentity: () => checkBinaryIdentity
 });
-import { existsSync as existsSync22, statSync as statSync16 } from "fs";
+import { existsSync as existsSync22, statSync as statSync17 } from "fs";
 function buildIdentity() {
   return {
     supervisorPid: process.pid,
@@ -640535,7 +640828,7 @@ function checkBinaryIdentity() {
     if (!execPath2 || !existsSync22(execPath2)) {
       return "binary identity unresolvable";
     }
-    statSync16(execPath2);
+    statSync17(execPath2);
   } catch {
     return "binary identity unresolvable";
   }
@@ -642501,7 +642794,7 @@ var init_file_index = __esm(() => {
 });
 
 // src/hooks/fileSuggestions.ts
-import { statSync as statSync17 } from "fs";
+import { statSync as statSync18 } from "fs";
 import * as path35 from "path";
 function getFileIndex() {
   if (!fileIndex) {
@@ -642549,7 +642842,7 @@ function getGitIndexMtime() {
   if (!repoRoot)
     return null;
   try {
-    return statSync17(path35.join(repoRoot, ".git", "index")).mtimeMs;
+    return statSync18(path35.join(repoRoot, ".git", "index")).mtimeMs;
   } catch {
     return null;
   }
@@ -699801,7 +700094,7 @@ var init_autocompact2 = __esm(() => {
 });
 
 // src/commands/cd/cdLogic.ts
-import { realpathSync as realpathSync8, statSync as statSync18 } from "fs";
+import { realpathSync as realpathSync8, statSync as statSync19 } from "fs";
 import { resolve as resolve57 } from "path";
 function resolveDirectoryTarget(target) {
   const resolved = resolve57(target);
@@ -699812,7 +700105,7 @@ function resolveDirectoryTarget(target) {
     return { ok: false, error: `Directory does not exist: ${resolved}` };
   }
   try {
-    if (!statSync18(physical).isDirectory()) {
+    if (!statSync19(physical).isDirectory()) {
       return { ok: false, error: `Not a directory: ${resolved}` };
     }
   } catch {
@@ -729077,7 +729370,7 @@ import {
   symlink as symlink5,
   utimes as utimes2
 } from "fs/promises";
-import { existsSync as existsSync26, readFileSync as readFileSync34, statSync as statSync19 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync34, statSync as statSync20 } from "fs";
 import { basename as basename51, dirname as dirname73, join as join166 } from "path";
 function validateWorktreeSlug(slug) {
   if (slug.length > MAX_WORKTREE_SLUG_LENGTH) {
@@ -729124,7 +729417,7 @@ function getLinkedGitWorktreePath() {
     const dotGit = join166(dir, ".git");
     try {
       if (existsSync26(dotGit)) {
-        const stats = statSync19(dotGit);
+        const stats = statSync20(dotGit);
         if (stats.isFile()) {
           const content = readFileSync34(dotGit, "utf8").trim();
           if (content.startsWith("gitdir:")) {
@@ -812672,6 +812965,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++) {
@@ -814925,7 +815230,7 @@ class QueryEngine {
     yield buildSystemInitMessage({
       tools,
       mcpClients,
-      mcpServerErrors: [],
+      mcpServerErrors: getSkippedMcpServerErrors(),
       model: mainLoopModel,
       permissionMode: initialAppState.toolPermissionContext.mode,
       commands: commands7,
@@ -815472,6 +815777,7 @@ var init_QueryEngine = __esm(() => {
   init_paths();
   init_query2();
   init_errors10();
+  init_skippedMcpServerErrors();
   init_Tool();
   init_SyntheticOutputTool();
   init_pointer();
@@ -816337,8 +816643,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
   const mutableMessages = initialMessages;
   let readFileState = extractReadFilesFromMessages(initialMessages, cwd2(), READ_FILE_STATE_CACHE_SIZE);
   const pendingSeeds = createFileStateCacheWithSizeLimit(READ_FILE_STATE_CACHE_SIZE);
-  const resumeInterruptedTurnEnv = process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN;
-  if (turnInterruptionState && turnInterruptionState.kind !== "none" && resumeInterruptedTurnEnv) {
+  if (turnInterruptionState && turnInterruptionState.kind !== "none" && isEnvTruthy(process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN)) {
     logForDebugging(`[print.ts] Auto-resuming interrupted turn (kind: ${turnInterruptionState.kind})`);
     removeInterruptedMessage(mutableMessages, turnInterruptionState.message);
     enqueue({
@@ -823645,13 +823950,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,
@@ -823659,35 +823965,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:
@@ -823695,25 +824014,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"
@@ -826152,7 +826473,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.291",
+  "version": "2.1.293",
   "license": "MIT",
   "type": "module",
   "bin": {