@google/gemini-cli-a2a-server 0.57.0-preview.1 → 0.58.0-preview.0

package/dist/a2a-server.mjs

@@ -68743,11 +68743,38 @@ function getSupportedAudioMimeTypeForFile(filePath) {
   }
   return extensionMimeType;
 }
+function canonicalizeMacosPath(p2) {
+  if (process.platform === "darwin") {
+    if (p2 === "/var" || p2.startsWith("/var/")) {
+      return "/private" + p2;
+    }
+    if (p2 === "/tmp" || p2.startsWith("/tmp/")) {
+      return "/private" + p2;
+    }
+    if (p2 === "/etc" || p2.startsWith("/etc/")) {
+      return "/private" + p2;
+    }
+  }
+  return p2;
+}
 function isWithinRoot(pathToCheck, rootDirectory) {
-  const normalizedPathToCheck = path8.resolve(pathToCheck);
-  const normalizedRootDirectory = path8.resolve(rootDirectory);
+  const normalizedPathToCheck = canonicalizeMacosPath(path8.resolve(pathToCheck));
+  const normalizedRootDirectory = canonicalizeMacosPath(path8.resolve(rootDirectory));
   const rootWithSeparator = normalizedRootDirectory === path8.sep || normalizedRootDirectory.endsWith(path8.sep) ? normalizedRootDirectory : normalizedRootDirectory + path8.sep;
-  return normalizedPathToCheck === normalizedRootDirectory || normalizedPathToCheck.startsWith(rootWithSeparator);
+  if (normalizedPathToCheck === normalizedRootDirectory || normalizedPathToCheck.startsWith(rootWithSeparator)) {
+    return true;
+  }
+  if (process.platform === "darwin") {
+    try {
+      const realPathToCheck = resolveToRealPath(normalizedPathToCheck);
+      const realRootDirectory = resolveToRealPath(normalizedRootDirectory);
+      const realRootWithSeparator = realRootDirectory === path8.sep || realRootDirectory.endsWith(path8.sep) ? realRootDirectory : realRootDirectory + path8.sep;
+      return realPathToCheck === realRootDirectory || realPathToCheck.startsWith(realRootWithSeparator);
+    } catch {
+      return false;
+    }
+  }
+  return false;
 }
 async function isEmpty(filePath) {
   try {
@@ -69020,6 +69047,7 @@ var init_fileUtils = __esm({
     init_tool_error();
     init_ignorePatterns();
     init_debugLogger();
+    init_paths();
     init_constants();
     requireModule = createModuleRequire(import.meta.url);
     SUPPORTED_AUDIO_MIME_TYPES_BY_EXTENSION = /* @__PURE__ */ new Map([
@@ -72854,6 +72882,54 @@ var init_baseProfile = __esm({
   (subpath "/dev")
 )
 
+; Block Docker & container daemon UNIX domain sockets (read & write)
+(deny file-read* file-write*
+  (literal "/var/run/docker.sock")
+  (literal "/var/run/docker.sock.raw")
+  (literal "/private/var/run/docker.sock")
+  (literal "/private/var/run/docker.sock.raw")
+  (subpath "/var/run/docker")
+  (subpath "/private/var/run/docker")
+  (subpath "/Users/Shared/.docker")
+  (regex #"^/Users/[^/]+/\\.docker/run/")
+  (regex #"^/Users/[^/]+/\\.docker/desktop/")
+  (regex #"^/Users/[^/]+/\\.colima/")
+  (regex #"^/Users/[^/]+/\\.orbstack/run/")
+  (regex #"^/Users/[^/]+/\\.rd/")
+)
+
+; Block container CLI and daemon binaries from execution
+(deny process-exec
+  (literal "/usr/local/bin/docker")
+  (literal "/usr/local/bin/dockerd")
+  (literal "/usr/local/bin/docker-compose")
+  (literal "/usr/bin/docker")
+  (literal "/opt/homebrew/bin/docker")
+  (literal "/opt/homebrew/bin/dockerd")
+  (literal "/opt/homebrew/bin/docker-compose")
+  (literal "/opt/homebrew/bin/podman")
+  (literal "/usr/local/bin/podman")
+  (literal "/opt/homebrew/bin/colima")
+  (literal "/usr/local/bin/colima")
+  (literal "/opt/homebrew/bin/orb")
+  (literal "/Applications/Docker.app/Contents/Resources/bin/docker")
+  (subpath "/Applications/Docker.app/Contents/MacOS/")
+  (subpath "/Applications/OrbStack.app/Contents/MacOS/")
+  (subpath "/Applications/Rancher Desktop.app/Contents/MacOS/")
+)
+
+; Block com.docker.* and container manager Mach lookup / XPC services
+(deny mach-lookup
+  (xpc-service-name-prefix "com.docker.")
+  (global-name-prefix "com.docker.")
+  (global-name-prefix "dev.kdrag0n.OrbStack")
+)
+
+; Block Docker POSIX Shared Memory
+(deny ipc-posix-shm*
+  (ipc-posix-name-prefix "docker")
+  (ipc-posix-name-prefix "com.docker.")
+)
 `;
     NETWORK_SEATBELT_PROFILE = `
 ; Network Access
@@ -148686,13 +148762,13 @@ var require_path = __commonJS({
   "node_modules/@protobufjs/path/index.js"(exports2) {
     "use strict";
     var path99 = exports2;
-    var isAbsolute7 = (
+    var isAbsolute8 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path99.isAbsolute = function isAbsolute8(path100) {
+      path99.isAbsolute = function isAbsolute9(path100) {
         return /^(?:\/|\w+:)/.test(path100);
       }
     );
@@ -148704,7 +148780,7 @@ var require_path = __commonJS({
        */
       path99.normalize = function normalize7(path100) {
         path100 = path100.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts2 = path100.split("/"), absolute = isAbsolute7(path100), prefix = "";
+        var parts2 = path100.split("/"), absolute = isAbsolute8(path100), prefix = "";
         if (absolute)
           prefix = parts2.shift() + "/";
         for (var i3 = 0; i3 < parts2.length; ) {
@@ -148726,7 +148802,7 @@ var require_path = __commonJS({
     path99.resolve = function resolve23(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize6(includePath);
-      if (isAbsolute7(includePath))
+      if (isAbsolute8(includePath))
         return includePath;
       if (!alreadyNormalized)
         originPath = normalize6(originPath);
@@ -220988,8 +221064,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 = "3910b2093";
-    CLI_VERSION = "0.57.0-preview.1";
+    GIT_COMMIT_INFO = "812f7a2bc";
+    CLI_VERSION = "0.58.0-preview.0";
   }
 });
 
@@ -336720,7 +336796,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.57.0-preview.1";
+    return "0.58.0-preview.0";
   })();
   return versionPromise;
 }
@@ -343683,7 +343759,18 @@ function getNormalizedRelativePath(projectRoot, filePath, isDirectory) {
   if (!isWithinRoot(absoluteFilePath, projectRoot)) {
     return null;
   }
-  const relativePath = path46.relative(projectRoot, absoluteFilePath);
+  const canonicalRoot = canonicalizeMacosPath(projectRoot);
+  const canonicalAbs = canonicalizeMacosPath(absoluteFilePath);
+  let relativePath = path46.relative(canonicalRoot, canonicalAbs);
+  if (process.platform === "darwin" && relativePath.startsWith("..")) {
+    try {
+      const crossPlatformRel = path46.relative(resolveToRealPath(projectRoot), resolveToRealPath(absoluteFilePath));
+      if (!crossPlatformRel.startsWith("..")) {
+        relativePath = crossPlatformRel;
+      }
+    } catch {
+    }
+  }
   let normalized = relativePath.replace(/\\/g, "/");
   if (isDirectory && !normalized.endsWith("/") && normalized !== "") {
     normalized += "/";
@@ -343700,6 +343787,7 @@ var init_ignorePathUtils = __esm({
   "packages/core/dist/src/utils/ignorePathUtils.js"() {
     "use strict";
     init_fileUtils();
+    init_paths();
   }
 });
 
@@ -343963,6 +344051,7 @@ var init_fileDiscoveryService = __esm({
     init_constants4();
     init_errors2();
     init_debugLogger();
+    init_paths();
     FileDiscoveryService = class {
       gitIgnoreFilter = null;
       geminiIgnoreFilter = null;
@@ -344018,14 +344107,18 @@ var init_fileDiscoveryService = __esm({
           }
           await Promise.all(dirEntries.map(async (entry) => {
             const fullPath = path50.join(currentDir, entry.name);
+            const entryOptions = {
+              ...options,
+              isSymbolicLink: entry.isSymbolicLink()
+            };
             if (entry.isDirectory()) {
-              if (this.shouldIgnoreDirectory(fullPath, options)) {
+              if (this.shouldIgnoreDirectory(fullPath, entryOptions)) {
                 ignoredPaths.push(fullPath);
               } else {
                 await walk(fullPath);
               }
             } else {
-              if (this.shouldIgnoreFile(fullPath, options)) {
+              if (this.shouldIgnoreFile(fullPath, entryOptions)) {
                 ignoredPaths.push(fullPath);
               }
             }
@@ -344086,10 +344179,7 @@ var init_fileDiscoveryService = __esm({
       shouldIgnoreDirectory(dirPath, options = {}) {
         return this._shouldIgnore(dirPath, true, options);
       }
-      /**
-       * Internal unified check for paths.
-       */
-      _shouldIgnore(filePath, isDirectory, options = {}) {
+      _checkIgnoreFilters(filePath, isDirectory, options = {}) {
         const { respectGitIgnore = this.defaultFilterFileOptions.respectGitIgnore, respectGeminiIgnore = this.defaultFilterFileOptions.respectGeminiIgnore } = options;
         if (respectGitIgnore && respectGeminiIgnore && this.combinedIgnoreFilter) {
           return this.combinedIgnoreFilter.isIgnored(filePath, isDirectory);
@@ -344105,6 +344195,31 @@ var init_fileDiscoveryService = __esm({
         }
         return false;
       }
+      /**
+       * Internal unified check for paths.
+       */
+      _shouldIgnore(filePath, isDirectory, options = {}) {
+        if (this._checkIgnoreFilters(filePath, isDirectory, options)) {
+          return true;
+        }
+        try {
+          const absolutePath = path50.isAbsolute(filePath) ? filePath : path50.resolve(this.projectRoot, filePath);
+          const isSymlink = options.isSymbolicLink ?? fs46.lstatSync(absolutePath, { throwIfNoEntry: false })?.isSymbolicLink() ?? false;
+          if (isSymlink) {
+            const realPath = resolveToRealPath(absolutePath);
+            let targetIsDir = isDirectory;
+            try {
+              targetIsDir = fs46.statSync(realPath).isDirectory();
+            } catch {
+            }
+            if (this._checkIgnoreFilters(realPath, targetIsDir, options)) {
+              return true;
+            }
+          }
+        } catch {
+        }
+        return false;
+      }
       /**
        * Returns the list of ignore files being used (e.g. .geminiignore) excluding .gitignore.
        */
@@ -344278,7 +344393,7 @@ ${result2.llmContent}`;
           return "start_line cannot be greater than end_line";
         }
         const fileFilteringOptions = this.config.getFileFilteringOptions();
-        if (this.fileDiscoveryService.shouldIgnoreFile(resolvedPath, fileFilteringOptions)) {
+        if (this.fileDiscoveryService.shouldIgnoreFile(sanitizedPath, fileFilteringOptions) || this.fileDiscoveryService.shouldIgnoreFile(resolvedPath, fileFilteringOptions)) {
           return `File path '${resolvedPath}' is ignored by configured ignore patterns.`;
         }
         return null;
@@ -358075,6 +358190,8 @@ ${truncated}`;
         }
         let spawnedPty;
         let cmdCleanup;
+        let headlessTerminal;
+        const disposables = [];
         try {
           const cols = shellExecutionConfig.terminalWidth ?? 80;
           const rows = shellExecutionConfig.terminalHeight ?? 30;
@@ -358100,17 +358217,18 @@ ${truncated}`;
             ...isWindowsPlatform ? { useConpty: true } : {}
           });
           spawnedPty = ptyProcess;
-          const ptyPid = Number(ptyProcess.pid);
-          const headlessTerminal = new Terminal({
+          const pty = spawnedPty;
+          const ptyPid = Number(pty.pid);
+          headlessTerminal = new Terminal({
             allowProposedApi: true,
             cols,
             rows,
             scrollback: shellExecutionConfig.scrollback ?? SCROLLBACK_LIMIT
           });
           headlessTerminal.scrollToTop();
+          const terminal = headlessTerminal;
           this.activePtys.set(ptyPid, {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            ptyProcess,
+            ptyProcess: pty,
             headlessTerminal,
             maxSerializedLines: shellExecutionConfig.maxSerializedLines,
             command: shellExecutionConfig.originalCommand ?? commandToExecute,
@@ -358122,13 +358240,12 @@ ${truncated}`;
               if (!ExecutionLifecycleService.isActive(ptyPid)) {
                 return;
               }
-              ptyProcess.write(input);
+              pty.write(input);
             },
             kill: () => {
               killProcessGroup({
                 pid: ptyPid,
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                pty: ptyProcess
+                pty
               }).catch(() => {
               });
             },
@@ -358142,11 +358259,11 @@ ${truncated}`;
                 return false;
               }
             },
-            getBackgroundOutput: () => getFullBufferText(headlessTerminal),
+            getBackgroundOutput: () => getFullBufferText(terminal),
             getSubscriptionSnapshot: () => {
-              const endLine = headlessTerminal.buffer.active.length;
+              const endLine = terminal.buffer.active.length;
               const startLine = Math.max(0, endLine - (shellExecutionConfig.maxSerializedLines ?? 2e3));
-              const bufferData = serializeTerminalToObject(headlessTerminal, startLine, endLine);
+              const bufferData = serializeTerminalToObject(terminal, startLine, endLine);
               return bufferData.length > 0 ? bufferData : void 0;
             },
             formatInjection: (output2, error3) => _ShellExecutionService.formatShellBackgroundCompletion(ptyPid, shellExecutionConfig.backgroundCompletionBehavior || "silent", output2, error3 ?? void 0),
@@ -358172,21 +358289,21 @@ ${truncated}`;
             }
             if (!shellExecutionConfig.disableDynamicLineTrimming) {
               if (!hasStartedOutput) {
-                const bufferText = getFullBufferText(headlessTerminal);
+                const bufferText = getFullBufferText(terminal);
                 if (bufferText.trim().length === 0) {
                   return;
                 }
                 hasStartedOutput = true;
               }
             }
-            const buffer = headlessTerminal.buffer.active;
+            const buffer = terminal.buffer.active;
             const endLine = buffer.length;
             const startLine = Math.max(0, endLine - (shellExecutionConfig.maxSerializedLines ?? 2e3));
             let newOutput;
             if (shellExecutionConfig.showColor) {
-              newOutput = serializeTerminalToObject(headlessTerminal, startLine, endLine);
+              newOutput = serializeTerminalToObject(terminal, startLine, endLine);
             } else {
-              newOutput = (serializeTerminalToObject(headlessTerminal, startLine, endLine) || []).map((line) => line.map((token2) => {
+              newOutput = (serializeTerminalToObject(terminal, startLine, endLine) || []).map((line) => line.map((token2) => {
                 token2.fg = "";
                 token2.bg = "";
                 return token2;
@@ -358269,7 +358386,7 @@ ${truncated}`;
                   _ShellExecutionService.syncBackgroundLog(ptyPid, decodedChunk);
                 }
                 isWriting = true;
-                headlessTerminal.write(decodedChunk, () => {
+                terminal.write(decodedChunk, () => {
                   render3();
                   isWriting = false;
                   resolveChunk();
@@ -358286,17 +358403,24 @@ ${truncated}`;
               }
             }));
           };
-          ptyProcess.onData((data) => {
+          const dataListener = pty.onData((data) => {
             const bufferData = Buffer.from(data, "utf-8");
             handleOutput(bufferData);
           });
-          ptyProcess.onExit(({ exitCode, signal }) => {
+          disposables.push(dataListener);
+          const exitListener = pty.onExit(({ exitCode, signal }) => {
             exited = true;
             abortSignal.removeEventListener("abort", abortHandler);
-            _ShellExecutionService.destroyPtyProcess(ptyProcess);
+            _ShellExecutionService.destroyPtyProcess(pty);
             const finalize = () => {
               render3(true);
               cmdCleanup?.();
+              disposables.forEach((d) => {
+                try {
+                  d.dispose();
+                } catch {
+                }
+              });
               const event = {
                 type: "exit",
                 exitCode,
@@ -358312,12 +358436,12 @@ ${truncated}`;
                 historyItem.endTime = Date.now();
               }
               onOutputEvent(event);
-              const endLine = headlessTerminal.buffer.active.length;
+              const endLine = headlessTerminal ? headlessTerminal.buffer.active.length : 0;
               const startLine = Math.max(0, endLine - (shellExecutionConfig.maxSerializedLines ?? 2e3));
-              const ansiOutputSnapshot = serializeTerminalToObject(headlessTerminal, startLine, endLine);
-              const finalOutput = getFullBufferText(headlessTerminal);
+              const ansiOutputSnapshot = headlessTerminal ? serializeTerminalToObject(headlessTerminal, startLine, endLine) : [];
+              const finalOutput = headlessTerminal ? getFullBufferText(headlessTerminal) : "";
               try {
-                headlessTerminal.dispose();
+                headlessTerminal?.dispose();
               } catch {
               }
               _ShellExecutionService.cleanupLogStream(ptyPid).then(() => {
@@ -358353,6 +358477,7 @@ ${truncated}`;
               finalize();
             });
           });
+          disposables.push(exitListener);
           const abortHandler = async () => {
             if (ptyProcess.pid && !exited) {
               await killProcessGroup({
@@ -358372,10 +358497,23 @@ ${truncated}`;
           if (spawnedPty) {
             _ShellExecutionService.destroyPtyProcess(spawnedPty);
           }
-          if (error2?.message?.includes("posix_spawnp failed")) {
+          if (headlessTerminal) {
+            try {
+              headlessTerminal.dispose();
+            } catch {
+            }
+          }
+          disposables.forEach((d) => {
+            try {
+              d.dispose();
+            } catch {
+            }
+          });
+          const isPtyCreationFailure = error2?.message?.includes("posix_spawnp failed") || error2?.message?.includes("ENXIO") || isNodeError(error2) && error2.code === "ENXIO" || error2?.message?.includes("Device not configured");
+          if (isPtyCreationFailure) {
             onOutputEvent({
               type: "data",
-              chunk: "[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n"
+              chunk: "[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to terminal exhaustion or sandbox restrictions.\n"
             });
             throw e3;
           } else {
@@ -366425,13 +366563,13 @@ function stripToolCallIdPrefixes(contents) {
           };
         }
       }
-      const hasOtherKeys = Object.keys(newPart).some((key) => key !== "text" && key !== "thought" && key !== "callIndex" && newPart[key] !== void 0);
+      const hasOtherKeys = Object.keys(newPart).some((key) => key !== "text" && key !== "thought" && key !== "callIndex");
       if (newPart.text !== void 0 && newPart.text === "" && hasOtherKeys) {
         delete newPart.text;
       }
       return newPart;
     }).filter((part) => {
-      const hasOtherKeys = Object.keys(part).some((key) => key !== "text" && key !== "thought" && key !== "callIndex" && part[key] !== void 0);
+      const hasOtherKeys = Object.keys(part).some((key) => key !== "text" && key !== "thought" && key !== "callIndex");
       if (part.text !== void 0 && part.text === "" && !hasOtherKeys) {
         return false;
       }
@@ -439368,6 +439506,7 @@ var Task4 = class _Task {
     );
   }
   async *acceptUserMessage(requestContext, aborted2) {
+    this.cancellationError = void 0;
     const userMessage = requestContext.userMessage;
     const llmParts = [];
     let anyConfirmationHandled = false;
@@ -439568,12 +439707,12 @@ var CoderAgentExecutor = class {
   }
   tasks = /* @__PURE__ */ new Map();
   // Track tasks with an active execution loop.
-  executingTasks = /* @__PURE__ */ new Set();
+  executingTasks = /* @__PURE__ */ new Map();
   activeAbortControllers = /* @__PURE__ */ new Map();
   // Track tasks currently initializing to prevent race conditions.
   initializingTasks = /* @__PURE__ */ new Set();
   initializationPromises = /* @__PURE__ */ new Map();
-  // Track explicitly canceled task IDs to handle cancellation during initialization.
+  // Track explicitly canceled abort controllers to handle cancellation during initialization.
   explicitlyCanceledTasks = /* @__PURE__ */ new Set();
   async getConfigWithEnv(agentSettings, taskId, isTrusted, workspaceRoot) {
     const settings = loadSettings(workspaceRoot, isTrusted);
@@ -439598,9 +439737,15 @@ var CoderAgentExecutor = class {
       return fn2(isTrusted, workspaceRoot);
     });
   }
-  cleanupAndEvictTask(taskId) {
+  cleanupAndEvictTask(taskId, expectedWrapper) {
     const wrapper = this.tasks.get(taskId);
     if (wrapper) {
+      if (expectedWrapper && wrapper !== expectedWrapper) {
+        logger.info(
+          `[CoderAgentExecutor] cleanupAndEvictTask: wrapper mismatch for task ${taskId}. Skipping eviction.`
+        );
+        return;
+      }
       wrapper.task.dispose();
       this.tasks.delete(taskId);
     }
@@ -439707,11 +439852,11 @@ var CoderAgentExecutor = class {
     );
     const abortControllers = this.activeAbortControllers.get(taskId);
     if (abortControllers && abortControllers.size > 0) {
-      this.explicitlyCanceledTasks.add(taskId);
       logger.info(
         `[CoderAgentExecutor] Aborting ${abortControllers.size} active execution loop(s) for task ${taskId}.`
       );
       for (const controller of Array.from(abortControllers)) {
+        this.explicitlyCanceledTasks.add(controller);
         controller.abort();
       }
       const wrapper2 = this.tasks.get(taskId);
@@ -439725,6 +439870,7 @@ var CoderAgentExecutor = class {
           void 0,
           true
         );
+        this.cleanupAndEvictTask(taskId, wrapper2);
         try {
           await this.taskStore?.save(wrapper2.toSDKTask());
           logger.info(
@@ -439736,7 +439882,6 @@ var CoderAgentExecutor = class {
             saveError
           );
         }
-        this.cleanupAndEvictTask(taskId);
       }
       return;
     }
@@ -439812,9 +439957,9 @@ var CoderAgentExecutor = class {
       logger.info(
         `[CoderAgentExecutor] Task ${taskId} cancellation processed. Saving state.`
       );
+      this.cleanupAndEvictTask(taskId, wrapper);
       await this.taskStore?.save(wrapper.toSDKTask());
       logger.info(`[CoderAgentExecutor] Task ${taskId} state CANCELED saved.`);
-      this.cleanupAndEvictTask(taskId);
     } catch (error2) {
       const errorMessage = error2 instanceof Error ? error2.message : "Unknown error";
       logger.error(
@@ -440028,16 +440173,16 @@ var CoderAgentExecutor = class {
           }
           const currentTask2 = wrapper.task;
           if (["canceled", "failed", "completed"].includes(currentTask2.taskState)) {
-            logger.warn(
-              `[CoderAgentExecutor] Attempted to execute task ${taskId} which is already in state ${currentTask2.taskState}. Ignoring.`
+            logger.info(
+              `[CoderAgentExecutor] Re-activating task ${taskId} from terminal state ${currentTask2.taskState}.`
             );
-            return;
+            currentTask2.taskState = "submitted";
           }
           if (abortSignal.aborted) {
             logger.warn(
               `[CoderAgentExecutor] Task ${taskId} was aborted during initialization.`
             );
-            const isExplicitCancel = this.explicitlyCanceledTasks.has(taskId);
+            const isExplicitCancel = this.explicitlyCanceledTasks.has(abortController);
             const finalState = isExplicitCancel ? "canceled" : "input-required";
             const message = isExplicitCancel ? "Task canceled by user request." : "Execution aborted by client.";
             currentTask2.setTaskStateAndPublishUpdate(
@@ -440056,11 +440201,12 @@ var CoderAgentExecutor = class {
               );
             }
             if (isExplicitCancel) {
-              this.cleanupAndEvictTask(taskId);
+              this.cleanupAndEvictTask(taskId, wrapper);
             }
             return;
           }
-          if (this.executingTasks.has(taskId)) {
+          const activeController = this.executingTasks.get(taskId);
+          if (activeController && !activeController.signal.aborted) {
             logger.info(
               `[CoderAgentExecutor] Task ${taskId} has a pending execution. Processing message and yielding.`
             );
@@ -440087,7 +440233,7 @@ var CoderAgentExecutor = class {
           isPrimaryExecution = true;
           proceedToMainLoop = true;
         } finally {
-          this.explicitlyCanceledTasks.delete(taskId);
+          this.explicitlyCanceledTasks.delete(abortController);
           if (!proceedToMainLoop) {
             const controllers = this.activeAbortControllers.get(taskId);
             if (controllers) {
@@ -440103,7 +440249,7 @@ var CoderAgentExecutor = class {
           logger.info(
             `[CoderAgentExecutor] Starting main execution for message ${userMessage.messageId} for task ${taskId}.`
           );
-          this.executingTasks.add(taskId);
+          this.executingTasks.set(taskId, abortController);
           let agentTurnActive = true;
           logger.info(
             `[CoderAgentExecutor] Task ${taskId}: Processing user turn.`
@@ -440252,7 +440398,14 @@ var CoderAgentExecutor = class {
                 this.activeAbortControllers.delete(taskId);
               }
             }
-            this.executingTasks.delete(taskId);
+            if (this.executingTasks.get(taskId) === abortController) {
+              this.executingTasks.delete(taskId);
+            }
+            if (["canceled", "failed", "completed"].includes(
+              currentTask.taskState
+            )) {
+              this.cleanupAndEvictTask(taskId, wrapper);
+            }
             logger.info(
               `[CoderAgentExecutor] Saving final state for task ${taskId}.`
             );
@@ -440265,11 +440418,6 @@ var CoderAgentExecutor = class {
                 saveError
               );
             }
-            if (["canceled", "failed", "completed"].includes(
-              currentTask.taskState
-            )) {
-              this.cleanupAndEvictTask(taskId);
-            }
           }
         }
       } catch (error2) {

package/dist/policies/write.toml

@@ -39,7 +39,11 @@ decision = "allow"
 priority = 15
 modes = ["autoEdit"]
 
-[rule.safety_checker]
+[[safety_checker]]
+toolName = "replace"
+priority = 15
+modes = ["autoEdit"]
+[safety_checker.checker]
 type = "in-process"
 name = "allowed-path"
 required_context = ["environment"]
@@ -68,7 +72,11 @@ decision = "allow"
 priority = 15
 modes = ["autoEdit"]
 
-[rule.safety_checker]
+[[safety_checker]]
+toolName = "write_file"
+priority = 15
+modes = ["autoEdit"]
+[safety_checker.checker]
 type = "in-process"
 name = "allowed-path"
 required_context = ["environment"]