@cnwenf/occ 2.1.337 → 2.1.339

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.272](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.272-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.274](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.274-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.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.
+**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.274` — 2.1.270 fully aligned; 2.1.271–2.1.274 partial: the latest OCC-127 round landed the 2.1.274 MCP auth-stub description secret-leak fix — the byte-verified display-sanitizer family (NFKC + invisible-character stripping, quote/angle-bracket neutralization, bearer/token-family redaction, code-point-safe truncation) with the origin-only unexpanded endpoint — and confirmed NO-OP with behavioral tests for the 2.1.274 bash special-variable assignment/loop and worktree nested-expansion hardening (OCC's existing guards already ask/refuse every risky vector, byte-verified parity with the official); prior rounds landed the 2.1.273 gateway-hint request headers (default on for the first-party api.anthropic.com endpoint, off for third-party/custom endpoints; tri-bool `CLAUDE_CODE_GATEWAY_HINT_HEADERS` override), the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and the subshell-hidden dangerous-`rm` bypass fix (per-segment analysis in the always-on catastrophic-rm deny guard), per `docs/upstream-version-gap-occ127.md`; remaining 2.1.273/2.1.274 entries are triaged there as NO-OP (surfaces OCC trims) or STAGED (per-site forensics needed); 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), 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/OCC-126). The code is fully open, auditable, backdoor-free, and your data stays under your control.
 
 If you worry that a closed-source CLI might hide backdoors, or that your code and credentials are uploaded to unauditable services, OCC is for you: all source is open and unobfuscated, the build is reproducible from source, and API credentials are sent only to endpoints you configure.
 
@@ -62,7 +62,7 @@ Requires a valid Anthropic API Key (or AWS Bedrock / Google Vertex / Azure Found
 | **Auditability** | Line-by-line reviewable | No |
 | **Telemetry** | Minimal (analytics stubbed) | Standard |
 | **Data sovereignty** | Credentials stay on your machine; requests only to endpoints you configure | Anthropic endpoints |
-| **Capability parity** | Tracks CC `2.1.272` (2.1.270 fully aligned; 2.1.271/2.1.272 partial) | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.274` (2.1.270 fully aligned; 2.1.271–2.1.274 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.272 (dev polyfill; build overrides with pkg.version) when working
+bun run dev          # run from source; version prints 2.1.274 (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.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`).
+- Tracks Claude Code **`2.1.274`** (2.1.270 fully aligned; 2.1.271–2.1.274 partial — the latest OCC-127 round landed the 2.1.274 MCP auth-stub description secret-leak fix (byte-verified display-sanitizer family port) and verified the 2.1.274 bash special-variable and worktree nested-expansion hardening as NO-OP with behavioral tests; prior rounds landed the 2.1.273 gateway-hint request headers, the spinner doubled-ellipsis guard, the shell-mode `!` insert fix, and the subshell-hidden dangerous-`rm` bypass fix — see `docs/upstream-version-gap-occ127.md`; remaining 2.1.273/2.1.274 entries are triaged there as NO-OP or STAGED; 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, OCC-125, and OCC-126 — see `docs/upstream-version-gap-occ124.md`, `docs/upstream-version-gap-occ125.md`, and `docs/upstream-version-gap-occ126.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/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-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":""};
+globalThis.MACRO={"VERSION":"2.1.339","BINARY_NAME":"occ","BUILD_TIME":"2026-09-17T03:37:58.902Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -101874,6 +101874,62 @@ var init_model = __esm(() => {
   ];
 });
 
+// src/utils/agentSwarmsEnabled.ts
+function isAgentTeamsFlagSet() {
+  return process.argv.includes("--agent-teams");
+}
+function isAgentSwarmsEnabled() {
+  if (process.env.USER_TYPE === "ant") {
+    return true;
+  }
+  if (!isEnvTruthy(process.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS) && !isAgentTeamsFlagSet()) {
+    return false;
+  }
+  if (!getFeatureValue_CACHED_MAY_BE_STALE("tengu_amber_flint", true)) {
+    return false;
+  }
+  return true;
+}
+var init_agentSwarmsEnabled = __esm(() => {
+  init_growthbook();
+  init_envUtils();
+});
+
+// src/utils/agentContext.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
+function getAgentContext() {
+  return agentContextStorage.getStore();
+}
+function runWithAgentContext(context, fn) {
+  return agentContextStorage.run(context, fn);
+}
+function isSubagentContext(context) {
+  return context?.agentType === "subagent";
+}
+function getSubagentLogName() {
+  const context = getAgentContext();
+  if (!isSubagentContext(context) || !context.subagentName) {
+    return;
+  }
+  return context.isBuiltIn ? context.subagentName : "user-defined";
+}
+function consumeInvokingRequestId() {
+  const context = getAgentContext();
+  if (!context?.invokingRequestId || context.invocationEmitted) {
+    return;
+  }
+  context.invocationEmitted = true;
+  return {
+    invokingRequestId: context.invokingRequestId,
+    invocationKind: context.invocationKind
+  };
+}
+var agentContextStorage;
+var init_agentContext = __esm(() => {
+  init_agentSwarmsEnabled();
+  agentContextStorage = new AsyncLocalStorage2;
+});
+
 // src/services/api/bedrockContentTypeGuard.ts
 function assertBedrockStreamingContentType(response, requestUrl, provider3) {
   if (provider3 !== "bedrock")
@@ -101909,6 +101965,160 @@ var init_bedrockContentTypeGuard = __esm(() => {
   };
 });
 
+// src/services/api/gatewayHints.ts
+function isFirstPartyAnthropicGateway() {
+  return getAPIProvider() === "firstParty" && isFirstPartyAnthropicBaseUrl();
+}
+function isGatewayHintHeadersEnabled() {
+  const envOverride = parseTriBool(process.env.CLAUDE_CODE_GATEWAY_HINT_HEADERS);
+  if (envOverride !== undefined) {
+    return envOverride;
+  }
+  if (isFirstPartyAnthropicGateway()) {
+    return true;
+  }
+  if (getAPIProvider() !== "firstParty") {
+    return false;
+  }
+  return false;
+}
+function parseTriBool(value) {
+  if (value === undefined) {
+    return;
+  }
+  if (isEnvTruthy(value)) {
+    return true;
+  }
+  if (isEnvDefinedFalsy(value)) {
+    return false;
+  }
+  return;
+}
+function toWellFormedString(value) {
+  if (typeof String.prototype.toWellFormed === "function") {
+    return value.toWellFormed();
+  }
+  return value.replace(LONE_SURROGATE_RE, "\uFFFD");
+}
+function sanitizeToolNameForHeader(toolName) {
+  return toWellFormedString(toolName).replace(/%|[;=, ]|[^\x20-\x7e]/gu, encodeURIComponent);
+}
+function sanitizeHeaderValue(value) {
+  return value.replace(/%|[^\x20-\x7e]/gu, encodeURIComponent);
+}
+function buildPrevToolDurationsHeader(entries) {
+  const parts = [];
+  let length = 0;
+  for (const { toolName, durationMs } of entries) {
+    if (parts.length >= MAX_TOOL_DURATION_ENTRIES) {
+      break;
+    }
+    if (!Number.isFinite(durationMs)) {
+      continue;
+    }
+    const ms = Math.max(0, Math.round(durationMs));
+    const entry = `${sanitizeToolNameForHeader(toolName)}=${ms}`;
+    const separatorLength = parts.length > 0 ? 1 : 0;
+    if (length + separatorLength + entry.length > MAX_TOOL_DURATION_HEADER_BYTES) {
+      break;
+    }
+    length += separatorLength + entry.length;
+    parts.push(entry);
+  }
+  return parts.length > 0 ? parts.join(";") : undefined;
+}
+function classifyQuerySource(querySource) {
+  if (querySource === undefined) {
+    return;
+  }
+  if (querySource.startsWith("repl_main_thread") || querySource === "sdk") {
+    return "main";
+  }
+  if (querySource.startsWith("agent:") || querySource === "hook_agent") {
+    return "subagent";
+  }
+  return "auxiliary";
+}
+function isMainThreadQuerySource(querySource) {
+  return querySource === undefined || classifyQuerySource(querySource) === "main";
+}
+function shouldSendContextCompactedHeader(querySource, agentId) {
+  return agentId === undefined && isMainThreadQuerySource(querySource);
+}
+function getRequestClassHeader(querySource, agentContext) {
+  if (querySource === undefined) {
+    return;
+  }
+  if (querySource === "compact") {
+    return "compaction";
+  }
+  const querySourceClass = classifyQuerySource(querySource);
+  if (querySourceClass === "subagent" && agentContext?.agentType === "subagent" && agentContext.workflowRunId) {
+    return "workflow";
+  }
+  return querySourceClass;
+}
+function getAgentTypeHeader(querySource, agentContext) {
+  if (querySource === undefined || !querySource.startsWith("agent:")) {
+    return;
+  }
+  if (agentContext?.agentType === "teammate") {
+    return "teammate";
+  }
+  if (querySource.startsWith(BUILTIN_AGENT_QUERY_SOURCE_PREFIX)) {
+    return querySource.slice(BUILTIN_AGENT_QUERY_SOURCE_PREFIX.length) || undefined;
+  }
+  if (querySource.startsWith("agent:custom")) {
+    return "custom";
+  }
+  return;
+}
+function getCompactionKind(trigger, definednessProbe) {
+  return trigger === "manual" ? "manual" : definednessProbe !== undefined ? "auto" : "reactive";
+}
+function armPendingContextCompacted(kind) {
+  pendingContextCompacted = kind;
+}
+function consumePendingContextCompacted() {
+  const kind = pendingContextCompacted;
+  pendingContextCompacted = undefined;
+  return kind;
+}
+function applyContextCompactedHeaders(headers, contextCompactedKind, compactionRequestKind) {
+  if (contextCompactedKind === undefined && compactionRequestKind === undefined) {
+    return;
+  }
+  const firstPartyGateway = isFirstPartyAnthropicGateway();
+  const hintsEnabled = isGatewayHintHeadersEnabled();
+  if (contextCompactedKind !== undefined) {
+    if (firstPartyGateway) {
+      headers[CONTEXT_COMPACTED_GATEWAY_HEADER] = contextCompactedKind;
+    }
+    if (hintsEnabled) {
+      headers[CONTEXT_COMPACTED_HEADER] = contextCompactedKind;
+    }
+  }
+  if (compactionRequestKind !== undefined) {
+    if (firstPartyGateway) {
+      headers[COMPACTION_REQUEST_GATEWAY_HEADER] = compactionRequestKind;
+    }
+    if (hintsEnabled) {
+      headers[COMPACTION_HEADER] = compactionRequestKind;
+    }
+  }
+}
+function applyPrevToolDurationsHeader(headers, prevToolDurationsHeader) {
+  if (prevToolDurationsHeader !== undefined && isGatewayHintHeadersEnabled()) {
+    headers[PREV_TOOL_DURATIONS_HEADER] = prevToolDurationsHeader;
+  }
+}
+var CONTEXT_COMPACTED_GATEWAY_HEADER = "x-cc-context-compacted", COMPACTION_REQUEST_GATEWAY_HEADER = "x-cc-compaction-request", COMPACTION_HEADER = "x-claude-code-compaction", CONTEXT_COMPACTED_HEADER = "x-claude-code-context-compacted", PREV_TOOL_DURATIONS_HEADER = "x-claude-code-prev-tool-durations", REQUEST_CLASS_HEADER = "x-claude-code-request-class", AGENT_TYPE_HEADER = "x-claude-code-agent-type", MAX_TOOL_DURATION_ENTRIES = 32, MAX_TOOL_DURATION_HEADER_BYTES = 4096, BUILTIN_AGENT_QUERY_SOURCE_PREFIX = "agent:builtin:", LONE_SURROGATE_RE, pendingContextCompacted;
+var init_gatewayHints = __esm(() => {
+  init_envUtils();
+  init_providers();
+  LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+});
+
 // node_modules/.bun/tslib@1.14.1/node_modules/tslib/tslib.js
 var require_tslib2 = __commonJS((exports, module) => {
   /*! *****************************************************************************
@@ -139857,6 +140067,17 @@ async function getAnthropicClient({
     ...remoteSessionId ? { "x-claude-remote-session-id": remoteSessionId } : {},
     ...clientApp ? { "x-client-app": clientApp } : {}
   };
+  if (isGatewayHintHeadersEnabled()) {
+    const agentContext = getAgentContext();
+    const requestClass = getRequestClassHeader(source, agentContext);
+    if (requestClass) {
+      defaultHeaders[REQUEST_CLASS_HEADER] = requestClass;
+    }
+    const agentType = getAgentTypeHeader(source, agentContext);
+    if (agentType) {
+      defaultHeaders[AGENT_TYPE_HEADER] = sanitizeHeaderValue(agentType);
+    }
+  }
   logForDebugging(`[API:request] Creating client, ANTHROPIC_CUSTOM_HEADERS present: ${!!process.env.ANTHROPIC_CUSTOM_HEADERS}, has Authorization header: ${!!customHeaders["Authorization"]}`);
   const additionalProtectionEnabled = isEnvTruthy(process.env.CLAUDE_CODE_ADDITIONAL_PROTECTION);
   if (additionalProtectionEnabled) {
@@ -140064,7 +140285,9 @@ var init_client9 = __esm(() => {
   init_oauth();
   init_debug();
   init_envUtils();
+  init_agentContext();
   init_bedrockContentTypeGuard();
+  init_gatewayHints();
 });
 
 // src/utils/model/modelCapabilities.ts
@@ -143744,7 +143967,7 @@ function getClaudeCodeUserAgent() {
 }
 
 // src/utils/workloadContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
 function getWorkload() {
   return workloadStorage.getStore()?.workload;
 }
@@ -143753,7 +143976,7 @@ function runWithWorkload(workload, fn) {
 }
 var WORKLOAD_CRON = "cron", workloadStorage;
 var init_workloadContext = __esm(() => {
-  workloadStorage = new AsyncLocalStorage2;
+  workloadStorage = new AsyncLocalStorage3;
 });
 
 // src/utils/http.ts
@@ -150712,62 +150935,6 @@ var init_officialRegistry = __esm(() => {
   init_errors();
 });
 
-// src/utils/agentSwarmsEnabled.ts
-function isAgentTeamsFlagSet() {
-  return process.argv.includes("--agent-teams");
-}
-function isAgentSwarmsEnabled() {
-  if (process.env.USER_TYPE === "ant") {
-    return true;
-  }
-  if (!isEnvTruthy(process.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS) && !isAgentTeamsFlagSet()) {
-    return false;
-  }
-  if (!getFeatureValue_CACHED_MAY_BE_STALE("tengu_amber_flint", true)) {
-    return false;
-  }
-  return true;
-}
-var init_agentSwarmsEnabled = __esm(() => {
-  init_growthbook();
-  init_envUtils();
-});
-
-// src/utils/agentContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
-function getAgentContext() {
-  return agentContextStorage.getStore();
-}
-function runWithAgentContext(context4, fn) {
-  return agentContextStorage.run(context4, fn);
-}
-function isSubagentContext(context4) {
-  return context4?.agentType === "subagent";
-}
-function getSubagentLogName() {
-  const context4 = getAgentContext();
-  if (!isSubagentContext(context4) || !context4.subagentName) {
-    return;
-  }
-  return context4.isBuiltIn ? context4.subagentName : "user-defined";
-}
-function consumeInvokingRequestId() {
-  const context4 = getAgentContext();
-  if (!context4?.invokingRequestId || context4.invocationEmitted) {
-    return;
-  }
-  context4.invocationEmitted = true;
-  return {
-    invokingRequestId: context4.invokingRequestId,
-    invocationKind: context4.invocationKind
-  };
-}
-var agentContextStorage;
-var init_agentContext = __esm(() => {
-  init_agentSwarmsEnabled();
-  agentContextStorage = new AsyncLocalStorage3;
-});
-
 // src/utils/teammateContext.ts
 import { AsyncLocalStorage as AsyncLocalStorage4 } from "async_hooks";
 function getTeammateContext() {
@@ -385080,8 +385247,8 @@ function findCatastrophicSubstitutionBlock(command4) {
     }
     return null;
   }
-  for (const body of [command4, ...subs]) {
-    let c9 = body.trim();
+  const analyzeText = (text2) => {
+    let c9 = text2.trim();
     if (c9.startsWith("{") && /;?\s*\}$/.test(c9) || c9.startsWith("(") && c9.endsWith(")")) {
       c9 = c9.slice(1).replace(/;?\s*[)}]$/, "").trim();
     }
@@ -385098,6 +385265,18 @@ function findCatastrophicSubstitutionBlock(command4) {
         reason: "rm -rf targeting the root or home directory detected inside command substitution"
       };
     }
+    return null;
+  };
+  for (const body of [command4, ...subs]) {
+    for (const text2 of [body, ...splitCommand_DEPRECATED(body)]) {
+      if (text2.trim() === "") {
+        continue;
+      }
+      const block = analyzeText(text2);
+      if (block !== null) {
+        return block;
+      }
+    }
   }
   return null;
 }
@@ -453775,9 +453954,13 @@ function computeTodoLabel(todo) {
 function computeSpinnerVerbWidth(columns) {
   return Math.max(40, columns - 8);
 }
-var THINKING_AMBER_DELAY_MS = 1e4, THINKING_AMBER_RAMP_MS = 1e4, RGB_CACHE;
+function appendSpinnerEllipsis(verb) {
+  return SPINNER_ELLIPSIS_RE.test(verb) ? verb : verb + "\u2026";
+}
+var THINKING_AMBER_DELAY_MS = 1e4, THINKING_AMBER_RAMP_MS = 1e4, RGB_CACHE, SPINNER_ELLIPSIS_RE;
 var init_utils10 = __esm(() => {
   RGB_CACHE = new Map;
+  SPINNER_ELLIPSIS_RE = /(\u2026|\.\.\.)$/;
 });
 
 // src/components/Spinner/FlashingChar.tsx
@@ -460580,7 +460763,7 @@ function SpinnerWithVerbInner({
   const leaderTodoLabel = currentTodo ? computeTodoLabel(currentTodo) : undefined;
   const leaderVerb = overrideMessage ?? (leaderTodoLabel === undefined ? undefined : truncateToWidthNoEllipsis(leaderTodoLabel, computeSpinnerVerbWidth(columns))) ?? randomVerb;
   const effectiveVerb = foregroundedTeammate && !foregroundedTeammate.isIdle ? foregroundedTeammate.spinnerVerb ?? randomVerb : leaderVerb;
-  const message = effectiveVerb + "\u2026";
+  const message = appendSpinnerEllipsis(effectiveVerb);
   import_react64.useEffect(() => {
     const operationId = "spinner-" + mode;
     activityManager.startCLIActivity(operationId);
@@ -587155,9 +587338,20 @@ You MUST call the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool exactly once at the end of
       model: agentModel,
       startTime: agentStartTime
     });
+    const workflowAgentContext = {
+      agentId,
+      parentSessionId: getParentSessionId2(),
+      agentType: "subagent",
+      subagentName: agentDef.agentType,
+      isBuiltIn: isBuiltInAgent(agentDef),
+      workflowRunId: ctx.runId,
+      workflowName: ctx.workflowName,
+      invocationKind: "spawn",
+      invocationEmitted: false
+    };
     let messages;
     try {
-      messages = await drainGenerator(gen);
+      messages = await runWithAgentContext(workflowAgentContext, () => drainGenerator(gen));
     } catch (e4) {
       const msg = `Agent "${opts.label ?? prompt.slice(0, 40)}" failed: ${e4.message}`;
       ctx.counters.failures.push(msg);
@@ -587443,6 +587637,9 @@ var WORKFLOW_AGENT_LIFETIME_CAP = 1000, WORKFLOW_PARALLEL_MAX_ITEMS = 4096, WORK
 var init_primitives = __esm(() => {
   init_runAgent();
   init_generalPurposeAgent();
+  init_loadAgentsDir();
+  init_agentContext();
+  init_teammate();
   init_worktree();
   init_messages3();
   init_tokens();
@@ -596533,7 +596730,8 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input2, toolUseConte
         contextModifier: toolContextModifier ? {
           toolUseID,
           modifyContext: toolContextModifier
-        } : undefined
+        } : undefined,
+        toolDuration: { toolName: tool.name, durationMs }
       });
     }
     if (!isMcpTool(tool)) {
@@ -596700,7 +596898,8 @@ async function checkPermissionsAndCallTool(tool, toolUseID, input2, toolUseConte
           toolUseResult: `Error: ${content}`,
           mcpMeta: toolUseContext.agentId ? undefined : error52 instanceof McpToolCallError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS ? error52.mcpMeta : undefined,
           sourceToolAssistantUUID: assistantMessage.uuid
-        })
+        }),
+        toolDuration: { toolName: tool.name, durationMs }
       },
       ...hookMessages
     ];
@@ -596961,6 +597160,9 @@ class StreamingToolExecutor {
         if (update.contextModifier) {
           contextModifiers.push(update.contextModifier.modifyContext);
         }
+        if (update.toolDuration) {
+          tool.toolDuration = update.toolDuration;
+        }
       }
       tool.results = messages;
       tool.contextModifiers = contextModifiers;
@@ -596992,8 +597194,10 @@ class StreamingToolExecutor {
       }
       if (tool.status === "completed" && tool.results) {
         tool.status = "yielded";
+        let toolDuration = tool.toolDuration;
         for (const message of tool.results) {
-          yield { message, newContext: this.toolUseContext };
+          yield { message, newContext: this.toolUseContext, toolDuration };
+          toolDuration = undefined;
         }
         markToolUseAsComplete(this.toolUseContext, tool.id);
       } else if (tool.status === "executing" && !tool.isConcurrencySafe) {
@@ -597253,7 +597457,8 @@ async function* runTools(toolUseMessages, assistantMessages, canUseTool, toolUse
         }
         yield {
           message: update.message,
-          newContext: currentContext
+          newContext: currentContext,
+          ...update.toolDuration && { toolDuration: update.toolDuration }
         };
       }
       for (const block of blocks) {
@@ -597273,7 +597478,8 @@ async function* runTools(toolUseMessages, assistantMessages, canUseTool, toolUse
         }
         yield {
           message: update.message,
-          newContext: currentContext
+          newContext: currentContext,
+          ...update.toolDuration && { toolDuration: update.toolDuration }
         };
       }
     }
@@ -597308,7 +597514,8 @@ async function* runToolsSerially(toolUseMessages, assistantMessages, canUseTool,
       }
       yield {
         message: update.message,
-        newContext: currentContext
+        newContext: currentContext,
+        ...update.toolDuration && { toolDuration: update.toolDuration }
       };
     }
     markToolUseAsComplete2(toolUseContext, toolUse.id);
@@ -599829,7 +600036,8 @@ async function* queryLoop(params, consumedCommandUuids) {
     querySource,
     maxTurns,
     skipCacheWrite,
-    agentCacheTtlOverride
+    agentCacheTtlOverride,
+    compactionRequestKind
   } = params;
   const deps = params.deps ?? productionDeps();
   let state3 = {
@@ -599847,6 +600055,7 @@ async function* queryLoop(params, consumedCommandUuids) {
   };
   const budgetTracker = feature("TOKEN_BUDGET") ? createBudgetTracker() : null;
   let taskBudgetRemaining;
+  let prevToolDurations;
   const config7 = buildQueryConfig();
   const pendingMemoryPrefetch = startRelevantMemoryPrefetch(state3.messages, state3.toolUseContext);
   while (true) {
@@ -599963,6 +600172,7 @@ async function* queryLoop(params, consumedCommandUuids) {
     const toolResults = [];
     const toolUseBlocks = [];
     let needsFollowUp = false;
+    const toolDurations = [];
     queryCheckpoint("query_setup_start");
     const useStreamingToolExecution = config7.gates.streamingToolExecution;
     let streamingToolExecutor = useStreamingToolExecution ? new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext) : null;
@@ -600045,6 +600255,10 @@ async function* queryLoop(params, consumedCommandUuids) {
               agentCacheTtlOverride,
               agentId: toolUseContext.agentId,
               addNotification: toolUseContext.addNotification,
+              ...prevToolDurations !== undefined && { prevToolDurations },
+              ...compactionRequestKind !== undefined && {
+                compactionRequestKind
+              },
               ...params.taskBudget && {
                 taskBudget: {
                   total: params.taskBudget.total,
@@ -600135,6 +600349,9 @@ async function* queryLoop(params, consumedCommandUuids) {
             }
             if (streamingToolExecutor && !toolUseContext.abortController.signal.aborted) {
               for (const result of streamingToolExecutor.getCompletedResults()) {
+                if (result.toolDuration) {
+                  toolDurations.push(result.toolDuration);
+                }
                 if (result.message) {
                   yield result.message;
                   toolResults.push(...normalizeMessagesForAPI([result.message], toolUseContext.options.tools).filter((_4) => _4.type === "user"));
@@ -600482,6 +600699,9 @@ ${stopHookAdditionalContexts.join(`
     }
     const toolUpdates = streamingToolExecutor ? streamingToolExecutor.getRemainingResults() : runTools(toolUseBlocks, assistantMessages, canUseTool, toolUseContext);
     for await (const update of toolUpdates) {
+      if (update.toolDuration) {
+        toolDurations.push(update.toolDuration);
+      }
       if (update.message) {
         yield update.message;
         if (update.message.type === "attachment" && update.message.attachment.type === "hook_stopped_continuation") {
@@ -600497,6 +600717,7 @@ ${stopHookAdditionalContexts.join(`
       }
     }
     queryCheckpoint("query_tool_execution_end");
+    prevToolDurations = toolDurations.length > 0 ? [...toolDurations] : undefined;
     let nextPendingToolUseSummary;
     if (config7.gates.emitToolUseSummaries && toolUseBlocks.length > 0 && !toolUseContext.abortController.signal.aborted && !toolUseContext.agentId) {
       const lastAssistantMessage = assistantMessages.at(-1);
@@ -601503,7 +601724,8 @@ async function runForkedAgent({
   maxTurns,
   onMessage: onMessage2,
   skipTranscript,
-  skipCacheWrite
+  skipCacheWrite,
+  compactionRequestKind
 }) {
   const startTime2 = Date.now();
   const outputMessages = [];
@@ -601536,7 +601758,8 @@ async function runForkedAgent({
       maxOutputTokensOverride: maxOutputTokens,
       maxTurns,
       skipCacheWrite,
-      agentCacheTtlOverride
+      agentCacheTtlOverride,
+      compactionRequestKind
     })) {
       if (message.type === "stream_event") {
         if ("event" in message && message.event?.type === "message_delta" && message.event.usage) {
@@ -606556,7 +606779,8 @@ function mergeHookInstructions(userInstructions, hookInstructions) {
 
 ${hookInstructions}`;
 }
-async function compactConversation(messages, context7, cacheSafeParams, suppressFollowUpQuestions, customInstructions, isAutoCompact = false, recompactionInfo) {
+async function compactConversation(messages, context7, cacheSafeParams, suppressFollowUpQuestions, customInstructions, isAutoCompact = false, recompactionInfo, thresholdSource) {
+  const compactionRequestKind = getCompactionKind(isAutoCompact ? "auto" : "manual", thresholdSource);
   try {
     if (messages.length === 0) {
       throw new Error(ERROR_MESSAGE_NOT_ENOUGH_MESSAGES);
@@ -606598,7 +606822,8 @@ async function compactConversation(messages, context7, cacheSafeParams, suppress
         appState,
         context: context7,
         preCompactTokenCount,
-        cacheSafeParams: retryCacheSafeParams
+        cacheSafeParams: retryCacheSafeParams,
+        compactionRequestKind
       });
       summary = getAssistantMessageText(summaryResponse);
       if (!summary?.startsWith(PROMPT_TOO_LONG_ERROR_MESSAGE))
@@ -606755,6 +606980,9 @@ async function compactConversation(messages, context7, cacheSafeParams, suppress
       postCompactHookResult.userDisplayMessage
     ].filter(Boolean).join(`
 `);
+    if (shouldSendContextCompactedHeader(recompactionInfo?.querySource ?? context7.options.querySource, context7.agentId)) {
+      armPendingContextCompacted(getCompactionKind(isAutoCompact ? "auto" : "manual", getLastMainRequestId()));
+    }
     return {
       boundaryMarker,
       summaryMessages,
@@ -607012,7 +607240,8 @@ async function streamCompactSummary({
   appState,
   context: context7,
   preCompactTokenCount,
-  cacheSafeParams
+  cacheSafeParams,
+  compactionRequestKind
 }) {
   const promptCacheSharingEnabled = getFeatureValue_CACHED_MAY_BE_STALE("tengu_compact_cache_prefix", true);
   const activityInterval = isSessionActivityTrackingActive() ? setInterval((statusSetter) => {
@@ -607030,7 +607259,8 @@ async function streamCompactSummary({
           forkLabel: "compact",
           maxTurns: 1,
           skipCacheWrite: true,
-          overrides: { abortController: context7.abortController }
+          overrides: { abortController: context7.abortController },
+          ...compactionRequestKind !== undefined && { compactionRequestKind }
         });
         const assistantMsg = getLastAssistantMessage(result.messages);
         const assistantText = assistantMsg ? getAssistantMessageText(assistantMsg) : null;
@@ -607093,6 +607323,7 @@ async function streamCompactSummary({
           hasAppendSystemPrompt: !!context7.options.appendSystemPrompt,
           maxOutputTokensOverride: Math.min(COMPACT_MAX_OUTPUT_TOKENS, getMaxOutputTokensForModel(context7.options.mainLoopModel)),
           querySource: "compact",
+          ...compactionRequestKind !== undefined && { compactionRequestKind },
           agents: context7.options.agentDefinitions.activeAgents,
           mcpTools: [],
           effortValue: appState.effortValue
@@ -607304,6 +607535,7 @@ var init_compact = __esm(() => {
   init_uniqBy();
   init_sdk();
   init_state();
+  init_gatewayHints();
   init_state();
   init_FileReadTool();
   init_prompt3();
@@ -608039,7 +608271,7 @@ async function autoCompactIfNeeded(messages, toolUseContext, cacheSafeParams, qu
     };
   }
   try {
-    const compactionResult = await compactConversation(messages, toolUseContext, cacheSafeParams, true, undefined, true, recompactionInfo);
+    const compactionResult = await compactConversation(messages, toolUseContext, cacheSafeParams, true, undefined, true, recompactionInfo, "auto-compact-threshold");
     setLastSummarizedMessageId(undefined);
     runPostCompactCleanup(querySource);
     return {
@@ -628227,17 +628459,78 @@ var init_auth11 = __esm(() => {
   };
 });
 
+// src/services/mcp/displaySanitize.ts
+function stripInvisibleForDisplay(input2) {
+  if (typeof input2 !== "string")
+    return "";
+  return (input2.length > 4096 ? input2.slice(0, 4096) : input2).replace(SURROGATE_PATTERN, (match) => match.length === 2 ? match : " ").replace(INVISIBLE_PATTERN, " ");
+}
+function sanitizeLoneSurrogatesFallback(value) {
+  const chunks = [];
+  for (let i6 = 0;i6 < value.length; i6 += 8192) {
+    const end = Math.min(i6 + 8192, value.length);
+    const codes = new Uint16Array(end - i6);
+    for (let a6 = i6;a6 < end; a6++)
+      codes[a6 - i6] = value.charCodeAt(a6);
+    chunks.push(String.fromCharCode(...codes));
+  }
+  return chunks.join("");
+}
+function sanitizeLoneSurrogates(value) {
+  if (typeof Buffer < "u")
+    return Buffer.from(value, "utf16le").toString("utf16le");
+  return sanitizeLoneSurrogatesFallback(value);
+}
+function truncateToDisplayLength(value, max2) {
+  if (max2 <= 0)
+    return "";
+  if (value.length <= max2)
+    return value;
+  const head = value.slice(0, max2);
+  const lastUnit = head.charCodeAt(max2 - 1);
+  return sanitizeLoneSurrogates(lastUnit >= 55296 && lastUnit <= 56319 ? head.slice(0, -1) : head);
+}
+function redactSecretsForDisplay(value, mode = "all") {
+  function replacer(match, label, secret) {
+    return /[0-9._~+/=%-]/.test(secret) ? `${label} [redacted]` : match;
+  }
+  if (mode === "none")
+    return value;
+  return value.replace(/(?:\b|(?<=\\[A-Za-z"']))(bearer|basic)[\s:=\uFF1A\uFF1D]+(?:(?:\\*["']|\\+)\s*)?([A-Za-z0-9._~+/=%-]{8,})/gi, replacer).replace(/(?:\b|(?<=\\[A-Za-z"']))((?:access[-_ ]?|refresh[-_ ]?|id[-_ ]?|client[-_ ]?|api[-_ ]?|x[-_]api[-_ ]?|session[-_ ]?|auth[-_ ]?)?(?:token|key|secret|password|authorization|credential)s?)(?:\\*["']|\\+)?\s*[:=\uFF1A\uFF1D]\s*(?:\\*["']|\\+)?\s*([A-Za-z0-9._~+/=%-]{8,})/gi, replacer);
+}
+function sanitizeForDisplay(input2, max2 = DEFAULT_DISPLAY_MAX, redact = "all") {
+  if (typeof input2 !== "string")
+    return "";
+  const cleaned = stripInvisibleForDisplay(input2.normalize("NFKC")).replaceAll(/[<>";\u2018\u2019\u201A\u201C\u201D\u201E\u00AB\u20BB\u2039\u203A\u2329\u232A\u27E8\u27E9\u27EA\u27EB\u3008\u3009\u300A\u300B]/g, " ").replaceAll(/\s+/g, " ").trim();
+  const scanMax = Math.max(REDACT_SCAN_MAX, max2 + REDACT_SCAN_SLACK);
+  const overflow = cleaned.length > scanMax;
+  const redacted = redactSecretsForDisplay(overflow ? truncateToDisplayLength(cleaned, scanMax) : cleaned, redact);
+  return overflow || redacted.length > max2 ? `${truncateToDisplayLength(redacted, max2)}\u2026` : redacted;
+}
+function sanitizeDisplayUrl(url3, max2 = 1024) {
+  return sanitizeForDisplay(url3, max2);
+}
+function sanitizeServerNameForDisplay(name3, max2 = 64) {
+  if (typeof name3 !== "string")
+    return "";
+  return sanitizeForDisplay(name3.normalize("NFKC").replace(/['`]/g, " "), max2, "none");
+}
+var SURROGATE_PATTERN, INVISIBLE_PATTERN, DEFAULT_DISPLAY_MAX = 200, REDACT_SCAN_MAX = 2000, REDACT_SCAN_SLACK = 512;
+var init_displaySanitize = __esm(() => {
+  SURROGATE_PATTERN = /[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF]|[\uDC00-\uDFFF]/g;
+  INVISIBLE_PATTERN = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}\p{Default_Ignorable_Code_Point}\u2800]|(?!\u0020)\p{Zs}/gu;
+});
+
 // src/tools/McpAuthTool/McpAuthTool.ts
-function getConfigUrl(config7) {
-  if ("url" in config7)
-    return config7.url;
-  return;
+function buildMcpAuthToolDescription(serverName, config7, resolveUnexpanded = resolveUnexpandedMcpServers) {
+  const transport = config7.type ?? "stdio";
+  const displayOrigin = getMcpErrorEndpoint(serverName, config7, { detail: "origin" }, resolveUnexpanded);
+  const location = displayOrigin && displayOrigin !== transport ? `${transport} at ${sanitizeDisplayUrl(displayOrigin, 256)}` : transport;
+  return `The "${sanitizeServerNameForDisplay(serverName)}" MCP server (${location}) is installed but requires authentication. ` + `Call this tool to start the OAuth flow \u2014 you'll receive an authorization URL to share with the user. ` + `Once the user completes authorization in their browser, the server's real tools will become available automatically.`;
 }
-function createMcpAuthTool(serverName, config7) {
-  const url3 = getConfigUrl(config7);
+function createMcpAuthTool(serverName, config7, resolveUnexpanded = resolveUnexpandedMcpServers) {
   const transport = config7.type ?? "stdio";
-  const location = url3 ? `${transport} at ${url3}` : transport;
-  const description = `The \`${serverName}\` MCP server (${location}) is installed but requires authentication. ` + `Call this tool to start the OAuth flow \u2014 you'll receive an authorization URL to share with the user. ` + `Once the user completes authorization in their browser, the server's real tools will become available automatically.`;
+  const description = buildMcpAuthToolDescription(serverName, config7, resolveUnexpanded);
   return {
     name: buildMcpToolName(serverName, "authenticate"),
     isMcp: true,
@@ -628358,7 +628651,10 @@ var init_McpAuthTool = __esm(() => {
   init_v4();
   init_auth11();
   init_client12();
+  init_displaySanitize();
   init_mcpStringUtils();
+  init_redaction();
+  init_utils9();
   init_errors();
   init_log3();
   inputSchema45 = lazySchema(() => exports_external.object({}));
@@ -633883,7 +634179,7 @@ function getCacheControl({
 function querySourceMatchesPatterns(querySource, patterns) {
   return querySource !== undefined && patterns.some((pattern) => pattern.endsWith("*") ? querySource.startsWith(pattern.slice(0, -1)) : querySource === pattern);
 }
-function isMainThreadQuerySource(querySource) {
+function isMainThreadQuerySource2(querySource) {
   return querySourceMatchesPatterns(querySource, MAIN_THREAD_QUERY_SOURCES);
 }
 function parsePromptCacheTtlEnv(value) {
@@ -633893,7 +634189,7 @@ function resolvePromptCacheTtlOverride(querySource, agentCacheTtlOverride, isUsi
   if (isEnvTruthy(process.env.FORCE_PROMPT_CACHING_5M)) {
     return { ttl: "5m", reason: "force_5m_env" };
   }
-  const isMainThread = isMainThreadQuerySource(querySource);
+  const isMainThread = isMainThreadQuerySource2(querySource);
   const envTtl = parsePromptCacheTtlEnv(isMainThread ? process.env.CLAUDE_CODE_PROMPT_CACHE_TTL : process.env.CLAUDE_CODE_SUBAGENT_PROMPT_CACHE_TTL);
   if (envTtl !== undefined)
     return { ttl: envTtl, reason: "env" };
@@ -634150,7 +634446,7 @@ function getApiForceIdleTimeout() {
   const ms = parseInt(raw, 10);
   return Number.isFinite(ms) && ms > 0 ? ms : undefined;
 }
-async function* executeNonStreamingRequest(clientOptions, retryOptions, paramsFromContext, onAttempt, captureRequest, originatingRequestId) {
+async function* executeNonStreamingRequest(clientOptions, retryOptions, paramsFromContext, onAttempt, captureRequest, originatingRequestId, gatewayHintWireValues) {
   const fallbackTimeoutMs = getNonstreamingFallbackTimeoutMs();
   const generator = withRetry(() => getAnthropicClient({
     maxRetries: 0,
@@ -634164,12 +634460,16 @@ async function* executeNonStreamingRequest(clientOptions, retryOptions, paramsFr
     onAttempt(attempt, start, retryParams.max_tokens);
     const adjustedParams = adjustParamsForNonStreaming(retryParams, MAX_NON_STREAMING_TOKENS);
     try {
+      const hintHeaders = {};
+      applyContextCompactedHeaders(hintHeaders, gatewayHintWireValues?.contextCompactedKindForWire, gatewayHintWireValues?.compactionRequestKindForWire);
+      applyPrevToolDurationsHeader(hintHeaders, gatewayHintWireValues?.prevToolDurationsForWire);
       return await anthropic.beta.messages.create({
         ...adjustedParams,
         model: normalizeModelStringForAPI(adjustedParams.model)
       }, {
         signal: retryOptions.signal,
-        timeout: fallbackTimeoutMs
+        timeout: fallbackTimeoutMs,
+        ...Object.keys(hintHeaders).length > 0 ? { headers: hintHeaders } : {}
       });
     } catch (err2) {
       if (err2 instanceof APIUserAbortError)
@@ -634672,6 +634972,9 @@ ${deferredToolList}
   let research;
   let isFastModeRequest = isFastMode;
   let isAdvisorInProgress = false;
+  const contextCompactedKindForWire = classifyQuerySource(options.querySource) === "main" && options.agentId === undefined ? consumePendingContextCompacted() : undefined;
+  const compactionRequestKindForWire = options.compactionRequestKind;
+  const prevToolDurationsForWire = options.prevToolDurations !== undefined ? buildPrevToolDurationsHeader(options.prevToolDurations) : undefined;
   try {
     let clearStreamIdleTimers = function() {
       if (streamIdleWarningTimer !== null) {
@@ -634728,20 +635031,23 @@ ${deferredToolList}
       }
       clientRequestId = getAPIProvider() === "firstParty" && isFirstPartyAnthropicBaseUrl() ? randomUUID33() : undefined;
       const incomingTrace = shouldPropagateTraceparent() ? getIncomingTraceContext() : undefined;
+      const attemptHeaders = {
+        ...clientRequestId && {
+          [CLIENT_REQUEST_ID_HEADER]: clientRequestId
+        },
+        ...incomingTrace?.traceparent && {
+          traceparent: incomingTrace.traceparent
+        },
+        ...incomingTrace?.tracestate && {
+          tracestate: incomingTrace.tracestate
+        }
+      };
+      applyContextCompactedHeaders(attemptHeaders, contextCompactedKindForWire, compactionRequestKindForWire);
+      applyPrevToolDurationsHeader(attemptHeaders, prevToolDurationsForWire);
       const result = await anthropic.beta.messages.create({ ...params, stream: true }, {
         signal,
         ...getApiForceIdleTimeout() !== undefined ? { timeout: false } : {},
-        headers: {
-          ...clientRequestId && {
-            [CLIENT_REQUEST_ID_HEADER]: clientRequestId
-          },
-          ...incomingTrace?.traceparent && {
-            traceparent: incomingTrace.traceparent
-          },
-          ...incomingTrace?.tracestate && {
-            tracestate: incomingTrace.tracestate
-          }
-        }
+        headers: attemptHeaders
       }).withResponse();
       queryCheckpoint("query_response_headers_received");
       streamRequestId = result.request_id;
@@ -635195,7 +635501,11 @@ ${deferredToolList}
       }, paramsFromContext, (attempt, _startTime, tokens) => {
         attemptNumber = attempt;
         maxOutputTokens = tokens;
-      }, (params) => captureAPIRequest(params, options.querySource), streamRequestId);
+      }, (params) => captureAPIRequest(params, options.querySource), streamRequestId, {
+        contextCompactedKindForWire,
+        compactionRequestKindForWire,
+        prevToolDurationsForWire
+      });
       const m5 = {
         message: {
           ...result,
@@ -635252,7 +635562,11 @@ ${deferredToolList}
         }, paramsFromContext, (attempt, _startTime, tokens) => {
           attemptNumber = attempt;
           maxOutputTokens = tokens;
-        }, (params) => captureAPIRequest(params, options.querySource), failedRequestId);
+        }, (params) => captureAPIRequest(params, options.querySource), failedRequestId, {
+          contextCompactedKindForWire,
+          compactionRequestKindForWire,
+          prevToolDurationsForWire
+        });
         const m5 = {
           message: {
             ...result,
@@ -635743,6 +636057,7 @@ var init_claude = __esm(() => {
   init_utils9();
   init_vcr();
   init_client9();
+  init_gatewayHints();
   init_errors10();
   init_logging2();
   init_rawApiBodies();
@@ -638988,6 +639303,9 @@ function getValueFromInput(input2) {
 function isInputModeCharacter(input2) {
   return input2 === "!";
 }
+function shouldTriggerModeSwitch(keystroke, isAtStart, currentMode) {
+  return currentMode !== undefined && isAtStart && isInputModeCharacter(keystroke) && currentMode !== getModeFromInput(keystroke);
+}
 
 // src/projectOnboardingState.ts
 import { join as join128 } from "path";
@@ -641172,7 +641490,8 @@ function useTextInput({
   onOffsetChange,
   inputFilter,
   inlineGhostText,
-  dim: dim2
+  dim: dim2,
+  getInputMode
 }) {
   if (env4.terminal === "Apple_Terminal") {
     prewarmModifiers();
@@ -641432,7 +641751,7 @@ function useTextInput({
                 if (echo !== null)
                   pushScreenReaderAnnouncement(echo);
               }
-              if (cursor.isAtStart() && isInputModeCharacter(input2)) {
+              if (shouldTriggerModeSwitch(input2, cursor.isAtStart(), getInputMode?.())) {
                 return cursor.insert(text2).left();
               }
               return cursor.insert(text2);
@@ -642199,6 +642518,7 @@ function TextInput(props) {
     onOffsetChange: props.onChangeCursorOffset,
     inputFilter: props.inputFilter,
     inlineGhostText: props.inlineGhostText,
+    getInputMode: props.getInputMode,
     dim: source_default.dim
   });
   return /* @__PURE__ */ jsx_runtime167.jsx(ThemedBox_default, {
@@ -730614,7 +730934,7 @@ function urlMatchesPattern2(url3, pattern) {
   const regexStr = escaped.replace(/\*/g, ".*");
   return new RegExp(`^${regexStr}$`).test(url3);
 }
-function sanitizeHeaderValue(value) {
+function sanitizeHeaderValue2(value) {
   return value.replace(/[\r\n\x00]/g, "");
 }
 function interpolateEnvVars(value, allowedEnvVars) {
@@ -730626,7 +730946,7 @@ function interpolateEnvVars(value, allowedEnvVars) {
     }
     return process.env[varName] ?? "";
   });
-  return sanitizeHeaderValue(interpolated);
+  return sanitizeHeaderValue2(interpolated);
 }
 async function execHttpHook(hook, _hookEvent, jsonInput, signal) {
   const policy = getHttpHookPolicy();
@@ -777010,7 +777330,7 @@ var init_PromptInputStashNotice = __esm(() => {
 function stripLoneSurrogates2(text2) {
   if (isWellFormed && isWellFormed(text2))
     return text2;
-  return text2.replace(LONE_SURROGATE_RE, "");
+  return text2.replace(LONE_SURROGATE_RE2, "");
 }
 function stripAnsiSequences(text2) {
   let result = text2;
@@ -777034,11 +777354,11 @@ function clampBannerTextWidth(maxWidth) {
 function sanitizeAndClampBannerText(text2, maxWidth) {
   return truncateToWidth(sanitizeBannerText(text2), clampBannerTextWidth(maxWidth));
 }
-var BANNER_TEXT_MAX_WIDTH = 24, ANSI_STRIP_PASSES = 4, ANSI_SEQUENCE_RE, LONE_SURROGATE_RE, CONTROL_FORMAT_RE, isWellFormed;
+var BANNER_TEXT_MAX_WIDTH = 24, ANSI_STRIP_PASSES = 4, ANSI_SEQUENCE_RE, LONE_SURROGATE_RE2, CONTROL_FORMAT_RE, isWellFormed;
 var init_sanitizeBannerText = __esm(() => {
   init_truncate();
   ANSI_SEQUENCE_RE = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]|\x1b[\]PX^_][^\x1b\x07]*(?:\x07|\x1b\\)/g;
-  LONE_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
+  LONE_SURROGATE_RE2 = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
   CONTROL_FORMAT_RE = /[\p{Cc}\p{Cf}\u2028\u2029]+/gu;
   isWellFormed = typeof String.prototype.isWellFormed === "function" ? Function.prototype.call.bind(String.prototype.isWellFormed) : undefined;
 });
@@ -778004,14 +778324,14 @@ function PromptInput({
     abortSpeculation(setAppState);
     const isSingleCharInsertion = value.length === input2.length + 1;
     const insertedAtStart = cursorOffset === 0;
-    const mode2 = getModeFromInput(value);
-    if (insertedAtStart && mode2 !== "prompt") {
+    const detectedMode = getModeFromInput(value);
+    if (insertedAtStart && detectedMode !== "prompt" && detectedMode !== mode) {
       if (isSingleCharInsertion) {
-        onModeChange(mode2);
+        onModeChange(detectedMode);
         return;
       }
       if (input2.length === 0) {
-        onModeChange(mode2);
+        onModeChange(detectedMode);
         const valueWithoutMode = getValueFromInput(value).replaceAll("\t", "    ");
         pushToBuffer(input2, cursorOffset, pastedContents);
         trackAndSetInput(valueWithoutMode);
@@ -778028,7 +778348,7 @@ function PromptInput({
       footerSelection: null
     });
     trackAndSetInput(processedValue);
-  }, [trackAndSetInput, onModeChange, input2, cursorOffset, pushToBuffer, pastedContents, dismissStashHint, setAppState]);
+  }, [trackAndSetInput, onModeChange, input2, cursorOffset, mode, pushToBuffer, pastedContents, dismissStashHint, setAppState]);
   const {
     resetHistory,
     onHistoryUp,
@@ -779126,7 +779446,8 @@ function PromptInput({
     } : undefined,
     highlights: combinedHighlights,
     inlineGhostText,
-    inputFilter: lazySpaceInputFilter
+    inputFilter: lazySpaceInputFilter,
+    getInputMode: () => mode
   };
   const getBorderColor = () => {
     const modeColors = {
@@ -831613,7 +831934,7 @@ var _FEATURE_ALLOWLIST = new Set([
 var feature2 = (name3) => _FEATURE_ALLOWLIST.has(name3);
 if (typeof globalThis.MACRO === "undefined") {
   globalThis.MACRO = {
-    VERSION: "2.1.272",
+    VERSION: "2.1.274",
     BINARY_NAME: "occ",
     BUILD_TIME: new Date().toISOString(),
     FEEDBACK_CHANNEL: "",

package/package.json

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