@cnwenf/occ 2.1.292 → 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-43 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.219`：2.1.218 已完全对齐、2.1.219 部分对齐）。代码全开放、可审计、无暗门，数据由你掌控。
+**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.219`**（2.1.218 完全对齐、2.1.219 部分对齐）。
+- 跟踪 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.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":""};
+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;
@@ -359985,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;
@@ -360174,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")
@@ -360618,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)
@@ -360675,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"
       };
     }
@@ -362031,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(`
@@ -362091,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) => {
@@ -362107,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;
@@ -362133,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}>
@@ -564823,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);
   }
@@ -565853,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;
@@ -565867,7 +565961,7 @@ var init_node12 = __esm(() => {
     resolve: resolve40,
     exists: (file2) => {
       try {
-        return statSync13(file2).isFile();
+        return statSync14(file2).isFile();
       } catch (err2) {
         return false;
       }
@@ -583931,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() {
@@ -583958,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;
@@ -583987,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 {}
     }
@@ -639383,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");
@@ -639528,7 +639622,7 @@ async function displaceHolder() {
 }
 function lockfileMtime() {
   try {
-    return statSync15(getDaemonLockfilePath()).mtimeMs;
+    return statSync16(getDaemonLockfilePath()).mtimeMs;
   } catch {
     return null;
   }
@@ -640711,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,
@@ -640734,7 +640828,7 @@ function checkBinaryIdentity() {
     if (!execPath2 || !existsSync22(execPath2)) {
       return "binary identity unresolvable";
     }
-    statSync16(execPath2);
+    statSync17(execPath2);
   } catch {
     return "binary identity unresolvable";
   }
@@ -642700,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) {
@@ -642748,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;
   }
@@ -700000,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);
@@ -700011,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 {
@@ -729276,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) {
@@ -729323,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:")) {
@@ -816549,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({

package/package.json

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