@cnwenf/occ 2.1.338 → 2.1.340

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.273](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.273-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.274](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.274-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.273` — 2.1.270 fully aligned; 2.1.271–2.1.273 partial: the OCC-127 catch-up round landed the 2.1.273 gateway-hint request headers (default on for the first-party api.anthropic.com endpoint, off for third-party/custom endpoints; tri-bool `CLAUDE_CODE_GATEWAY_HINT_HEADERS` override), the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and — the round's security centerpiece — the subshell-hidden dangerous-`rm` bypass fix (per-segment analysis in the always-on catastrophic-rm deny guard), per `docs/upstream-version-gap-occ127.md`; remaining 2.1.273 entries are triaged there as NO-OP (surfaces OCC trims) or STAGED (per-site forensics needed); still not landed from the 2.1.270→2.1.272 delta: `/config` panel fullscreen mouse support (PORTABLE-LARGE scope) and the spinner status ladder "deep in thought"/"picking the thought back up" (STAGED), plus the pre-existing sandbox per-command `allowed_domains` gap; prior alignment through 2.1.270 landed via OCC-122/OCC-123/OCC-84/OCC-124/OCC-85/OCC-125/OCC-126). 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.274` — 2.1.270 fully aligned; 2.1.271–2.1.274 partial: the latest OCC-127 round landed the 2.1.274 MCP auth-stub description secret-leak fix — the byte-verified display-sanitizer family (NFKC + invisible-character stripping, quote/angle-bracket neutralization, bearer/token-family redaction, code-point-safe truncation) with the origin-only unexpanded endpoint — and confirmed NO-OP with behavioral tests for the 2.1.274 bash special-variable assignment/loop and worktree nested-expansion hardening (OCC's existing guards already ask/refuse every risky vector, byte-verified parity with the official); prior rounds landed the 2.1.273 gateway-hint request headers (default on for the first-party api.anthropic.com endpoint, off for third-party/custom endpoints; tri-bool `CLAUDE_CODE_GATEWAY_HINT_HEADERS` override), the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and the subshell-hidden dangerous-`rm` bypass fix (per-segment analysis in the always-on catastrophic-rm deny guard), per `docs/upstream-version-gap-occ127.md`; remaining 2.1.273/2.1.274 entries are triaged there as NO-OP (surfaces OCC trims) or STAGED (per-site forensics needed); still not landed from the 2.1.270→2.1.272 delta: `/config` panel fullscreen mouse support (PORTABLE-LARGE scope) and the spinner status ladder "deep in thought"/"picking the thought back up" (STAGED), plus the pre-existing sandbox per-command `allowed_domains` gap; prior alignment through 2.1.270 landed via OCC-122/OCC-123/OCC-84/OCC-124/OCC-85/OCC-125/OCC-126). 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.273` (2.1.270 fully aligned; 2.1.271–2.1.273 partial) | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.274` (2.1.270 fully aligned; 2.1.271–2.1.274 partial) | Reference implementation |
 | **Providers** | Anthropic Direct, Bedrock, Vertex, Azure | Anthropic, Bedrock, Vertex |
 | **Cost** | Free & open-source (MIT) | Subscription |
 | **Build** | Reproducible from source | N/A |
@@ -143,7 +143,7 @@ Requires [Bun](https://bun.sh/) >= 1.3.11 (use `bun upgrade` — older Bun cause
 
 ```bash
 bun install
-bun run dev          # run from source; version prints 2.1.273 (dev polyfill; build overrides with pkg.version) when working
+bun run dev          # run from source; version prints 2.1.274 (dev polyfill; build overrides with pkg.version) when working
 bun run build        # output: dist/cli.js (~26 MB, single-file bundle)
 bun test             # test suite (Bun test runner)
 bun run lint         # Biome lint (formatter disabled to avoid large diffs)
@@ -157,7 +157,7 @@ For architecture, entry/bootstrap, tool system, UI layer, and module-status deta
 
 ## Status
 
-- Tracks Claude Code **`2.1.273`** (2.1.270 fully aligned; 2.1.271–2.1.273 partial — the OCC-127 catch-up round landed the gateway-hint request headers, the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and the subshell-hidden dangerous-`rm` bypass fix — see `docs/upstream-version-gap-occ127.md`; remaining 2.1.273 entries are triaged there as NO-OP or STAGED; still not landed from the 2.1.270→2.1.272 delta: `/config` fullscreen mouse support (PORTABLE-LARGE) and the spinner status ladder (STAGED), plus the pre-existing sandbox per-command `allowed_domains` gap; prior alignment through 2.1.270 landed via OCC-122/OCC-123/OCC-84, OCC-124 + OCC-85, OCC-125, and OCC-126 — see `docs/upstream-version-gap-occ124.md`, `docs/upstream-version-gap-occ125.md`, and `docs/upstream-version-gap-occ126.md`).
+- Tracks Claude Code **`2.1.274`** (2.1.270 fully aligned; 2.1.271–2.1.274 partial — the latest OCC-127 round landed the 2.1.274 MCP auth-stub description secret-leak fix (byte-verified display-sanitizer family port) and verified the 2.1.274 bash special-variable and worktree nested-expansion hardening as NO-OP with behavioral tests; prior rounds landed the 2.1.273 gateway-hint request headers, the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and the subshell-hidden dangerous-`rm` bypass fix — see `docs/upstream-version-gap-occ127.md`; remaining 2.1.273/2.1.274 entries are triaged there as NO-OP or STAGED; still not landed from the 2.1.270→2.1.272 delta: `/config` fullscreen mouse support (PORTABLE-LARGE) and the spinner status ladder (STAGED), plus the pre-existing sandbox per-command `allowed_domains` gap; prior alignment through 2.1.270 landed via OCC-122/OCC-123/OCC-84, OCC-124 + OCC-85, OCC-125, and OCC-126 — see `docs/upstream-version-gap-occ124.md`, `docs/upstream-version-gap-occ125.md`, and `docs/upstream-version-gap-occ126.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/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.338","BINARY_NAME":"occ","BUILD_TIME":"2026-09-16T23:15:11.887Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.340","BINARY_NAME":"occ","BUILD_TIME":"2026-09-17T20:08:32.450Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -9112,6 +9112,17 @@ async function appendAsync(needMkdir, dir, path2, content) {
   updateLatestDebugLogSymlink();
 }
 function noop2() {}
+function appendFileSyncWithDirFallback(path2, content) {
+  try {
+    getFsImplementation().appendFileSync(path2, content);
+  } catch (e) {
+    if (e?.code !== "EISDIR")
+      throw e;
+    const fallback = join3(path2, `${getSessionId()}.txt`);
+    dirFallbackLogPath = fallback;
+    getFsImplementation().appendFileSync(fallback, content);
+  }
+}
 function getDebugWriter() {
   if (!debugWriter) {
     let ensuredDir = null;
@@ -9127,7 +9138,7 @@ function getDebugWriter() {
               getFsImplementation().mkdirSync(dir);
             } catch {}
           }
-          getFsImplementation().appendFileSync(path2, content);
+          appendFileSyncWithDirFallback(path2, content);
           updateLatestDebugLogSymlink();
           return;
         }
@@ -9167,7 +9178,7 @@ function logForDebugging(message, { level } = {
   getDebugWriter().write(output);
 }
 function getDebugLogPath() {
-  return getDebugFilePath() ?? process.env.CLAUDE_CODE_DEBUG_LOGS_DIR ?? join3(getClaudeConfigHomeDir(), "debug", `${getSessionId()}.txt`);
+  return dirFallbackLogPath ?? getDebugFilePath() ?? process.env.CLAUDE_CODE_DEBUG_LOGS_DIR ?? join3(getClaudeConfigHomeDir(), "debug", `${getSessionId()}.txt`);
 }
 function logAntError(context, error2) {
   if (process.env.USER_TYPE !== "ant") {
@@ -9180,7 +9191,7 @@ ${error2.stack}`, {
     });
   }
 }
-var LEVEL_ORDER, getMinDebugLogLevel, runtimeDebugEnabled = false, isDebugMode, getDebugFilter, isDebugToStdErr, getDebugFilePath, hasFormattedOutput = false, debugWriter = null, pendingWrite, updateLatestDebugLogSymlink;
+var LEVEL_ORDER, getMinDebugLogLevel, runtimeDebugEnabled = false, isDebugMode, getDebugFilter, isDebugToStdErr, getDebugFilePath, hasFormattedOutput = false, debugWriter = null, pendingWrite, dirFallbackLogPath = null, updateLatestDebugLogSymlink;
 var init_debug = __esm(() => {
   init_memoize();
   init_state();
@@ -473601,8 +473612,8 @@ async function getMessagesForSlashCommand(commandName, args, setToolJSX, context
           command4.load().then((mod2) => mod2.call(onDone, {
             ...context6,
             canUseTool
-          }, args)).then((jsx128) => {
-            if (jsx128 == null)
+          }, args)).then((commandJsx) => {
+            if (commandJsx == null)
               return;
             if (context6.options.isNonInteractiveSession) {
               resolve37({
@@ -473615,7 +473626,7 @@ async function getMessagesForSlashCommand(commandName, args, setToolJSX, context
             if (doneWasCalled)
               return;
             setToolJSX({
-              jsx: jsx128,
+              jsx: commandJsx,
               shouldHidePromptInput: true,
               showSpinner: false,
               isLocalJSXCommand: true,
@@ -628459,17 +628470,78 @@ var init_auth11 = __esm(() => {
   };
 });
 
+// src/services/mcp/displaySanitize.ts
+function stripInvisibleForDisplay(input2) {
+  if (typeof input2 !== "string")
+    return "";
+  return (input2.length > 4096 ? input2.slice(0, 4096) : input2).replace(SURROGATE_PATTERN, (match) => match.length === 2 ? match : " ").replace(INVISIBLE_PATTERN, " ");
+}
+function sanitizeLoneSurrogatesFallback(value) {
+  const chunks = [];
+  for (let i6 = 0;i6 < value.length; i6 += 8192) {
+    const end = Math.min(i6 + 8192, value.length);
+    const codes = new Uint16Array(end - i6);
+    for (let a6 = i6;a6 < end; a6++)
+      codes[a6 - i6] = value.charCodeAt(a6);
+    chunks.push(String.fromCharCode(...codes));
+  }
+  return chunks.join("");
+}
+function sanitizeLoneSurrogates(value) {
+  if (typeof Buffer < "u")
+    return Buffer.from(value, "utf16le").toString("utf16le");
+  return sanitizeLoneSurrogatesFallback(value);
+}
+function truncateToDisplayLength(value, max2) {
+  if (max2 <= 0)
+    return "";
+  if (value.length <= max2)
+    return value;
+  const head = value.slice(0, max2);
+  const lastUnit = head.charCodeAt(max2 - 1);
+  return sanitizeLoneSurrogates(lastUnit >= 55296 && lastUnit <= 56319 ? head.slice(0, -1) : head);
+}
+function redactSecretsForDisplay(value, mode = "all") {
+  function replacer(match, label, secret) {
+    return /[0-9._~+/=%-]/.test(secret) ? `${label} [redacted]` : match;
+  }
+  if (mode === "none")
+    return value;
+  return value.replace(/(?:\b|(?<=\\[A-Za-z"']))(bearer|basic)[\s:=\uFF1A\uFF1D]+(?:(?:\\*["']|\\+)\s*)?([A-Za-z0-9._~+/=%-]{8,})/gi, replacer).replace(/(?:\b|(?<=\\[A-Za-z"']))((?:access[-_ ]?|refresh[-_ ]?|id[-_ ]?|client[-_ ]?|api[-_ ]?|x[-_]api[-_ ]?|session[-_ ]?|auth[-_ ]?)?(?:token|key|secret|password|authorization|credential)s?)(?:\\*["']|\\+)?\s*[:=\uFF1A\uFF1D]\s*(?:\\*["']|\\+)?\s*([A-Za-z0-9._~+/=%-]{8,})/gi, replacer);
+}
+function sanitizeForDisplay(input2, max2 = DEFAULT_DISPLAY_MAX, redact = "all") {
+  if (typeof input2 !== "string")
+    return "";
+  const cleaned = stripInvisibleForDisplay(input2.normalize("NFKC")).replaceAll(/[<>";\u2018\u2019\u201A\u201C\u201D\u201E\u00AB\u20BB\u2039\u203A\u2329\u232A\u27E8\u27E9\u27EA\u27EB\u3008\u3009\u300A\u300B]/g, " ").replaceAll(/\s+/g, " ").trim();
+  const scanMax = Math.max(REDACT_SCAN_MAX, max2 + REDACT_SCAN_SLACK);
+  const overflow = cleaned.length > scanMax;
+  const redacted = redactSecretsForDisplay(overflow ? truncateToDisplayLength(cleaned, scanMax) : cleaned, redact);
+  return overflow || redacted.length > max2 ? `${truncateToDisplayLength(redacted, max2)}\u2026` : redacted;
+}
+function sanitizeDisplayUrl(url3, max2 = 1024) {
+  return sanitizeForDisplay(url3, max2);
+}
+function sanitizeServerNameForDisplay(name3, max2 = 64) {
+  if (typeof name3 !== "string")
+    return "";
+  return sanitizeForDisplay(name3.normalize("NFKC").replace(/['`]/g, " "), max2, "none");
+}
+var SURROGATE_PATTERN, INVISIBLE_PATTERN, DEFAULT_DISPLAY_MAX = 200, REDACT_SCAN_MAX = 2000, REDACT_SCAN_SLACK = 512;
+var init_displaySanitize = __esm(() => {
+  SURROGATE_PATTERN = /[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF]|[\uDC00-\uDFFF]/g;
+  INVISIBLE_PATTERN = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}\u2800]|(?!\u0020)\p{Zs}/gu;
+});
+
 // src/tools/McpAuthTool/McpAuthTool.ts
-function getConfigUrl(config7) {
-  if ("url" in config7)
-    return config7.url;
-  return;
+function buildMcpAuthToolDescription(serverName, config7, resolveUnexpanded = resolveUnexpandedMcpServers) {
+  const transport = config7.type ?? "stdio";
+  const displayOrigin = getMcpErrorEndpoint(serverName, config7, { detail: "origin" }, resolveUnexpanded);
+  const location = displayOrigin && displayOrigin !== transport ? `${transport} at ${sanitizeDisplayUrl(displayOrigin, 256)}` : transport;
+  return `The "${sanitizeServerNameForDisplay(serverName)}" MCP server (${location}) is installed but requires authentication. ` + `Call this tool to start the OAuth flow \u2014 you'll receive an authorization URL to share with the user. ` + `Once the user completes authorization in their browser, the server's real tools will become available automatically.`;
 }
-function createMcpAuthTool(serverName, config7) {
-  const url3 = getConfigUrl(config7);
+function createMcpAuthTool(serverName, config7, resolveUnexpanded = resolveUnexpandedMcpServers) {
   const transport = config7.type ?? "stdio";
-  const location = url3 ? `${transport} at ${url3}` : transport;
-  const description = `The \`${serverName}\` MCP server (${location}) is installed but requires authentication. ` + `Call this tool to start the OAuth flow \u2014 you'll receive an authorization URL to share with the user. ` + `Once the user completes authorization in their browser, the server's real tools will become available automatically.`;
+  const description = buildMcpAuthToolDescription(serverName, config7, resolveUnexpanded);
   return {
     name: buildMcpToolName(serverName, "authenticate"),
     isMcp: true,
@@ -628590,7 +628662,10 @@ var init_McpAuthTool = __esm(() => {
   init_v4();
   init_auth11();
   init_client12();
+  init_displaySanitize();
   init_mcpStringUtils();
+  init_redaction();
+  init_utils9();
   init_errors();
   init_log3();
   inputSchema45 = lazySchema(() => exports_external.object({}));
@@ -718102,9 +718177,9 @@ function RateLimitOptionsMenu(t0) {
     t5 = function handleSelect2(value) {
       if (value === "upgrade") {
         logEvent2("tengu_rate_limit_options_menu_select_upgrade", {});
-        call81(onDone, context8).then((jsx346) => {
-          if (jsx346) {
-            setSubCommandJSX(jsx346);
+        call81(onDone, context8).then((upgradeJsx) => {
+          if (upgradeJsx) {
+            setSubCommandJSX(upgradeJsx);
           }
         });
       } else {
@@ -776558,7 +776633,7 @@ function ModeIndicator({
   if (mode === "bash") {
     return /* @__PURE__ */ jsx_runtime432.jsx(ThemedText, {
       color: "bashBorder",
-      children: "! for bash mode"
+      children: "! for shell mode"
     });
   }
   const currentMode = toolPermissionContext?.mode;
@@ -779059,7 +779134,7 @@ function PromptInput({
     if (getPlatform() === "macos" && isMacosOptionChar(char)) {
       const shortcut = MACOS_OPTION_SPECIAL_CHARS[char];
       const terminalName = getNativeCSIuTerminalDisplayName();
-      const jsx430 = terminalName ? /* @__PURE__ */ jsx_runtime437.jsxs(ThemedText, {
+      const hintJsx = terminalName ? /* @__PURE__ */ jsx_runtime437.jsxs(ThemedText, {
         dimColor: true,
         children: [
           "To enable ",
@@ -779084,7 +779159,7 @@ function PromptInput({
       });
       addNotification({
         key: "option-meta-hint",
-        jsx: jsx430,
+        jsx: hintJsx,
         priority: "immediate",
         timeoutMs: 5000
       });
@@ -792655,9 +792730,9 @@ async function processBashCommand(inputString, precedingInputBlocks, attachmentM
       precedingInputBlocks
     })
   });
-  let jsx434;
+  let backgroundJsx;
   setToolJSX({
-    jsx: /* @__PURE__ */ jsx434(BashModeProgress, {
+    jsx: /* @__PURE__ */ jsx_runtime442.jsx(BashModeProgress, {
       input: inputString,
       progress: null,
       verbose: context8.options.verbose
@@ -792668,19 +792743,19 @@ async function processBashCommand(inputString, precedingInputBlocks, attachmentM
     const bashModeContext = {
       ...context8,
       setToolJSX: (_4) => {
-        jsx434 = _4?.jsx;
+        backgroundJsx = _4?.jsx;
       }
     };
     const onProgress = (progress) => {
       setToolJSX({
         jsx: /* @__PURE__ */ jsx_runtime442.jsxs(jsx_runtime442.Fragment, {
           children: [
-            /* @__PURE__ */ jsx434(BashModeProgress, {
+            /* @__PURE__ */ jsx_runtime442.jsx(BashModeProgress, {
               input: inputString,
               progress: progress.data,
               verbose: context8.options.verbose
             }),
-            jsx434
+            backgroundJsx
           ]
         }),
         shouldHidePromptInput: false,
@@ -807220,10 +807295,10 @@ Error: sandbox required but unavailable: ${reason}
           };
           const context8 = getToolUseContext(messagesRef.current, [], createAbortController(), mainLoopModel);
           const mod2 = await matchingCommand.load();
-          const jsx463 = await mod2.call(onDone, context8, commandArgs);
-          if (jsx463 && !doneWasCalled) {
+          const commandJsx = await mod2.call(onDone, context8, commandArgs);
+          if (commandJsx && !doneWasCalled) {
             setToolJSX({
-              jsx: jsx463,
+              jsx: commandJsx,
               shouldHidePromptInput: false,
               isLocalJSXCommand: true
             });
@@ -831870,7 +831945,7 @@ var _FEATURE_ALLOWLIST = new Set([
 var feature2 = (name3) => _FEATURE_ALLOWLIST.has(name3);
 if (typeof globalThis.MACRO === "undefined") {
   globalThis.MACRO = {
-    VERSION: "2.1.273",
+    VERSION: "2.1.274",
     BINARY_NAME: "occ",
     BUILD_TIME: new Date().toISOString(),
     FEEDBACK_CHANNEL: "",

package/package.json

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