@cnwenf/occ 2.1.257 → 2.1.259

package/dist/cli.js

@@ -208988,7 +208988,17 @@ var init_ripgrep = __esm(() => {
     }
     const rgRoot = path13.resolve(__dirname3, "vendor", "ripgrep");
     const command4 = process.platform === "win32" ? path13.resolve(rgRoot, `${process.arch}-win32`, "rg.exe") : path13.resolve(rgRoot, `${process.arch}-${process.platform}`, "rg");
-    return { mode: "builtin", command: command4, args: [] };
+    try {
+      const fs9 = __require("fs");
+      if (fs9.existsSync(command4)) {
+        return { mode: "builtin", command: command4, args: [] };
+      }
+    } catch {}
+    const { cmd: systemRg } = findExecutable2("rg", []);
+    if (systemRg !== "rg") {
+      return { mode: "system", command: "rg", args: [] };
+    }
+    return { mode: "system", command: "grep", args: ["-rn"] };
   });
   RipgrepTimeoutError = class RipgrepTimeoutError extends Error {
     partialResults;
@@ -262807,6 +262817,61 @@ var init_tmuxSocket = __esm(() => {
   init_platform2();
 });
 
+// src/utils/shell/pidNamespace.ts
+var exports_pidNamespace = {};
+__export(exports_pidNamespace, {
+  wrapWithPidNamespace: () => wrapWithPidNamespace,
+  isPidNamespaceAvailable: () => isPidNamespaceAvailable,
+  _resetPidNamespaceCache: () => _resetPidNamespaceCache,
+  PID_NAMESPACE_DISABLE_ENV: () => PID_NAMESPACE_DISABLE_ENV
+});
+import { execFileSync as execFileSync2 } from "child_process";
+function isPidNamespaceAvailable() {
+  if (_availabilityCache !== undefined)
+    return _availabilityCache;
+  _availabilityCache = computePidNamespaceAvailable();
+  return _availabilityCache;
+}
+function computePidNamespaceAvailable() {
+  if (getPlatform() !== "linux")
+    return false;
+  if (process.env[PID_NAMESPACE_DISABLE_ENV])
+    return false;
+  try {
+    execFileSync2("test", ["-e", "/proc/self/ns/pid"], { stdio: "ignore" });
+  } catch {
+    return false;
+  }
+  try {
+    execFileSync2("command", ["-v", "unshare"], {
+      stdio: ["ignore", "pipe", "ignore"],
+      shell: "bash"
+    });
+  } catch {
+    try {
+      execFileSync2("unshare", ["--help"], { stdio: "ignore" });
+    } catch {
+      return false;
+    }
+  }
+  return true;
+}
+function wrapWithPidNamespace(shellPath, commandString) {
+  if (!isPidNamespaceAvailable())
+    return commandString;
+  const innerShell = quote([shellPath]);
+  const innerCmd = quote([commandString]);
+  return `unshare --user --map-root-user --pid --fork -- ${innerShell} -c ${innerCmd}`;
+}
+function _resetPidNamespaceCache() {
+  _availabilityCache = undefined;
+}
+var PID_NAMESPACE_DISABLE_ENV = "CLAUDE_CODE_DISABLE_PID_NAMESPACE", _availabilityCache;
+var init_pidNamespace = __esm(() => {
+  init_platform2();
+  init_shellQuote();
+});
+
 // src/utils/shell/bashProvider.ts
 import { access } from "fs/promises";
 import { tmpdir as osTmpdir } from "os";
@@ -262885,8 +262950,8 @@ ${quotedCommand.slice(0, 500)}`);
       }
       if (opts.useSandbox) {
         try {
-          const { wrapWithPidNamespace } = (()=>{throw new Error("Cannot require module "+"./pidNamespace.js");})();
-          commandString = wrapWithPidNamespace(commandString);
+          const { wrapWithPidNamespace: wrapWithPidNamespace2 } = (init_pidNamespace(), __toCommonJS(exports_pidNamespace));
+          commandString = wrapWithPidNamespace2(commandString);
         } catch {}
       }
       return { commandString, cwdFilePath };
@@ -263047,7 +263112,7 @@ var init_powershellProvider = __esm(() => {
 });
 
 // src/utils/Shell.ts
-import { execFileSync as execFileSync2, spawn as spawn7 } from "child_process";
+import { execFileSync as execFileSync3, spawn as spawn7 } from "child_process";
 import { constants as fsConstants4, readFileSync as readFileSync19, unlinkSync as unlinkSync3 } from "fs";
 import { mkdir as mkdir12, open as open6, realpath as realpath8 } from "fs/promises";
 import { isAbsolute as isAbsolute12, resolve as resolve23 } from "path";
@@ -263059,7 +263124,7 @@ function isExecutable(shellPath) {
     return true;
   } catch (_err) {
     try {
-      execFileSync2(shellPath, ["--version"], {
+      execFileSync3(shellPath, ["--version"], {
         timeout: 1000,
         stdio: "ignore"
       });
@@ -268021,7 +268086,7 @@ var DEFAULT_MAX_LISTENERS = 50;
 var init_abortController = () => {};
 
 // src/utils/idePathConversion.ts
-import { execFileSync as execFileSync3 } from "child_process";
+import { execFileSync as execFileSync4 } from "child_process";
 
 class WindowsToWSLConverter {
   wslDistroName;
@@ -268038,7 +268103,7 @@ class WindowsToWSLConverter {
       }
     }
     try {
-      const result = execFileSync3("wslpath", ["-u", windowsPath], {
+      const result = execFileSync4("wslpath", ["-u", windowsPath], {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "ignore"]
       }).trim();
@@ -268051,7 +268116,7 @@ class WindowsToWSLConverter {
     if (!wslPath)
       return wslPath;
     try {
-      const result = execFileSync3("wslpath", ["-w", wslPath], {
+      const result = execFileSync4("wslpath", ["-w", wslPath], {
         encoding: "utf8",
         stdio: ["pipe", "pipe", "ignore"]
       }).trim();
@@ -472570,12 +472635,16 @@ function UserToolSuccessMessage({
     return null;
   }
   const rendersAsAssistantText = tool.userFacingName(undefined) === "";
+  const MAX_COLLAPSED_ROWS = verbose ? undefined : 12;
+  const [expanded, setExpanded] = React32.useState(verbose);
   return /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(ThemedBox_default, {
     flexDirection: "column",
     children: [
       /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(ThemedBox_default, {
         flexDirection: "column",
         width: rendersAsAssistantText ? undefined : width,
+        maxHeight: expanded ? undefined : MAX_COLLAPSED_ROWS,
+        overflow: expanded ? undefined : "hidden",
         children: [
           renderedMessage,
           feature("BASH_CLASSIFIER") ? classifierRule && /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(MessageResponse, {
@@ -472601,6 +472670,10 @@ function UserToolSuccessMessage({
           }, undefined, false, undefined, this) : null
         ]
       }, undefined, true, undefined, this),
+      !expanded && /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(ThemedText, {
+        dimColor: true,
+        children: " \xB7 \u2193 'e' to show full tool output"
+      }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(SentryErrorBoundary, {
         children: /* @__PURE__ */ jsx_dev_runtime120.jsxDEV(HookProgressMessage, {
           hookEvent: "PostToolUse",
@@ -636906,7 +636979,7 @@ __export(exports_insights, {
   deduplicateSessionBranches: () => deduplicateSessionBranches,
   buildExportData: () => buildExportData
 });
-import { execFileSync as execFileSync4 } from "child_process";
+import { execFileSync as execFileSync5 } from "child_process";
 import { constants as fsConstants8 } from "fs";
 import {
   copyFile as copyFile10,
@@ -639029,7 +639102,7 @@ Find something genuinely interesting or amusing from the session summaries.`,
         const s3Url = `https://s3-frontend.infra.ant.dev/anthropic-serve/atamkin/cc-user-reports/${filename}`;
         reportUrl = s3Url;
         try {
-          execFileSync4("ff", ["cp", htmlPath, s3Path], {
+          execFileSync5("ff", ["cp", htmlPath, s3Path], {
             timeout: 60000,
             stdio: "pipe"
           });
@@ -650520,7 +650593,7 @@ var init_chromeNativeHost = __esm(() => {
 });
 
 // src/daemon/process.ts
-import { execFileSync as execFileSync5 } from "child_process";
+import { execFileSync as execFileSync6 } from "child_process";
 function isPidAlive(pid) {
   if (!pid || pid <= 0)
     return false;
@@ -650536,7 +650609,7 @@ function getProcessStartMs(pid) {
     return null;
   let out;
   try {
-    out = execFileSync5("ps", ["-o", "lstart=", "-p", String(pid)], {
+    out = execFileSync6("ps", ["-o", "lstart=", "-p", String(pid)], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 2000
@@ -653874,11 +653947,11 @@ var init_lockfile = __esm(() => {
 });
 
 // src/daemon/respawn.ts
-import { execFileSync as execFileSync6 } from "child_process";
+import { execFileSync as execFileSync7 } from "child_process";
 function findOrphanedWorkers() {
   let out;
   try {
-    out = execFileSync6("ps", ["-e", "-o", "pid=,ppid=,command="], {
+    out = execFileSync7("ps", ["-e", "-o", "pid=,ppid=,command="], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 3000

package/package.json

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