@cnwenf/occ 2.1.310 → 2.1.312

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.310","BINARY_NAME":"occ","BUILD_TIME":"2026-08-23T17:30:46.969Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.312","BINARY_NAME":"occ","BUILD_TIME":"2026-08-25T20:28:13.846Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -2010,7 +2010,6 @@ __export(exports_state, {
   setScheduledTasksEnabled: () => setScheduledTasksEnabled,
   setQuestionPreviewFormat: () => setQuestionPreviewFormat,
   setPromptId: () => setPromptId,
-  setPromptCache1hEligible: () => setPromptCache1hEligible,
   setPromptCache1hAllowlist: () => setPromptCache1hAllowlist,
   setProjectRoot: () => setProjectRoot,
   setOriginalCwd: () => setOriginalCwd,
@@ -2131,7 +2130,6 @@ __export(exports_state, {
   getRegisteredHooks: () => getRegisteredHooks,
   getQuestionPreviewFormat: () => getQuestionPreviewFormat,
   getPromptId: () => getPromptId,
-  getPromptCache1hEligible: () => getPromptCache1hEligible,
   getPromptCache1hAllowlist: () => getPromptCache1hAllowlist,
   getProjectRoot: () => getProjectRoot,
   getPrCounter: () => getPrCounter,
@@ -2320,7 +2318,6 @@ function getInitialState() {
     hasDevChannels: false,
     sessionProjectDir: null,
     promptCache1hAllowlist: null,
-    promptCache1hEligible: null,
     afkModeHeaderLatched: null,
     fastModeHeaderLatched: null,
     cacheEditingHeaderLatched: null,
@@ -3143,12 +3140,6 @@ function getPromptCache1hAllowlist() {
 function setPromptCache1hAllowlist(allowlist) {
   STATE.promptCache1hAllowlist = allowlist;
 }
-function getPromptCache1hEligible() {
-  return STATE.promptCache1hEligible;
-}
-function setPromptCache1hEligible(eligible) {
-  STATE.promptCache1hEligible = eligible;
-}
 function getAfkModeHeaderLatched() {
   return STATE.afkModeHeaderLatched;
 }
@@ -59647,6 +59638,8 @@ var init_types2 = __esm(() => {
     }).optional().describe("Override spinner tips. tips: array of tip strings. excludeDefault: if true, only show custom tips (default: false)."),
     syntaxHighlightingDisabled: exports_external.boolean().optional().describe("Whether to disable syntax highlighting in diffs"),
     terminalTitleFromRename: exports_external.boolean().optional().describe("Whether /rename updates the terminal tab title (defaults to true). Set to false to keep auto-generated topic titles."),
+    promptCacheTtl: exports_external.enum(["5m", "1h"]).optional().catch(undefined).describe('Prompt cache TTL for the main conversation (interactive, -p and SDK turns, plus the helpers that run inline with it): "5m" or "1h". Unset = automatic: 1 hour on a Claude subscription within its usage limits, 5 minutes on an API key, Bedrock, Vertex or Foundry. 1-hour cache writes are billed at a higher rate; the cache stays warm across longer breaks. The CLAUDE_CODE_PROMPT_CACHE_TTL environment variable takes precedence.'),
+    subagentPromptCacheTtl: exports_external.enum(["5m", "1h"]).optional().catch(undefined).describe('Prompt cache TTL for everything outside the main conversation \u2014 subagents, workflows, background and helper requests: "5m" or "1h". Unset = automatic (5 minutes unless ENABLE_PROMPT_CACHING_1H=1). The CLAUDE_CODE_SUBAGENT_PROMPT_CACHE_TTL environment variable takes precedence.'),
     autoScrollEnabled: exports_external.boolean().optional().describe("Whether the conversation auto-scrolls to the bottom on new output in fullscreen mode (defaults to true). Set to false to keep the scroll position stable."),
     tui: exports_external.enum(["default", "fullscreen"]).optional().describe('Terminal UI renderer. "fullscreen" uses the flicker-free alt-screen renderer with virtualized scrollback (equivalent to CLAUDE_CODE_NO_FLICKER=1). "default" uses the classic main-screen renderer.'),
     axScreenReader: exports_external.boolean().optional().describe("Render screen-reader friendly output (flat text, no decorative borders or animations). Overridden by the CLAUDE_AX_SCREEN_READER env var and the --ax-screen-reader CLI flag."),
@@ -100362,6 +100355,7 @@ __export(exports_betas, {
   PROMPT_CACHING_SCOPE_BETA_HEADER: () => PROMPT_CACHING_SCOPE_BETA_HEADER,
   INTERLEAVED_THINKING_BETA_HEADER: () => INTERLEAVED_THINKING_BETA_HEADER,
   FAST_MODE_BETA_HEADER: () => FAST_MODE_BETA_HEADER,
+  EXTENDED_CACHE_TTL_BETA_HEADER: () => EXTENDED_CACHE_TTL_BETA_HEADER,
   EFFORT_BETA_HEADER: () => EFFORT_BETA_HEADER,
   CONTEXT_MANAGEMENT_BETA_HEADER: () => CONTEXT_MANAGEMENT_BETA_HEADER,
   CONTEXT_1M_BETA_HEADER: () => CONTEXT_1M_BETA_HEADER,
@@ -100372,7 +100366,7 @@ __export(exports_betas, {
   AFK_MODE_BETA_HEADER: () => AFK_MODE_BETA_HEADER,
   ADVISOR_BETA_HEADER: () => ADVISOR_BETA_HEADER
 });
-var CLAUDE_CODE_20250219_BETA_HEADER = "claude-code-20250219", INTERLEAVED_THINKING_BETA_HEADER = "interleaved-thinking-2025-05-14", CONTEXT_1M_BETA_HEADER = "context-1m-2025-08-07", CONTEXT_MANAGEMENT_BETA_HEADER = "context-management-2025-06-27", STRUCTURED_OUTPUTS_BETA_HEADER = "structured-outputs-2025-12-15", WEB_SEARCH_BETA_HEADER = "web-search-2025-03-05", TOOL_SEARCH_BETA_HEADER_1P = "advanced-tool-use-2025-11-20", TOOL_SEARCH_BETA_HEADER_3P = "tool-search-tool-2025-10-19", EFFORT_BETA_HEADER = "effort-2025-11-24", TASK_BUDGETS_BETA_HEADER = "task-budgets-2026-03-13", PROMPT_CACHING_SCOPE_BETA_HEADER = "prompt-caching-scope-2026-01-05", FAST_MODE_BETA_HEADER = "fast-mode-2026-02-01", REDACT_THINKING_BETA_HEADER = "redact-thinking-2026-02-12", TOKEN_EFFICIENT_TOOLS_BETA_HEADER = "token-efficient-tools-2026-03-28", SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER, AFK_MODE_BETA_HEADER, CLI_INTERNAL_BETA_HEADER, ADVISOR_BETA_HEADER = "advisor-tool-2026-03-01", BEDROCK_EXTRA_PARAMS_HEADERS, VERTEX_COUNT_TOKENS_ALLOWED_BETAS, CACHE_EDITING_BETA_HEADER = "";
+var CLAUDE_CODE_20250219_BETA_HEADER = "claude-code-20250219", INTERLEAVED_THINKING_BETA_HEADER = "interleaved-thinking-2025-05-14", CONTEXT_1M_BETA_HEADER = "context-1m-2025-08-07", CONTEXT_MANAGEMENT_BETA_HEADER = "context-management-2025-06-27", STRUCTURED_OUTPUTS_BETA_HEADER = "structured-outputs-2025-12-15", WEB_SEARCH_BETA_HEADER = "web-search-2025-03-05", TOOL_SEARCH_BETA_HEADER_1P = "advanced-tool-use-2025-11-20", TOOL_SEARCH_BETA_HEADER_3P = "tool-search-tool-2025-10-19", EFFORT_BETA_HEADER = "effort-2025-11-24", TASK_BUDGETS_BETA_HEADER = "task-budgets-2026-03-13", PROMPT_CACHING_SCOPE_BETA_HEADER = "prompt-caching-scope-2026-01-05", EXTENDED_CACHE_TTL_BETA_HEADER = "extended-cache-ttl-2025-04-11", FAST_MODE_BETA_HEADER = "fast-mode-2026-02-01", REDACT_THINKING_BETA_HEADER = "redact-thinking-2026-02-12", TOKEN_EFFICIENT_TOOLS_BETA_HEADER = "token-efficient-tools-2026-03-28", SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER, AFK_MODE_BETA_HEADER, CLI_INTERNAL_BETA_HEADER, ADVISOR_BETA_HEADER = "advisor-tool-2026-03-01", BEDROCK_EXTRA_PARAMS_HEADERS, VERTEX_COUNT_TOKENS_ALLOWED_BETAS, CACHE_EDITING_BETA_HEADER = "";
 var init_betas = __esm(() => {
   init_featureFlags();
   SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER = feature("CONNECTOR_TEXT") ? "summarize-connector-text-2026-03-13" : "";
@@ -100850,13 +100844,28 @@ function formatPrice(price) {
 function formatModelPricing(costs) {
   return `${formatPrice(costs.inputTokens)}/${formatPrice(costs.outputTokens)} per Mtok`;
 }
-var COST_TIER_3_15, COST_TIER_15_75, COST_TIER_5_25, COST_TIER_30_150, COST_TIER_10_50, COST_HAIKU_35, COST_HAIKU_45, DEFAULT_UNKNOWN_MODEL_COST, MODEL_COSTS;
+function getModelPricingString(model) {
+  const shortName = getCanonicalName(model);
+  const costs = MODEL_COSTS[shortName];
+  if (!costs)
+    return;
+  return formatModelPricing(costs);
+}
+var COST_TIER_2_10, COST_TIER_3_15, COST_TIER_15_75, COST_TIER_5_25, COST_TIER_30_150, COST_TIER_10_50, COST_HAIKU_35, COST_HAIKU_45, DEFAULT_UNKNOWN_MODEL_COST, MODEL_COSTS;
 var init_modelCost = __esm(() => {
   init_analytics();
   init_state();
   init_fastMode();
   init_configs();
   init_model();
+  COST_TIER_2_10 = {
+    inputTokens: 2,
+    outputTokens: 10,
+    promptCacheWriteTokens: 2.5,
+    promptCacheWrite1hTokens: 4,
+    promptCacheReadTokens: 0.2,
+    webSearchRequests: 0.01
+  };
   COST_TIER_3_15 = {
     inputTokens: 3,
     outputTokens: 15,
@@ -100922,6 +100931,7 @@ var init_modelCost = __esm(() => {
     [firstPartyNameToCanonical(CLAUDE_SONNET_4_CONFIG.firstParty)]: COST_TIER_3_15,
     [firstPartyNameToCanonical(CLAUDE_SONNET_4_5_CONFIG.firstParty)]: COST_TIER_3_15,
     [firstPartyNameToCanonical(CLAUDE_SONNET_4_6_CONFIG.firstParty)]: COST_TIER_3_15,
+    [firstPartyNameToCanonical(CLAUDE_SONNET_5_CONFIG.firstParty)]: COST_TIER_2_10,
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_CONFIG.firstParty)]: COST_TIER_15_75,
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_1_CONFIG.firstParty)]: COST_TIER_15_75,
     [firstPartyNameToCanonical(CLAUDE_OPUS_4_5_CONFIG.firstParty)]: COST_TIER_5_25,
@@ -140249,6 +140259,10 @@ function shouldIncludeFirstPartyOnlyBetas() {
 function shouldUseGlobalCacheScope() {
   return getAPIProvider() === "firstParty" && !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS);
 }
+function shouldSendExtendedCacheTtlBeta() {
+  const provider5 = getAPIProvider();
+  return (provider5 === "firstParty" || provider5 === "bedrock" || provider5 === "vertex" || provider5 === "foundry") && !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS);
+}
 function getMergedBetas(model, options) {
   const baseBetas = [...getModelBetas(model)];
   if (options?.isAgenticQuery) {
@@ -579646,13 +579660,22 @@ function getDefaultOptionForUser(fastMode = false) {
       description: getClaudeAiUserDefaultModelDescription(fastMode)
     };
   }
-  const is3P = getAPIProvider() !== "firstParty";
+  const defaultSetting = getDefaultMainLoopModelSetting();
   return {
     value: null,
     label: "Default (recommended)",
-    description: `Use the default model (currently ${renderDefaultModelSetting(getDefaultMainLoopModelSetting())})${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`
+    description: `Use the default model (currently ${renderDefaultModelSetting(defaultSetting)})${getDefaultOptionSuffix(defaultSetting)}`
   };
 }
+function getDefaultOptionSuffix(setting) {
+  if (resolveAnthropicDefaultModel() !== undefined) {
+    return " \xB7 Set by ANTHROPIC_DEFAULT_MODEL";
+  }
+  if (getAPIProvider() !== "firstParty")
+    return "";
+  const pricing = getModelPricingString(parseUserSpecifiedModel(setting));
+  return pricing === undefined ? "" : ` \xB7 ${pricing}`;
+}
 function getOpus5PricingSuffix(fastMode) {
   if (getAPIProvider() !== "firstParty")
     return "";
@@ -579665,7 +579688,7 @@ function getSonnet5Option() {
   return {
     value: is3P ? getModelStrings2().sonnet5 : "sonnet",
     label: "Sonnet",
-    description: `Sonnet 5 \xB7 Efficient for routine tasks${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`,
+    description: `Sonnet 5 \xB7 Efficient for routine tasks${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_2_10)}`}`,
     descriptionForModel: "Sonnet 5 - efficient for routine tasks. Generally recommended for most coding tasks"
   };
 }
@@ -579763,7 +579786,7 @@ function getSonnet5_1MOption() {
   return {
     value: is3P ? getModelStrings2().sonnet5 + "[1m]" : "sonnet[1m]",
     label: "Sonnet (1M context)",
-    description: `Sonnet 5 for long sessions${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`,
+    description: `Sonnet 5 for long sessions${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_2_10)}`}`,
     descriptionForModel: "Sonnet 5 with 1M context window - for long sessions with large codebases"
   };
 }
@@ -579840,7 +579863,7 @@ function getMaxSonnet5_1MOption() {
   return {
     value: "sonnet[1m]",
     label: "Sonnet (1M context)",
-    description: `Sonnet 5 with 1M context${billingInfo}${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_3_15)}`}`
+    description: `Sonnet 5 with 1M context${billingInfo}${is3P ? "" : ` \xB7 ${formatModelPricing(COST_TIER_2_10)}`}`
   };
 }
 function getMaxOpus5_1MOption(fastMode = false) {
@@ -631206,30 +631229,51 @@ function getCacheControl({
     ...scope === "global" && { scope }
   };
 }
-function should1hCacheTTL(querySource) {
+function querySourceMatchesPatterns(querySource, patterns) {
+  return querySource !== undefined && patterns.some((pattern) => pattern.endsWith("*") ? querySource.startsWith(pattern.slice(0, -1)) : querySource === pattern);
+}
+function isMainThreadQuerySource(querySource) {
+  return querySourceMatchesPatterns(querySource, MAIN_THREAD_QUERY_SOURCES);
+}
+function parsePromptCacheTtlEnv(value) {
+  return value === "5m" || value === "1h" ? value : undefined;
+}
+function resolvePromptCacheTtlOverride(querySource) {
   if (isEnvTruthy(process.env.FORCE_PROMPT_CACHING_5M)) {
-    return false;
+    return { ttl: "5m", reason: "force_5m_env" };
   }
-  if (isEnvTruthy(process.env.ENABLE_PROMPT_CACHING_1H)) {
-    return true;
-  }
-  if (getAPIProvider() === "bedrock" && isEnvTruthy(process.env.ENABLE_PROMPT_CACHING_1H_BEDROCK)) {
-    return true;
+  const isMainThread = isMainThreadQuerySource(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" };
+  const settings = getInitialSettings();
+  const settingTtl = isMainThread ? settings.promptCacheTtl : settings.subagentPromptCacheTtl;
+  if (settingTtl !== undefined)
+    return { ttl: settingTtl, reason: "setting" };
+  if (isEnvTruthy(process.env.ENABLE_PROMPT_CACHING_1H) || getAPIProvider() === "bedrock" && isEnvTruthy(process.env.ENABLE_PROMPT_CACHING_1H_BEDROCK)) {
+    return { ttl: "1h", reason: "enable_1h_env" };
   }
-  let userEligible = getPromptCache1hEligible();
-  if (userEligible === null) {
-    userEligible = process.env.USER_TYPE === "ant" || isClaudeAISubscriber() && !currentLimits.isUsingOverage;
-    setPromptCache1hEligible(userEligible);
+  return;
+}
+function resolvePromptCacheTtl(querySource) {
+  const override = resolvePromptCacheTtlOverride(querySource);
+  if (override !== undefined)
+    return override;
+  if (!isClaudeAISubscriber() || currentLimits.isUsingOverage) {
+    return { ttl: "5m", reason: "default" };
   }
-  if (!userEligible)
-    return false;
   let allowlist = getPromptCache1hAllowlist();
   if (allowlist === null) {
-    const config7 = getFeatureValue_CACHED_MAY_BE_STALE("tengu_prompt_cache_1h_config", {});
+    const config7 = getFeatureValue_CACHED_MAY_BE_STALE("tengu_prompt_cache_1h_config", {
+      allowlist: [...MAIN_THREAD_QUERY_SOURCES]
+    });
     allowlist = config7.allowlist ?? [];
     setPromptCache1hAllowlist(allowlist);
   }
-  return querySource !== undefined && allowlist.some((pattern) => pattern.endsWith("*") ? querySource.startsWith(pattern.slice(0, -1)) : querySource === pattern);
+  return querySourceMatchesPatterns(querySource, allowlist) ? { ttl: "1h", reason: "subscriber" } : { ttl: "5m", reason: "default" };
+}
+function should1hCacheTTL(querySource) {
+  return resolvePromptCacheTtl(querySource).ttl === "1h";
 }
 function configureEffortParams(effortValue, outputConfig, extraBodyParams, betas, model) {
   if (!modelSupportsEffort(model) || "effort" in outputConfig) {
@@ -631592,6 +631636,9 @@ async function* queryModel(messages, systemPrompt, thinkingConfig, tools, signal
   queryCheckpoint("query_tool_schema_build_start");
   const isAgenticQuery = options.querySource.startsWith("repl_main_thread") || options.querySource.startsWith("agent:") || options.querySource === "sdk" || options.querySource === "hook_agent" || options.querySource === "verification_agent";
   const betas = getMergedBetas(options.model, { isAgenticQuery });
+  if (should1hCacheTTL(options.querySource) && shouldSendExtendedCacheTtlBeta() && !betas.includes(EXTENDED_CACHE_TTL_BETA_HEADER)) {
+    betas.push(EXTENDED_CACHE_TTL_BETA_HEADER);
+  }
   if (isAdvisorEnabled()) {
     betas.push(ADVISOR_BETA_HEADER);
   }
@@ -632961,7 +633008,7 @@ function getMaxOutputTokensForModel(model) {
   const result = validateBoundedIntEnvVar("CLAUDE_CODE_MAX_OUTPUT_TOKENS", process.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS, defaultTokens, maxOutputTokens.upperLimit);
   return result.effective;
 }
-var autoModeStateModule3, MAX_NON_STREAMING_TOKENS = 64000;
+var autoModeStateModule3, MAIN_THREAD_QUERY_SOURCES, MAX_NON_STREAMING_TOKENS = 64000;
 var init_claude = __esm(() => {
   init_providers();
   init_system();
@@ -633004,6 +633051,7 @@ var init_claude = __esm(() => {
   init_mcpInstructionsDelta();
   init_modelCost();
   init_queryProfiler();
+  init_settings2();
   init_thinking();
   init_toolSearch();
   init_apiLimits();
@@ -633030,6 +633078,12 @@ var init_claude = __esm(() => {
   init_promptCacheBreakDetection();
   init_withRetry();
   autoModeStateModule3 = feature("TRANSCRIPT_CLASSIFIER") ? __toCommonJS(exports_autoModeState) : null;
+  MAIN_THREAD_QUERY_SOURCES = [
+    "repl_main_thread*",
+    "sdk",
+    "auto_mode",
+    "memdir_relevance"
+  ];
 });
 
 // src/utils/shell/prefix.ts
@@ -827551,13 +827605,13 @@ Usage: occ --remote "your task description"`, () => gracefulShutdown(1));
     } = await Promise.resolve().then(() => (init_mcp5(), exports_mcp3));
     await mcpRemoveHandler2(name3, options);
   });
-  mcp2.command("list").description("List configured MCP servers. Unapproved .mcp.json servers are shown as \u23F8 Pending approval and not connected to; approved servers are health-checked.").action(async () => {
+  mcp2.command("list").description("List configured MCP servers. Unapproved .mcp.json servers are shown as \u23F8 Pending approval and not connected to; approved servers are health-checked unless disabled for this project.").action(async () => {
     const {
       mcpListHandler: mcpListHandler2
     } = await Promise.resolve().then(() => (init_mcp5(), exports_mcp3));
     await mcpListHandler2();
   });
-  mcp2.command("get <name>").description("Get details about an MCP server. Unapproved .mcp.json servers are shown as \u23F8 Pending approval and not connected to; approved servers are health-checked.").action(async (name3) => {
+  mcp2.command("get <name>").description("Get details about an MCP server. Unapproved .mcp.json servers are shown as \u23F8 Pending approval and not connected to; approved servers are health-checked unless disabled for this project.").action(async (name3) => {
     const {
       mcpGetHandler: mcpGetHandler2
     } = await Promise.resolve().then(() => (init_mcp5(), exports_mcp3));

package/package.json

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