@cnwenf/occ 2.1.336 → 2.1.337

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.270](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.270-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.272](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.272-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.270` — fully aligned through official 2.1.270: the 2.1.268/2.1.269 portable subsets landed in OCC-122/OCC-123/OCC-84, and the 2.1.270 changelog change — the read-only git Bash permission regression fix — carries no portable client-side delta, verified independently by two forensic rounds OCC-124 + OCC-85; the OCC-125 strict self-acceptance round against the official 2.1.270 binary then landed two live-discovered gaps — the full `/output-style` port (Gap-125a) and markdown-serializer html/default-token parity (Gap-125b) — per `docs/upstream-version-gap-occ125.md`). 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.272` — 2.1.270 fully aligned; 2.1.271/2.1.272 partial: the OCC-126 catch-up round landed the 2.1.272 Monitor-deadline behavior (`tengu_breezy_crescent` gate flip), `omitClaudeMd` for custom/plugin agents, the 2.1.271 Bash permission fixes (wildcard glob-arg read validation + declaration-flag charset parity), and the 2.1.272 fast-mode fixes, per `docs/upstream-version-gap-occ126.md`; 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) — occ127 candidates, 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). 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.
 
@@ -40,7 +40,7 @@ Requires a valid Anthropic API Key (or AWS Bedrock / Google Vertex / Azure Found
 - 🔧 **Full tool suite** — Bash, Read, Edit, Write, NotebookEdit, Grep, Glob, Agent, WebFetch, WebSearch, WebBrowser (real Chrome via CDP), Todo, Skills, and more.
 - 🤖 **Sub-agents** — spawn fork / async / background / remote agents; team swarms (`TeamCreate`/`TeamDelete`) and worktree isolation.
 - 🔀 **Workflow engine** — vm-sandboxed multi-agent workflow scripts; `/workflows` browse + async launch (`remote: true`) + progress tracking. _(live via `WORKFLOW_SCRIPTS`)_
-- 📊 **Monitor tool** — self-contained monitoring. _(live via `MONITOR_TOOL`)_
+- 📊 **Monitor tool** — self-contained monitoring. _(live via `MONITOR_TOOL`; events and the deadline-expiry notice are recorded internally — chat delivery wiring is an occ127 follow-up, and the deadline kill itself is enforced)_
 - 🌐 **WebBrowser** — navigate, read page text, screenshot, and batch actions through a real Chrome instance (CDP).
 - 🛡️ **Permission model** — `default` / `acceptEdits` / `plan` / `bypassPermissions` modes, auto-approval, destructive-command blocking, path validation, rule matching.
 - 🪝 **Hooks** — `PreToolUse`, `PostToolUse`, `PermissionDenied`, `Stop`, and more, configurable via `settings.json`.
@@ -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.270` (fully aligned) | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.272` (2.1.270 fully aligned; 2.1.271/2.1.272 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.270 (dev polyfill; build overrides with pkg.version) when working
+bun run dev          # run from source; version prints 2.1.272 (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.270`** (fully aligned through official 2.1.270 — portable subsets through 2.1.269 landed in OCC-122/OCC-123/OCC-84; the 2.1.270 changelog change is the read-only-git Bash permission regression fix, which carries no portable client-side delta, verified independently by OCC-124 + OCC-85 — see `docs/upstream-version-gap-occ124.md` and `docs/upstream-version-gap-occ85.md`. The OCC-125 strict self-acceptance round against the official 2.1.270 binary landed two live-discovered gaps: Gap-125a `/output-style` full port + Gap-125b markdown-serializer html/default-token parity — see `docs/upstream-version-gap-occ125.md`).
+- Tracks Claude Code **`2.1.272`** (2.1.270 fully aligned; 2.1.271/2.1.272 partial — the OCC-126 catch-up round landed the Monitor-deadline gate flip, `omitClaudeMd` for custom/plugin agents, the 2.1.271 Bash permission fixes, and the 2.1.272 fast-mode fixes — see `docs/upstream-version-gap-occ126.md`; 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 — see `docs/upstream-version-gap-occ124.md` and `docs/upstream-version-gap-occ85.md` — and OCC-125 — see `docs/upstream-version-gap-occ125.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.270`：已完全对齐至官方 2.1.270——2.1.268/2.1.269 的可移植子集已在 OCC-122/OCC-123/OCC-84 落地，2.1.270 唯一变更（Bash 只读 git 权限回归修复）无可移植客户端代码差异，经 OCC-124 与 OCC-85 两轮独立取证核实，详见相应台账）。代码全开放、可审计、无暗门，数据由你掌控。
+**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.272`：2.1.270 已完全对齐、2.1.271/2.1.272 部分对齐——OCC-126 追齐轮落地了 2.1.272 Monitor 超时门翻转、自定义/插件智能体的 `omitClaudeMd`、2.1.271 Bash 权限修复（通配符 glob 参数读校验 + 声明标志字符集对齐）与 2.1.272 fast mode 修复，台账见 `docs/upstream-version-gap-occ126.md`；2.1.270→2.1.272 增量中仍未落地：`/config` 全屏鼠标支持（PORTABLE-LARGE 范围）与 spinner 状态文案阶梯 "deep in thought"/"picking the thought back up"（STAGED）——occ127 候选，另有先于 2.1.270 已存在的 sandbox 按命令 `allowed_domains` 缺口；此前对齐至 2.1.270 经 OCC-122/OCC-123/OCC-84/OCC-124/OCC-85/OCC-125 落地）。代码全开放、可审计、无暗门，数据由你掌控。
 
 如果你担心闭源 CLI 可能植入后门、担心代码与凭据被上传到不可审计的服务，OCC 就是为你准备的：全部源码开放、无混淆，构建产物可由源码复现，API 凭据只发往你自己配置的端点。
 
@@ -21,7 +21,7 @@
 
 ## 现状
 
-- 跟踪 Claude Code **`2.1.270`**（已完全对齐至官方 2.1.270——2.1.268/2.1.269 的可移植子集已在 OCC-122/OCC-123/OCC-84 落地；2.1.270 唯一变更（Bash 只读 git 权限回归修复）无可移植客户端差异，经 OCC-124 与 OCC-85 两轮独立取证核实 OCC 不受影响）。
+- 跟踪 Claude Code **`2.1.272`**（2.1.270 已完全对齐、2.1.271/2.1.272 部分对齐——OCC-126 追齐轮落地 Monitor 超时门翻转、`omitClaudeMd`、2.1.271 Bash 权限修复与 2.1.272 fast mode 修复，台账见 `docs/upstream-version-gap-occ126.md`；2.1.270→2.1.272 增量中仍未落地：`/config` 全屏鼠标支持（PORTABLE-LARGE）与 spinner 状态文案阶梯（STAGED），另有先于 2.1.270 已存在的 sandbox 按命令 `allowed_domains` 缺口；此前对齐至 2.1.270 经 OCC-122/OCC-123/OCC-84/OCC-124/OCC-85/OCC-125 落地）。
 - 代码库有约 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)。
@@ -80,7 +80,7 @@ Glob、Grep（默认启用）；TaskCreate/Get/Update/List（Todo v2）、EnterW
 
 ```bash
 bun install
-bun run dev          # 从源码运行；版本号显示 2.1.270（dev polyfill；build 用 pkg.version 覆盖）即正常
+bun run dev          # 从源码运行；版本号显示 2.1.272（dev polyfill；build 用 pkg.version 覆盖）即正常
 bun run build        # 产物：dist/cli.js（~26MB，5300+ 模块，单文件 bundle）
 bun test             # 测试套件
 bun run lint         # Biome lint（禁用格式化以避免大 diff）

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.336","BINARY_NAME":"occ","BUILD_TIME":"2026-09-15T19:40:03.023Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.337","BINARY_NAME":"occ","BUILD_TIME":"2026-09-15T23:26:27.856Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -232750,6 +232750,7 @@ function parseAgentFromJson(name3, definition, source = "flagSettings") {
       ...parsed.skills && parsed.skills.length > 0 ? { skills: parsed.skills } : {},
       ...parsed.initialPrompt ? { initialPrompt: parsed.initialPrompt } : {},
       ...parsed.background ? { background: parsed.background } : {},
+      ...parsed.omitClaudeMd ? { omitClaudeMd: parsed.omitClaudeMd } : {},
       ...parsed.memory ? { memory: parsed.memory } : {},
       ...parsed.isolation ? { isolation: parsed.isolation } : {}
     };
@@ -232809,6 +232810,8 @@ function parseAgentFromMarkdown(filePath, baseDir, frontmatter, content, source)
       logForDebugging(`Agent file ${filePath} has invalid background value '${backgroundRaw}'. Must be 'true', 'false', or omitted.`);
     }
     const background = backgroundRaw === "true" || backgroundRaw === true ? true : undefined;
+    const omitClaudeMdRaw = frontmatter["omitClaudeMd"];
+    const omitClaudeMd = omitClaudeMdRaw === "true" || omitClaudeMdRaw === true ? true : undefined;
     const VALID_MEMORY_SCOPES2 = ["user", "project", "local"];
     const memoryRaw = frontmatter["memory"];
     let memory;
@@ -232906,6 +232909,7 @@ function parseAgentFromMarkdown(filePath, baseDir, frontmatter, content, source)
       ...isValidPermissionMode ? { permissionMode: permissionModeRaw } : {},
       ...maxTurns !== undefined ? { maxTurns } : {},
       ...background ? { background } : {},
+      ...omitClaudeMd ? { omitClaudeMd } : {},
       ...memory ? { memory } : {},
       ...isolation ? { isolation } : {},
       ...cacheTtl !== undefined ? { cacheTtl } : {}
@@ -232964,6 +232968,7 @@ var init_loadAgentsDir = __esm(() => {
     initialPrompt: exports_external.string().optional(),
     memory: exports_external.enum(["user", "project", "local"]).optional(),
     background: exports_external.boolean().optional(),
+    omitClaudeMd: exports_external.boolean().optional(),
     isolation: (process.env.USER_TYPE === "ant" ? exports_external.enum(["worktree", "remote"]) : exports_external.enum(["worktree"])).optional()
   }));
   AgentsJsonSchema = lazySchema(() => exports_external.record(exports_external.string(), AgentJsonSchema()));
@@ -266498,29 +266503,39 @@ async function* withRetry(getClient2, operation, options) {
     } catch (error52) {
       lastError = error52;
       logForDebugging(`API error (attempt ${attempt}/${maxRetries + 1}): ${error52 instanceof APIError ? `${error52.status} ${error52.message}` : errorMessage(error52)}`, { level: "error" });
+      const watchdogRetryEnabled = isRetryWatchdogEnabled();
       if (wasFastModeActive && !isPersistentRetryEnabled() && error52 instanceof APIError && (error52.status === 429 || is529Error(error52))) {
         const overageReason = error52.headers?.get("anthropic-ratelimit-unified-overage-disabled-reason");
         if (overageReason !== null && overageReason !== undefined) {
           handleFastModeOverageRejection(overageReason);
           retryContext.fastMode = false;
+          if (watchdogRetryEnabled && attempt >= maxRetries)
+            attempt = maxRetries;
           continue;
         }
         const retryAfterMs = getRetryAfterMs(error52);
-        if (retryAfterMs !== null && retryAfterMs < SHORT_RETRY_THRESHOLD_MS) {
+        const isShortRetry = retryAfterMs !== null && retryAfterMs < SHORT_RETRY_THRESHOLD_MS;
+        if (isShortRetry && !watchdogRetryEnabled) {
           await sleep2(retryAfterMs, options.signal, { abortError });
           continue;
         }
-        const cooldownMs = Math.max(retryAfterMs ?? DEFAULT_FAST_MODE_FALLBACK_HOLD_MS, MIN_COOLDOWN_MS);
-        const cooldownReason = is529Error(error52) ? "overloaded" : "rate_limit";
-        triggerFastModeCooldown(Date.now() + cooldownMs, cooldownReason);
-        if (isFastModeEnabled()) {
-          retryContext.fastMode = false;
+        if (!isShortRetry) {
+          const cooldownMs = Math.max(retryAfterMs ?? DEFAULT_FAST_MODE_FALLBACK_HOLD_MS, MIN_COOLDOWN_MS);
+          const cooldownReason = is529Error(error52) ? "overloaded" : "rate_limit";
+          triggerFastModeCooldown(Date.now() + cooldownMs, cooldownReason);
+          if (isFastModeEnabled()) {
+            retryContext.fastMode = false;
+          }
+          if (watchdogRetryEnabled && attempt >= maxRetries)
+            attempt = maxRetries;
+          continue;
         }
-        continue;
       }
       if (wasFastModeActive && isFastModeNotEnabledError(error52)) {
         handleFastModeRejectedByAPI();
         retryContext.fastMode = false;
+        if (watchdogRetryEnabled && attempt >= maxRetries)
+          attempt = maxRetries;
         continue;
       }
       if (is529Error(error52) && !shouldRetry529(options.querySource) && !isRetryWatchdogEnabled()) {
@@ -361041,10 +361056,17 @@ function collectCommands(node, commands7, varScope) {
           const arg = walkArgument(child, commands7, varScope);
           if (typeof arg !== "string")
             return arg;
-          if ((argv[0] === "declare" || argv[0] === "typeset" || argv[0] === "local") && /^-[a-zA-Z]*[niaA]/.test(arg)) {
+          if ((argv[0] === "declare" || argv[0] === "typeset" || argv[0] === "local") && /^[+-].*[nialuAEFLRZ]/.test(arg)) {
+            return {
+              kind: "too-complex",
+              reason: `declare flag ${arg} changes assignment semantics (nameref/integer/float/array/width-truncation/case-conversion)`,
+              nodeType: "declaration_command"
+            };
+          }
+          if ((argv[0] === "export" || argv[0] === "readonly") && /^[+-].*[iluEFLRZ]/.test(arg)) {
             return {
               kind: "too-complex",
-              reason: `declare flag ${arg} changes assignment semantics (nameref/integer/array)`,
+              reason: `${argv[0]} flag ${arg} \u2014 zsh bin_typeset mathevals (-i/-E/-F), width-truncates (-L/-R/-Z), or case-converts (-l/-u) the assigned value`,
               nodeType: "declaration_command"
             };
           }
@@ -380838,10 +380860,32 @@ function parsePatternCommand(args, flagsWithArgs, defaults2 = []) {
   }
   return paths2.length > 0 ? paths2 : defaults2;
 }
+function globCharIndex(arg) {
+  for (let i6 = 0;i6 < arg.length; i6++) {
+    const c9 = arg[i6];
+    if (c9 === "*" || c9 === "?")
+      return i6;
+    if (c9 === "[" && arg.indexOf("]", i6 + 1) !== -1)
+      return i6;
+  }
+  return -1;
+}
+function collectUnextractedGlobArgs(args, extractedPaths) {
+  const seen = new Set(extractedPaths);
+  const out = [];
+  for (const arg of args) {
+    if (globCharIndex(arg) !== -1 && !seen.has(arg)) {
+      seen.add(arg);
+      out.push(arg);
+    }
+  }
+  return out;
+}
 function validateCommandPaths(command4, args, cwd2, toolPermissionContext, compoundCommandHasCd, operationTypeOverride) {
   const extractor = PATH_EXTRACTORS[command4];
-  const paths2 = extractor(args);
+  const extractedPaths = extractor(args);
   const operationType = operationTypeOverride ?? COMMAND_OPERATION_TYPE[command4];
+  const paths2 = operationType === "read" ? [...extractedPaths, ...collectUnextractedGlobArgs(args, extractedPaths)] : extractedPaths;
   const validator = COMMAND_VALIDATOR[command4];
   if (validator && !validator(args)) {
     return {
@@ -584823,10 +584867,117 @@ ${output2.json}`
 var exports_MonitorTool = {};
 __export(exports_MonitorTool, {
   stopMonitor: () => stopMonitor,
+  normalizeMonitorInput: () => normalizeMonitorInput,
+  monitorExpiredNotice: () => monitorExpiredNotice,
+  fireMonitorDeadline: () => fireMonitorDeadline,
   MonitorTool: () => MonitorTool,
   MONITOR_TOOL_NAME: () => MONITOR_TOOL_NAME
 });
 import { randomUUID as randomUUID22 } from "crypto";
+function monitorDeadlineCap() {
+  return getIsNonInteractiveSession() ? MONITOR_DEADLINE_CAP_PRINT_MS : MONITOR_DEADLINE_CAP_MS;
+}
+function formatMonitorMinutes(ms) {
+  return `${Math.round(ms / 60000)} minutes`;
+}
+function normalizeMonitorInput(input2) {
+  return {
+    timeoutMs: Math.min(input2.timeout_ms ?? DEFAULT_TIMEOUT_MS2, monitorDeadlineCap()),
+    persistent: false
+  };
+}
+function monitorExpiredNotice(timeoutMs, eventCount) {
+  const duration3 = formatDuration(timeoutMs, { hideTrailingZeros: true });
+  if (eventCount === 0) {
+    return `[Monitor expired after ${duration3} with no events delivered. Re-arm it if you still need the watch \u2014 and widen the filter if silence was unexpected.]`;
+  }
+  return `[Monitor expired after ${duration3} with ${eventCount} ${pluralize2(eventCount, "event")} delivered. Re-arm it if you still need the watch.]`;
+}
+function deadlineSection() {
+  return `Every monitor expires after \`timeout_ms\` (default ${formatMonitorMinutes(DEFAULT_TIMEOUT_MS2)}, at most ${formatMonitorMinutes(monitorDeadlineCap())}): it is killed and you get one notice with the event count. Re-arm it if you still need the watch; for a long watch (PR monitoring, log tails) set \`timeout_ms\` to the maximum and re-arm on each expiry, and widen the filter if an expiry with no events was unexpected.`;
+}
+function buildDescription2() {
+  return `**OCC build note (event delivery not yet wired):** in this build, Monitor events and the expiry notice are recorded internally but are NOT delivered to the chat \u2014 the notification consumer is a tracked follow-up (occ127). The deadline itself IS enforced: every monitor is killed and deregistered at \`timeout_ms\`. Until delivery lands, use Bash \`run_in_background\` when you need a delivered completion notification, and read the delivery-dependent statements below ("notifications arrive in the chat", the expiry notice) as describing not-yet-available behavior.
+
+Start a background monitor that streams events from a long-running script. Each stdout line is an event \u2014 you keep working and notifications arrive in the chat. Events arrive on their own schedule and are not replies from the user, even if one lands while you're waiting for the user to answer a question.
+
+Pick by how many notifications you need:
+- **One** ("tell me when the server is ready / the build finishes") \u2192 use **Bash with \`run_in_background\`** and a command that exits when the condition is true, e.g. \`until grep -q "Ready in" dev.log; do sleep 0.5; done\`. You get a single completion notification when it exits.
+- **One per occurrence, indefinitely** ("tell me every time an ERROR line appears") \u2192 Monitor with an unbounded command (\`tail -f\`, \`inotifywait -m\`, \`while true\`).
+- **One per occurrence, until a known end** ("emit each CI step result, stop when the run completes") \u2192 Monitor with a command that emits lines and then exits.
+
+Your script's stdout is the event stream. Each line becomes a notification. Exit ends the watch.
+
+  # Each matching log line is an event
+  tail -f /var/log/app.log | grep --line-buffered "ERROR"
+
+  # Each file change is an event
+  inotifywait -m --format '%e %f' /watched/dir
+
+  # Poll GitHub for new PR comments and emit one line per new comment
+  last=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+  while true; do
+    now=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+    gh api "repos/owner/repo/issues/123/comments?since=$last" --jq '.[] | "\\(.user.login): \\(.body)"'
+    last=$now; sleep 30
+  done
+
+  # Node script that emits events as they arrive (e.g. WebSocket listener)
+  node watch-for-events.js
+
+  # Per-occurrence with a natural end: emit each CI check as it lands, exit when the run completes
+  prev=""
+  while true; do
+    s=$(gh pr checks 123 --json name,bucket)
+    cur=$(jq -r '.[] | select(.bucket!="pending") | "\\(.name): \\(.bucket)"' <<<"$s" | sort)
+    comm -13 <(echo "$prev") <(echo "$cur")
+    prev=$cur
+    jq -e 'all(.bucket!="pending")' <<<"$s" >/dev/null && break
+    sleep 30
+  done
+
+**Don't use an unbounded command for a single notification.** \`tail -f\`, \`inotifywait -m\`, and \`while true\` never exit on their own, so the monitor stays armed until timeout even after the event has fired. For "tell me when X is ready," use Bash \`run_in_background\` with an \`until\` loop instead (one notification, ends in seconds). Note that \`tail -f log | grep -m 1 ...\` does *not* fix this: if the log goes quiet after the match, \`tail\` never receives SIGPIPE and the pipeline hangs anyway.
+
+**Script quality:**
+- Every pipe stage must flush per line or matches sit in its buffer unseen: \`grep\` needs \`--line-buffered\`, \`awk\` needs \`fflush()\`. \`head\` cannot flush at all \u2014 \`| head -N\` delivers nothing until N matches accumulate, then ends the stream.
+- In poll loops, handle transient failures (\`curl ... || true\`) \u2014 one failed request shouldn't kill the monitor.
+- Poll intervals: 30s+ for remote APIs (rate limits), 0.5-1s for local checks.
+- Write a specific \`description\` \u2014 it appears in every notification ("errors in deploy.log" not "watching logs").
+- Only stdout is the event stream. Stderr goes to the output file (readable via Read) but does not trigger notifications \u2014 for a command you run directly (e.g. \`python train.py 2>&1 | grep --line-buffered ...\`), merge stderr with \`2>&1\` so its failures reach your filter. (No effect on \`tail -f\` of an existing log \u2014 that file only contains what its writer redirected.)
+
+**Coverage \u2014 silence is not success.** When watching a job or process for an outcome, your filter must match every terminal state, not just the happy path. A monitor that greps only for the success marker stays silent through a crashloop, a hung process, or an unexpected exit \u2014 and silence looks identical to "still running." Before arming, ask: *if this process crashed right now, would my filter emit anything?* If not, widen it.
+
+  # Wrong \u2014 silent on crash, hang, or any non-success exit
+  tail -f run.log | grep --line-buffered "elapsed_steps="
+
+  # Right \u2014 one alternation covering progress + the failure signatures you'd act on
+  tail -f run.log | grep -E --line-buffered "elapsed_steps=|Traceback|Error|FAILED|assert|Killed|OOM"
+
+For poll loops checking job state, emit on every terminal status (\`succeeded|failed|cancelled|timeout\`), not just success. If you cannot confidently enumerate the failure signatures, broaden the grep alternation rather than narrow it \u2014 some extra noise is better than missing a crashloop.
+
+**Output volume**: Every stdout line is a conversation message, so the filter should be selective \u2014 but selective means "the lines you'd act on," not "only good news." Never pipe raw logs; filter to exactly the success and failure signals you care about. Monitors that produce too many events are automatically stopped; restart with a tighter filter if this happens.
+
+Stdout lines within 200ms are batched into a single notification, so multiline output from a single event groups naturally.
+
+The script runs in the same shell environment as Bash. Exit ends the watch (exit code is reported). ${deadlineSection()} Use TaskStop to cancel early.
+**ws source** \u2014 open a WebSocket and stream each incoming text frame as an event. No shell, no polling: the server pushes, you get notified.
+  Monitor({
+    ws: {url: 'wss://events.example.com/stream', protocols: ['v1']},
+    description: 'deploy events',
+  })
+Each text frame becomes one notification (multiline frames stay as one event). Binary frames are reported as \`[binary frame, N bytes]\` rather than passed through. Socket close ends the watch with the close code surfaced; errors are surfaced before close. Same rate limiting as bash \u2014 a firehose will be suppressed and eventually stopped, so subscribe to a filtered feed where one exists.
+Prefer this over \`command: 'websocat wss://\u2026'\` \u2014 it avoids the extra process and line-buffering pitfalls. Use bash when you need to transform or filter frames with shell tools before they become events.`;
+}
+function fireMonitorDeadline(deps) {
+  const registry2 = deps.registry ?? activeMonitors;
+  const h5 = registry2.get(deps.taskId);
+  if (!h5)
+    return false;
+  deps.emit(monitorExpiredNotice(deps.timeoutMs, deps.eventCount));
+  h5.kill();
+  registry2.delete(deps.taskId);
+  return true;
+}
 function shellPath() {
   return process.env.SHELL || "/bin/sh";
 }
@@ -584919,77 +585070,13 @@ function stopMonitor(taskId) {
   activeMonitors.delete(taskId);
   return true;
 }
-var MONITOR_TOOL_NAME = "Monitor", DEFAULT_TIMEOUT_MS2 = 300000, MAX_TIMEOUT_MS2 = 3600000, COMMAND_DESC = "Shell command or script. Each stdout line is an event; exit ends the watch.", DESCRIPTION19 = `Start a background monitor that streams events from a long-running script. Each stdout line is an event \u2014 you keep working and notifications arrive in the chat. Events arrive on their own schedule and are not replies from the user, even if one lands while you're waiting for the user to answer a question.
-
-Pick by how many notifications you need:
-- **One** ("tell me when the server is ready / the build finishes") \u2192 use **Bash with \`run_in_background\`** and a command that exits when the condition is true, e.g. \`until grep -q "Ready in" dev.log; do sleep 0.5; done\`. You get a single completion notification when it exits.
-- **One per occurrence, indefinitely** ("tell me every time an ERROR line appears") \u2192 Monitor with an unbounded command (\`tail -f\`, \`inotifywait -m\`, \`while true\`).
-- **One per occurrence, until a known end** ("emit each CI step result, stop when the run completes") \u2192 Monitor with a command that emits lines and then exits.
-
-Your script's stdout is the event stream. Each line becomes a notification. Exit ends the watch.
-
-  # Each matching log line is an event
-  tail -f /var/log/app.log | grep --line-buffered "ERROR"
-
-  # Each file change is an event
-  inotifywait -m --format '%e %f' /watched/dir
-
-  # Poll GitHub for new PR comments and emit one line per new comment
-  last=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-  while true; do
-    now=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-    gh api "repos/owner/repo/issues/123/comments?since=$last" --jq '.[] | "\\(.user.login): \\(.body)"'
-    last=$now; sleep 30
-  done
-
-  # Node script that emits events as they arrive (e.g. WebSocket listener)
-  node watch-for-events.js
-
-  # Per-occurrence with a natural end: emit each CI check as it lands, exit when the run completes
-  prev=""
-  while true; do
-    s=$(gh pr checks 123 --json name,bucket)
-    cur=$(jq -r '.[] | select(.bucket!="pending") | "\\(.name): \\(.bucket)"' <<<"$s" | sort)
-    comm -13 <(echo "$prev") <(echo "$cur")
-    prev=$cur
-    jq -e 'all(.bucket!="pending")' <<<"$s" >/dev/null && break
-    sleep 30
-  done
-
-**Don't use an unbounded command for a single notification.** \`tail -f\`, \`inotifywait -m\`, and \`while true\` never exit on their own, so the monitor stays armed until timeout even after the event has fired. For "tell me when X is ready," use Bash \`run_in_background\` with an \`until\` loop instead (one notification, ends in seconds). Note that \`tail -f log | grep -m 1 ...\` does *not* fix this: if the log goes quiet after the match, \`tail\` never receives SIGPIPE and the pipeline hangs anyway.
-
-**Script quality:**
-- Every pipe stage must flush per line or matches sit in its buffer unseen: \`grep\` needs \`--line-buffered\`, \`awk\` needs \`fflush()\`. \`head\` cannot flush at all \u2014 \`| head -N\` delivers nothing until N matches accumulate, then ends the stream.
-- In poll loops, handle transient failures (\`curl ... || true\`) \u2014 one failed request shouldn't kill the monitor.
-- Poll intervals: 30s+ for remote APIs (rate limits), 0.5-1s for local checks.
-- Write a specific \`description\` \u2014 it appears in every notification ("errors in deploy.log" not "watching logs").
-- Only stdout is the event stream. Stderr goes to the output file (readable via Read) but does not trigger notifications \u2014 for a command you run directly (e.g. \`python train.py 2>&1 | grep --line-buffered ...\`), merge stderr with \`2>&1\` so its failures reach your filter. (No effect on \`tail -f\` of an existing log \u2014 that file only contains what its writer redirected.)
-
-**Coverage \u2014 silence is not success.** When watching a job or process for an outcome, your filter must match every terminal state, not just the happy path. A monitor that greps only for the success marker stays silent through a crashloop, a hung process, or an unexpected exit \u2014 and silence looks identical to "still running." Before arming, ask: *if this process crashed right now, would my filter emit anything?* If not, widen it.
-
-  # Wrong \u2014 silent on crash, hang, or any non-success exit
-  tail -f run.log | grep --line-buffered "elapsed_steps="
-
-  # Right \u2014 one alternation covering progress + the failure signatures you'd act on
-  tail -f run.log | grep -E --line-buffered "elapsed_steps=|Traceback|Error|FAILED|assert|Killed|OOM"
-
-For poll loops checking job state, emit on every terminal status (\`succeeded|failed|cancelled|timeout\`), not just success. If you cannot confidently enumerate the failure signatures, broaden the grep alternation rather than narrow it \u2014 some extra noise is better than missing a crashloop.
-
-**Output volume**: Every stdout line is a conversation message, so the filter should be selective \u2014 but selective means "the lines you'd act on," not "only good news." Never pipe raw logs; filter to exactly the success and failure signals you care about. Monitors that produce too many events are automatically stopped; restart with a tighter filter if this happens.
-
-Stdout lines within 200ms are batched into a single notification, so multiline output from a single event groups naturally.
-
-The script runs in the same shell environment as Bash. Exit ends the watch (exit code is reported). Timeout \u2192 killed. Set \`persistent: true\` for session-length watches (PR monitoring, log tails) \u2014 the monitor runs until you call TaskStop or the session ends. Use TaskStop to cancel early.
-**ws source** \u2014 open a WebSocket and stream each incoming text frame as an event. No shell, no polling: the server pushes, you get notified.
-  Monitor({
-    ws: {url: 'wss://events.example.com/stream', protocols: ['v1']},
-    description: 'deploy events',
-  })
-Each text frame becomes one notification (multiline frames stay as one event). Binary frames are reported as \`[binary frame, N bytes]\` rather than passed through. Socket close ends the watch with the close code surfaced; errors are surfaced before close. Same rate limiting as bash \u2014 a firehose will be suppressed and eventually stopped, so subscribe to a filtered feed where one exists.
-Prefer this over \`command: 'websocat wss://\u2026'\` \u2014 it avoids the extra process and line-buffering pitfalls. Use bash when you need to transform or filter frames with shell tools before they become events.`, inputSchema38, outputSchema35, activeMonitors, MonitorTool;
+var MONITOR_TOOL_NAME = "Monitor", DEFAULT_TIMEOUT_MS2 = 300000, MAX_TIMEOUT_MS2 = 3600000, MONITOR_DEADLINE_CAP_MS = 1800000, MONITOR_DEADLINE_CAP_PRINT_MS = 600000, COMMAND_DESC = "Shell command or script. Each stdout line is an event; exit ends the watch.", inputSchema38, outputSchema35, activeMonitors, MonitorTool;
 var init_MonitorTool = __esm(() => {
   init_v4();
   init_Tool();
+  init_state();
+  init_format();
+  init_oauthLoginExpiry();
   inputSchema38 = lazySchema(() => exports_external.strictObject({
     command: exports_external.string().min(1).describe(COMMAND_DESC).optional(),
     ws: exports_external.object({
@@ -585013,10 +585100,10 @@ var init_MonitorTool = __esm(() => {
     maxResultSizeChars: 1e5,
     shouldDefer: true,
     async description() {
-      return DESCRIPTION19;
+      return buildDescription2();
     },
     async prompt() {
-      return DESCRIPTION19;
+      return buildDescription2();
     },
     get inputSchema() {
       return inputSchema38();
@@ -585038,8 +585125,7 @@ var init_MonitorTool = __esm(() => {
     },
     async call(input2, _context) {
       const taskId = `monitor-${randomUUID22()}`;
-      const persistent = input2.persistent ?? false;
-      const timeoutMs = persistent ? 0 : input2.timeout_ms ?? DEFAULT_TIMEOUT_MS2;
+      const { timeoutMs, persistent } = normalizeMonitorInput(input2);
       const events2 = [];
       const emit2 = (line) => {
         events2.push(line);
@@ -585049,17 +585135,16 @@ var init_MonitorTool = __esm(() => {
       } else if (input2.ws) {
         streamWs(input2.ws.url, input2.ws.protocols, taskId, emit2).catch(() => {});
       }
-      if (timeoutMs > 0) {
-        const timer2 = setTimeout(() => {
-          const h5 = activeMonitors.get(taskId);
-          if (h5) {
-            h5.kill();
-            activeMonitors.delete(taskId);
-          }
-        }, timeoutMs);
-        if (typeof timer2 === "object" && timer2 && "unref" in timer2) {
-          timer2.unref();
-        }
+      const timer2 = setTimeout(() => {
+        fireMonitorDeadline({
+          taskId,
+          timeoutMs,
+          eventCount: events2.length,
+          emit: emit2
+        });
+      }, timeoutMs);
+      if (typeof timer2 === "object" && timer2 && "unref" in timer2) {
+        timer2.unref();
       }
       return {
         data: {
@@ -585099,7 +585184,7 @@ function isPushDisabled() {
     return true;
   }
 }
-var PUSH_NOTIFICATION_TOOL_NAME = "PushNotification", DESCRIPTION20 = "Send a notification to the user via their terminal and, when Remote Control is connected, also push to their mobile device", inputSchema39, outputSchema36, noopTerminal, PushNotificationTool;
+var PUSH_NOTIFICATION_TOOL_NAME = "PushNotification", DESCRIPTION19 = "Send a notification to the user via their terminal and, when Remote Control is connected, also push to their mobile device", inputSchema39, outputSchema36, noopTerminal, PushNotificationTool;
 var init_PushNotificationTool = __esm(() => {
   init_v4();
   init_Tool();
@@ -585127,10 +585212,10 @@ var init_PushNotificationTool = __esm(() => {
     maxResultSizeChars: 1000,
     shouldDefer: true,
     async description() {
-      return DESCRIPTION20;
+      return DESCRIPTION19;
     },
     async prompt() {
-      return DESCRIPTION20;
+      return DESCRIPTION19;
     },
     get inputSchema() {
       return inputSchema39();
@@ -585451,7 +585536,7 @@ If you receive a JSON message with \`type: "shutdown_request"\` or \`type: "plan
 Approving shutdown terminates your process. Rejecting plan sends the teammate back to revise. Don't originate \`shutdown_request\` unless asked. Don't send structured JSON status messages \u2014 use TaskUpdate.
 `.trim();
 }
-var DESCRIPTION21 = "Send a message to another agent";
+var DESCRIPTION20 = "Send a message to another agent";
 var init_prompt24 = __esm(() => {
   init_featureFlags();
 });
@@ -585972,7 +586057,7 @@ var init_SendMessageTool = __esm(() => {
       return { result: true };
     },
     async description() {
-      return DESCRIPTION21;
+      return DESCRIPTION20;
     },
     async prompt() {
       return getPrompt6();
@@ -586220,7 +586305,7 @@ async function listCloudSessions() {
 async function listRemoteBridgeSessions() {
   return [];
 }
-var LIST_AGENTS_TOOL_NAME = "ListAgents", DESCRIPTION22 = `Lists agents you can SendMessage to \u2014 in-process subagents you spawned, other local Claude sessions on this machine, your Claude sessions running in the cloud (when this session has cloud access), and (when Remote Control is connected) remote bridge sessions, which you can only reply to. Names are the address: send with \`SendMessage({to: "<name>", message: "..."})\`, copying the name exactly as a row prints it. Append a row's \` [ref]\` only when the bare name is not enough \u2014 two rows share it, or an error asks you to disambiguate.`, inputSchema41, AgentTypeSchema, outputSchema37, ListPeersTool;
+var LIST_AGENTS_TOOL_NAME = "ListAgents", DESCRIPTION21 = `Lists agents you can SendMessage to \u2014 in-process subagents you spawned, other local Claude sessions on this machine, your Claude sessions running in the cloud (when this session has cloud access), and (when Remote Control is connected) remote bridge sessions, which you can only reply to. Names are the address: send with \`SendMessage({to: "<name>", message: "..."})\`, copying the name exactly as a row prints it. Append a row's \` [ref]\` only when the bare name is not enough \u2014 two rows share it, or an error asks you to disambiguate.`, inputSchema41, AgentTypeSchema, outputSchema37, ListPeersTool;
 var init_ListPeersTool = __esm(() => {
   init_v4();
   init_Tool();
@@ -586246,10 +586331,10 @@ var init_ListPeersTool = __esm(() => {
     maxResultSizeChars: 50000,
     shouldDefer: true,
     async description() {
-      return DESCRIPTION22;
+      return DESCRIPTION21;
     },
     async prompt() {
-      return DESCRIPTION22;
+      return DESCRIPTION21;
     },
     get inputSchema() {
       return inputSchema41();
@@ -588030,7 +588115,7 @@ function buildWorkflowProgressHandler(runId, seedPhases, emit2, onAgentEvent) {
     });
   };
 }
-var import_react86, inputSchema42, outputSchema38, DESCRIPTION23 = `Run a multi-step workflow from a self-contained JavaScript script. The script runs in a sandboxed vm with access to primitives: agent(prompt, opts?) to spawn a subagent, parallel(items) for concurrent execution (max 4096 items, ~10 concurrent), pipeline(items, ...stages) for streaming, phase(title, fn?) to group agents (optional callback form: phase('title', async () => { ...parallel/agent... }) runs fn within the phase and returns its result), log(...args) for workflow-scoped logging, budget {total, remaining(), spent()} for token caps, and workflow(nameOrRef) / resolveWorkflow(name) for sub-workflows. Scripts are deterministic for resume (no Date/Math.random/import). Use the Workflow tool on substantive multi-agent tasks.
+var import_react86, inputSchema42, outputSchema38, DESCRIPTION22 = `Run a multi-step workflow from a self-contained JavaScript script. The script runs in a sandboxed vm with access to primitives: agent(prompt, opts?) to spawn a subagent, parallel(items) for concurrent execution (max 4096 items, ~10 concurrent), pipeline(items, ...stages) for streaming, phase(title, fn?) to group agents (optional callback form: phase('title', async () => { ...parallel/agent... }) runs fn within the phase and returns its result), log(...args) for workflow-scoped logging, budget {total, remaining(), spent()} for token caps, and workflow(nameOrRef) / resolveWorkflow(name) for sub-workflows. Scripts are deterministic for resume (no Date/Math.random/import). Use the Workflow tool on substantive multi-agent tasks.
 
 - Ultracode is on for the session (a system-reminder confirms it) \u2014 see **Ultracode** below.
 
@@ -588089,10 +588174,10 @@ var init_WorkflowTool = __esm(() => {
     async description() {
       const size = getInitialSettings()?.dynamicWorkflowSize ?? "medium";
       const sizeHint = size === "small" ? "When creating a dynamic workflow, prefer a small number of agents (~3)." : size === "large" ? "When creating a dynamic workflow, prefer a large number of agents (~12)." : "When creating a dynamic workflow, prefer a medium number of agents (~6).";
-      return `${DESCRIPTION23} ${sizeHint} (Per the dynamicWorkflowSize setting \u2014 advisory, not a cap.)`;
+      return `${DESCRIPTION22} ${sizeHint} (Per the dynamicWorkflowSize setting \u2014 advisory, not a cap.)`;
     },
     async prompt() {
-      return `${DESCRIPTION23}
+      return `${DESCRIPTION22}
 
 Use this tool to run a workflow script. The script must start with \`export const meta = { name, description, phases }\` and export a default async function: \`export default async ({ agent, parallel, pipeline, phase, log, budget, workflow, resolveWorkflow, args }) => { ... }\`.`;
     },
@@ -624080,7 +624165,7 @@ var init_p_map = __esm(() => {
 });
 
 // src/tools/MCPTool/prompt.ts
-var PROMPT10 = "", DESCRIPTION24 = "";
+var PROMPT10 = "", DESCRIPTION23 = "";
 
 // src/components/design-system/ProgressBar.tsx
 function ProgressBar(t0) {
@@ -624749,7 +624834,7 @@ var init_MCPTool = __esm(() => {
     name: "mcp",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION24;
+      return DESCRIPTION23;
     },
     async prompt() {
       return PROMPT10;
@@ -709120,7 +709205,7 @@ function _temp148(s4) {
 }
 async function handleFastModeShortcut(enable2, getAppState, setAppState) {
   const unavailableReason = getFastModeUnavailableReason();
-  if (unavailableReason) {
+  if (enable2 && unavailableReason) {
     return `Fast mode unavailable: ${unavailableReason}`;
   }
   if (enable2) {
@@ -816520,7 +816605,7 @@ var init_verifyContent = __esm(() => {
 function registerVerifySkill() {
   registerBundledSkill({
     name: "verify",
-    description: DESCRIPTION25,
+    description: DESCRIPTION24,
     userInvocable: true,
     files: SKILL_FILES,
     async getPromptForCommand(args) {
@@ -816536,13 +816621,13 @@ ${args}`);
     }
   });
 }
-var frontmatter, SKILL_BODY, DESCRIPTION25;
+var frontmatter, SKILL_BODY, DESCRIPTION24;
 var init_verify = __esm(() => {
   init_frontmatterParser();
   init_bundledSkills();
   init_verifyContent();
   ({ frontmatter, content: SKILL_BODY } = parseFrontmatter(SKILL_MD));
-  DESCRIPTION25 = typeof frontmatter.description === "string" ? frontmatter.description : "Verify a code change does what it should by running the app.";
+  DESCRIPTION24 = typeof frontmatter.description === "string" ? frontmatter.description : "Verify a code change does what it should by running the app.";
 });
 
 // src/skills/bundled/dream.js
@@ -831528,7 +831613,7 @@ var _FEATURE_ALLOWLIST = new Set([
 var feature2 = (name3) => _FEATURE_ALLOWLIST.has(name3);
 if (typeof globalThis.MACRO === "undefined") {
   globalThis.MACRO = {
-    VERSION: "2.1.270",
+    VERSION: "2.1.272",
     BINARY_NAME: "occ",
     BUILD_TIME: new Date().toISOString(),
     FEEDBACK_CHANNEL: "",

package/package.json

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