@cnwenf/occ 2.1.305 → 2.1.307

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.305","BINARY_NAME":"occ","BUILD_TIME":"2026-08-18T19:38:44.255Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.307","BINARY_NAME":"occ","BUILD_TIME":"2026-08-20T23:38:42.953Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -101103,6 +101103,7 @@ var init_modelAllowlist = __esm(() => {
 var exports_model = {};
 __export(exports_model, {
   resolveSkillModelOverride: () => resolveSkillModelOverride,
+  resolveAnthropicDefaultModel: () => resolveAnthropicDefaultModel,
   renderModelSetting: () => renderModelSetting,
   renderModelName: () => renderModelName,
   renderDefaultModelSetting: () => renderDefaultModelSetting,
@@ -101241,7 +101242,32 @@ function getRuntimeMainLoopModel(params) {
   }
   return mainLoopModel;
 }
+function resolveAnthropicDefaultModel() {
+  const raw = process.env.ANTHROPIC_DEFAULT_MODEL;
+  if (raw === undefined || raw.trim() === "") {
+    return;
+  }
+  const normalized = raw.trim().toLowerCase();
+  if (normalized === "default" || normalized === "inherit") {
+    return;
+  }
+  const aliasForm = normalized.replace(/\[1m\]$/i, "");
+  if (aliasForm === "opusplan" || aliasForm === "haiku") {
+    return;
+  }
+  if (getEnforceAvailableModels()) {
+    return;
+  }
+  if (!isModelAllowed(raw)) {
+    return;
+  }
+  return raw;
+}
 function getDefaultMainLoopModelSetting() {
+  const anthropicDefault = resolveAnthropicDefaultModel();
+  if (anthropicDefault !== undefined) {
+    return anthropicDefault;
+  }
   let setting;
   if (process.env.USER_TYPE === "ant") {
     setting = getAntModelOverrideConfig()?.defaultModel ?? getDefaultOpusModel() + "[1m]";
@@ -264261,6 +264287,11 @@ function shouldInjectAgentListInMessages() {
 }
 async function getPrompt2(agentDefinitions, isCoordinator, allowedAgentTypes) {
   const effectiveAgents = allowedAgentTypes ? agentDefinitions.filter((a5) => allowedAgentTypes.includes(a5.agentType)) : agentDefinitions;
+  const normalizeAgentType = (s4) => s4.toLowerCase().replace(/[\s_-]+/g, "-");
+  const gpMatches = agentDefinitions.filter((a5) => normalizeAgentType(a5.agentType) === normalizeAgentType(GENERAL_PURPOSE_AGENT.agentType));
+  const passesAllowlist = (a5) => allowedAgentTypes?.includes(a5.agentType) ?? true;
+  const gpExact = gpMatches.find((a5) => a5.agentType === GENERAL_PURPOSE_AGENT.agentType);
+  const generalPurposeAvailable = gpExact ? passesAllowlist(gpExact) : gpMatches.length === 1 && passesAllowlist(gpMatches[0]);
   const forkEnabled = isForkSubagentEnabled();
   const whenToForkSection = forkEnabled ? `
 
@@ -264376,7 +264407,7 @@ The ${AGENT_TOOL_NAME} tool launches specialized agents (subprocesses) that auto
 
 ${agentListSection}
 
-${forkEnabled ? `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself \u2014 a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type parameter to select which agent type to use. If omitted, the general-purpose agent is used.`}`;
+${forkEnabled ? `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself \u2014 a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME} tool, specify a subagent_type parameter to select which agent type to use. ${generalPurposeAvailable ? "If omitted, the general-purpose agent is used." : "subagent_type is required: the general-purpose agent is not available in this session, so choose one of the listed agent types."}`}`;
   if (isCoordinator) {
     return shared4;
   }
@@ -264421,6 +264452,7 @@ var init_prompt12 = __esm(() => {
   init_teammateContext();
   init_prompt3();
   init_prompt4();
+  init_generalPurposeAgent();
   init_constants3();
   init_forkSubagent();
 });
@@ -461438,26 +461470,18 @@ function AssistantTextMessage(t0) {
       return null;
     }
     case PROMPT_TOO_LONG_ERROR_MESSAGE: {
-      let t22;
-      if ($3[3] === Symbol.for("react.memo_cache_sentinel")) {
-        t22 = getUpgradeMessage("warning");
-        $3[3] = t22;
-      } else {
-        t22 = $3[3];
-      }
-      const upgradeHint = t22;
+      const autoCompactOffSuffix = isAutoCompactExplicitlyOff() ? " \xB7 auto-compact is off \xB7 /config to turn it on" : "";
       let t32;
-      if ($3[4] === Symbol.for("react.memo_cache_sentinel")) {
+      if ($3[4] === Symbol.for("react.memo_cache_sentinel") || $3[3] !== autoCompactOffSuffix) {
+        const upgradeHint = getUpgradeMessage("warning");
         t32 = /* @__PURE__ */ jsx_runtime88.jsx(MessageResponse, {
           height: 1,
-          children: /* @__PURE__ */ jsx_runtime88.jsxs(ThemedText, {
+          children: /* @__PURE__ */ jsx_runtime88.jsx(ThemedText, {
             color: "error",
-            children: [
-              "Context limit reached \xB7 /compact or /clear to continue",
-              upgradeHint ? ` \xB7 ${upgradeHint}` : ""
-            ]
+            children: `Context limit reached \xB7 ${isEnvTruthy(process.env.DISABLE_COMPACT) ? "/clear to continue" : "/compact or /clear to continue"}${autoCompactOffSuffix}${upgradeHint ? ` \xB7 ${upgradeHint}` : ""}`
           })
         });
+        $3[3] = autoCompactOffSuffix;
         $3[4] = t32;
       } else {
         t32 = $3[4];
@@ -461732,6 +461756,8 @@ var init_AssistantTextMessage = __esm(() => {
   init_ink2();
   init_errors10();
   init_messages3();
+  init_envUtils();
+  init_autoCompact();
   init_contextWindowUpgradeCheck();
   init_model();
   init_macOsKeychainStorage();
@@ -478196,6 +478222,9 @@ var init_AgentTool = __esm(() => {
             const denyRule = getDenyRuleForAgent(appState.toolPermissionContext, AGENT_TOOL_NAME, effectiveType);
             throw new Error(`Agent type '${effectiveType}' has been denied by permission rule '${AGENT_TOOL_NAME}(${effectiveType})' from ${denyRule?.source ?? "settings"}.`);
           }
+          if (subagent_type === undefined) {
+            throw new Error(`subagent_type is required: the general-purpose agent is not available in this session. Available agents: ${agents.map((a5) => a5.agentType).join(", ") || "none"}`);
+          }
           throw new Error(`Agent type '${effectiveType}' not found. Available agents: ${agents.map((a5) => a5.agentType).join(", ")}`);
         }
         selectedAgent = found;
@@ -601658,7 +601687,7 @@ async function getAttachments(input2, toolUseContext, ideSelection, queuedComman
   const mainThreadAttachments = isMainThread ? [
     maybe("ide_selection", async () => getSelectedLinesFromIDE(ideSelection, toolUseContext)),
     maybe("ide_opened_file", async () => getOpenedFileFromIDE(ideSelection, toolUseContext)),
-    maybe("output_style", async () => Promise.resolve(getOutputStyleAttachment())),
+    maybe("output_style", () => getOutputStyleAttachment()),
     maybe("diagnostics", async () => getDiagnosticAttachments(toolUseContext)),
     maybe("lsp_diagnostics", async () => getLSPDiagnosticAttachments(toolUseContext)),
     maybe("unified_tasks", async () => getUnifiedTaskAttachments(toolUseContext)),
@@ -602004,16 +602033,18 @@ function getCriticalSystemReminderAttachment(toolUseContext) {
   }
   return [{ type: "critical_system_reminder", content: reminder }];
 }
-function getOutputStyleAttachment() {
+async function getOutputStyleAttachment() {
   const settings = getSettings_DEPRECATED();
   const outputStyle = settings?.outputStyle || "default";
   if (outputStyle === "default") {
     return [];
   }
+  const styleConfig = await getOutputStyleConfig();
   return [
     {
       type: "output_style",
-      style: outputStyle
+      style: outputStyle,
+      turnReminder: styleConfig?.turnReminder
     }
   ];
 }
@@ -603375,6 +603406,7 @@ var init_attachments2 = __esm(() => {
   init_common2();
   init_pdf();
   init_apiLimits();
+  init_outputStyles();
   init_agentSwarmsEnabled();
   init_findRelevantMemories();
   init_paths();
@@ -605512,6 +605544,12 @@ function isAutoCompactEnabled() {
   const userConfig = getGlobalConfig();
   return userConfig.autoCompactEnabled;
 }
+function isAutoCompactExplicitlyOff() {
+  if (isEnvTruthy(process.env.DISABLE_COMPACT) || isEnvTruthy(process.env.DISABLE_AUTO_COMPACT)) {
+    return false;
+  }
+  return getGlobalConfig().autoCompactEnabled === false;
+}
 async function shouldAutoCompact(messages, model, querySource, snipTokensFreed = 0) {
   if (querySource === "session_memory" || querySource === "compact") {
     return false;
@@ -613194,7 +613232,16 @@ async function getOutputStyleConfig() {
   const outputStyle = settings?.outputStyle || DEFAULT_OUTPUT_STYLE_NAME;
   return allStyles[outputStyle] ?? null;
 }
-var EXPLANATORY_FEATURE_PROMPT, DEFAULT_OUTPUT_STYLE_NAME = "default", OUTPUT_STYLE_CONFIG, getAllOutputStyles;
+var EXPLANATORY_FEATURE_PROMPT, DEFAULT_OUTPUT_STYLE_NAME = "default", CONCISE_STYLE_RULES = `The user chose brevity over narration. You should:
+
+1. **Lead with the result** \u2014 Your first sentence answers "what happened" or "what's the answer." No preamble ("Let me...", "Now I'll...") and no closing recap of what you already said.
+2. **Cut narration, keep substance** \u2014 Don't restate the request, the plan, or each step you took. Report outcomes, decisions, and anything the user must act on.
+3. **Short by default** \u2014 Answer simple questions in 1-3 sentences of plain prose. Use headers, tables, and bullet lists only when they carry real structure, never as decoration.
+4. **State things plainly** \u2014 Skip hedging boilerplate. Mention a caveat only when it changes what the user should do next.
+5. **Give full detail on request** \u2014 When the user asks for an explanation or detail, answer completely. Conciseness never means withholding requested information.
+6. **Never trade correctness for brevity** \u2014 Error reports, failing test output, security warnings, and confirmations for destructive actions keep their full content.
+
+Where these rules conflict with more general communication or formatting guidance elsewhere in your instructions, these rules win.`, CONCISE_TURN_REMINDER = "Be concise: lead with the result, skip preamble and narration, keep only what the user needs.", OUTPUT_STYLE_CONFIG, getAllOutputStyles;
 var init_outputStyles = __esm(() => {
   init_figures();
   init_memoize();
@@ -613213,6 +613260,17 @@ In order to encourage learning, before and after writing code, always provide br
 These insights should be included in the conversation, not in the codebase. You should generally focus on interesting insights that are specific to the codebase or the code you just wrote, rather than general programming concepts.`;
   OUTPUT_STYLE_CONFIG = {
     [DEFAULT_OUTPUT_STYLE_NAME]: null,
+    Concise: {
+      name: "Concise",
+      source: "built-in",
+      description: "Claude responds tersely, leading with results and skipping preamble and narration",
+      keepCodingInstructions: true,
+      prompt: `You are an interactive CLI tool that helps users with software engineering tasks. Keep your responses short and direct while doing the work just as thoroughly.
+
+# Concise Style Active
+${CONCISE_STYLE_RULES}`,
+      turnReminder: CONCISE_TURN_REMINDER
+    },
     Explanatory: {
       name: "Explanatory",
       source: "built-in",
@@ -615641,7 +615699,7 @@ ${attachment.content}`,
       }
       return wrapMessagesInSystemReminder([
         createUserMessage({
-          content: `${outputStyle.name} output style is active. Remember to follow the specific guidelines for this style.`,
+          content: `${outputStyle.name} output style is active. ${attachment.turnReminder ?? "Remember to follow the specific guidelines for this style."}`,
           isMeta: true
         })
       ]);

package/package.json

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