pybao-cli 1.3.44 → 1.3.46

package/dist/{chunk-NDUV7XH4.js → chunk-FREXXRCP.js}

@@ -2,7 +2,7 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   listPybAgentSessions
-} from "./chunk-DTDUB7LG.js";
+} from "./chunk-VWOTB6OP.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -16,11 +16,11 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-LBHF6BS2.js";
+} from "./chunk-J2QBYXHQ.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-DTLOHNDH.js";
+} from "./chunk-PN4VJABA.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -33,15 +33,15 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-AIE6TFWI.js";
+} from "./chunk-AHDLGGNV.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-5XDINARX.js";
+} from "./chunk-YOMMEAP6.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-FBVDMTHQ.js";
+} from "./chunk-JWIWFXZH.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -58,7 +58,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-KAWPVVO4.js";
+} from "./chunk-QXB5JU22.js";
 import {
   getPybAgentSessionId,
   setPybAgentSessionId
@@ -71,35 +71,35 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-WZQQI3WY.js";
+} from "./chunk-HKQR7WT7.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-G22THW43.js";
+} from "./chunk-ZCIAAXXX.js";
 import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-6GSWJDP7.js";
+} from "./chunk-XPNI6T7J.js";
 import {
   listAllContentFiles,
   ripGrep,
   tree
-} from "./chunk-RHOMDJ4W.js";
+} from "./chunk-EL65JN4A.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-AVJMRJOF.js";
+} from "./chunk-AKPC4FCY.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-NAEAT6CC.js";
+} from "./chunk-2TG6N7RM.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback
-} from "./chunk-I4OD44YI.js";
+} from "./chunk-UH5XH34C.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
@@ -112,7 +112,7 @@ import {
   resetReminderSession,
   setTodos,
   systemReminderService
-} from "./chunk-R5B3QREX.js";
+} from "./chunk-BSKDTFG4.js";
 import {
   getSessionState
 } from "./chunk-ERMQRV55.js";
@@ -121,7 +121,7 @@ import {
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-S5PEPGE4.js";
+} from "./chunk-MLEJ32DL.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -154,22 +154,22 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-5CTMULCY.js";
+} from "./chunk-WCSNMHIZ.js";
 import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-FE3MRJ7F.js";
+} from "./chunk-O77VW2OG.js";
 import {
   getCodeStyle,
   getContext,
   getGitState,
   getIsGit,
   getProjectDocs
-} from "./chunk-FPSETIH6.js";
+} from "./chunk-UJV74XPJ.js";
 import {
   getTheme
-} from "./chunk-A7BD4CXP.js";
+} from "./chunk-YCIJ2LZ5.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -182,7 +182,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-LZUURGDV.js";
+} from "./chunk-GCQTTFVA.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -191,7 +191,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-NBLIMAPB.js";
+} from "./chunk-FJROYNRY.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -227,10 +227,10 @@ import {
   renderBashNotification,
   setActivePlanConversationKey,
   setCwd
-} from "./chunk-3VMVNZBA.js";
+} from "./chunk-BKP3JI3M.js";
 import {
   MACRO
-} from "./chunk-QVUJ6WJZ.js";
+} from "./chunk-2B56EMQC.js";
 import {
   formatTotalCost,
   getTotalAPIDuration,
@@ -245,7 +245,7 @@ import {
 // src/tools/system/BashTool/BashTool.tsx
 import { statSync as statSync12 } from "fs";
 import { EOL as EOL3 } from "os";
-import { isAbsolute as isAbsolute10, relative as relative13, resolve as resolve10 } from "path";
+import { isAbsolute as isAbsolute10, relative as relative13, resolve as resolve11 } from "path";
 import * as React109 from "react";
 import { z as z16 } from "zod";
 
@@ -418,7 +418,7 @@ var getCommandSubcommandPrefix = memoize(
 var getCommandPrefix = memoize(
   async (command4, abortSignal) => {
     const { systemPrompt, userPrompt } = buildBashCommandPrefixDetectionPrompt(command4);
-    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-22YH2ZPY.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-Q5CFDHRJ.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -941,8 +941,8 @@ async function shouldAllowNetworkRequest(query2) {
 }
 async function serializePermissionPrompt(task) {
   let release = null;
-  const next = new Promise((resolve11) => {
-    release = resolve11;
+  const next = new Promise((resolve12) => {
+    release = resolve12;
   });
   const prev = active.permissionPromptChain;
   active.permissionPromptChain = prev.then(() => next);
@@ -975,18 +975,18 @@ async function cleanupSandboxNetworkInfrastructure() {
   active.sessionDeniedHosts.clear();
   active.inflightPermissionRequests.clear();
   await Promise.allSettled([
-    httpServer ? new Promise((resolve11) => {
+    httpServer ? new Promise((resolve12) => {
       try {
-        httpServer.close(() => resolve11());
+        httpServer.close(() => resolve12());
       } catch {
-        resolve11();
+        resolve12();
       }
     }) : Promise.resolve(),
-    socksServer ? new Promise((resolve11) => {
+    socksServer ? new Promise((resolve12) => {
       try {
-        socksServer.close(() => resolve11());
+        socksServer.close(() => resolve12());
       } catch {
-        resolve11();
+        resolve12();
       }
     }) : Promise.resolve()
   ]);
@@ -1176,7 +1176,7 @@ async function startHttpProxy() {
     clientSocket.on("data", onData);
   });
   active.httpProxyServer = server;
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve12, reject) => {
     server.once("error", reject);
     server.once("listening", () => {
       const addr = server.address();
@@ -1185,7 +1185,7 @@ async function startHttpProxy() {
         return;
       }
       server.unref();
-      resolve11(addr.port);
+      resolve12(addr.port);
     });
     server.listen(0, "127.0.0.1");
   });
@@ -1295,7 +1295,7 @@ async function startSocks5Proxy() {
     socket.on("data", onData);
   });
   active.socksProxyServer = server;
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve12, reject) => {
     server.once("error", reject);
     server.once("listening", () => {
       const addr = server.address();
@@ -1304,7 +1304,7 @@ async function startSocks5Proxy() {
         return;
       }
       server.unref();
-      resolve11(addr.port);
+      resolve12(addr.port);
     });
     server.listen(0, "127.0.0.1");
   });
@@ -4458,7 +4458,7 @@ function formatParseError(error) {
   return error instanceof Error ? error.message : String(error);
 }
 async function defaultGateQuery(args) {
-  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-22YH2ZPY.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-Q5CFDHRJ.js");
   const messages = [
     {
       type: "user",
@@ -9721,9 +9721,9 @@ function setTerminalTitle(title) {
   }
 }
 function clearTerminal() {
-  return new Promise((resolve11) => {
+  return new Promise((resolve12) => {
     process.stdout.write("\x1B[2J\x1B[3J\x1B[H", () => {
-      resolve11();
+      resolve12();
     });
   });
 }
@@ -10841,8 +10841,8 @@ var OAuthService = class {
       await authURLHandler(manualUrl);
       await openBrowser(autoUrl);
     };
-    const { authorizationCode, useManualRedirect } = await new Promise((resolve11, reject) => {
-      this.pendingCodePromise = { resolve: resolve11, reject };
+    const { authorizationCode, useManualRedirect } = await new Promise((resolve12, reject) => {
+      this.pendingCodePromise = { resolve: resolve12, reject };
       this.startLocalServer(state, onReady);
     });
     const {
@@ -11013,7 +11013,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-22YH2ZPY.js");
+        const { resetAnthropicClient } = await import("./llm-Q5CFDHRJ.js");
         resetAnthropicClient();
       } catch {
       }
@@ -13383,7 +13383,7 @@ function ModelSelector({
         setModelLoadError(
           `Attempt ${attempt}/${MAX_RETRIES}: Retrying model discovery...`
         );
-        await new Promise((resolve11) => setTimeout(resolve11, 1e3));
+        await new Promise((resolve12) => setTimeout(resolve12, 1e3));
       }
       try {
         const models = await fetchModels();
@@ -15295,7 +15295,7 @@ async function refreshPluginRuntimeFromInstalls() {
   const existingRoots = getSessionPlugins().map((p) => p.rootDir);
   const dirs = Array.from(/* @__PURE__ */ new Set([...existingRoots, ...installedRoots]));
   if (dirs.length === 0) return [];
-  const { configureSessionPlugins } = await import("./pluginRuntime-ULGPYEC2.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-T5ID6ROB.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -15964,7 +15964,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-W6KAPOMM.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-TCTZSQL7.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -20023,7 +20023,7 @@ async function launchExternalEditor(initialText) {
     }
   }
   try {
-    await new Promise((resolve11, reject) => {
+    await new Promise((resolve12, reject) => {
       const child = spawn(
         editorCommand.command,
         [...editorCommand.args, filePath],
@@ -20035,7 +20035,7 @@ async function launchExternalEditor(initialText) {
       child.on("error", reject);
       child.on("exit", (code, signal) => {
         if (code === 0 || code === null) {
-          resolve11();
+          resolve12();
         } else {
           reject(
             new Error(
@@ -20086,7 +20086,7 @@ async function launchExternalEditorForFilePath(filePath) {
     }
   }
   try {
-    await new Promise((resolve11, reject) => {
+    await new Promise((resolve12, reject) => {
       const child = spawn(
         editorCommand.command,
         [...editorCommand.args, filePath],
@@ -20098,7 +20098,7 @@ async function launchExternalEditorForFilePath(filePath) {
       child.on("error", reject);
       child.on("exit", (code, signal) => {
         if (code === 0 || code === null) {
-          resolve11();
+          resolve12();
         } else {
           reject(
             new Error(
@@ -23223,7 +23223,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-22YH2ZPY.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-Q5CFDHRJ.js");
     const systemPrompt = [
       "You're helping the user structure notes that will be added to their PYB.md file.",
       "Format the user's input into a well-structured note that will be useful for later reference.",
@@ -23428,7 +23428,7 @@ function PromptInput({
           abortController.abort();
         }
         setIsLoading(false);
-        await new Promise((resolve11) => setTimeout(resolve11, 0));
+        await new Promise((resolve12) => setTimeout(resolve12, 0));
         setIsLoading(true);
         let finalInput2 = cleanInput;
         for (const { placeholder: placeholder2, text } of pastedTexts) {
@@ -23536,7 +23536,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-LIRDPMWY.js");
+          const { getCwd: getCwd2 } = await import("./state-Q4M7BXGL.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -23896,11 +23896,11 @@ import { useCallback as useCallback14 } from "react";
 function useCanUseTool(setToolUseConfirm) {
   return useCallback14(
     async (tool, input, toolUseContext, assistantMessage) => {
-      return new Promise((resolve11) => {
+      return new Promise((resolve12) => {
         function logCancelledEvent() {
         }
         function resolveWithCancelledAndAbortAllToolCalls(message) {
-          resolve11({
+          resolve12({
             result: false,
             message: message ? `${REJECT_MESSAGE_WITH_FEEDBACK_PREFIX}${message}` : REJECT_MESSAGE
           });
@@ -23918,12 +23918,12 @@ function useCanUseTool(setToolUseConfirm) {
           assistantMessage
         ).then(async (result) => {
           if (result.result === true) {
-            resolve11({ result: true });
+            resolve12({ result: true });
             return;
           }
           const deniedResult = result;
           if (deniedResult.shouldPromptUser === false) {
-            resolve11({ result: false, message: deniedResult.message });
+            resolve12({ result: false, message: deniedResult.message });
             return;
           }
           const [description2, commandPrefix] = await Promise.all([
@@ -23955,7 +23955,7 @@ function useCanUseTool(setToolUseConfirm) {
               if (type2 === "permanent") {
               } else {
               }
-              resolve11({ result: true });
+              resolve12({ result: true });
             },
             onReject(rejectionMessage) {
               resolveWithCancelledAndAbortAllToolCalls(rejectionMessage);
@@ -24607,8 +24607,8 @@ var ToolUseQueue = class {
       }
       if (this.hasExecutingTools() && !this.hasCompletedResults() && !this.hasPendingProgress()) {
         const promises = this.tools.filter((t) => t.status === "executing" && t.promise).map((t) => t.promise);
-        const progressPromise = new Promise((resolve11) => {
-          this.progressAvailableResolve = resolve11;
+        const progressPromise = new Promise((resolve12) => {
+          this.progressAvailableResolve = resolve12;
         });
         if (promises.length > 0) {
           await Promise.race([...promises, progressPromise]);
@@ -25473,7 +25473,7 @@ function BinaryFeedbackView({
 function BinaryFeedback({
   m1,
   m2,
-  resolve: resolve11,
+  resolve: resolve12,
   debug: debug2,
   erroredToolUseIDs,
   inProgressToolUseIDs,
@@ -25485,9 +25485,9 @@ function BinaryFeedback({
   const onChoose = useCallback15(
     (choice) => {
       logBinaryFeedbackEvent(m1, m2, choice);
-      resolve11(getBinaryFeedbackResultForChoice(m1, m2, choice));
+      resolve12(getBinaryFeedbackResultForChoice(m1, m2, choice));
     },
-    [m1, m2, resolve11]
+    [m1, m2, resolve12]
   );
   useNotifyAfterTimeout(
     `${PRODUCT_NAME} needs your input on a response comparison`
@@ -26322,7 +26322,7 @@ import { homedir as homedir7 } from "os";
 // src/commands/agents/generation.ts
 import { randomUUID as randomUUID5 } from "crypto";
 async function generateAgentWithClaude(prompt) {
-  const { queryModel } = await import("./llm-22YH2ZPY.js");
+  const { queryModel } = await import("./llm-Q5CFDHRJ.js");
   const systemPrompt = `You are an expert at creating AI agent configurations. Based on the user's description, generate a specialized agent configuration.
 
 Return your response as a JSON object with exactly these fields:
@@ -26619,7 +26619,7 @@ var COLOR_OPTIONS = [
   "cyan"
 ];
 function openInEditor(filePath) {
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve12, reject) => {
     const platform = process.platform;
     let command4;
     let args;
@@ -26642,7 +26642,7 @@ function openInEditor(filePath) {
     child.on("error", (err) => reject(err));
     child.on(
       "exit",
-      (code) => code === 0 ? resolve11() : reject(new Error(`Editor exited with ${code}`))
+      (code) => code === 0 ? resolve12() : reject(new Error(`Editor exited with ${code}`))
     );
   });
 }
@@ -29491,25 +29491,14 @@ function WebFetchPermissionRequest({
 }
 
 // src/utils/tree-sitter/loader.ts
-import treeSitterWasm from "web-tree-sitter/web-tree-sitter.wasm";
-import treeSitterBashWasm from "tree-sitter-bash/tree-sitter-bash.wasm";
+import { createRequire } from "module";
 import { Parser, Language } from "web-tree-sitter";
-
-// src/utils/tree-sitter/resolve-wasm.ts
-import { fileURLToPath } from "url";
-var resolveWasm = (asset) => {
-  if (asset.startsWith("file://")) return fileURLToPath(asset);
-  if (asset.startsWith("/") || /^[a-z]:/i.test(asset)) return asset;
-  const url2 = new URL(asset, import.meta.url);
-  return fileURLToPath(url2);
-};
-
-// src/utils/tree-sitter/loader.ts
 var parserInstance = null;
 var initParser = async () => {
   if (parserInstance) return parserInstance;
-  const treeWasmPath = resolveWasm(treeSitterWasm);
-  const bashWasmPath = resolveWasm(treeSitterBashWasm);
+  const require2 = createRequire(import.meta.url);
+  const treeWasmPath = require2.resolve("web-tree-sitter/web-tree-sitter.wasm");
+  const bashWasmPath = require2.resolve("tree-sitter-bash/tree-sitter-bash.wasm");
   await Parser.init({
     locateFile: () => treeWasmPath
   });
@@ -29551,21 +29540,22 @@ var BashParser = class {
 };
 
 // src/utils/bash-parser/validator.ts
-async function validateSafety(script) {
+import { resolve as resolve10 } from "path";
+async function validateSafety(script, cwd2 = process.cwd()) {
   const tree2 = await BashParser.parse(script);
   const root = tree2.rootNode;
-  validateNode(root, script);
+  validateNode(root, script, cwd2);
 }
-function validateNode(node, script) {
+function validateNode(node, script, cwd2) {
   if (node.type === "command") {
-    checkCommand(node, script);
+    checkCommand(node, script, cwd2);
   }
   for (let i = 0; i < node.childCount; i++) {
     const child = node.child(i);
-    if (child) validateNode(child, script);
+    if (child) validateNode(child, script, cwd2);
   }
 }
-function checkCommand(node, script) {
+function checkCommand(node, script, cwd2) {
   const nameNode = node.childForFieldName("name");
   if (!nameNode) return;
   const commandName = nameNode.text.trim();
@@ -29582,7 +29572,6 @@ function checkCommand(node, script) {
     const isRecursive = args.some((arg) => /^-.*r/.test(arg));
     const criticalPaths = [
       "/",
-      "/*",
       "/etc",
       "/var",
       "/usr",
@@ -29595,27 +29584,38 @@ function checkCommand(node, script) {
       "/lib",
       "/lib64",
       "/opt",
-      "C:\\",
       "C:/",
-      "C:\\Windows",
       "C:/Windows",
-      "C:\\Program Files",
       "C:/Program Files"
     ];
     const targetsCritical = args.some((arg) => {
-      return criticalPaths.some(
-        (critical) => arg === critical || arg.startsWith(critical + "/") || arg.startsWith(critical + "\\")
-      ) || arg.startsWith("..");
+      if (arg.startsWith("-") || arg.startsWith("$")) return false;
+      try {
+        const absPath = resolve10(cwd2, arg).replace(/\\/g, "/");
+        return criticalPaths.some((critical) => {
+          const normalizedCritical = critical.endsWith("/") ? critical : critical + "/";
+          if (absPath === critical || absPath === critical.replace(/\/$/, "")) return true;
+          if (absPath.startsWith(normalizedCritical)) return true;
+          return false;
+        });
+      } catch (e) {
+        return criticalPaths.includes(arg);
+      }
     });
     const originalCommand = node.text;
     if (isRecursive && targetsCritical) {
       throw new Error(`Security Alert: Potentially dangerous recursive deletion detected: "${originalCommand}". Execution blocked.`);
     }
-    const normalizedArgs = args.map((arg) => arg.replace(/\\\\/g, "/").replace(/\\/g, "/"));
-    const isWindowsRoot = normalizedArgs.some(
-      (arg) => /^c:(\/|\\)?$/i.test(arg)
-    );
-    if (normalizedArgs.includes("/") || isWindowsRoot) {
+    const targetsRoot = args.some((arg) => {
+      if (arg.startsWith("-") || arg.startsWith("$")) return false;
+      try {
+        const absPath = resolve10(cwd2, arg).replace(/\\/g, "/");
+        return absPath === "/" || /^[a-z]:\/?$/i.test(absPath);
+      } catch {
+        return arg === "/" || /^[a-z]:\/?$/i.test(arg);
+      }
+    });
+    if (targetsRoot) {
       throw new Error(`Security Alert: Root deletion detected: "${originalCommand}". Execution blocked.`);
     }
   }
@@ -29717,7 +29717,7 @@ var BashTool = {
   async validateInput({ command: command4, timeout, dangerouslyDisableSandbox, cwd: cwd2 }, context) {
     const trimmed = command4.trim();
     try {
-      await validateSafety(trimmed);
+      await validateSafety(trimmed, cwd2 ? resolve11(getCwd(), cwd2) : getCwd());
     } catch (e) {
       return {
         result: false,
@@ -29757,7 +29757,7 @@ var BashTool = {
       };
     }
     if (cwd2) {
-      const fullTargetDir = isAbsolute10(cwd2) ? cwd2 : resolve10(getCwd(), cwd2);
+      const fullTargetDir = isAbsolute10(cwd2) ? cwd2 : resolve11(getCwd(), cwd2);
       if (!isInDirectory(
         relative13(getOriginalCwd(), fullTargetDir),
         relative13(getCwd(), getOriginalCwd())
@@ -29777,7 +29777,7 @@ var BashTool = {
           continue;
         }
         const targetDir = parts[1].replace(/^['"]|['"]$/g, "");
-        const fullTargetDir = isAbsolute10(targetDir) ? targetDir : resolve10(getCwd(), targetDir);
+        const fullTargetDir = isAbsolute10(targetDir) ? targetDir : resolve11(getCwd(), targetDir);
         if (!isInDirectory(
           relative13(getOriginalCwd(), fullTargetDir),
           relative13(getCwd(), getOriginalCwd())
@@ -29862,9 +29862,9 @@ var BashTool = {
     const safeMode = Boolean(context?.safeMode ?? context?.options?.safeMode);
     const userPrompt = typeof context?.options?.lastUserPrompt === "string" ? context.options.lastUserPrompt.trim() : "";
     const commandDescription = typeof description2 === "string" ? description2.trim() : "";
-    const effectiveCwd = cwd2 ? isAbsolute10(cwd2) ? cwd2 : resolve10(getCwd(), cwd2) : getCwd();
+    const effectiveCwd = cwd2 ? isAbsolute10(cwd2) ? cwd2 : resolve11(getCwd(), cwd2) : getCwd();
     try {
-      await validateSafety(command4);
+      await validateSafety(command4, effectiveCwd);
     } catch (error) {
       const msg = error instanceof Error ? error.message : String(error);
       const data = {
@@ -30012,7 +30012,7 @@ var BashTool = {
           if (abortController.signal.aborted) return false;
           const hostForUrl = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
           const url2 = `http://${hostForUrl}:${port}/`;
-          return await new Promise((resolve11) => {
+          return await new Promise((resolve12) => {
             const assistantMessage = createAssistantMessage("");
             if (context.messageId) {
               ;
@@ -30028,13 +30028,13 @@ var BashTool = {
               suggestions: void 0,
               riskScore: null,
               onAbort() {
-                resolve11(false);
+                resolve12(false);
               },
               onAllow() {
-                resolve11(true);
+                resolve12(true);
               },
               onReject() {
-                resolve11(false);
+                resolve12(false);
               }
             };
             setToolJSX({
@@ -30128,8 +30128,8 @@ var BashTool = {
       );
       let backgroundRequested = false;
       let resolveBackground = null;
-      const backgroundPromise = new Promise((resolve11) => {
-        resolveBackground = resolve11;
+      const backgroundPromise = new Promise((resolve12) => {
+        resolveBackground = resolve12;
       });
       const requestBackground = () => {
         if (backgroundRequested) return;
@@ -30172,7 +30172,7 @@ ${footerParts.join(" ")}`;
             bashId
           })),
           new Promise(
-            (resolve11) => setTimeout(() => resolve11({ kind: "tick" }), waitMs)
+            (resolve12) => setTimeout(() => resolve12({ kind: "tick" }), waitMs)
           )
         ]);
         if (race.kind === "background") {
@@ -30206,7 +30206,7 @@ ${footerParts.join(" ")}`;
           if (process.env.NODE_ENV !== "test") {
             getCommandFilePaths(command4, stdout).then((filePaths) => {
               for (const filePath of filePaths) {
-                const fullFilePath = isAbsolute10(filePath) ? filePath : resolve10(getCwd(), filePath);
+                const fullFilePath = isAbsolute10(filePath) ? filePath : resolve11(getCwd(), filePath);
                 try {
                   readFileTimestamps[fullFilePath] = statSync12(fullFilePath).mtimeMs;
                 } catch (e) {