@cnwenf/occ 2.1.278 → 2.1.280

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.215](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.215-blueviolet.svg)](https://docs.anthropic.com/en/docs/claude-code)
+[![Tracks: Claude Code 2.1.218](https://img.shields.io/badge/Tracks-Claude%20Code%202.1.218-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.215`). 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.218`). 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.215` | Reference implementation |
+| **Capability parity** | Tracks CC `2.1.218` | Reference implementation |
 | **Providers** | Anthropic Direct, Bedrock, Vertex, Azure | Anthropic, Bedrock, Vertex |
 | **Cost** | Free & open-source (MIT) | Subscription |
 | **Build** | Reproducible from source | N/A |
@@ -157,7 +157,7 @@ For architecture, entry/bootstrap, tool system, UI layer, and module-status deta
 
 ## Status
 
-- Tracks Claude Code **`2.1.215`**.
+- Tracks Claude Code **`2.1.218`**.
 - 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/README.zh-CN.md

@@ -8,7 +8,7 @@
 
 ## 这是什么
 
-**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.215`）。代码全开放、可审计、无暗门，数据由你掌控。
+**Open C Code（OCC）** 是一个开源的编码智能体。能力与 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) 对齐（当前跟踪 `2.1.218`）。代码全开放、可审计、无暗门，数据由你掌控。
 
 如果你担心闭源 CLI 可能植入后门、担心代码与凭据被上传到不可审计的服务，OCC 就是为你准备的：全部源码开放、无混淆，构建产物可由源码复现，API 凭据只发往你自己配置的端点。
 
@@ -21,7 +21,7 @@
 
 ## 现状
 
-- 跟踪 Claude Code **`2.1.215`**。
+- 跟踪 Claude Code **`2.1.218`**。
 - 代码库有约 1300 个不阻塞的 `tsc` 类型错误（大量松散的 `unknown`/`never`/`{}` 类型），**不影响 Bun 运行时执行**。门槛是 Biome lint，不是 `tsc`。
 - 所有内部 feature flag（`feature(...)`）已被 polyfill 为 `false` —— 内部功能（COORDINATOR_MODE、KAIROS、PROACTIVE 等）全部关闭。
 - 已发布到 npm：[`@cnwenf/occ`](https://www.npmjs.com/package/@cnwenf/occ)。

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.278","BUILD_TIME":"2026-07-23T19:50:06.511Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.280","BUILD_TIME":"2026-07-24T09:01:43.886Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -386098,7 +386098,7 @@ function mcpServerPendingApprovalMessage(name3) {
 function mcpServerHealthStatusLabel(result) {
   switch (result.type) {
     case "connected":
-      return "\u2713 Connected";
+      return "\u2714 Connected";
     case "needs-auth":
       return "! Needs authentication";
     case "needs-approval":
@@ -684818,22 +684818,22 @@ var init_OccWelcome = __esm(() => {
   jsx_runtime263 = __toESM(require_jsx_runtime(), 1);
   OCC_LOGOS = {
     wide: normalizeLogo([
-      "      \u2880\u28E0\u28E4\u28C0",
-      "   \u2880\u28FE\u281F\u2809\u2809\u283B\u28F7\u28C4",
-      "  \u28F0\u28FF\u2803  \u28C0  \u2818\u28FF\u28C6",
-      " \u28B8\u28FF\u2847  \u28FF\u28FF\u2847  \u28FF\u28FF  \u2830\u2844",
-      "  \u28BF\u28F7  \u283B\u281F  \u28F0\u28FF\u280F \u2880\u281E",
-      "   \u283B\u28F7\u28C4  \u28E0\u28FE\u281F  \u2870\u280B",
-      "     \u2819\u283F\u283F\u281B\u2801  \u2818\u2801"
+      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B",
+      "\u2588\u2588        ",
+      "\u2588\u2588        ",
+      "\u2588\u2588        ",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259C",
+      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
     ]),
     compact: normalizeLogo([
-      "   \u28E0\u28E4\u28C4",
-      " \u28F0\u287F\u280B\u2819\u28BF\u28C6",
-      "\u28B0\u28FF  \u28FF\u2847 \u28FF\u2847\u28A0",
-      " \u28BF\u28E7 \u281B \u28F0\u287F\u28A0\u2803",
-      "  \u2819\u283F\u28F6\u283F\u280B \u2818"
+      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
+      "\u2588\u2588      ",
+      "\u2588\u2588      ",
+      "\u2588\u2588      ",
+      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
     ]),
-    plain: normalizeLogo([" \u28E0\u28C4", "\u28B8\u2847\u28FF\u2847\u28A0", " \u283B\u2836\u280B\u2818"])
+    plain: normalizeLogo(["\u259F\u2588\u2588\u2588\u2588\u2599", "\u2588\u2588    ", "\u259C\u2588\u2588\u2588\u2588\u259B"])
   };
 });
 
@@ -729822,7 +729822,7 @@ function getSessionSpecificGuidanceSection(enabledTools, skillToolCommands) {
   return ["# Session-specific guidance", ...prependBullets(items)].join(`
 `);
 }
-async function getSystemPrompt(tools, model, additionalWorkingDirectories, mcpClients) {
+async function getSystemPrompt(tools, model, additionalWorkingDirectories, mcpClients, opts) {
   if (isEnvTruthy(process.env.CLAUDE_CODE_SIMPLE)) {
     return [
       `You are Claude Code, Anthropic's official CLI for Claude.
@@ -729885,7 +729885,7 @@ ${CYBER_RISK_INSTRUCTION}`,
     getSimpleSystemSection(model),
     outputStyleConfig === null || outputStyleConfig.keepCodingInstructions === true ? getSimpleDoingTasksSection() : null,
     getActionsSection(),
-    ...shouldUseGlobalCacheScope() ? [SYSTEM_PROMPT_DYNAMIC_BOUNDARY] : [],
+    ...shouldUseGlobalCacheScope() || opts?.excludeDynamicSections ? [SYSTEM_PROMPT_DYNAMIC_BOUNDARY] : [],
     ...resolvedDynamicSections,
     `# Context management
 When the conversation grows long, some or all of the current context is summarized; the summary, along with any remaining unsummarized context, is provided in the next context window so work can continue \u2014 you don't need to wrap up early or hand off mid-task.`
@@ -812143,7 +812143,7 @@ function registerMcpAddCommand(mcp2) {
 ` + `  claude mcp add --transport http corridor https://app.corridor.dev/api/mcp --header "Authorization: Bearer ..."
 
 ` + `  # Add stdio server with environment variables:
-` + `  claude mcp add -e API_KEY=xxx my-server -- npx my-mcp-server
+` + `  claude mcp add my-server -e API_KEY=xxx -- npx my-mcp-server
 
 ` + `  # Add stdio server with subprocess flags:
 ` + "  claude mcp add my-server -- my-command --some-flag arg1").option("-s, --scope <scope>", "Configuration scope (local, user, or project)", "local").option("-t, --transport <transport>", "Transport type (stdio, sse, http). Defaults to stdio if not specified.").option("-e, --env <env...>", "Set environment variables (e.g. -e KEY=value)").option("-H, --header <header...>", 'Set WebSocket headers (e.g. -H "X-Api-Key: abc123" -H "X-Custom: value")').option("--client-id <clientId>", "OAuth client ID for HTTP/SSE servers").option("--client-secret", "Prompt for OAuth client secret (or set MCP_CLIENT_SECRET env var)").option("--callback-port <port>", "Fixed port for OAuth callback (for servers requiring pre-registered redirect URIs)").helpOption("-h, --help", "Display help for command").addOption(new Option("--xaa", "Enable XAA (SEP-990) for this server. Requires 'claude mcp xaa setup' first. Also requires --client-id and --client-secret (for the MCP server's AS).").hideHelp(!isXaaEnabled())).action(async (name3, commandOrUrl, args, options) => {
@@ -813330,17 +813330,114 @@ var init_protocolHandler = __esm(() => {
   init_terminalLauncher();
 });
 
+// src/utils/plugins/fetchPluginZip.ts
+var exports_fetchPluginZip = {};
+__export(exports_fetchPluginZip, {
+  validatePluginZipUrl: () => validatePluginZipUrl,
+  fetchPluginZipFromUrl: () => fetchPluginZipFromUrl,
+  MAX_PLUGIN_ZIP_BYTES: () => MAX_PLUGIN_ZIP_BYTES,
+  DEFAULT_PLUGIN_ZIP_TIMEOUT_MS: () => DEFAULT_PLUGIN_ZIP_TIMEOUT_MS
+});
+import { randomUUID as randomUUID64 } from "crypto";
+import { mkdir as mkdir60, open as open17, rm as rm14 } from "fs/promises";
+import { tmpdir as tmpdir19 } from "os";
+import { join as join186 } from "path";
+function validatePluginZipUrl(raw) {
+  let parsed;
+  try {
+    parsed = new URL(raw);
+  } catch {
+    throw new Error(`--plugin-url: invalid URL "${raw}". Expected an https:// URL to a plugin .zip.`);
+  }
+  if (parsed.protocol !== "https:") {
+    throw new Error(`--plugin-url: only https:// URLs are accepted (got "${parsed.protocol}"). OCC fetches plugin zips over HTTPS only.`);
+  }
+  return parsed;
+}
+async function openForWrite(path43) {
+  const handle2 = await open17(path43, "w");
+  return {
+    write: async (chunk) => {
+      await handle2.writeFile(chunk);
+    },
+    close: async () => {
+      await handle2.close();
+    }
+  };
+}
+async function fetchPluginZipFromUrl(rawUrl, options = {}) {
+  const url3 = validatePluginZipUrl(rawUrl);
+  const maxBytes = options.maxBytes ?? MAX_PLUGIN_ZIP_BYTES;
+  const timeoutMs = options.timeoutMs ?? DEFAULT_PLUGIN_ZIP_TIMEOUT_MS;
+  const doFetch = options.fetchImpl ?? fetch;
+  const controller = new AbortController;
+  const timer2 = setTimeout(() => controller.abort(), timeoutMs);
+  let sessionTmp = null;
+  try {
+    const response3 = await doFetch(url3, {
+      method: "GET",
+      redirect: "error",
+      signal: controller.signal
+    });
+    if (!response3.ok) {
+      throw new Error(`--plugin-url: fetch "${rawUrl}" failed: HTTP ${response3.status}${response3.statusText ? ` ${response3.statusText}` : ""}`);
+    }
+    if (response3.body === null) {
+      throw new Error(`--plugin-url: response from "${rawUrl}" has no body`);
+    }
+    sessionTmp = join186(tmpdir19(), `occ-plugin-url-${randomUUID64()}`);
+    await mkdir60(sessionTmp, { recursive: true });
+    const zipPath = join186(sessionTmp, "plugin.zip");
+    const reader = response3.body.getReader();
+    const writer = await openForWrite(zipPath);
+    let received = 0;
+    try {
+      for (;; ) {
+        const { done, value } = await reader.read();
+        if (done) {
+          break;
+        }
+        received += value.byteLength;
+        if (received > maxBytes) {
+          throw new Error(`--plugin-url: zip from "${rawUrl}" exceeds the ${maxBytes}-byte limit (received >= ${received} bytes).`);
+        }
+        await writer.write(value);
+      }
+    } finally {
+      await writer.close();
+    }
+    if (received === 0) {
+      throw new Error(`--plugin-url: response from "${rawUrl}" was empty`);
+    }
+    return { path: zipPath, url: rawUrl };
+  } catch (error52) {
+    if (sessionTmp !== null) {
+      await rm14(sessionTmp, { recursive: true, force: true }).catch(() => {});
+    }
+    if (controller.signal.aborted) {
+      throw new Error(`--plugin-url: fetch "${rawUrl}" timed out after ${timeoutMs}ms.`);
+    }
+    throw error52;
+  } finally {
+    clearTimeout(timer2);
+  }
+}
+var MAX_PLUGIN_ZIP_BYTES, DEFAULT_PLUGIN_ZIP_TIMEOUT_MS = 45000;
+var init_fetchPluginZip = __esm(() => {
+  MAX_PLUGIN_ZIP_BYTES = 100 * 1024 * 1024;
+});
+
 // src/utils/computerUse/setup.ts
 var exports_setup = {};
 __export(exports_setup, {
   setupComputerUseMCP: () => setupComputerUseMCP
 });
-import { join as join186 } from "path";
+import { join as join187 } from "path";
 import { fileURLToPath as fileURLToPath10 } from "url";
 function setupComputerUseMCP() {
   const allowedTools = buildComputerUseTools(CLI_CU_CAPABILITIES, getChicagoCoordinateMode()).map((t4) => buildMcpToolName(COMPUTER_USE_MCP_SERVER_NAME, t4.name));
   const args = isInBundledMode() ? ["--computer-use-mcp"] : [
-    join186(fileURLToPath10(import.meta.url), "..", "cli.js"),
+    join187(fileURLToPath10(import.meta.url), "..", "cli.js"),
     "--computer-use-mcp"
   ];
   return {
@@ -813562,7 +813659,7 @@ var init_sessionMemory = __esm(() => {
 // src/utils/iTermBackup.ts
 import { copyFile as copyFile12, stat as stat54 } from "fs/promises";
 import { homedir as homedir52 } from "os";
-import { join as join187 } from "path";
+import { join as join188 } from "path";
 function markITerm2SetupComplete() {
   saveGlobalConfig((current) => ({
     ...current,
@@ -813577,7 +813674,7 @@ function getIterm2RecoveryInfo() {
   };
 }
 function getITerm2PlistPath() {
-  return join187(homedir52(), "Library", "Preferences", "com.googlecode.iterm2.plist");
+  return join188(homedir52(), "Library", "Preferences", "com.googlecode.iterm2.plist");
 }
 async function checkAndRestoreITerm2Backup() {
   const { inProgress, backupPath } = getIterm2RecoveryInfo();
@@ -814305,7 +814402,7 @@ var init_queryContext = __esm(() => {
 });
 
 // src/QueryEngine.ts
-import { randomUUID as randomUUID64 } from "crypto";
+import { randomUUID as randomUUID65 } from "crypto";
 function monotonicNow() {
   if (typeof performance !== "undefined" && typeof performance.now === "function") {
     return performance.now();
@@ -814623,7 +814720,7 @@ class QueryEngine {
         modelUsage: getModelUsage(),
         permission_denials: this.permissionDenials,
         fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-        uuid: randomUUID64()
+        uuid: randomUUID65()
       };
       return;
     }
@@ -814747,7 +814844,7 @@ class QueryEngine {
               event,
               session_id: getSessionId(),
               parent_tool_use_id: null,
-              uuid: randomUUID64()
+              uuid: randomUUID65()
             };
           }
           break;
@@ -814782,7 +814879,7 @@ class QueryEngine {
               modelUsage: getModelUsage(),
               permission_denials: this.permissionDenials,
               fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-              uuid: randomUUID64(),
+              uuid: randomUUID65(),
               errors: [
                 `Reached maximum number of turns (${attachment.maxTurns})`
               ]
@@ -814890,7 +814987,7 @@ class QueryEngine {
           modelUsage: getModelUsage(),
           permission_denials: this.permissionDenials,
           fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-          uuid: randomUUID64(),
+          uuid: randomUUID65(),
           errors: [`Reached maximum budget ($${maxBudgetUsd})`]
         };
         return;
@@ -814919,7 +815016,7 @@ class QueryEngine {
             modelUsage: getModelUsage(),
             permission_denials: this.permissionDenials,
             fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-            uuid: randomUUID64(),
+            uuid: randomUUID65(),
             errors: [
               `Failed to provide valid structured output after ${maxRetries} attempts`
             ]
@@ -814951,7 +815048,7 @@ class QueryEngine {
         modelUsage: getModelUsage(),
         permission_denials: this.permissionDenials,
         fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-        uuid: randomUUID64(),
+        uuid: randomUUID65(),
         errors: (() => {
           const all4 = getInMemoryErrors();
           const start = errorLogWatermark ? all4.lastIndexOf(errorLogWatermark) + 1 : 0;
@@ -814988,7 +815085,7 @@ class QueryEngine {
       permission_denials: this.permissionDenials,
       structured_output: structuredOutputFromTool,
       fast_mode_state: getFastModeState(mainLoopModel, initialAppState.fastMode),
-      uuid: randomUUID64()
+      uuid: randomUUID65()
     };
   }
   interrupt() {
@@ -815142,7 +815239,7 @@ var init_QueryEngine = __esm(() => {
 var FILE_COUNT_LIMIT = 1e4, OUTPUTS_SUBDIR = ".claude-code/outputs", DEFAULT_UPLOAD_CONCURRENCY = 5;
 
 // src/utils/filePersistence/filePersistence.ts
-import { join as join188, relative as relative39 } from "path";
+import { join as join189, relative as relative39 } from "path";
 async function runFilePersistence(turnStartTime, signal) {
   const environmentKind = getEnvironmentKind();
   if (environmentKind !== "byoc") {
@@ -815161,7 +815258,7 @@ async function runFilePersistence(turnStartTime, signal) {
     oauthToken: sessionAccessToken,
     sessionId
   };
-  const outputsDir = join188(getCwd(), sessionId, OUTPUTS_SUBDIR);
+  const outputsDir = join189(getCwd(), sessionId, OUTPUTS_SUBDIR);
   if (signal?.aborted) {
     logDebug("Persistence aborted before processing");
     return null;
@@ -815332,11 +815429,11 @@ var init_idleTimeout = __esm(() => {
 });
 
 // src/utils/sessionUrl.ts
-import { randomUUID as randomUUID65 } from "crypto";
+import { randomUUID as randomUUID66 } from "crypto";
 function parseSessionIdentifier(resumeIdentifier) {
   if (resumeIdentifier.toLowerCase().endsWith(".jsonl")) {
     return {
-      sessionId: randomUUID65(),
+      sessionId: randomUUID66(),
       ingressUrl: null,
       isUrl: false,
       jsonlFile: resumeIdentifier,
@@ -815355,7 +815452,7 @@ function parseSessionIdentifier(resumeIdentifier) {
   try {
     const url3 = new URL(resumeIdentifier);
     return {
-      sessionId: randomUUID65(),
+      sessionId: randomUUID66(),
       ingressUrl: url3.href,
       isUrl: true,
       jsonlFile: null,
@@ -815370,7 +815467,7 @@ var init_sessionUrl = __esm(() => {
 
 // src/utils/plugins/zipCacheAdapters.ts
 import { readFile as readFile68 } from "fs/promises";
-import { join as join189 } from "path";
+import { join as join190 } from "path";
 async function readZipCacheKnownMarketplaces() {
   try {
     const content = await readFile68(getZipCacheKnownMarketplacesPath(), "utf-8");
@@ -815395,13 +815492,13 @@ async function saveMarketplaceJsonToZipCache(marketplaceName, installLocation) {
   const content = await readMarketplaceJsonContent(installLocation);
   if (content !== null) {
     const relPath = getMarketplaceJsonRelativePath(marketplaceName);
-    await atomicWriteToZipCache(join189(zipCachePath, relPath), content);
+    await atomicWriteToZipCache(join190(zipCachePath, relPath), content);
   }
 }
 async function readMarketplaceJsonContent(dir) {
   const candidates = [
-    join189(dir, ".claude-plugin", "marketplace.json"),
-    join189(dir, "marketplace.json"),
+    join190(dir, ".claude-plugin", "marketplace.json"),
+    join190(dir, "marketplace.json"),
     dir
   ];
   for (const candidate of candidates) {
@@ -815541,7 +815638,7 @@ __export(exports_print, {
 import { readFile as readFile69, stat as stat55 } from "fs/promises";
 import { dirname as dirname84 } from "path";
 import { cwd as cwd2 } from "process";
-import { randomUUID as randomUUID66 } from "crypto";
+import { randomUUID as randomUUID67 } from "crypto";
 function trackReceivedMessageUuid(uuid5) {
   if (receivedMessageUuids.has(uuid5)) {
     return false;
@@ -815671,7 +815768,7 @@ Error: sandbox required but unavailable: ${sandboxUnavailableReason}
               hook_id: event.hookId,
               hook_name: event.hookName,
               hook_event: event.hookEvent,
-              uuid: randomUUID66(),
+              uuid: randomUUID67(),
               session_id: getSessionId()
             };
           case "progress":
@@ -815684,7 +815781,7 @@ Error: sandbox required but unavailable: ${sandboxUnavailableReason}
               stdout: event.stdout,
               stderr: event.stderr,
               output: event.output,
-              uuid: randomUUID66(),
+              uuid: randomUUID67(),
               session_id: getSessionId()
             };
           case "response":
@@ -815699,7 +815796,7 @@ Error: sandbox required but unavailable: ${sandboxUnavailableReason}
               stderr: event.stderr,
               exit_code: event.exitCode,
               outcome: event.outcome,
-              uuid: randomUUID66(),
+              uuid: randomUUID67(),
               session_id: getSessionId()
             };
         }
@@ -815743,6 +815840,32 @@ Error: sandbox required but unavailable: ${sandboxUnavailableReason}
       saveAgentSetting(restoredAgent.agentType);
     }
   }
+  if (options.excludeDynamicSections && !options.systemPrompt) {
+    const { getSystemPrompt: getSystemPrompt2, SYSTEM_PROMPT_DYNAMIC_BOUNDARY: SYSTEM_PROMPT_DYNAMIC_BOUNDARY2 } = await Promise.resolve().then(() => (init_prompts4(), exports_prompts));
+    const addDirs = options.addDir;
+    const parts = await getSystemPrompt2(tools, options.userSpecifiedModel ?? getMainLoopModel(), addDirs, [], { excludeDynamicSections: true });
+    const joined = parts.join(`
+
+`);
+    const boundaryIdx = joined.indexOf(SYSTEM_PROMPT_DYNAMIC_BOUNDARY2);
+    if (boundaryIdx !== -1) {
+      const staticPre = joined.slice(0, boundaryIdx).replace(/\s+$/, "");
+      const after = joined.slice(boundaryIdx + SYSTEM_PROMPT_DYNAMIC_BOUNDARY2.length);
+      const tailMarker = "# Context management";
+      const tailIdx = after.indexOf(tailMarker);
+      const dynamicPart = (tailIdx !== -1 ? after.slice(0, tailIdx) : after).trim();
+      const tailPart = tailIdx !== -1 ? after.slice(tailIdx).trim() : "";
+      const staticSystemPrompt = [staticPre, tailPart].filter(Boolean).join(`
+
+`);
+      if (staticSystemPrompt) {
+        options.systemPrompt = staticSystemPrompt;
+      }
+      if (dynamicPart) {
+        structuredIO.prependUserMessage(dynamicPart);
+      }
+    }
+  }
   if (initialMessages.length === 0 && process.exitCode !== undefined) {
     return;
   }
@@ -815906,7 +816029,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
         subtype: "status",
         status: null,
         permissionMode: newMode,
-        uuid: randomUUID66(),
+        uuid: randomUUID67(),
         session_id: getSessionId()
       });
     }
@@ -815927,7 +816050,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
         isAuthenticating: status2.isAuthenticating,
         output: status2.output,
         error: status2.error,
-        uuid: randomUUID66(),
+        uuid: randomUUID67(),
         session_id: getSessionId()
       });
     });
@@ -815938,7 +816061,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
       output2.enqueue({
         type: "rate_limit_event",
         rate_limit_info: rateLimitInfo,
-        uuid: randomUUID66(),
+        uuid: randomUUID67(),
         session_id: getSessionId()
       });
     }
@@ -815954,7 +816077,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
     enqueue({
       mode: "prompt",
       value: turnInterruptionState.message.message.content,
-      uuid: randomUUID66()
+      uuid: randomUUID67()
     });
   }
   const modelOptions = getModelOptions();
@@ -816049,7 +816172,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
             subtype: "elicitation_complete",
             mcp_server_name: serverName,
             elicitation_id: elicitationId,
-            uuid: randomUUID66(),
+            uuid: randomUUID67(),
             session_id: getSessionId()
           });
         });
@@ -816295,7 +816418,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
       enqueue({
         mode: "prompt",
         value: tickContent,
-        uuid: randomUUID66(),
+        uuid: randomUUID67(),
         priority: "later",
         isMeta: true
       });
@@ -816419,7 +816542,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
                   duration_ms: durationMsMatch ? parseInt(durationMsMatch[1], 10) : 0
                 } : undefined,
                 session_id: getSessionId(),
-                uuid: randomUUID66()
+                uuid: randomUUID67()
               });
             }
           }
@@ -816494,7 +816617,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
                   subtype: "status",
                   status: status2,
                   session_id: getSessionId(),
-                  uuid: randomUUID66()
+                  uuid: randomUUID67()
                 });
               }
             })) {
@@ -816531,7 +816654,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
                 files: result.persistedFiles,
                 failed: result.failedFiles,
                 processed_at: new Date().toISOString(),
-                uuid: randomUUID66(),
+                uuid: randomUUID67(),
                 session_id: getSessionId()
               });
             });
@@ -816554,7 +816677,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
                   const suggestionMsg = {
                     type: "prompt_suggestion",
                     suggestion: result.suggestion,
-                    uuid: randomUUID66(),
+                    uuid: randomUUID67(),
                     session_id: getSessionId()
                   };
                   const lastEmittedEntry = {
@@ -816644,7 +816767,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
           usage: EMPTY_USAGE,
           modelUsage: {},
           permission_denials: [],
-          uuid: randomUUID66(),
+          uuid: randomUUID67(),
           errors: [
             errorMessage(error52),
             ...getInMemoryErrors().map((_4) => _4.error)
@@ -816733,7 +816856,7 @@ ${m5.text}
             enqueue({
               mode: "prompt",
               value: formatted,
-              uuid: randomUUID66()
+              uuid: randomUUID67()
             });
             run();
             return;
@@ -816744,7 +816867,7 @@ ${m5.text}
             enqueue({
               mode: "prompt",
               value: SHUTDOWN_TEAM_PROMPT,
-              uuid: randomUUID66()
+              uuid: randomUUID67()
             });
             run();
             return;
@@ -816768,7 +816891,7 @@ ${m5.text}
         enqueue({
           mode: "prompt",
           value: SHUTDOWN_TEAM_PROMPT,
-          uuid: randomUUID66()
+          uuid: randomUUID67()
         });
         run();
       } else {
@@ -816802,7 +816925,7 @@ ${m5.text}
         enqueue({
           mode: "prompt",
           value: prompt,
-          uuid: randomUUID66(),
+          uuid: randomUUID67(),
           priority: "later",
           isMeta: true,
           workload: WORKLOAD_CRON
@@ -817568,7 +817691,7 @@ ${m5.text}
                       subtype: "bridge_state",
                       state: state4,
                       detail,
-                      uuid: randomUUID66(),
+                      uuid: randomUUID67(),
                       session_id: getSessionId()
                     });
                   },
@@ -817898,7 +818021,7 @@ async function handleInitializeRequest(request5, requestId, initialized5, output
         isAuthenticating: status2.isAuthenticating,
         output: status2.output,
         error: status2.error,
-        uuid: randomUUID66(),
+        uuid: randomUUID67(),
         session_id: getSessionId()
       });
     }
@@ -818099,7 +818222,7 @@ function emitLoadError(message, outputFormat) {
       usage: EMPTY_USAGE,
       modelUsage: {},
       permission_denials: [],
-      uuid: randomUUID66(),
+      uuid: randomUUID67(),
       errors: [message]
     };
     process.stdout.write(jsonStringify(errorResult) + `
@@ -819720,14 +819843,14 @@ __export(exports_claudeDesktop, {
 });
 import { readdir as readdir38, readFile as readFile70, stat as stat56 } from "fs/promises";
 import { homedir as homedir53 } from "os";
-import { join as join190 } from "path";
+import { join as join191 } from "path";
 async function getClaudeDesktopConfigPath() {
   const platform7 = getPlatform();
   if (!SUPPORTED_PLATFORMS.includes(platform7)) {
     throw new Error(`Unsupported platform: ${platform7} - Claude Desktop integration only works on macOS and WSL.`);
   }
   if (platform7 === "macos") {
-    return join190(homedir53(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return join191(homedir53(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   const windowsHome = process.env.USERPROFILE ? process.env.USERPROFILE.replace(/\\/g, "/") : null;
   if (windowsHome) {
@@ -819746,7 +819869,7 @@ async function getClaudeDesktopConfigPath() {
         if (user.name === "Public" || user.name === "Default" || user.name === "Default User" || user.name === "All Users") {
           continue;
         }
-        const potentialConfigPath = join190(usersDir, user.name, "AppData", "Roaming", "Claude", "claude_desktop_config.json");
+        const potentialConfigPath = join191(usersDir, user.name, "AppData", "Roaming", "Claude", "claude_desktop_config.json");
         try {
           await stat56(potentialConfigPath);
           return potentialConfigPath;
@@ -819936,7 +820059,7 @@ async function mcpListHandler() {
   if (Object.keys(configs).length === 0) {
     console.log("No MCP servers configured. Use `claude mcp add` to add a server.");
   } else {
-    console.log(`Checking MCP server health...
+    console.log(`Checking MCP server health\u2026
 `);
     const entries = Object.entries(configs);
     const results = await pMap(entries, async ([name3, server]) => ({
@@ -820729,12 +820852,12 @@ __export(exports_install, {
   install: () => install2
 });
 import { homedir as homedir54 } from "os";
-import { join as join191 } from "path";
+import { join as join192 } from "path";
 function getInstallationPath2() {
   const isWindows3 = env4.platform === "win32";
   const homeDir = homedir54();
   if (isWindows3) {
-    const windowsPath = join191(homeDir, ".local", "bin", "claude.exe");
+    const windowsPath = join192(homeDir, ".local", "bin", "claude.exe");
     return windowsPath.replace(/\//g, "\\");
   }
   return "~/.local/bin/claude";
@@ -821462,7 +821585,7 @@ var exports_projectPurge = {};
 __export(exports_projectPurge, {
   purgeProjectHandler: () => purgeProjectHandler
 });
-import { join as join192 } from "path";
+import { join as join193 } from "path";
 function resolveAbsolutePath(input2) {
   if (!input2) {
     return getCwd();
@@ -821481,7 +821604,7 @@ async function discoverAllProjectPaths() {
   try {
     const entries = await fs27.readdir(projectsDir);
     for (const entry of entries) {
-      paths2.add(join192(projectsDir, entry.name));
+      paths2.add(join193(projectsDir, entry.name));
     }
   } catch {}
   return [...paths2];
@@ -821491,7 +821614,7 @@ async function collectItemsForProject(projectPath) {
   const warnings = [];
   const fs27 = getFsImplementation();
   const projectsDir = getProjectsDir2();
-  const transcriptDir = join192(projectsDir, sanitizePath2(projectPath));
+  const transcriptDir = join193(projectsDir, sanitizePath2(projectPath));
   try {
     const stat58 = await fs27.stat(transcriptDir);
     if (stat58.isDirectory()) {
@@ -822799,9 +822922,26 @@ async function run() {
     initSinks2();
     profileCheckpoint("preAction_after_sinks");
     const pluginDir = thisCommand.getOptionValue("pluginDir");
+    const pluginUrl = thisCommand.getOptionValue("pluginUrl");
+    const inlinePluginPaths = [];
     if (Array.isArray(pluginDir) && pluginDir.length > 0 && pluginDir.every((p4) => typeof p4 === "string")) {
-      setInlinePlugins(pluginDir);
-      clearPluginCache("preAction: --plugin-dir inline plugins");
+      inlinePluginPaths.push(...pluginDir);
+    }
+    if (Array.isArray(pluginUrl) && pluginUrl.length > 0 && pluginUrl.every((p4) => typeof p4 === "string")) {
+      const { fetchPluginZipFromUrl: fetchPluginZipFromUrl2 } = await Promise.resolve().then(() => (init_fetchPluginZip(), exports_fetchPluginZip));
+      for (const url3 of pluginUrl) {
+        try {
+          const fetched = await fetchPluginZipFromUrl2(url3);
+          inlinePluginPaths.push(fetched.path);
+        } catch (error52) {
+          const { exitWithError: exitWithError3 } = await Promise.resolve().then(() => (init_process(), exports_process));
+          exitWithError3(error52 instanceof Error ? error52.message : String(error52));
+        }
+      }
+    }
+    if (inlinePluginPaths.length > 0) {
+      setInlinePlugins(inlinePluginPaths);
+      clearPluginCache("preAction: --plugin-dir/--plugin-url inline plugins");
     }
     runMigrations();
     profileCheckpoint("preAction_after_migrations");
@@ -822846,8 +822986,19 @@ async function run() {
       throw new InvalidArgumentError(`It must be one of: ${allowed.join(", ")}`);
     }
     return value;
-  })).option("--agent <agent>", `Agent for the current session. Overrides the 'agent' setting.`).option("--betas <betas...>", "Beta headers to include in API requests (API key users only)").option("--fallback-model <model>", "Enable automatic fallback to specified model when default model is overloaded (only works with --print)").addOption(new Option("--workload <tag>", "Workload tag for billing-header attribution (cc_workload). Process-scoped; set by SDK daemon callers that spawn subprocesses for cron work. (only works with --print)").hideHelp()).option("--settings <file-or-json>", "Path to a settings JSON file or a JSON string to load additional settings from").option("--add-dir <directories...>", "Additional directories to allow tool access to").option("--ide", "Automatically connect to IDE on startup if exactly one valid IDE is available", () => true).option("--strict-mcp-config", "Only use MCP servers from --mcp-config, ignoring all other MCP configurations", () => true).option("--session-id <uuid>", "Use a specific session ID for the conversation (must be a valid UUID)").option("-n, --name <name>", "Set a display name for this session (shown in /resume and terminal title)").option("--agents <json>", `JSON object defining custom agents (e.g. '{"reviewer": {"description": "Reviews code", "prompt": "You are a code reviewer"}}')`).option("--setting-sources <sources>", "Comma-separated list of setting sources to load (user, project, local).").option("--plugin-dir <path>", "Load plugins from a directory for this session only (repeatable: --plugin-dir A --plugin-dir B)", (val, prev) => [...prev, val], []).option("--disable-slash-commands", "Disable all skills", () => true).option("--chrome", "Enable Claude in Chrome integration").option("--no-chrome", "Disable Claude in Chrome integration").option("--file <specs...>", "File resources to download at startup. Format: file_id:relative_path (e.g., --file file_abc:doc.txt file_def:img.png)").action(async (prompt, options) => {
+  })).option("--agent <agent>", `Agent for the current session. Overrides the 'agent' setting.`).option("--betas <betas...>", "Beta headers to include in API requests (API key users only)").option("--fallback-model <model>", "Enable automatic fallback to specified model when default model is overloaded (only works with --print)").addOption(new Option("--workload <tag>", "Workload tag for billing-header attribution (cc_workload). Process-scoped; set by SDK daemon callers that spawn subprocesses for cron work. (only works with --print)").hideHelp()).option("--settings <file-or-json>", "Path to a settings JSON file or a JSON string to load additional settings from").option("--add-dir <directories...>", "Additional directories to allow tool access to").option("--ide", "Automatically connect to IDE on startup if exactly one valid IDE is available", () => true).option("--strict-mcp-config", "Only use MCP servers from --mcp-config, ignoring all other MCP configurations", () => true).option("--session-id <uuid>", "Use a specific session ID for the conversation (must be a valid UUID)").option("-n, --name <name>", "Set a display name for this session (shown in /resume and terminal title)").option("--agents <json>", `JSON object defining custom agents (e.g. '{"reviewer": {"description": "Reviews code", "prompt": "You are a code reviewer"}}')`).option("--setting-sources <sources>", "Comma-separated list of setting sources to load (user, project, local).").addOption(new Option("--prompt-suggestions [value]", "Enable prompt suggestions. In print/SDK mode, emits a prompt_suggestion message after each turn with a predicted next user prompt").choices(["true", "false", "1", "0", "yes", "no", "on", "off"]).preset("true").argParser((raw) => {
+    const allowed = ["true", "false", "1", "0", "yes", "no", "on", "off"];
+    if (!allowed.includes(raw)) {
+      throw new InvalidArgumentError("Allowed choices are true, false, 1, 0, yes, no, on, off.");
+    }
+    return !["false", "0", "no", "off"].includes(raw);
+  })).addOption(new Option("--exclude-dynamic-system-prompt-sections", "Move per-machine sections (cwd, env info, memory paths, git status) from the system prompt into the first user message. Improves cross-user prompt-cache reuse. Only applies with the default system prompt (ignored with --system-prompt).").default(false)).option("--plugin-url <url>", "Fetch a plugin .zip from a URL for this session only (repeatable: --plugin-url A --plugin-url B)", (val, prev) => [...prev, val], []).option("--bg, --background", "Start the session as a background agent. OCC note: background sessions are managed via the `daemon` and `agents` subcommands (e.g. `occ daemon start`, `occ agents`, `occ attach <id>`) \u2014 see `occ daemon --help`. This flag is accepted for CLI compatibility but does not start a foreground REPL.").option("--plugin-dir <path>", "Load plugins from a directory for this session only (repeatable: --plugin-dir A --plugin-dir B)", (val, prev) => [...prev, val], []).option("--disable-slash-commands", "Disable all skills", () => true).option("--chrome", "Enable Claude in Chrome integration").option("--no-chrome", "Disable Claude in Chrome integration").option("--file <specs...>", "File resources to download at startup. Format: file_id:relative_path (e.g., --file file_abc:doc.txt file_def:img.png)").action(async (prompt, options) => {
     profileCheckpoint("action_handler_start");
+    const bgFlag = options.bg || options.background;
+    if (bgFlag) {
+      console.error("Error: OCC manages background sessions via the `daemon` and `agents` subcommands, not the `--bg` flag.\n  Start a background daemon:  `occ daemon start`\n  View background sessions:   `occ agents`\n  Resume a background session: `occ attach <id>`\n  See `occ daemon --help` and `occ agents --help`.");
+      process.exit(1);
+    }
     if (options.bare) {
       process.env.CLAUDE_CODE_SIMPLE = "1";
     }
@@ -823013,6 +823164,10 @@ ${getTmuxInstallInstructions2()}
         print = true;
       }
     }
+    if (options.promptSuggestions !== undefined && !(print && outputFormat === "stream-json")) {
+      console.error("Error: --prompt-suggestions requires --print and --output-format=stream-json (prompt_suggestion messages are only surfaced in stream-json output).");
+      process.exit(1);
+    }
     const teleport = options.teleport ?? null;
     const remoteOption = options.remote;
     const remote = remoteOption === true ? "" : remoteOption ?? null;
@@ -824153,7 +824308,9 @@ ${inputPrompt}` : mergePrompt;
         agent: agentCli,
         workload: options.workload,
         setupTrigger: setupTrigger ?? undefined,
-        sessionStartHooksPromise
+        sessionStartHooksPromise,
+        promptSuggestions: options.promptSuggestions,
+        excludeDynamicSections: options.excludeDynamicSystemPromptSections || undefined
       });
       return;
     }
@@ -824906,9 +825063,7 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
   if (feature("UDS_INBOX")) {
     program3.addOption(new Option("--messaging-socket-path <path>", "Unix domain socket path for the UDS messaging server (defaults to a tmp path)"));
   }
-  if (feature("KAIROS") || feature("KAIROS_BRIEF")) {
-    program3.addOption(new Option("--brief", "Enable SendUserMessage tool for agent-to-user communication"));
-  }
+  program3.addOption(new Option("--brief", "Enable SendUserMessage tool for agent-to-user communication"));
   if (feature("KAIROS")) {
     program3.addOption(new Option("--assistant", "Force assistant mode (Agent SDK daemon use)").hideHelp());
   }
@@ -824929,8 +825084,9 @@ Usage: claude --remote "your task description"`, () => gracefulShutdown(1));
   program3.addOption(new Option("--daemon-worker <kind>", "Run as a B daemon worker of the given kind (internal)").hideHelp());
   program3.addOption(new Option("--teleport [session]", "Resume a teleport session, optionally specify session ID").hideHelp());
   program3.addOption(new Option("--remote [description]", "Create a remote session with the given description").hideHelp());
+  program3.addOption(new Option("--remote-control [name]", "Start an interactive session with Remote Control enabled (optionally named)").argParser((value) => value || true));
+  program3.addOption(new Option("--remote-control-session-name-prefix <prefix>", "Prefix for auto-generated Remote Control session names (default: hostname)"));
   if (feature("BRIDGE_MODE")) {
-    program3.addOption(new Option("--remote-control [name]", "Start an interactive session with Remote Control enabled (optionally named)").argParser((value) => value || true).hideHelp());
     program3.addOption(new Option("--rc [name]", "Alias for --remote-control").argParser((value) => value || true).hideHelp());
   }
   if (feature("HARD_FAIL")) {

package/package.json

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