@cnwenf/occ 2.1.289 → 2.1.290

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.289","BINARY_NAME":"occ","BUILD_TIME":"2026-07-28T17:56:28.643Z","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) => {
@@ -100633,6 +100637,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 3,
     outputTokens: 15,
     promptCacheWriteTokens: 3.75,
+    promptCacheWrite1hTokens: 6,
     promptCacheReadTokens: 0.3,
     webSearchRequests: 0.01
   };
@@ -100640,6 +100645,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 15,
     outputTokens: 75,
     promptCacheWriteTokens: 18.75,
+    promptCacheWrite1hTokens: 30,
     promptCacheReadTokens: 1.5,
     webSearchRequests: 0.01
   };
@@ -100647,6 +100653,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 5,
     outputTokens: 25,
     promptCacheWriteTokens: 6.25,
+    promptCacheWrite1hTokens: 10,
     promptCacheReadTokens: 0.5,
     webSearchRequests: 0.01
   };
@@ -100654,6 +100661,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 30,
     outputTokens: 150,
     promptCacheWriteTokens: 37.5,
+    promptCacheWrite1hTokens: 60,
     promptCacheReadTokens: 3,
     webSearchRequests: 0.01
   };
@@ -100661,6 +100669,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 10,
     outputTokens: 50,
     promptCacheWriteTokens: 12.5,
+    promptCacheWrite1hTokens: 20,
     promptCacheReadTokens: 1,
     webSearchRequests: 0.01
   };
@@ -100668,6 +100677,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 0.8,
     outputTokens: 4,
     promptCacheWriteTokens: 1,
+    promptCacheWrite1hTokens: 1.6,
     promptCacheReadTokens: 0.08,
     webSearchRequests: 0.01
   };
@@ -100675,6 +100685,7 @@ var init_modelCost = __esm(() => {
     inputTokens: 1,
     outputTokens: 5,
     promptCacheWriteTokens: 1.25,
+    promptCacheWrite1hTokens: 2,
     promptCacheReadTokens: 0.1,
     webSearchRequests: 0.01
   };
@@ -452643,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()),
@@ -738433,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",
@@ -738443,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),
@@ -742881,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),
@@ -814885,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.289",
+  "version": "2.1.290",
   "license": "MIT",
   "type": "module",
   "bin": {