@cnwenf/occ 2.1.330 → 2.1.332

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.330","BINARY_NAME":"occ","BUILD_TIME":"2026-09-12T00:55:03.697Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.332","BINARY_NAME":"occ","BUILD_TIME":"2026-09-12T20:24:55.070Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -260734,7 +260734,8 @@ var init_FileReadTool = __esm(() => {
         return {
           result: false,
           message: "File is in a directory that is denied by your permission settings.",
-          errorCode: 1
+          errorCode: 1,
+          deniedByPermissionRule: true
         };
       }
       const isUncPath = fullFilePath.startsWith("\\\\") || fullFilePath.startsWith("//");
@@ -374648,14 +374649,16 @@ var init_FileWriteTool = __esm(() => {
         return {
           result: false,
           message: "File is in a directory that is denied by your permission settings.",
-          errorCode: 1
+          errorCode: 1,
+          deniedByPermissionRule: true
         };
       }
       if (isCoveredByReadDenyRule(fullFilePath, toolPermissionContext)) {
         return {
           result: false,
           message: READ_DENY_WRITE_MESSAGE,
-          errorCode: 13
+          errorCode: 13,
+          deniedByPermissionRule: true
         };
       }
       if (fullFilePath.startsWith("\\\\") || fullFilePath.startsWith("//")) {
@@ -380709,6 +380712,19 @@ var init_sedValidation = __esm(() => {
 // src/tools/BashTool/pathValidation.ts
 import { homedir as homedir22 } from "os";
 import { isAbsolute as isAbsolute21, resolve as resolve30 } from "path";
+function filterTeeDevicePaths(paths2) {
+  return paths2.filter((p4) => !TEE_DEVICE_PATHS.has(p4));
+}
+function canonicalizePathCommandName(cmd) {
+  if (!cmd) {
+    return cmd;
+  }
+  const base2 = cmd.replace(/^.*[\\/]/, "");
+  if (CANONICAL_PATH_COMMAND_BASENAMES.has(base2)) {
+    return base2;
+  }
+  return base2.toLowerCase().replace(/\.exe$/, "") === "tee" ? "tee" : cmd;
+}
 function checkDangerousRemovalPaths(command4, args, cwd2) {
   const extractor = PATH_EXTRACTORS[command4];
   const paths2 = extractor(args);
@@ -380900,7 +380916,8 @@ function validateSinglePathCommand(cmd, cwd2, toolPermissionContext, compoundCom
       message: "Empty command - no paths to validate"
     };
   }
-  const [baseCmd, ...args] = extractedArgs;
+  const [rawBaseCmd, ...args] = extractedArgs;
+  const baseCmd = canonicalizePathCommandName(rawBaseCmd);
   if (!baseCmd || !SUPPORTED_PATH_COMMANDS.includes(baseCmd)) {
     return {
       behavior: "passthrough",
@@ -380919,7 +380936,8 @@ function validateSinglePathCommandArgv(cmd, cwd2, toolPermissionContext, compoun
       message: "Empty command - no paths to validate"
     };
   }
-  const [baseCmd, ...args] = argv;
+  const [rawBaseCmd, ...args] = argv;
+  const baseCmd = canonicalizePathCommandName(rawBaseCmd);
   if (!baseCmd || !SUPPORTED_PATH_COMMANDS.includes(baseCmd)) {
     return {
       behavior: "passthrough",
@@ -381146,7 +381164,7 @@ function stripWrappersFromArgv(argv) {
     }
   }
 }
-var PATH_EXTRACTORS, SUPPORTED_PATH_COMMANDS, ACTION_VERBS, COMMAND_OPERATION_TYPE, COMMAND_VALIDATOR, TIMEOUT_FLAG_VALUE_RE;
+var TEE_DEVICE_PATHS, CANONICAL_PATH_COMMAND_BASENAMES, PATH_EXTRACTORS, SUPPORTED_PATH_COMMANDS, ACTION_VERBS, COMMAND_OPERATION_TYPE, COMMAND_VALIDATOR, TIMEOUT_FLAG_VALUE_RE;
 var init_pathValidation2 = __esm(() => {
   init_commands4();
   init_shellQuote();
@@ -381156,6 +381174,13 @@ var init_pathValidation2 = __esm(() => {
   init_pathValidation();
   init_bashPermissions();
   init_sedValidation();
+  TEE_DEVICE_PATHS = new Set([
+    "/dev/null",
+    "/dev/stdout",
+    "/dev/stderr",
+    "/dev/tty"
+  ]);
+  CANONICAL_PATH_COMMAND_BASENAMES = new Set(["rm", "rmdir", "tee"]);
   PATH_EXTRACTORS = {
     cd: (args) => args.length === 0 ? [homedir22()] : [args.join(" ")],
     ls: (args) => {
@@ -381238,6 +381263,7 @@ var init_pathValidation2 = __esm(() => {
     sha256sum: filterOutFlags,
     sha1sum: filterOutFlags,
     md5sum: filterOutFlags,
+    tee: (args) => filterTeeDevicePaths(filterOutFlags(args)),
     tr: (args) => {
       const hasDelete = args.some((a5) => a5 === "-d" || a5 === "--delete" || a5.startsWith("-") && a5.includes("d"));
       const nonFlags = filterOutFlags(args);
@@ -381428,7 +381454,8 @@ var init_pathValidation2 = __esm(() => {
     jq: "process JSON from files in",
     sha256sum: "compute SHA-256 checksums for files in",
     sha1sum: "compute SHA-1 checksums for files in",
-    md5sum: "compute MD5 checksums for files in"
+    md5sum: "compute MD5 checksums for files in",
+    tee: "write to files in"
   };
   COMMAND_OPERATION_TYPE = {
     cd: "read",
@@ -381466,7 +381493,8 @@ var init_pathValidation2 = __esm(() => {
     jq: "read",
     sha256sum: "read",
     sha1sum: "read",
-    md5sum: "read"
+    md5sum: "read",
+    tee: "write"
   };
   COMMAND_VALIDATOR = {
     mv: (args) => !args.some((arg) => arg?.startsWith("-")),
@@ -381666,7 +381694,7 @@ function extractWritePathsFromSubcommand(subcommand) {
   const tokens = parseResult.tokens.filter((t4) => typeof t4 === "string");
   if (tokens.length === 0)
     return [];
-  const baseCmd = tokens[0];
+  const baseCmd = canonicalizePathCommandName(tokens[0]?.replace(/[\\'"]/g, ""));
   if (!baseCmd)
     return [];
   if (!(baseCmd in COMMAND_OPERATION_TYPE)) {
@@ -395528,14 +395556,19 @@ async function gracefulShutdown(exitCode = 0, reason = "other", options) {
     return;
   }
   shutdownInProgress = true;
-  const { executeSessionEndHooks, getSessionEndHookTimeoutMs } = await Promise.resolve().then(() => (init_hooks5(), exports_hooks2));
+  const {
+    executeSessionEndHooks,
+    getSessionEndHookTimeoutMs,
+    getSessionEndHooksBudgetMs
+  } = await Promise.resolve().then(() => (init_hooks5(), exports_hooks2));
   const sessionEndTimeoutMs = getSessionEndHookTimeoutMs();
+  const sessionEndBudgetMs = getSessionEndHooksBudgetMs();
   failsafeTimer = setTimeout(async (code) => {
     cleanupTerminalModes();
     printResumeHint();
     await drainStdoutBeforeExit(500);
     forceExit(code);
-  }, Math.max(5000, sessionEndTimeoutMs + 3500), exitCode);
+  }, Math.max(5000, sessionEndBudgetMs + 3500), exitCode);
   failsafeTimer.unref();
   process.exitCode = exitCode;
   cleanupTerminalModes();
@@ -395560,7 +395593,7 @@ async function gracefulShutdown(exitCode = 0, reason = "other", options) {
   try {
     await executeSessionEndHooks(reason, {
       ...options,
-      signal: AbortSignal.timeout(sessionEndTimeoutMs),
+      signal: AbortSignal.timeout(sessionEndBudgetMs),
       timeoutMs: sessionEndTimeoutMs
     });
   } catch {}
@@ -451315,7 +451348,8 @@ var init_FileEditTool = __esm(() => {
           result: false,
           behavior: "ask",
           message: "File is in a directory that is denied by your permission settings.",
-          errorCode: 2
+          errorCode: 2,
+          deniedByPermissionRule: true
         };
       }
       if (isCoveredByReadDenyRule(fullFilePath, appState.toolPermissionContext)) {
@@ -451323,7 +451357,8 @@ var init_FileEditTool = __esm(() => {
           result: false,
           behavior: "ask",
           message: READ_DENY_EDIT_MESSAGE,
-          errorCode: 13
+          errorCode: 13,
+          deniedByPermissionRule: true
         };
       }
       if (fullFilePath.startsWith("\\\\") || fullFilePath.startsWith("//")) {
@@ -476316,7 +476351,8 @@ function deserializeMessagesWithInterruptDetection(serializedMessages) {
     const filteredToolUses = filterUnresolvedToolUses(migratedMessages);
     const filteredThinking = filterOrphanedThinkingOnlyMessages(filteredToolUses);
     const filteredMessages = filterWhitespaceOnlyAssistantMessages(filteredThinking);
-    const internalState = detectTurnInterruption(filteredMessages);
+    const droppedUnresolvedToolUses = filteredToolUses.length !== migratedMessages.length;
+    const internalState = applyResumeStalenessGates(detectTurnInterruption(filteredMessages), droppedUnresolvedToolUses ? migratedMessages : filteredMessages);
     let turnInterruptionState;
     if (internalState.kind === "interrupted_turn") {
       const [continuationMessage] = normalizeMessages([
@@ -476377,6 +476413,87 @@ function detectTurnInterruption(messages) {
   }
   return { kind: "none" };
 }
+function getResumeMaxAgeEnvMs() {
+  const raw = process.env[RESUME_MAX_AGE_ENV];
+  if (!raw)
+    return;
+  const n5 = Number(raw);
+  if (n5 === 0)
+    return 0;
+  return Number.isFinite(n5) && n5 > 0 ? n5 : RESUME_INVALID_ENV_MAX_AGE_MS;
+}
+function getResumeMaxAge() {
+  const fromEnv5 = getResumeMaxAgeEnvMs();
+  if (fromEnv5)
+    return { maxAgeMs: fromEnv5, source: "env" };
+  return { maxAgeMs: RESUME_DEFAULT_MAX_AGE_MS, source: "default" };
+}
+function messageTimestampMs(m5) {
+  return Date.parse(typeof m5.timestamp === "string" ? m5.timestamp : "");
+}
+function isResumeTailStaleByEnv(messages) {
+  const maxAge = getResumeMaxAgeEnvMs();
+  if (!maxAge)
+    return false;
+  for (let i6 = messages.length - 1;i6 >= 0; i6--) {
+    const m5 = messages[i6];
+    if (m5.type === "system" || m5.type === "progress")
+      continue;
+    const t4 = messageTimestampMs(m5);
+    if (Number.isFinite(t4))
+      return Date.now() - t4 >= maxAge;
+  }
+  return true;
+}
+function isResumeRowStale(m5, maxAgeMs) {
+  const t4 = messageTimestampMs(m5);
+  return !Number.isFinite(t4) || Math.abs(Date.now() - t4) >= maxAgeMs;
+}
+function newerResumeRow(a5, b5) {
+  if (a5 === undefined || b5 === undefined)
+    return a5 ?? b5;
+  const ra = messageTimestampMs(a5);
+  const rb = messageTimestampMs(b5);
+  if (!Number.isFinite(ra))
+    return a5;
+  if (!Number.isFinite(rb))
+    return b5;
+  return rb > ra ? b5 : a5;
+}
+function findSkippedTailApiErrorRow(messages) {
+  const lastRelevantIdx = messages.findLastIndex((m5) => m5.type !== "system" && m5.type !== "progress" && !(m5.type === "assistant" && m5.isApiErrorMessage));
+  let newest;
+  for (let i6 = lastRelevantIdx + 1;i6 < messages.length; i6++) {
+    const m5 = messages[i6];
+    if (m5.type === "assistant" && m5.isApiErrorMessage) {
+      newest = newerResumeRow(newest, m5);
+    }
+  }
+  return newest;
+}
+function applyResumeStalenessGates(state3, walkMessages) {
+  if (state3.kind === "none")
+    return state3;
+  if (isResumeTailStaleByEnv(walkMessages)) {
+    if (process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN) {
+      logForDebugging(`[conversationRecovery] tengu_resume_stale_turn_suppressed (kind: ${state3.kind})`);
+    }
+    return { kind: "none" };
+  }
+  const apiErrorRow = findSkippedTailApiErrorRow(walkMessages);
+  if (apiErrorRow !== undefined) {
+    const bound = getResumeMaxAge();
+    if (isResumeRowStale(apiErrorRow, bound.maxAgeMs)) {
+      if (process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN) {
+        const t4 = messageTimestampMs(apiErrorRow);
+        const ageMin = Number.isFinite(t4) ? Math.floor((Date.now() - t4) / 60000) : undefined;
+        logForDebugging(`[conversationRecovery] tengu_resume_stale_turn_suppressed (kind: ${state3.kind}, tail: api_error` + (ageMin !== undefined ? `, age_min: ${ageMin}` : "") + `, bound_source: ${bound.source}, bound_min: ${Math.floor(bound.maxAgeMs / 60000)})`);
+      }
+      return { kind: "none" };
+    }
+  }
+  return state3;
+}
 function isTerminalToolResult(result, messages, resultIdx) {
   const content = result.message.content;
   if (!Array.isArray(content))
@@ -476554,7 +476671,7 @@ async function loadConversationForResume(source, sourceJsonlFile) {
     throw error52;
   }
 }
-var BRIEF_TOOL_NAME4, LEGACY_BRIEF_TOOL_NAME2, SEND_USER_FILE_TOOL_NAME3, LOCAL_COMMAND_TAG_KINDS;
+var BRIEF_TOOL_NAME4, LEGACY_BRIEF_TOOL_NAME2, SEND_USER_FILE_TOOL_NAME3, RESUME_MAX_AGE_ENV = "CLAUDE_CODE_RESUME_INTERRUPTED_TURN_MAX_AGE_MS", RESUME_DEFAULT_MAX_AGE_MS = 21600000, RESUME_INVALID_ENV_MAX_AGE_MS = 3600000, LOCAL_COMMAND_TAG_KINDS;
 var init_conversationRecovery = __esm(() => {
   init_featureFlags();
   init_cwd2();
@@ -476565,6 +476682,7 @@ var init_conversationRecovery = __esm(() => {
   init_attachments2();
   init_fileHistory();
   init_log3();
+  init_debug();
   init_messages3();
   init_plans();
   init_sessionStart();
@@ -481765,6 +481883,38 @@ var init_UI10 = __esm(() => {
   jsx_runtime137 = __toESM(require_jsx_runtime(), 1);
 });
 
+// src/utils/combinedAbortSignal.ts
+function createCombinedAbortSignal(signal, opts) {
+  const { signalB, timeoutMs } = opts ?? {};
+  const combined = createAbortController();
+  if (signal?.aborted || signalB?.aborted) {
+    combined.abort();
+    return { signal: combined.signal, cleanup: () => {} };
+  }
+  let timer;
+  const abortCombined = () => {
+    if (timer !== undefined)
+      clearTimeout(timer);
+    combined.abort();
+  };
+  if (timeoutMs !== undefined) {
+    timer = setTimeout(abortCombined, timeoutMs);
+    timer.unref?.();
+  }
+  signal?.addEventListener("abort", abortCombined);
+  signalB?.addEventListener("abort", abortCombined);
+  const cleanup = () => {
+    if (timer !== undefined)
+      clearTimeout(timer);
+    signal?.removeEventListener("abort", abortCombined);
+    signalB?.removeEventListener("abort", abortCombined);
+  };
+  return { signal: combined.signal, cleanup };
+}
+var init_combinedAbortSignal = __esm(() => {
+  init_abortController();
+});
+
 // src/utils/mcpOutputStorage.ts
 import { writeFile as writeFile27 } from "fs/promises";
 import { join as join100 } from "path";
@@ -498499,11 +498649,13 @@ __export(exports_utils2, {
   isPermittedRedirect: () => isPermittedRedirect,
   invalidUrlErrorMessage: () => invalidUrlErrorMessage,
   getWithPermittedRedirects: () => getWithPermittedRedirects,
+  getWebFetchDeadlineMs: () => getWebFetchDeadlineMs,
   getURLMarkdownContent: () => getURLMarkdownContent,
   getTurndownService: () => getTurndownService,
   clearWebFetchCache: () => clearWebFetchCache,
   checkDomainBlocklist: () => checkDomainBlocklist,
   applyPromptToMarkdown: () => applyPromptToMarkdown,
+  WebFetchTransportError: () => WebFetchTransportError,
   MAX_MARKDOWN_LENGTH: () => MAX_MARKDOWN_LENGTH
 });
 function clearWebFetchCache() {
@@ -498523,6 +498675,13 @@ function getTurndownService() {
     return service;
   });
 }
+function getWebFetchDeadlineMs() {
+  const fromEnv5 = parseEnvInt(process.env.CLAUDE_CODE_WEBFETCH_DEADLINE_MS);
+  if (fromEnv5 !== undefined) {
+    return Math.min(fromEnv5, MAX_DEADLINE_MS);
+  }
+  return WEBFETCH_DEADLINE_MS_DEFAULT;
+}
 function isPreapprovedUrl(url3) {
   try {
     const parsedUrl = new URL(url3);
@@ -498606,13 +498765,30 @@ function isPermittedRedirect(originalUrl, redirectUrl) {
     return false;
   }
 }
-async function getWithPermittedRedirects(url3, signal, redirectChecker, depth = 0) {
+async function getWithPermittedRedirects(url3, signal, redirectChecker, depth = 0, deadlineSignal) {
+  if (deadlineSignal !== undefined) {
+    return fetchWithRedirectChain(url3, signal, redirectChecker, depth, deadlineSignal);
+  }
+  const deadlineMs = getWebFetchDeadlineMs();
+  if (deadlineMs === 0) {
+    return fetchWithRedirectChain(url3, signal, redirectChecker, depth, new AbortController().signal);
+  }
+  const deadline = createCombinedAbortSignal(undefined, {
+    timeoutMs: deadlineMs
+  });
+  try {
+    return await fetchWithRedirectChain(url3, signal, redirectChecker, depth, deadline.signal);
+  } finally {
+    deadline.cleanup();
+  }
+}
+async function fetchWithRedirectChain(url3, signal, redirectChecker, depth, deadlineSignal) {
   if (depth > MAX_REDIRECTS) {
     throw new Error(`Too many redirects (exceeded ${MAX_REDIRECTS})`);
   }
   try {
     return await axios_default.get(url3, {
-      signal,
+      signal: AbortSignal.any([signal, deadlineSignal]),
       timeout: FETCH_TIMEOUT_MS3,
       maxRedirects: 0,
       responseType: "arraybuffer",
@@ -498623,14 +498799,17 @@ async function getWithPermittedRedirects(url3, signal, redirectChecker, depth =
       }
     });
   } catch (error52) {
-    if (axios_default.isAxiosError(error52) && error52.response && [301, 302, 307, 308].includes(error52.response.status)) {
+    if (axios_default.isCancel(error52) && deadlineSignal.aborted && !signal.aborted) {
+      throw new WebFetchTransportError(`Fetch did not complete within the ${getWebFetchDeadlineMs() / 1000}s deadline`, "EDEADLINE");
+    }
+    if (axios_default.isAxiosError(error52) && error52.response && REDIRECT_STATUS_CODES.has(error52.response.status)) {
       const redirectLocation = error52.response.headers.location;
       if (!redirectLocation) {
         throw new Error("Redirect missing Location header");
       }
       const redirectUrl = new URL(redirectLocation, url3).toString();
       if (redirectChecker(url3, redirectUrl)) {
-        return getWithPermittedRedirects(redirectUrl, signal, redirectChecker, depth + 1);
+        return fetchWithRedirectChain(redirectUrl, signal, redirectChecker, depth + 1, deadlineSignal);
       } else {
         return {
           type: "redirect",
@@ -498684,7 +498863,7 @@ async function getURLMarkdownContent(url3, abortController) {
         case "blocked":
           throw new DomainBlockedError(hostname4);
         case "check_failed":
-          throw new DomainCheckFailedError(hostname4);
+          throw new DomainCheckFailedError(hostname4, axios_default.isCancel(checkResult.error) ? "EDEADLINE_PREFLIGHT" : undefined);
       }
     }
     if (process.env.USER_TYPE === "ant") {
@@ -498768,12 +498947,14 @@ async function applyPromptToMarkdown(prompt, markdownContent, signal, isNonInter
   }
   return "No response from model";
 }
-var DomainBlockedError, DomainCheckFailedError, EgressBlockedError, MAX_CACHE_SIZE_BYTES, URL_CACHE, DOMAIN_CHECK_CACHE, turndownServicePromise, MAX_URL_LENGTH = 2000, MAX_HTTP_CONTENT_LENGTH = 10485760, FETCH_TIMEOUT_MS3 = 60000, DOMAIN_CHECK_TIMEOUT_MS = 1e4, MAX_REDIRECTS = 10, MAX_MARKDOWN_LENGTH = 1e5;
+var DomainBlockedError, DomainCheckFailedError, WebFetchTransportError, EgressBlockedError, MAX_CACHE_SIZE_BYTES, URL_CACHE, DOMAIN_CHECK_CACHE, turndownServicePromise, MAX_URL_LENGTH = 2000, MAX_HTTP_CONTENT_LENGTH = 10485760, FETCH_TIMEOUT_MS3 = 60000, DOMAIN_CHECK_TIMEOUT_MS = 1e4, MAX_REDIRECTS = 10, REDIRECT_STATUS_CODES, WEBFETCH_DEADLINE_MS_DEFAULT = 300000, MAX_DEADLINE_MS = 2147483647, MAX_MARKDOWN_LENGTH = 1e5;
 var init_utils12 = __esm(() => {
   init_axios2();
   init_index_min();
   init_analytics();
   init_claude();
+  init_combinedAbortSignal();
+  init_envValidation();
   init_errors();
   init_http4();
   init_log3();
@@ -498789,9 +498970,19 @@ var init_utils12 = __esm(() => {
     }
   };
   DomainCheckFailedError = class DomainCheckFailedError extends Error {
-    constructor(domain2) {
+    code;
+    constructor(domain2, code) {
       super(`Unable to verify if domain ${domain2} is safe to fetch. This may be due to network restrictions or enterprise security policies blocking claude.ai.`);
       this.name = "DomainCheckFailedError";
+      this.code = code;
+    }
+  };
+  WebFetchTransportError = class WebFetchTransportError extends Error {
+    code;
+    constructor(message, code) {
+      super(message);
+      this.name = "WebFetchTransportError";
+      this.code = code;
     }
   };
   EgressBlockedError = class EgressBlockedError extends Error {
@@ -498815,6 +499006,13 @@ var init_utils12 = __esm(() => {
     max: 128,
     ttl: 5 * 60 * 1000
   });
+  REDIRECT_STATUS_CODES = new Set([
+    301,
+    302,
+    303,
+    307,
+    308
+  ]);
 });
 
 // src/tools/WebFetchTool/WebFetchTool.ts
@@ -561594,18 +561792,18 @@ function parseFolderPath(folderPath) {
   }
   return { platform: platform5, buildId };
 }
-var import_debug178, debugCache;
+var import_debug179, debugCache;
 var init_Cache = __esm(() => {
   init_browser_data();
   init_detectPlatform();
-  import_debug178 = __toESM(require_src(), 1);
-  debugCache = import_debug178.default("puppeteer:browsers:cache");
+  import_debug179 = __toESM(require_src(), 1);
+  debugCache = import_debug179.default("puppeteer:browsers:cache");
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/debug.js
-var import_debug179;
+var import_debug180;
 var init_debug3 = __esm(() => {
-  import_debug179 = __toESM(require_src(), 1);
+  import_debug180 = __toESM(require_src(), 1);
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/launch.js
@@ -561924,7 +562122,7 @@ var init_launch = __esm(() => {
   init_Cache();
   init_debug3();
   init_detectPlatform();
-  debugLaunch = import_debug179.default("puppeteer:browsers:launcher");
+  debugLaunch = import_debug180.default("puppeteer:browsers:launcher");
   CDP_WEBSOCKET_ENDPOINT_REGEX = /^DevTools listening on (ws:\/\/.*)$/;
   WEBDRIVER_BIDI_WEBSOCKET_ENDPOINT_REGEX = /^WebDriver BiDi listening on (ws:\/\/.*)$/;
   processListeners = new Map;
@@ -567008,10 +567206,10 @@ async function installDMG(dmgPath, folderPath) {
     spawnSync4("hdiutil", ["detach", mountPath, "-quiet"]);
   }
 }
-var import_debug181, debugFileUtil, internalConstantsForTesting;
+var import_debug182, debugFileUtil, internalConstantsForTesting;
 var init_fileUtil = __esm(() => {
-  import_debug181 = __toESM(require_src(), 1);
-  debugFileUtil = import_debug181.default("puppeteer:browsers:fileUtil");
+  import_debug182 = __toESM(require_src(), 1);
+  debugFileUtil = import_debug182.default("puppeteer:browsers:fileUtil");
   internalConstantsForTesting = {
     xz: "xz",
     bzip2: "bzip2"
@@ -567304,7 +567502,7 @@ var init_install = __esm(() => {
   init_fileUtil();
   init_httpUtil();
   import_progress = __toESM(require_node_progress(), 1);
-  debugInstall = import_debug179.default("puppeteer:browsers:install");
+  debugInstall = import_debug180.default("puppeteer:browsers:install");
   times = new Map;
 });
 
@@ -573579,7 +573777,7 @@ import fs23 from "fs";
 import os16 from "os";
 import { dirname as dirname45 } from "path";
 import { PassThrough as PassThrough4 } from "stream";
-var import_debug183, __runInitializers23 = function(thisArg, initializers, value) {
+var import_debug184, __runInitializers23 = function(thisArg, initializers, value) {
   var useValue = arguments.length > 2;
   for (var i6 = 0;i6 < initializers.length; i6++) {
     value = useValue ? initializers[i6].call(thisArg, value) : initializers[i6].call(thisArg);
@@ -573639,8 +573837,8 @@ var init_ScreenRecorder = __esm(() => {
   init_util6();
   init_decorators();
   init_disposable();
-  import_debug183 = __toESM(require_src(), 1);
-  debugFfmpeg = import_debug183.default("puppeteer:ffmpeg");
+  import_debug184 = __toESM(require_src(), 1);
+  debugFfmpeg = import_debug184.default("puppeteer:ffmpeg");
   ScreenRecorder = (() => {
     let _classSuper = PassThrough4;
     let _instanceExtraInitializers = [];
@@ -581311,12 +581509,13 @@ async function fetchAndCacheGatewayModels() {
   }
   const baseUrl = process.env.ANTHROPIC_BASE_URL.replace(/\/+$/, "");
   const url3 = `${baseUrl}/v1/models?limit=1000`;
+  const timeoutMs = Number(process.env[DISCOVERY_TIMEOUT_ENV] ?? DEFAULT_DISCOVERY_TIMEOUT_MS);
   try {
     const response3 = await fetch(url3, {
       method: "GET",
       headers: buildHeaders5(),
       redirect: "error",
-      signal: AbortSignal.timeout(5000)
+      signal: AbortSignal.timeout(timeoutMs)
     });
     if (!response3.ok) {
       logForDebugging(`[Bootstrap] Gateway /v1/models fetch failed: HTTP ${response3.status}`);
@@ -581340,7 +581539,7 @@ async function fetchAndCacheGatewayModels() {
     logForDebugging(`[Bootstrap] Gateway /v1/models fetch failed: ${error52 instanceof Error ? error52.message : "unknown"}`);
   }
 }
-var GatewayModelSchema, GatewayModelsResponseSchema, GatewayCacheSchema;
+var GatewayModelSchema, GatewayModelsResponseSchema, GatewayCacheSchema, DEFAULT_DISCOVERY_TIMEOUT_MS = 3000, DISCOVERY_TIMEOUT_ENV = "CLAUDE_CODE_GATEWAY_MODEL_DISCOVERY_TIMEOUT_MS";
 var init_gatewayModelDiscovery = __esm(() => {
   init_v4();
   init_auth6();
@@ -586492,6 +586691,37 @@ var init_prefixStagger = __esm(() => {
 });
 
 // src/tools/WorkflowTool/primitives.ts
+import { availableParallelism } from "os";
+function parseConcurrencyEnv(raw) {
+  if (raw === undefined) {
+    return;
+  }
+  if (!/^[+-]?\d+$/.test(raw.trim())) {
+    return;
+  }
+  const n5 = Number(raw.trim());
+  if (!Number.isFinite(n5)) {
+    return;
+  }
+  if (n5 < 1) {
+    return;
+  }
+  if (n5 > 256) {
+    return;
+  }
+  return n5;
+}
+function getDefaultWorkflowConcurrency() {
+  return Math.min(16, Math.max(2, availableParallelism() - 2));
+}
+function resolveWorkflowConcurrency() {
+  const fromEnv5 = parseConcurrencyEnv(process.env[WORKFLOW_CONCURRENCY_ENV]);
+  const gate = fromEnv5 ?? getDefaultWorkflowConcurrency();
+  if (fromEnv5 !== undefined) {
+    logForDebugging(`workflow: concurrent agent gate = ${gate} (CLAUDE_CODE_WORKFLOW_MAX_CONCURRENT_AGENTS)`);
+  }
+  return gate;
+}
 function workflowAgentTelemetryAttributes(runId, workflowName) {
   return {
     "workflow.run_id": runId,
@@ -586623,7 +586853,7 @@ function extractToolUseStats(messages) {
   return { toolUseCount, recentActivities: capped, lastActivity };
 }
 function createPrimitives(ctx) {
-  const concurrency = ctx.tokenBudget && ctx.tokenBudget > 0 ? Math.max(1, Math.floor(ctx.tokenBudget / 1e5)) : WORKFLOW_DEFAULT_CONCURRENCY;
+  const concurrency = resolveWorkflowConcurrency();
   const agent = async (prompt, opts = {}) => {
     if (!prompt || typeof prompt !== "string") {
       throw new Error("agent() requires a non-empty string prompt");
@@ -587027,7 +587257,7 @@ function buildPrimitivesObject(ctx) {
     resolveWorkflow: p4.resolveWorkflow
   };
 }
-var WORKFLOW_AGENT_LIFETIME_CAP = 1000, WORKFLOW_PARALLEL_MAX_ITEMS = 4096, WORKFLOW_DEFAULT_CONCURRENCY = 10;
+var WORKFLOW_AGENT_LIFETIME_CAP = 1000, WORKFLOW_PARALLEL_MAX_ITEMS = 4096, WORKFLOW_CONCURRENCY_ENV = "CLAUDE_CODE_WORKFLOW_MAX_CONCURRENT_AGENTS";
 var init_primitives = __esm(() => {
   init_runAgent();
   init_generalPurposeAgent();
@@ -595690,6 +595920,11 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input2, toolUseConte
       },
       ...mcpToolDetailsForAnalytics(tool.name, mcpServerType, mcpServerBaseUrl)
     });
+    if (isValidCall.deniedByPermissionRule) {
+      const observableInput = { ...parsedInput.data };
+      tool.backfillObservableInput?.(observableInput);
+      toolUseContext.onPermissionDenial?.(tool, toolUseID, observableInput);
+    }
     return [
       {
         message: createUserMessage({
@@ -606897,6 +607132,8 @@ function runPostCompactCleanup(querySource) {
   if (isMainThreadCompact) {
     getUserContext.cache.clear?.();
     resetGetMemoryFilesCache("compact");
+    getSystemContext.cache.clear?.();
+    getGitStatus.cache.clear?.();
   }
   clearSystemPromptSections();
   clearClassifierApprovals();
@@ -625728,9 +625965,28 @@ async function findAvailablePort() {
     });
     return REDIRECT_PORT_FALLBACK;
   } catch {
+    const ephemeralPort = await tryAssignEphemeralPort();
+    if (ephemeralPort !== undefined) {
+      return ephemeralPort;
+    }
     throw new Error(`No available ports for OAuth redirect`);
   }
 }
+async function tryAssignEphemeralPort() {
+  try {
+    return await new Promise((resolve53) => {
+      const testServer = createServer4();
+      testServer.once("error", () => resolve53(undefined));
+      testServer.listen(0, "127.0.0.1", () => {
+        const address = testServer.address();
+        const port2 = typeof address === "object" && address !== null ? address.port : undefined;
+        testServer.close(() => resolve53(port2));
+      });
+    });
+  } catch {
+    return;
+  }
+}
 var REDIRECT_PORT_RANGE, REDIRECT_PORT_FALLBACK = 3118;
 var init_oauthPort = __esm(() => {
   init_platform2();
@@ -644967,6 +645223,9 @@ var init_ScrollBox = __esm(() => {
 });
 
 // src/utils/sideQuestion.ts
+function containsFakeToolCalls(text2) {
+  return BTW_FAKE_TOOLCALL_DETECTOR.test(text2);
+}
 function findBtwTriggerPositions(text2) {
   const positions = [];
   const matches = text2.matchAll(BTW_PATTERN);
@@ -644995,6 +645254,7 @@ IMPORTANT CONTEXT:
 
 CRITICAL CONSTRAINTS:
 - You have NO tools available - you cannot read files, run commands, search, or take any actions
+- Do NOT write tool calls or tool output as text (for example invoke or function_calls XML blocks) - nothing you write here is executed; if answering would need reading files, running commands, or searching, say that can't be checked from a side question and suggest asking in the main conversation
 - This is a one-off response - there will be no follow-up turns
 - You can ONLY provide information based on what you already know from the conversation context
 - NEVER say things like "Let me try...", "I'll now...", "Let me check...", or promise to take any action
@@ -645027,8 +645287,11 @@ function extractSideQuestionResponse(messages) {
     const text2 = extractTextContent(assistantBlocks, `
 
 `).trim();
-    if (text2)
-      return text2;
+    if (text2) {
+      return containsFakeToolCalls(text2) ? `${text2}
+
+${BTW_TOOLCALL_DISCLAIMER}` : text2;
+    }
     const toolUse = assistantBlocks.find((b6) => b6.type === "tool_use");
     if (toolUse) {
       const toolName = "name" in toolUse ? toolUse.name : "a tool";
@@ -645041,12 +645304,13 @@ function extractSideQuestionResponse(messages) {
   }
   return null;
 }
-var BTW_PATTERN;
+var BTW_PATTERN, BTW_TOOL_CALL_PREFIX = "antml:", BTW_FAKE_TOOLCALL_DETECTOR, BTW_TOOLCALL_DISCLAIMER = "_/btw can't run tools: any tool calls or tool output shown above were not executed and may not reflect your actual files or data. Ask in the main conversation to check._";
 var init_sideQuestion = __esm(() => {
   init_errorUtils();
   init_forkedAgent();
   init_messages3();
   BTW_PATTERN = /^\/btw\b/gi;
+  BTW_FAKE_TOOLCALL_DETECTOR = new RegExp(`<(?:${BTW_TOOL_CALL_PREFIX})?(?:function_calls>|invoke name=)|</(?:${BTW_TOOL_CALL_PREFIX})?(?:function_calls|invoke)>`);
 });
 
 // src/commands/btw/btw.tsx
@@ -647111,10 +647375,11 @@ async function clearConversation({
   setConversationId
 }) {
   const sessionEndTimeoutMs = getSessionEndHookTimeoutMs();
+  const sessionEndBudgetMs = getSessionEndHooksBudgetMs();
   await executeSessionEndHooks("clear", {
     getAppState,
     setAppState,
-    signal: AbortSignal.timeout(sessionEndTimeoutMs),
+    signal: AbortSignal.timeout(sessionEndBudgetMs),
     timeoutMs: sessionEndTimeoutMs
   });
   const lastRequestId = getLastMainRequestId();
@@ -704074,6 +704339,7 @@ var init_cd2 = __esm(() => {
 var exports_focus = {};
 __export(exports_focus, {
   setFocusViewEnabled: () => setFocusViewEnabled,
+  isFullscreenActive: () => isFullscreenActive2,
   isFocusViewEnabled: () => isFocusViewEnabled,
   call: () => call46
 });
@@ -729176,38 +729442,6 @@ var init_hooks4 = __esm(() => {
   });
 });
 
-// src/utils/combinedAbortSignal.ts
-function createCombinedAbortSignal(signal, opts) {
-  const { signalB, timeoutMs } = opts ?? {};
-  const combined = createAbortController();
-  if (signal?.aborted || signalB?.aborted) {
-    combined.abort();
-    return { signal: combined.signal, cleanup: () => {} };
-  }
-  let timer2;
-  const abortCombined = () => {
-    if (timer2 !== undefined)
-      clearTimeout(timer2);
-    combined.abort();
-  };
-  if (timeoutMs !== undefined) {
-    timer2 = setTimeout(abortCombined, timeoutMs);
-    timer2.unref?.();
-  }
-  signal?.addEventListener("abort", abortCombined);
-  signalB?.addEventListener("abort", abortCombined);
-  const cleanup2 = () => {
-    if (timer2 !== undefined)
-      clearTimeout(timer2);
-    signal?.removeEventListener("abort", abortCombined);
-    signalB?.removeEventListener("abort", abortCombined);
-  };
-  return { signal: combined.signal, cleanup: cleanup2 };
-}
-var init_combinedAbortSignal = __esm(() => {
-  init_abortController();
-});
-
 // src/utils/hooks/hookHelpers.ts
 function addArgumentsToPrompt(prompt, jsonInput) {
   return substituteArguments(prompt, jsonInput);
@@ -730043,6 +730277,7 @@ __export(exports_hooks2, {
   getTaskCreatedHookMessage: () => getTaskCreatedHookMessage,
   getTaskCompletedHookMessage: () => getTaskCompletedHookMessage,
   getStopHookMessage: () => getStopHookMessage,
+  getSessionEndHooksBudgetMs: () => getSessionEndHooksBudgetMs,
   getSessionEndHookTimeoutMs: () => getSessionEndHookTimeoutMs,
   getPreToolHookBlockingMessage: () => getPreToolHookBlockingMessage,
   getMatchingHooks: () => getMatchingHooks,
@@ -730093,9 +730328,28 @@ function hookCallbackTimeoutMessage(hookName, timeoutMs) {
   return `${hookName} hook callback timed out after ${timeoutMs}ms`;
 }
 function getSessionEndHookTimeoutMs() {
-  const raw = process.env.CLAUDE_CODE_SESSIONEND_HOOKS_TIMEOUT_MS;
-  const parsed = raw ? parseEnvInt(raw) : NaN;
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : SESSION_END_HOOK_TIMEOUT_MS_DEFAULT;
+  const parsed = parseEnvInt(process.env.CLAUDE_CODE_SESSIONEND_HOOKS_TIMEOUT_MS);
+  return parsed ?? SESSION_END_HOOK_TIMEOUT_MS_DEFAULT;
+}
+function getSessionEndHooksBudgetMs() {
+  const fromEnv5 = parseEnvInt(process.env.CLAUDE_CODE_SESSIONEND_HOOKS_TIMEOUT_MS);
+  if (fromEnv5 !== undefined) {
+    return fromEnv5;
+  }
+  let maxHookTimeoutMs = 0;
+  try {
+    for (const matcher of getHooksConfigFromSnapshot()?.SessionEnd ?? []) {
+      for (const hook of matcher.hooks ?? []) {
+        const timeoutSec = hook.timeout;
+        if (timeoutSec && timeoutSec * 1000 > maxHookTimeoutMs) {
+          maxHookTimeoutMs = timeoutSec * 1000;
+        }
+      }
+    }
+  } catch (e4) {
+    logError2(e4);
+  }
+  return Math.max(SESSION_END_HOOK_TIMEOUT_MS_DEFAULT, Math.min(maxHookTimeoutMs, SESSION_END_HOOKS_BUDGET_MS_MAX));
 }
 function executeInBackground({
   processId,
@@ -733427,7 +733681,7 @@ async function* executeMessageDisplayHooks(display, getAppState, agentId, signal
     timeoutMs
   });
 }
-var TOOL_HOOK_EXECUTION_TIMEOUT_MS, PRE_TOOL_USE_HOOK_TIMEOUT_MESSAGE = "PreToolUse hook did not respond before its timeout (host client may be unreachable). The tool call was not executed; other configured hooks may not have completed.", SESSION_END_HOOK_TIMEOUT_MS_DEFAULT = 1500, BACKGROUND_TASK_TYPE_LABELS, HOOK_STRING_CAP = 1000, HOOK_JSON_VALIDATION_ERROR_PREFIX = "Hook JSON output validation failed \u2014 ", HOOK_JSON_DISCRIMINATOR_KEYS, MISSING_SCRIPT_HOOK_EVENTS, MATCHER_COMMA_HYPHEN_EVENTS;
+var TOOL_HOOK_EXECUTION_TIMEOUT_MS, PRE_TOOL_USE_HOOK_TIMEOUT_MESSAGE = "PreToolUse hook did not respond before its timeout (host client may be unreachable). The tool call was not executed; other configured hooks may not have completed.", SESSION_END_HOOK_TIMEOUT_MS_DEFAULT = 1500, SESSION_END_HOOKS_BUDGET_MS_MAX = 60000, BACKGROUND_TASK_TYPE_LABELS, HOOK_STRING_CAP = 1000, HOOK_JSON_VALIDATION_ERROR_PREFIX = "Hook JSON output validation failed \u2014 ", HOOK_JSON_DISCRIMINATOR_KEYS, MISSING_SCRIPT_HOOK_EVENTS, MATCHER_COMMA_HYPHEN_EVENTS;
 var init_hooks5 = __esm(() => {
   init_file();
   init_envValidation();
@@ -796852,6 +797106,7 @@ var init_tipRegistry = __esm(() => {
   init_fileHistory();
   init_settings2();
   init_terminalSetup();
+  init_focus2();
   init_DesktopUpsellStartup();
   init_color();
   init_OverageCreditUpsell();
@@ -797328,6 +797583,12 @@ ${blue2(`/plugin install vercel@${OFFICIAL_MARKETPLACE_NAME}`)}`;
         const config8 = getGlobalConfig();
         return config8.numStartups > 5;
       }
+    },
+    {
+      id: "focus-view",
+      content: async () => "Use /focus to see just your prompt, a one-line summary of the work, and the response",
+      cooldownSessions: 15,
+      isRelevant: async () => isFullscreenActive2() && getSettings_DEPRECATED().viewMode === undefined && !isFocusViewEnabled()
     }
   ];
   internalOnlyTips = process.env.USER_TYPE === "ant" ? [
@@ -819385,6 +819646,14 @@ class QueryEngine {
       updateFileHistoryState: processUserInputContext.updateFileHistoryState,
       updateAttributionState: processUserInputContext.updateAttributionState,
       setSDKStatus,
+      onPermissionDenial: (tool, toolUseId, input2) => {
+        this.permissionDenials.push({
+          type: "permission_denial",
+          tool_name: sdkCompatToolName(tool.name),
+          tool_use_id: toolUseId,
+          tool_input: input2
+        });
+      },
       taskRegistry: getHeadlessTaskRegistry()
     };
     headlessProfilerCheckpoint("before_skills_plugins");

package/package.json

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