@cnwenf/occ 2.1.296 → 2.1.297

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.296","BINARY_NAME":"occ","BUILD_TIME":"2026-08-07T09:27:10.873Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.297","BINARY_NAME":"occ","BUILD_TIME":"2026-08-07T19:33:55.492Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -1940,18 +1940,8 @@ function createSignal() {
 
 // src/utils/taskRegistry.ts
 class TaskRegistryImpl {
-  totalAgentSpawns = 0;
   webSearchCalls = 0;
   runningSubagents = 0;
-  getTotalAgentSpawns() {
-    return this.totalAgentSpawns;
-  }
-  incrementTotalAgentSpawns() {
-    this.totalAgentSpawns += 1;
-  }
-  resetTotalAgentSpawns() {
-    this.totalAgentSpawns = 0;
-  }
   getWebSearchCalls() {
     return this.webSearchCalls;
   }
@@ -1981,11 +1971,6 @@ function getNoopTaskRegistry() {
 var noopRegistry;
 var init_taskRegistry = __esm(() => {
   noopRegistry = {
-    getTotalAgentSpawns() {
-      return 0;
-    },
-    incrementTotalAgentSpawns() {},
-    resetTotalAgentSpawns() {},
     getWebSearchCalls() {
       return 0;
     },
@@ -51874,6 +51859,51 @@ function extractLastJsonStringField(text, key) {
   }
   return lastValue;
 }
+function extractLastTypedLineField(text, type, field) {
+  const typeMarker = `"type":"${type}"`;
+  const fieldMarker = `"${field}":`;
+  let end = text.length;
+  while (end > 0) {
+    const lineStart = text.lastIndexOf(`
+`, end - 1);
+    const line = text.slice(lineStart + 1, end);
+    end = lineStart;
+    if (line.includes(typeMarker) && line.includes(fieldMarker)) {
+      try {
+        const parsed = JSON.parse(line);
+        if (typeof parsed === "object" && parsed !== null && parsed.type === type) {
+          const value = parsed[field];
+          if (typeof value === "string")
+            return value;
+        }
+      } catch {}
+    }
+    if (lineStart < 0)
+      break;
+  }
+  return;
+}
+function extractFirstLineField(text, field) {
+  const fieldMarker = `"${field}":`;
+  let start = 0;
+  while (start < text.length) {
+    const lineEnd = text.indexOf(`
+`, start);
+    const line = lineEnd < 0 ? text.slice(start) : text.slice(start, lineEnd);
+    start = lineEnd < 0 ? text.length : lineEnd + 1;
+    if (line.includes(fieldMarker)) {
+      try {
+        const parsed = JSON.parse(line);
+        if (typeof parsed === "object" && parsed !== null) {
+          const value = parsed[field];
+          if (typeof value === "string")
+            return value;
+        }
+      } catch {}
+    }
+  }
+  return;
+}
 async function readHeadAndTail(filePath, fileSize, buf) {
   try {
     const fh = await fsOpen(filePath, "r");
@@ -51896,7 +51926,31 @@ async function readHeadAndTail(filePath, fileSize, buf) {
     return { head: "", tail: "" };
   }
 }
-function simpleHash(str) {
+async function readSessionLite(filePath) {
+  try {
+    const fh = await fsOpen(filePath, "r");
+    try {
+      const stat2 = await fh.stat();
+      const buf = Buffer.allocUnsafe(LITE_READ_BUF_SIZE);
+      const headResult = await fh.read(buf, 0, LITE_READ_BUF_SIZE, 0);
+      if (headResult.bytesRead === 0)
+        return null;
+      const head = buf.toString("utf8", 0, headResult.bytesRead);
+      const tailOffset = Math.max(0, stat2.size - LITE_READ_BUF_SIZE);
+      let tail = head;
+      if (tailOffset > 0) {
+        const tailResult = await fh.read(buf, 0, LITE_READ_BUF_SIZE, tailOffset);
+        tail = buf.toString("utf8", 0, tailResult.bytesRead);
+      }
+      return { mtime: stat2.mtime.getTime(), size: stat2.size, head, tail };
+    } finally {
+      await fh.close();
+    }
+  } catch {
+    return null;
+  }
+}
+function pathHashSuffix(str) {
   return Math.abs(djb2Hash(str)).toString(36);
 }
 function sanitizePath2(name) {
@@ -51904,12 +51958,35 @@ function sanitizePath2(name) {
   if (sanitized.length <= MAX_SANITIZED_LENGTH2) {
     return sanitized;
   }
-  const hash3 = typeof Bun !== "undefined" ? Bun.hash(name).toString(36) : simpleHash(name);
-  return `${sanitized.slice(0, MAX_SANITIZED_LENGTH2)}-${hash3}`;
+  return `${sanitized.slice(0, MAX_SANITIZED_LENGTH2)}-${pathHashSuffix(name)}`;
 }
 function getProjectsDir() {
   return join9(getClaudeConfigHomeDir(), "projects");
 }
+async function dirMatchesProjectPath(dir, projectPath, caseInsensitive = false) {
+  const want = projectPath.replace(/[^a-zA-Z0-9]/g, "-");
+  let dirents;
+  try {
+    dirents = await readdir2(dir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  for (const entry of dirents) {
+    if (!entry.isFile() || !entry.name.endsWith(".jsonl"))
+      continue;
+    const lite = await readSessionLite(join9(dir, entry.name));
+    if (lite === null)
+      continue;
+    const recordedCwd = extractLastTypedLineField(lite.tail, "relocated", "relocatedCwd") ?? extractFirstLineField(lite.head, "cwd");
+    if (recordedCwd === undefined)
+      continue;
+    const candidate = recordedCwd.replace(/[^a-zA-Z0-9]/g, "-");
+    if (caseInsensitive ? candidate.toLowerCase() === want.toLowerCase() : candidate === want) {
+      return true;
+    }
+  }
+  return false;
+}
 function compactBoundaryMarker() {
   return _compactBoundaryMarker ??= Buffer.from('"compact_boundary"');
 }
@@ -96034,7 +96111,12 @@ var init_dist_es21 = __esm(() => {
 });
 
 // src/utils/model/bedrock.ts
-function findFirstMatch(profiles, substring) {
+function findFirstMatch(profiles, substring, preferredPrefix) {
+  if (preferredPrefix) {
+    const preferred = profiles.find((p3) => p3.startsWith(`${preferredPrefix}.`) && p3.includes(substring));
+    if (preferred)
+      return preferred;
+  }
   return profiles.find((p3) => p3.includes(substring)) ?? null;
 }
 async function createBedrockClient() {
@@ -96137,7 +96219,28 @@ function applyBedrockRegionPrefix(modelId, prefix) {
   }
   return modelId;
 }
-var getBedrockInferenceProfiles, getInferenceProfileBackingModel, BEDROCK_REGION_PREFIXES;
+function deriveBedrockRegionPrefixFromRegion(region) {
+  const r3 = region ?? "";
+  if (r3.startsWith("us-gov-"))
+    return "us-gov";
+  if (r3.startsWith("us-"))
+    return "us";
+  if (r3.startsWith("eu-"))
+    return "eu";
+  if (r3.startsWith("ap-"))
+    return "apac";
+  return "global";
+}
+function getEffectiveBedrockRegionPrefix(region) {
+  if (region?.startsWith("us-gov-"))
+    return "us-gov";
+  const envValue = process.env.ANTHROPIC_BEDROCK_REGION_PREFIX;
+  if (envValue && BEDROCK_REGION_PREFIX_ENV_VALUES.includes(envValue)) {
+    return envValue;
+  }
+  return deriveBedrockRegionPrefixFromRegion(region);
+}
+var getBedrockInferenceProfiles, getInferenceProfileBackingModel, BEDROCK_REGION_PREFIXES, BEDROCK_REGION_PREFIX_ENV_VALUES;
 var init_bedrock = __esm(() => {
   init_memoize();
   init_auth6();
@@ -96193,7 +96296,23 @@ var init_bedrock = __esm(() => {
       return null;
     }
   });
-  BEDROCK_REGION_PREFIXES = ["us", "eu", "apac", "global"];
+  BEDROCK_REGION_PREFIXES = [
+    "us",
+    "eu",
+    "apac",
+    "jp",
+    "au",
+    "us-gov",
+    "global"
+  ];
+  BEDROCK_REGION_PREFIX_ENV_VALUES = [
+    "us",
+    "eu",
+    "apac",
+    "jp",
+    "au",
+    "global"
+  ];
 });
 
 // src/utils/model/configs.ts
@@ -96400,22 +96519,48 @@ function getBuiltinModelStrings(provider3) {
   }
   return out;
 }
+function applyRegionPrefixToModelStrings(ms, prefix) {
+  const out = {};
+  for (const key of MODEL_KEYS) {
+    out[key] = applyBedrockRegionPrefix(ms[key], prefix);
+  }
+  return out;
+}
 async function getBedrockModelStrings() {
-  const fallback = getBuiltinModelStrings("bedrock");
+  const region = getAWSRegion();
+  const effectivePrefix = getEffectiveBedrockRegionPrefix(region);
+  const derivedPrefix = deriveBedrockRegionPrefixFromRegion(region);
+  const hardcoded = applyRegionPrefixToModelStrings(getBuiltinModelStrings("bedrock"), effectivePrefix);
+  const warnIfPrefixDiverges = () => {
+    if (effectivePrefix !== derivedPrefix) {
+      logForDebugging(`ANTHROPIC_BEDROCK_REGION_PREFIX=${effectivePrefix} is being applied without an availability check (inference-profile discovery is unavailable). If requests 400, ensure ${effectivePrefix}.* cross-region inference profiles are enabled in this account, or unset the variable to fall back to ${derivedPrefix}.*.`, { level: "warn" });
+    }
+  };
   let profiles;
   try {
     profiles = await getBedrockInferenceProfiles();
   } catch (error49) {
     logError2(error49);
-    return fallback;
+    logForDebugging(`Failed to list Bedrock inference profiles, falling back to hardcoded models: ${error49 instanceof Error ? error49.message : String(error49)}`, { level: "error" });
+    warnIfPrefixDiverges();
+    return hardcoded;
   }
   if (!profiles?.length) {
-    return fallback;
+    warnIfPrefixDiverges();
+    return hardcoded;
   }
   const out = {};
+  const mismatched = [];
   for (const key of MODEL_KEYS) {
     const needle = ALL_MODEL_CONFIGS[key].firstParty;
-    out[key] = findFirstMatch(profiles, needle) || fallback[key];
+    const value = findFirstMatch(profiles, needle, effectivePrefix) || hardcoded[key];
+    out[key] = value;
+    if (effectivePrefix !== derivedPrefix && !value.startsWith(`${effectivePrefix}.`)) {
+      mismatched.push(needle);
+    }
+  }
+  if (mismatched.length > 0) {
+    logForDebugging(`ANTHROPIC_BEDROCK_REGION_PREFIX=${effectivePrefix}: ${mismatched.length} model(s) resolved to a different prefix (no ${effectivePrefix}.* profile in this account): ${mismatched.join(", ")}. This is a preference, not a residency guarantee.`, { level: "warn" });
   }
   return out;
 }
@@ -96465,7 +96610,10 @@ function getModelStrings2() {
   const ms = getModelStrings();
   if (ms === null) {
     initModelStrings();
-    return applyModelOverrides(getBuiltinModelStrings(getAPIProvider()));
+    const provider3 = getAPIProvider();
+    const base2 = getBuiltinModelStrings(provider3);
+    const interim = provider3 === "bedrock" ? applyRegionPrefixToModelStrings(base2, getEffectiveBedrockRegionPrefix(getAWSRegion())) : base2;
+    return applyModelOverrides(interim);
   }
   return applyModelOverrides(ms);
 }
@@ -96483,6 +96631,8 @@ async function ensureModelStringsInitialized() {
 var MODEL_KEYS, updateBedrockModelStrings;
 var init_modelStrings = __esm(() => {
   init_state();
+  init_debug();
+  init_envUtils();
   init_log3();
   init_settings2();
   init_bedrock();
@@ -361938,23 +362088,12 @@ function parsePositiveIntEnv(raw) {
 function getMaxWebSearchesPerSession() {
   return parsePositiveIntEnv(process.env.CLAUDE_CODE_MAX_WEB_SEARCHES_PER_SESSION) ?? DEFAULT_MAX_WEB_SEARCHES_PER_SESSION;
 }
-function getMaxSubagentsPerSession() {
-  return parsePositiveIntEnv(process.env.CLAUDE_CODE_MAX_SUBAGENTS_PER_SESSION) ?? DEFAULT_MAX_SUBAGENTS_PER_SESSION;
-}
 function getMaxConcurrentSubagents() {
   return parsePositiveIntEnv(process.env.CLAUDE_CODE_MAX_CONCURRENT_SUBAGENTS) ?? DEFAULT_MAX_CONCURRENT_SUBAGENTS;
 }
 function getMaxSubagentSpawnDepth() {
   return parsePositiveIntEnv(process.env.CLAUDE_CODE_MAX_SUBAGENT_SPAWN_DEPTH) ?? DEFAULT_MAX_SUBAGENT_SPAWN_DEPTH;
 }
-function assertSubagentCapAndIncrement(context4) {
-  const max2 = getMaxSubagentsPerSession();
-  const count3 = context4.taskRegistry?.getTotalAgentSpawns() ?? 0;
-  if (count3 >= max2) {
-    throw new Error(`Subagent spawn limit reached (${count3} of ${max2} agents spawned). Complete the remaining work directly with your tools instead of spawning more agents. If more agents are genuinely needed, ask the user to raise CLAUDE_CODE_MAX_SUBAGENTS_PER_SESSION.`);
-  }
-  context4.taskRegistry?.incrementTotalAgentSpawns();
-}
 function claimConcurrentSubagentSlot(context4) {
   const max2 = getMaxConcurrentSubagents();
   const running = context4.taskRegistry?.getConcurrentSubagents() ?? 0;
@@ -361963,7 +362102,7 @@ function claimConcurrentSubagentSlot(context4) {
   }
   return context4.taskRegistry?.takeConcurrencySlot() ?? (() => {});
 }
-var DEFAULT_MAX_WEB_SEARCHES_PER_SESSION = 200, DEFAULT_MAX_SUBAGENTS_PER_SESSION = 200, DEFAULT_MAX_CONCURRENT_SUBAGENTS = 20, DEFAULT_MAX_SUBAGENT_SPAWN_DEPTH = 3;
+var DEFAULT_MAX_WEB_SEARCHES_PER_SESSION = 200, DEFAULT_MAX_CONCURRENT_SUBAGENTS = 20, DEFAULT_MAX_SUBAGENT_SPAWN_DEPTH = 3;
 
 // src/utils/sdkEventQueue.ts
 import { randomUUID as randomUUID12 } from "crypto";
@@ -362129,7 +362268,6 @@ function startBackgroundSession({
   runWithAgentContext(agentContext, async () => {
     let releaseConcurrentSubagentSlot = null;
     try {
-      assertSubagentCapAndIncrement(queryParams.toolUseContext);
       releaseConcurrentSubagentSlot = claimConcurrentSubagentSlot(queryParams.toolUseContext);
       const bgMessages = [...messages];
       const recentActivities = [];
@@ -471364,7 +471502,6 @@ async function* runAgent({
   transcriptSubdir,
   onQueryProgress
 }) {
-  assertSubagentCapAndIncrement(toolUseContext);
   const appState = toolUseContext.getAppState();
   const permissionMode = appState.toolPermissionContext.mode;
   const rootSetAppState = toolUseContext.setAppStateForTasks ?? toolUseContext.setAppState;
@@ -477254,7 +477391,6 @@ async function handleSpawn(input, context6) {
   return handleSpawnSeparateWindow(input, context6);
 }
 async function spawnTeammate(config6, context6) {
-  assertSubagentCapAndIncrement(context6);
   return handleSpawn(config6, context6);
 }
 var import_react85;
@@ -559142,18 +559278,18 @@ function parseFolderPath(folderPath) {
   }
   return { platform: platform5, buildId };
 }
-var import_debug174, debugCache;
+var import_debug175, debugCache;
 var init_Cache = __esm(() => {
   init_browser_data();
   init_detectPlatform();
-  import_debug174 = __toESM(require_src(), 1);
-  debugCache = import_debug174.default("puppeteer:browsers:cache");
+  import_debug175 = __toESM(require_src(), 1);
+  debugCache = import_debug175.default("puppeteer:browsers:cache");
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/debug.js
-var import_debug175;
+var import_debug176;
 var init_debug3 = __esm(() => {
-  import_debug175 = __toESM(require_src(), 1);
+  import_debug176 = __toESM(require_src(), 1);
 });
 
 // node_modules/.bun/@puppeteer+browsers@2.13.2/node_modules/@puppeteer/browsers/lib/esm/launch.js
@@ -559472,7 +559608,7 @@ var init_launch = __esm(() => {
   init_Cache();
   init_debug3();
   init_detectPlatform();
-  debugLaunch = import_debug175.default("puppeteer:browsers:launcher");
+  debugLaunch = import_debug176.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;
@@ -564556,10 +564692,10 @@ async function installDMG(dmgPath, folderPath) {
     spawnSync4("hdiutil", ["detach", mountPath, "-quiet"]);
   }
 }
-var import_debug177, debugFileUtil, internalConstantsForTesting;
+var import_debug178, debugFileUtil, internalConstantsForTesting;
 var init_fileUtil = __esm(() => {
-  import_debug177 = __toESM(require_src(), 1);
-  debugFileUtil = import_debug177.default("puppeteer:browsers:fileUtil");
+  import_debug178 = __toESM(require_src(), 1);
+  debugFileUtil = import_debug178.default("puppeteer:browsers:fileUtil");
   internalConstantsForTesting = {
     xz: "xz",
     bzip2: "bzip2"
@@ -564852,7 +564988,7 @@ var init_install = __esm(() => {
   init_fileUtil();
   init_httpUtil();
   import_progress = __toESM(require_node_progress(), 1);
-  debugInstall = import_debug175.default("puppeteer:browsers:install");
+  debugInstall = import_debug176.default("puppeteer:browsers:install");
   times = new Map;
 });
 
@@ -571127,7 +571263,7 @@ import fs22 from "fs";
 import os16 from "os";
 import { dirname as dirname45 } from "path";
 import { PassThrough as PassThrough4 } from "stream";
-var import_debug179, __runInitializers23 = function(thisArg, initializers, value) {
+var import_debug180, __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);
@@ -571187,8 +571323,8 @@ var init_ScreenRecorder = __esm(() => {
   init_util6();
   init_decorators();
   init_disposable();
-  import_debug179 = __toESM(require_src(), 1);
-  debugFfmpeg = import_debug179.default("puppeteer:ffmpeg");
+  import_debug180 = __toESM(require_src(), 1);
+  debugFfmpeg = import_debug180.default("puppeteer:ffmpeg");
   ScreenRecorder = (() => {
     let _classSuper = PassThrough4;
     let _instanceExtraInitializers = [];
@@ -722502,8 +722638,9 @@ async function getLastSessionLogFromWorktrees(sessionId) {
     const dirName = caseInsensitive ? dirent.name.toLowerCase() : dirent.name;
     if (seenDirs.has(dirName))
       continue;
-    for (const { prefix } of indexed) {
-      if (dirName === prefix || dirName.startsWith(prefix + "-")) {
+    for (const { path: wtPath, prefix } of indexed) {
+      const isMatch = dirName === prefix || prefix.length > MAX_SANITIZED_LENGTH2 && dirName.startsWith(prefix.slice(0, MAX_SANITIZED_LENGTH2) + "-") && await dirMatchesProjectPath(join161(projectsDir, dirent.name), wtPath, caseInsensitive);
+      if (isMatch) {
         seenDirs.add(dirName);
         const projectDir = join161(projectsDir, dirent.name);
         if (projectDir !== currentProjectDir) {
@@ -722627,7 +722764,8 @@ async function getStatOnlyLogsForWorktrees(worktreePaths, limit) {
     if (seenDirs.has(dirName))
       continue;
     for (const { path: wtPath, prefix } of indexed) {
-      if (dirName === prefix || dirName.startsWith(prefix + "-")) {
+      const isMatch = dirName === prefix || prefix.length > MAX_SANITIZED_LENGTH2 && dirName.startsWith(prefix.slice(0, MAX_SANITIZED_LENGTH2) + "-") && await dirMatchesProjectPath(join161(projectsDir, dirent.name), wtPath, caseInsensitive);
+      if (isMatch) {
         seenDirs.add(dirName);
         allLogs.push(...await getSessionFilesLite(join161(projectsDir, dirent.name), undefined, wtPath));
         break;

package/package.json

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