@google/gemini-cli-a2a-server 0.38.0-preview.0 → 0.39.0-nightly.20260408.a39461718

package/dist/a2a-server.mjs

@@ -112259,7 +112259,7 @@ var init_types2 = __esm({
       InProcessCheckerType2["ALLOWED_PATH"] = "allowed-path";
       InProcessCheckerType2["CONSECA"] = "conseca";
     })(InProcessCheckerType || (InProcessCheckerType = {}));
-    PRIORITY_SUBAGENT_TOOL = 1.05;
+    PRIORITY_SUBAGENT_TOOL = 1.03;
     ALWAYS_ALLOW_PRIORITY_FRACTION = 950;
     ALWAYS_ALLOW_PRIORITY_OFFSET = ALWAYS_ALLOW_PRIORITY_FRACTION / 1e3;
     PRIORITY_YOLO_ALLOW_ALL = 998;
@@ -120054,88 +120054,94 @@ async function* execStreaming(command, args2, options) {
     cwd: options?.cwd?.toString() ?? process.cwd(),
     env: options?.env ?? process.env
   });
-  const { program: finalCommand, args: finalArgs, env: finalEnv } = prepared;
-  const child = spawn(finalCommand, finalArgs, {
-    ...options,
-    env: finalEnv,
-    // ensure we don't open a window on windows if possible/relevant
-    windowsHide: true
-  });
-  const rl = readline.createInterface({
-    input: child.stdout,
-    terminal: false
-  });
-  const errorChunks = [];
-  let stderrTotalBytes = 0;
-  const MAX_STDERR_BYTES = 20 * 1024;
-  child.stderr.on("data", (chunk2) => {
-    if (stderrTotalBytes < MAX_STDERR_BYTES) {
-      errorChunks.push(chunk2);
-      stderrTotalBytes += chunk2.length;
-    }
-  });
-  let error2 = null;
-  child.on("error", (err2) => {
-    error2 = err2;
-  });
-  const onAbort = () => {
-    if (!child.killed)
-      child.kill();
-  };
-  if (options?.signal?.aborted) {
-    onAbort();
-  } else {
-    options?.signal?.addEventListener("abort", onAbort);
-  }
-  let finished8 = false;
   try {
-    for await (const line of rl) {
-      if (options?.signal?.aborted)
-        break;
-      yield line;
-    }
-    finished8 = true;
-  } finally {
-    rl.close();
-    options?.signal?.removeEventListener("abort", onAbort);
-    let killedByGenerator = false;
-    if (!finished8 && child.exitCode === null && !child.killed) {
-      try {
-        child.kill();
-      } catch {
+    const { program: finalCommand, args: finalArgs, env: finalEnv } = prepared;
+    const child = spawn(finalCommand, finalArgs, {
+      ...options,
+      env: finalEnv,
+      // ensure we don't open a window on windows if possible/relevant
+      windowsHide: true
+    });
+    const rl = readline.createInterface({
+      input: child.stdout,
+      terminal: false
+    });
+    const errorChunks = [];
+    let stderrTotalBytes = 0;
+    const MAX_STDERR_BYTES = 20 * 1024;
+    child.stderr.on("data", (chunk2) => {
+      if (stderrTotalBytes < MAX_STDERR_BYTES) {
+        errorChunks.push(chunk2);
+        stderrTotalBytes += chunk2.length;
       }
-      killedByGenerator = true;
+    });
+    let error2 = null;
+    child.on("error", (err2) => {
+      error2 = err2;
+    });
+    const onAbort = () => {
+      if (!child.killed)
+        child.kill();
+    };
+    if (options?.signal?.aborted) {
+      onAbort();
+    } else {
+      options?.signal?.addEventListener("abort", onAbort);
     }
-    await new Promise((resolve24, reject) => {
-      if (error2) {
-        reject(error2);
-        return;
+    let finished8 = false;
+    try {
+      for await (const line of rl) {
+        if (options?.signal?.aborted)
+          break;
+        yield line;
       }
-      function checkExit(code) {
-        if (options?.signal?.aborted || killedByGenerator) {
-          resolve24();
+      finished8 = true;
+    } finally {
+      rl.close();
+      options?.signal?.removeEventListener("abort", onAbort);
+      let killedByGenerator = false;
+      if (!finished8 && child.exitCode === null && !child.killed) {
+        try {
+          child.kill();
+        } catch {
+        }
+        killedByGenerator = true;
+      }
+      await new Promise((resolve24, reject) => {
+        if (error2) {
+          reject(error2);
           return;
         }
-        const allowed = options?.allowedExitCodes ?? [0];
-        if (code !== null && allowed.includes(code)) {
-          resolve24();
-        } else {
-          if (error2)
-            reject(error2);
-          else {
-            const stderr = Buffer.concat(errorChunks).toString("utf8");
-            const truncatedMsg = stderrTotalBytes >= MAX_STDERR_BYTES ? "...[truncated]" : "";
-            reject(new Error(`Process exited with code ${code}: ${stderr}${truncatedMsg}`));
+        function checkExit(code) {
+          if (options?.signal?.aborted || killedByGenerator) {
+            resolve24();
+            return;
+          }
+          const allowed = options?.allowedExitCodes ?? [0];
+          if (code !== null && allowed.includes(code)) {
+            resolve24();
+          } else {
+            if (error2)
+              reject(error2);
+            else {
+              const stderr = Buffer.concat(errorChunks).toString("utf8");
+              const truncatedMsg = stderrTotalBytes >= MAX_STDERR_BYTES ? "...[truncated]" : "";
+              reject(new Error(`Process exited with code ${code}: ${stderr}${truncatedMsg}`));
+            }
           }
         }
-      }
-      if (child.exitCode !== null) {
-        checkExit(child.exitCode);
-      } else {
-        child.on("close", (code) => checkExit(code));
-        child.on("error", (err2) => reject(err2));
-      }
-    });
+        if (child.exitCode !== null) {
+          checkExit(child.exitCode);
+        } else {
+          child.on("close", (code) => checkExit(code));
+          child.on("error", (err2) => {
+            reject(err2);
+          });
+        }
+      });
+    }
+  } finally {
+    prepared.cleanup?.();
   }
 }
 var import_shell_quote, SHELL_TOOL_NAMES, bashLanguage, treeSitterInitialization, treeSitterInitializationError, ShellParserInitializationError, POWERSHELL_COMMAND_ENV, PARSE_TIMEOUT_MICROS, POWERSHELL_PARSER_SCRIPT, REDIRECTION_NAMES, isWindows, spawnAsync;
@@ -120218,31 +120224,35 @@ foreach ($commandAst in $commandAsts) {
         env: options?.env ?? process.env
       });
       const { program: finalCommand, args: finalArgs, env: finalEnv } = prepared;
-      return new Promise((resolve24, reject) => {
-        const child = spawn(finalCommand, finalArgs, {
-          ...options,
-          env: finalEnv
-        });
-        let stdout = "";
-        let stderr = "";
-        child.stdout.on("data", (data) => {
-          stdout += data.toString();
-        });
-        child.stderr.on("data", (data) => {
-          stderr += data.toString();
-        });
-        child.on("close", (code) => {
-          if (code === 0) {
-            resolve24({ stdout, stderr });
-          } else {
-            reject(new Error(`Command failed with exit code ${code}:
+      try {
+        return await new Promise((resolve24, reject) => {
+          const child = spawn(finalCommand, finalArgs, {
+            ...options,
+            env: finalEnv
+          });
+          let stdout = "";
+          let stderr = "";
+          child.stdout.on("data", (data) => {
+            stdout += data.toString();
+          });
+          child.stderr.on("data", (data) => {
+            stderr += data.toString();
+          });
+          child.on("close", (code) => {
+            if (code === 0) {
+              resolve24({ stdout, stderr });
+            } else {
+              reject(new Error(`Command failed with exit code ${code}:
 ${stderr}`));
-          }
-        });
-        child.on("error", (err2) => {
-          reject(err2);
+            }
+          });
+          child.on("error", (err2) => {
+            reject(err2);
+          });
         });
-      });
+      } finally {
+        prepared.cleanup?.();
+      }
     };
   }
 });
@@ -208731,8 +208741,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "e77b22e63";
-    CLI_VERSION = "0.38.0-preview.0";
+    GIT_COMMIT_INFO = "a39461718";
+    CLI_VERSION = "0.39.0-nightly.20260408.a39461718";
   }
 });
 
@@ -331876,7 +331886,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.38.0-preview.0";
+    return "0.39.0-nightly.20260408.a39461718";
   })();
   return versionPromise;
 }
@@ -333493,6 +333503,7 @@ var init_tool_registry = __esm({
         let finalCommand = callCommand;
         let finalArgs = args2;
         let finalEnv = process.env;
+        let cleanupFunc;
         const sandboxManager = this.config.sandboxManager;
         if (sandboxManager) {
           const prepared = await sandboxManager.prepareCommand({
@@ -333504,47 +333515,52 @@ var init_tool_registry = __esm({
           finalCommand = prepared.program;
           finalArgs = prepared.args;
           finalEnv = prepared.env;
+          cleanupFunc = prepared.cleanup;
         }
-        const child = spawn4(finalCommand, finalArgs, {
-          env: finalEnv
-        });
-        child.stdin.write(JSON.stringify(this.params));
-        child.stdin.end();
         let stdout = "";
         let stderr = "";
         let error2 = null;
         let code = null;
         let signal = null;
-        await new Promise((resolve24) => {
-          const onStdout = (data) => {
-            stdout += data?.toString();
-          };
-          const onStderr = (data) => {
-            stderr += data?.toString();
-          };
-          const onError2 = (err2) => {
-            error2 = err2;
-          };
-          const onClose = (_code, _signal2) => {
-            code = _code;
-            signal = _signal2;
-            cleanup();
-            resolve24();
-          };
-          const cleanup = () => {
-            child.stdout.removeListener("data", onStdout);
-            child.stderr.removeListener("data", onStderr);
-            child.removeListener("error", onError2);
-            child.removeListener("close", onClose);
-            if (child.connected) {
-              child.disconnect();
-            }
-          };
-          child.stdout.on("data", onStdout);
-          child.stderr.on("data", onStderr);
-          child.on("error", onError2);
-          child.on("close", onClose);
-        });
+        try {
+          const child = spawn4(finalCommand, finalArgs, {
+            env: finalEnv
+          });
+          child.stdin.write(JSON.stringify(this.params));
+          child.stdin.end();
+          await new Promise((resolve24) => {
+            const onStdout = (data) => {
+              stdout += data?.toString();
+            };
+            const onStderr = (data) => {
+              stderr += data?.toString();
+            };
+            const onError2 = (err2) => {
+              error2 = err2;
+            };
+            const onClose = (_code, _signal2) => {
+              code = _code;
+              signal = _signal2;
+              cleanup();
+              resolve24();
+            };
+            const cleanup = () => {
+              child.stdout.removeListener("data", onStdout);
+              child.stderr.removeListener("data", onStderr);
+              child.removeListener("error", onError2);
+              child.removeListener("close", onClose);
+              if (child.connected) {
+                child.disconnect();
+              }
+            };
+            child.stdout.on("data", onStdout);
+            child.stderr.on("data", onStderr);
+            child.on("error", onError2);
+            child.on("close", onClose);
+          });
+        } finally {
+          cleanupFunc?.();
+        }
         if (error2 || code !== 0 || signal || stderr) {
           const llmContent = [
             `Stdout: ${stdout || "(empty)"}`,
@@ -333732,6 +333748,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
           let finalCommand = firstPart;
           let finalArgs = cmdParts.slice(1).filter((p2) => typeof p2 === "string");
           let finalEnv = process.env;
+          let cleanupFunc;
           const sandboxManager = this.config.sandboxManager;
           if (sandboxManager) {
             const prepared = await sandboxManager.prepareCommand({
@@ -333743,87 +333760,94 @@ Signal: Signal number or \`(none)\` if no signal was received.
             finalCommand = prepared.program;
             finalArgs = prepared.args;
             finalEnv = prepared.env;
+            cleanupFunc = prepared.cleanup;
           }
-          const proc2 = spawn4(finalCommand, finalArgs, {
-            env: finalEnv
-          });
-          let stdout = "";
-          const stdoutDecoder = new StringDecoder("utf8");
-          let stderr = "";
-          const stderrDecoder = new StringDecoder("utf8");
-          let sizeLimitExceeded = false;
-          const MAX_STDOUT_SIZE = 10 * 1024 * 1024;
-          const MAX_STDERR_SIZE = 10 * 1024 * 1024;
-          let stdoutByteLength = 0;
-          let stderrByteLength = 0;
-          proc2.stdout.on("data", (data) => {
-            if (sizeLimitExceeded)
-              return;
-            if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
-              sizeLimitExceeded = true;
-              proc2.kill();
-              return;
-            }
-            stdoutByteLength += data.length;
-            stdout += stdoutDecoder.write(data);
-          });
-          proc2.stderr.on("data", (data) => {
-            if (sizeLimitExceeded)
-              return;
-            if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
-              sizeLimitExceeded = true;
-              proc2.kill();
-              return;
-            }
-            stderrByteLength += data.length;
-            stderr += stderrDecoder.write(data);
-          });
-          await new Promise((resolve24, reject) => {
-            proc2.on("error", reject);
-            proc2.on("close", (code) => {
-              stdout += stdoutDecoder.end();
-              stderr += stderrDecoder.end();
-              if (sizeLimitExceeded) {
-                return reject(new Error(`Tool discovery command output exceeded size limit of ${MAX_STDOUT_SIZE} bytes.`));
-              }
-              if (code !== 0) {
-                coreEvents.emitFeedback("error", `Tool discovery command failed with code ${code}.`, stderr);
-                return reject(new Error(`Tool discovery command failed with exit code ${code}`));
+          try {
+            const proc2 = spawn4(finalCommand, finalArgs, {
+              env: finalEnv
+            });
+            let stdout = "";
+            const stdoutDecoder = new StringDecoder("utf8");
+            let stderr = "";
+            const stderrDecoder = new StringDecoder("utf8");
+            let sizeLimitExceeded = false;
+            const MAX_STDOUT_SIZE = 10 * 1024 * 1024;
+            const MAX_STDERR_SIZE = 10 * 1024 * 1024;
+            let stdoutByteLength = 0;
+            let stderrByteLength = 0;
+            proc2.stdout.on("data", (data) => {
+              if (sizeLimitExceeded)
+                return;
+              if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
+                sizeLimitExceeded = true;
+                proc2.kill();
+                return;
               }
-              resolve24();
+              stdoutByteLength += data.length;
+              stdout += stdoutDecoder.write(data);
             });
-          });
-          const functions = [];
-          const discoveredItems = JSON.parse(stdout.trim());
-          if (!discoveredItems || !Array.isArray(discoveredItems)) {
-            throw new Error("Tool discovery command did not return a JSON array of tools.");
-          }
-          for (const tool of discoveredItems) {
-            if (tool && typeof tool === "object") {
-              if (Array.isArray(tool["function_declarations"])) {
-                functions.push(...tool["function_declarations"]);
-              } else if (Array.isArray(tool["functionDeclarations"])) {
-                functions.push(...tool["functionDeclarations"]);
-              } else if (tool["name"]) {
-                functions.push(tool);
+            proc2.stderr.on("data", (data) => {
+              if (sizeLimitExceeded)
+                return;
+              if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
+                sizeLimitExceeded = true;
+                proc2.kill();
+                return;
+              }
+              stderrByteLength += data.length;
+              stderr += stderrDecoder.write(data);
+            });
+            await new Promise((resolve24, reject) => {
+              proc2.on("error", (err2) => {
+                reject(err2);
+              });
+              proc2.on("close", (code) => {
+                stdout += stdoutDecoder.end();
+                stderr += stderrDecoder.end();
+                if (sizeLimitExceeded) {
+                  return reject(new Error(`Tool discovery command output exceeded size limit of ${MAX_STDOUT_SIZE} bytes.`));
+                }
+                if (code !== 0) {
+                  coreEvents.emitFeedback("error", `Tool discovery command failed with code ${code}.`, stderr);
+                  return reject(new Error(`Tool discovery command failed with exit code ${code}`));
+                }
+                resolve24();
+              });
+            });
+            const functions = [];
+            const discoveredItems = JSON.parse(stdout.trim());
+            if (!discoveredItems || !Array.isArray(discoveredItems)) {
+              throw new Error("Tool discovery command did not return a JSON array of tools.");
+            }
+            for (const tool of discoveredItems) {
+              if (tool && typeof tool === "object") {
+                if (Array.isArray(tool["function_declarations"])) {
+                  functions.push(...tool["function_declarations"]);
+                } else if (Array.isArray(tool["functionDeclarations"])) {
+                  functions.push(...tool["functionDeclarations"]);
+                } else if (tool["name"]) {
+                  functions.push(tool);
+                }
               }
             }
-          }
-          for (const func2 of functions) {
-            if (!func2.name) {
-              debugLogger.warn("Discovered a tool with no name. Skipping.");
-              continue;
+            for (const func2 of functions) {
+              if (!func2.name) {
+                debugLogger.warn("Discovered a tool with no name. Skipping.");
+                continue;
+              }
+              const parameters = func2.parametersJsonSchema && typeof func2.parametersJsonSchema === "object" && !Array.isArray(func2.parametersJsonSchema) ? func2.parametersJsonSchema : {};
+              this.registerTool(new DiscoveredTool(
+                this.config,
+                func2.name,
+                DISCOVERED_TOOL_PREFIX + func2.name,
+                func2.description ?? "",
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                parameters,
+                this.messageBus
+              ));
             }
-            const parameters = func2.parametersJsonSchema && typeof func2.parametersJsonSchema === "object" && !Array.isArray(func2.parametersJsonSchema) ? func2.parametersJsonSchema : {};
-            this.registerTool(new DiscoveredTool(
-              this.config,
-              func2.name,
-              DISCOVERED_TOOL_PREFIX + func2.name,
-              func2.description ?? "",
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-              parameters,
-              this.messageBus
-            ));
+          } finally {
+            cleanupFunc?.();
           }
         } catch (e3) {
           debugLogger.error(`Tool discovery command "${discoveryCmd}" failed:`, e3);
@@ -342642,6 +342666,7 @@ var init_grep = __esm({
           let finalCommand = checkCommand;
           let finalArgs = checkArgs;
           let finalEnv = process.env;
+          let cleanup;
           if (sandboxManager) {
             try {
               const prepared = await sandboxManager.prepareCommand({
@@ -342653,22 +342678,29 @@ var init_grep = __esm({
               finalCommand = prepared.program;
               finalArgs = prepared.args;
               finalEnv = prepared.env;
+              cleanup = prepared.cleanup;
             } catch (err2) {
               debugLogger.debug(`[GrepTool] Sandbox preparation failed for '${command}':`, err2);
             }
           }
-          return await new Promise((resolve24) => {
-            const child = spawn5(finalCommand, finalArgs, {
-              stdio: "ignore",
-              shell: true,
-              env: finalEnv
-            });
-            child.on("close", (code) => resolve24(code === 0));
-            child.on("error", (err2) => {
-              debugLogger.debug(`[GrepTool] Failed to start process for '${command}':`, err2.message);
-              resolve24(false);
+          try {
+            return await new Promise((resolve24) => {
+              const child = spawn5(finalCommand, finalArgs, {
+                stdio: "ignore",
+                shell: true,
+                env: finalEnv
+              });
+              child.on("close", (code) => {
+                resolve24(code === 0);
+              });
+              child.on("error", (err2) => {
+                debugLogger.debug(`[GrepTool] Failed to start process for '${command}':`, err2.message);
+                resolve24(false);
+              });
             });
-          });
+          } finally {
+            cleanup?.();
+          }
         } catch {
           return false;
         }
@@ -372787,6 +372819,7 @@ ${truncated}`;
         };
       }
       static async childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal, shellExecutionConfig, isInteractive) {
+        let cmdCleanup;
         try {
           let cleanup2 = function() {
             exited = true;
@@ -372827,7 +372860,9 @@ ${truncated}`;
           };
           var cleanup = cleanup2;
           const isWindows2 = os31.platform() === "win32";
-          const { program: finalExecutable, args: finalArgs, env: finalEnv, cwd: finalCwd, cleanup: cmdCleanup } = await this.prepareExecution(commandToExecute, cwd, shellExecutionConfig, isInteractive);
+          const prepared = await this.prepareExecution(commandToExecute, cwd, shellExecutionConfig, isInteractive);
+          cmdCleanup = prepared.cleanup;
+          const { program: finalExecutable, args: finalArgs, env: finalEnv, cwd: finalCwd } = prepared;
           const child = cpSpawn(finalExecutable, finalArgs, {
             cwd: finalCwd,
             stdio: ["ignore", "pipe", "pipe"],
@@ -373022,6 +373057,7 @@ ${truncated}`;
           return { pid: child.pid, result: result2 };
         } catch (e3) {
           const error2 = e3;
+          cmdCleanup?.();
           return {
             pid: void 0,
             result: Promise.resolve({
@@ -373042,10 +373078,13 @@ ${truncated}`;
           throw new Error("PTY implementation not found");
         }
         let spawnedPty;
+        let cmdCleanup;
         try {
           const cols = shellExecutionConfig.terminalWidth ?? 80;
           const rows = shellExecutionConfig.terminalHeight ?? 30;
-          const { program: finalExecutable, args: finalArgs, env: finalEnv, cwd: finalCwd, cleanup: cmdCleanup } = await this.prepareExecution(commandToExecute, cwd, shellExecutionConfig, true);
+          const prepared = await this.prepareExecution(commandToExecute, cwd, shellExecutionConfig, true);
+          cmdCleanup = prepared.cleanup;
+          const { program: finalExecutable, args: finalArgs, env: finalEnv, cwd: finalCwd } = prepared;
           const ptyProcess = ptyInfo.module.spawn(finalExecutable, finalArgs, {
             cwd: finalCwd,
             name: "xterm-256color",
@@ -373328,6 +373367,7 @@ ${truncated}`;
           return { pid: ptyPid, result: result2 };
         } catch (e3) {
           const error2 = e3;
+          cmdCleanup?.();
           if (spawnedPty) {
             try {
               spawnedPty.destroy?.();
@@ -391388,35 +391428,39 @@ var init_sandboxedFileSystemService = __esm({
             allowedPaths: [safePath]
           }
         });
-        return new Promise((resolve24, reject) => {
-          const child = spawn8(prepared.program, prepared.args, {
-            cwd: this.cwd,
-            env: prepared.env
-          });
-          let output = "";
-          let error2 = "";
-          child.stdout?.on("data", (data) => {
-            output += data.toString();
-          });
-          child.stderr?.on("data", (data) => {
-            error2 += data.toString();
-          });
-          child.on("close", (code) => {
-            if (code === 0) {
-              resolve24(output);
-            } else {
-              const isEnoent = error2.toLowerCase().includes("no such file or directory") || error2.toLowerCase().includes("enoent") || error2.toLowerCase().includes("could not find file") || error2.toLowerCase().includes("could not find a part of the path");
-              const err2 = new Error(`Sandbox Error: read_file failed for '${filePath}'. Exit code ${code}. ${error2 ? "Details: " + error2 : ""}`);
-              if (isEnoent) {
-                Object.assign(err2, { code: "ENOENT" });
+        try {
+          return await new Promise((resolve24, reject) => {
+            const child = spawn8(prepared.program, prepared.args, {
+              cwd: this.cwd,
+              env: prepared.env
+            });
+            let output = "";
+            let error2 = "";
+            child.stdout?.on("data", (data) => {
+              output += data.toString();
+            });
+            child.stderr?.on("data", (data) => {
+              error2 += data.toString();
+            });
+            child.on("close", (code) => {
+              if (code === 0) {
+                resolve24(output);
+              } else {
+                const isEnoent = error2.toLowerCase().includes("no such file or directory") || error2.toLowerCase().includes("enoent") || error2.toLowerCase().includes("could not find file") || error2.toLowerCase().includes("could not find a part of the path");
+                const err2 = new Error(`Sandbox Error: read_file failed for '${filePath}'. Exit code ${code}. ${error2 ? "Details: " + error2 : ""}`);
+                if (isEnoent) {
+                  Object.assign(err2, { code: "ENOENT" });
+                }
+                reject(err2);
               }
-              reject(err2);
-            }
-          });
-          child.on("error", (err2) => {
-            reject(new Error(`Sandbox Error: Failed to spawn read_file for '${filePath}': ${err2.message}`));
+            });
+            child.on("error", (err2) => {
+              reject(new Error(`Sandbox Error: Failed to spawn read_file for '${filePath}': ${err2.message}`));
+            });
           });
-        });
+        } finally {
+          prepared.cleanup?.();
+        }
       }
       async writeTextFile(filePath, content) {
         const safePath = this.sanitizeAndValidatePath(filePath);
@@ -391434,34 +391478,38 @@ var init_sandboxedFileSystemService = __esm({
             }
           }
         });
-        return new Promise((resolve24, reject) => {
-          const child = spawn8(prepared.program, prepared.args, {
-            cwd: this.cwd,
-            env: prepared.env
-          });
-          child.stdin?.on("error", (err2) => {
-            if (isNodeError(err2) && err2.code === "EPIPE") {
-              return;
-            }
-            debugLogger.error(`Sandbox Error: stdin error for '${filePath}': ${err2 instanceof Error ? err2.message : String(err2)}`);
-          });
-          child.stdin?.write(content);
-          child.stdin?.end();
-          let error2 = "";
-          child.stderr?.on("data", (data) => {
-            error2 += data.toString();
-          });
-          child.on("close", (code) => {
-            if (code === 0) {
-              resolve24();
-            } else {
-              reject(new Error(`Sandbox Error: write_file failed for '${filePath}'. Exit code ${code}. ${error2 ? "Details: " + error2 : ""}`));
-            }
-          });
-          child.on("error", (err2) => {
-            reject(new Error(`Sandbox Error: Failed to spawn write_file for '${filePath}': ${err2.message}`));
+        try {
+          return await new Promise((resolve24, reject) => {
+            const child = spawn8(prepared.program, prepared.args, {
+              cwd: this.cwd,
+              env: prepared.env
+            });
+            child.stdin?.on("error", (err2) => {
+              if (isNodeError(err2) && err2.code === "EPIPE") {
+                return;
+              }
+              debugLogger.error(`Sandbox Error: stdin error for '${filePath}': ${err2 instanceof Error ? err2.message : String(err2)}`);
+            });
+            child.stdin?.write(content);
+            child.stdin?.end();
+            let error2 = "";
+            child.stderr?.on("data", (data) => {
+              error2 += data.toString();
+            });
+            child.on("close", (code) => {
+              if (code === 0) {
+                resolve24();
+              } else {
+                reject(new Error(`Sandbox Error: write_file failed for '${filePath}'. Exit code ${code}. ${error2 ? "Details: " + error2 : ""}`));
+              }
+            });
+            child.on("error", (err2) => {
+              reject(new Error(`Sandbox Error: Failed to spawn write_file for '${filePath}': ${err2.message}`));
+            });
           });
-        });
+        } finally {
+          prepared.cleanup?.();
+        }
       }
     };
   }
@@ -439684,6 +439732,45 @@ var init_init2 = __esm({
   }
 });
 
+// packages/core/dist/src/agents/skill-extraction-agent.js
+var SkillExtractionSchema;
+var init_skill_extraction_agent = __esm({
+  "packages/core/dist/src/agents/skill-extraction-agent.js"() {
+    "use strict";
+    init_zod();
+    init_tool_names();
+    init_models();
+    SkillExtractionSchema = external_exports.object({
+      response: external_exports.string().describe("A summary of the skills extracted or updated.")
+    });
+  }
+});
+
+// packages/core/dist/src/services/memoryService.js
+var LOCK_STALE_MS, MIN_IDLE_MS;
+var init_memoryService = __esm({
+  "packages/core/dist/src/services/memoryService.js"() {
+    "use strict";
+    init_chatRecordingService();
+    init_debugLogger();
+    init_events();
+    init_errors2();
+    init_skillLoader();
+    init_local_executor();
+    init_skill_extraction_agent();
+    init_registry();
+    init_executionLifecycleService();
+    init_prompt_registry();
+    init_resource_registry();
+    init_policy_engine();
+    init_types2();
+    init_message_bus();
+    init_storage();
+    LOCK_STALE_MS = 35 * 60 * 1e3;
+    MIN_IDLE_MS = 3 * 60 * 60 * 1e3;
+  }
+});
+
 // packages/core/dist/src/commands/memory.js
 function showMemory(config3) {
   const memoryContent = flattenMemory(config3.getUserMemory());
@@ -439763,7 +439850,10 @@ ${filePaths.join("\n")}`;
 var init_memory2 = __esm({
   "packages/core/dist/src/commands/memory.js"() {
     "use strict";
+    init_storage();
     init_memory();
+    init_skillLoader();
+    init_memoryService();
     init_memoryDiscovery();
   }
 });
@@ -442368,44 +442458,6 @@ var init_sessionSummaryUtils = __esm({
   }
 });
 
-// packages/core/dist/src/agents/skill-extraction-agent.js
-var SkillExtractionSchema;
-var init_skill_extraction_agent = __esm({
-  "packages/core/dist/src/agents/skill-extraction-agent.js"() {
-    "use strict";
-    init_zod();
-    init_tool_names();
-    init_models();
-    SkillExtractionSchema = external_exports.object({
-      response: external_exports.string().describe("A summary of the skills extracted or updated.")
-    });
-  }
-});
-
-// packages/core/dist/src/services/memoryService.js
-var LOCK_STALE_MS, MIN_IDLE_MS;
-var init_memoryService = __esm({
-  "packages/core/dist/src/services/memoryService.js"() {
-    "use strict";
-    init_chatRecordingService();
-    init_debugLogger();
-    init_errors2();
-    init_skillLoader();
-    init_local_executor();
-    init_skill_extraction_agent();
-    init_registry();
-    init_executionLifecycleService();
-    init_prompt_registry();
-    init_resource_registry();
-    init_policy_engine();
-    init_types2();
-    init_message_bus();
-    init_storage();
-    LOCK_STALE_MS = 35 * 60 * 1e3;
-    MIN_IDLE_MS = 3 * 60 * 60 * 1e3;
-  }
-});
-
 // packages/core/dist/src/ide/ide-installer.js
 var init_ide_installer = __esm({
   "packages/core/dist/src/ide/ide-installer.js"() {