@cnwenf/occ 2.1.305 → 2.1.306

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.306","BINARY_NAME":"occ","BUILD_TIME":"2026-08-19T19:58:24.299Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -264261,6 +264261,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 +264381,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 +264426,7 @@ var init_prompt12 = __esm(() => {
   init_teammateContext();
   init_prompt3();
   init_prompt4();
+  init_generalPurposeAgent();
   init_constants3();
   init_forkSubagent();
 });
@@ -461438,26 +461444,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 +461730,8 @@ var init_AssistantTextMessage = __esm(() => {
   init_ink2();
   init_errors10();
   init_messages3();
+  init_envUtils();
+  init_autoCompact();
   init_contextWindowUpgradeCheck();
   init_model();
   init_macOsKeychainStorage();
@@ -478196,6 +478196,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;
@@ -605512,6 +605515,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;

package/package.json

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