@cnwenf/occ 2.1.330 → 2.1.331

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.331","BINARY_NAME":"occ","BUILD_TIME":"2026-09-12T07:54:49.967Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -395528,14 +395528,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 +395565,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 {}
@@ -481765,6 +481770,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 +498536,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 +498562,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 +498652,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 +498686,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 +498750,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 +498834,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 +498857,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 +498893,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
@@ -625728,9 +625813,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();
@@ -647111,10 +647215,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();
@@ -729176,38 +729281,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 +730116,7 @@ __export(exports_hooks2, {
   getTaskCreatedHookMessage: () => getTaskCreatedHookMessage,
   getTaskCompletedHookMessage: () => getTaskCompletedHookMessage,
   getStopHookMessage: () => getStopHookMessage,
+  getSessionEndHooksBudgetMs: () => getSessionEndHooksBudgetMs,
   getSessionEndHookTimeoutMs: () => getSessionEndHookTimeoutMs,
   getPreToolHookBlockingMessage: () => getPreToolHookBlockingMessage,
   getMatchingHooks: () => getMatchingHooks,
@@ -730093,9 +730167,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 +733520,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();

package/package.json

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