@google/gemini-cli-a2a-server 0.35.0-preview.5 → 0.35.1

package/dist/a2a-server.mjs

@@ -1304,7 +1304,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join34 = ",";
+            let join35 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -1318,7 +1318,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join34 = `,
+                join35 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -1326,13 +1326,13 @@ ${indentation}`;
               for (; i4 < maximumValuesToStringify - 1; i4++) {
                 const tmp2 = stringifyFnReplacer(String(i4), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join34;
+                res += join35;
               }
               const tmp = stringifyFnReplacer(String(i4), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join34}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join35}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -1353,7 +1353,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join34 = `,
+              join35 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -1367,13 +1367,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join34;
+                separator = join35;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join34;
+              separator = join35;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -1414,7 +1414,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join34 = ",";
+            let join35 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -1427,7 +1427,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join34 = `,
+                join35 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -1435,13 +1435,13 @@ ${indentation}`;
               for (; i4 < maximumValuesToStringify - 1; i4++) {
                 const tmp2 = stringifyArrayReplacer(String(i4), value[i4], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join34;
+                res += join35;
               }
               const tmp = stringifyArrayReplacer(String(i4), value[i4], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join34}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join35}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -1454,7 +1454,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join34 = `,
+              join35 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -1463,7 +1463,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join34;
+                separator = join35;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -1521,20 +1521,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join35 = `,
+              const join36 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i4 = 0;
               for (; i4 < maximumValuesToStringify - 1; i4++) {
                 const tmp2 = stringifyIndent(String(i4), value[i4], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join35;
+                res2 += join36;
               }
               const tmp = stringifyIndent(String(i4), value[i4], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join35}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join36}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -1550,16 +1550,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join34 = `,
+            const join35 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join34, maximumBreadth);
+              res += stringifyTypedArray(value, join35, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join34;
+              separator = join35;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -1570,13 +1570,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}: ${tmp}`;
-                separator = join34;
+                separator = join35;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join34;
+              separator = join35;
             }
             if (separator !== "") {
               res = `
@@ -3144,7 +3144,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join34(s5) {
+        value: function join35(s5) {
           if (this.length === 0) return "";
           var p2 = this.head;
           var ret = "" + p2.data;
@@ -33063,7 +33063,7 @@ var require_view = __commonJS({
     var dirname22 = path85.dirname;
     var basename13 = path85.basename;
     var extname2 = path85.extname;
-    var join34 = path85.join;
+    var join35 = path85.join;
     var resolve21 = path85.resolve;
     module2.exports = View;
     function View(name3, options) {
@@ -33125,12 +33125,12 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve22(dir, file) {
       var ext2 = this.ext;
-      var path86 = join34(dir, file);
+      var path86 = join35(dir, file);
       var stat5 = tryStat(path86);
       if (stat5 && stat5.isFile()) {
         return path86;
       }
-      path86 = join34(dir, basename13(file, ext2), "index" + ext2);
+      path86 = join35(dir, basename13(file, ext2), "index" + ext2);
       stat5 = tryStat(path86);
       if (stat5 && stat5.isFile()) {
         return path86;
@@ -36783,7 +36783,7 @@ var require_send = __commonJS({
     var Stream4 = __require("stream");
     var util5 = __require("util");
     var extname2 = path85.extname;
-    var join34 = path85.join;
+    var join35 = path85.join;
     var normalize6 = path85.normalize;
     var resolve21 = path85.resolve;
     var sep7 = path85.sep;
@@ -36955,7 +36955,7 @@ var require_send = __commonJS({
           return res;
         }
         parts2 = path86.split(sep7);
-        path86 = normalize6(join34(root, path86));
+        path86 = normalize6(join35(root, path86));
       } else {
         if (UP_PATH_REGEXP.test(path86)) {
           debug2('malicious path "%s"', path86);
@@ -37088,7 +37088,7 @@ var require_send = __commonJS({
           if (err2) return self2.onStatError(err2);
           return self2.error(404);
         }
-        var p2 = join34(path86, self2._index[i4]);
+        var p2 = join35(path86, self2._index[i4]);
         debug2('stat "%s"', p2);
         fs70.stat(p2, function(err3, stat5) {
           if (err3) return next(err3);
@@ -176705,7 +176705,7 @@ var require_util11 = __commonJS({
     function getFilesInPath(source) {
       const lstatSync3 = fs70.lstatSync;
       const readdirSync4 = fs70.readdirSync;
-      const join34 = path85.join;
+      const join35 = path85.join;
       function isDirectory(source2) {
         return lstatSync3(source2).isDirectory();
       }
@@ -176714,12 +176714,12 @@ var require_util11 = __commonJS({
       }
       function getDirectories(source2) {
         return readdirSync4(source2).map((name3) => {
-          return join34(source2, name3);
+          return join35(source2, name3);
         }).filter(isDirectory);
       }
       function getFiles(source2) {
         return readdirSync4(source2).map((name3) => {
-          return join34(source2, name3);
+          return join35(source2, name3);
         }).filter(isFile2);
       }
       function getFilesRecursively(source2) {
@@ -194274,7 +194274,7 @@ var init_modelFamilyService = __esm({
 });
 
 // packages/core/dist/src/tools/definitions/base-declarations.js
-var PARAM_FILE_PATH, PARAM_DIR_PATH, PARAM_PATTERN, PARAM_CASE_SENSITIVE, PARAM_RESPECT_GIT_IGNORE, PARAM_RESPECT_GEMINI_IGNORE, PARAM_FILE_FILTERING_OPTIONS, PARAM_DESCRIPTION, GLOB_TOOL_NAME, GREP_TOOL_NAME, GREP_PARAM_INCLUDE_PATTERN, GREP_PARAM_EXCLUDE_PATTERN, GREP_PARAM_NAMES_ONLY, GREP_PARAM_MAX_MATCHES_PER_FILE, GREP_PARAM_TOTAL_MAX_MATCHES, GREP_PARAM_FIXED_STRINGS, GREP_PARAM_CONTEXT, GREP_PARAM_AFTER, GREP_PARAM_BEFORE, GREP_PARAM_NO_IGNORE, LS_TOOL_NAME, LS_PARAM_IGNORE, READ_FILE_TOOL_NAME, READ_FILE_PARAM_START_LINE, READ_FILE_PARAM_END_LINE, SHELL_TOOL_NAME, SHELL_PARAM_COMMAND, SHELL_PARAM_IS_BACKGROUND, WRITE_FILE_TOOL_NAME, WRITE_FILE_PARAM_CONTENT, EDIT_TOOL_NAME, EDIT_PARAM_INSTRUCTION, EDIT_PARAM_OLD_STRING, EDIT_PARAM_NEW_STRING, EDIT_PARAM_ALLOW_MULTIPLE, WEB_SEARCH_TOOL_NAME, WEB_SEARCH_PARAM_QUERY, WRITE_TODOS_TOOL_NAME, TODOS_PARAM_TODOS, TODOS_ITEM_PARAM_DESCRIPTION, TODOS_ITEM_PARAM_STATUS, WEB_FETCH_TOOL_NAME, WEB_FETCH_PARAM_PROMPT, READ_MANY_FILES_TOOL_NAME, READ_MANY_PARAM_INCLUDE, READ_MANY_PARAM_EXCLUDE, READ_MANY_PARAM_RECURSIVE, READ_MANY_PARAM_USE_DEFAULT_EXCLUDES, MEMORY_TOOL_NAME, MEMORY_PARAM_FACT, GET_INTERNAL_DOCS_TOOL_NAME, DOCS_PARAM_PATH, ACTIVATE_SKILL_TOOL_NAME, SKILL_PARAM_NAME, ASK_USER_TOOL_NAME, ASK_USER_PARAM_QUESTIONS, ASK_USER_QUESTION_PARAM_QUESTION, ASK_USER_QUESTION_PARAM_HEADER, ASK_USER_QUESTION_PARAM_TYPE, ASK_USER_QUESTION_PARAM_OPTIONS, ASK_USER_QUESTION_PARAM_MULTI_SELECT, ASK_USER_QUESTION_PARAM_PLACEHOLDER, ASK_USER_OPTION_PARAM_LABEL, ASK_USER_OPTION_PARAM_DESCRIPTION, EXIT_PLAN_MODE_TOOL_NAME, EXIT_PLAN_PARAM_PLAN_PATH, ENTER_PLAN_MODE_TOOL_NAME, PLAN_MODE_PARAM_REASON;
+var PARAM_FILE_PATH, PARAM_DIR_PATH, PARAM_PATTERN, PARAM_CASE_SENSITIVE, PARAM_RESPECT_GIT_IGNORE, PARAM_RESPECT_GEMINI_IGNORE, PARAM_FILE_FILTERING_OPTIONS, PARAM_DESCRIPTION, GLOB_TOOL_NAME, GREP_TOOL_NAME, GREP_PARAM_INCLUDE_PATTERN, GREP_PARAM_EXCLUDE_PATTERN, GREP_PARAM_NAMES_ONLY, GREP_PARAM_MAX_MATCHES_PER_FILE, GREP_PARAM_TOTAL_MAX_MATCHES, GREP_PARAM_FIXED_STRINGS, GREP_PARAM_CONTEXT, GREP_PARAM_AFTER, GREP_PARAM_BEFORE, GREP_PARAM_NO_IGNORE, LS_TOOL_NAME, LS_PARAM_IGNORE, READ_FILE_TOOL_NAME, READ_FILE_PARAM_START_LINE, READ_FILE_PARAM_END_LINE, SHELL_TOOL_NAME, SHELL_PARAM_COMMAND, SHELL_PARAM_IS_BACKGROUND, WRITE_FILE_TOOL_NAME, WRITE_FILE_PARAM_CONTENT, EDIT_TOOL_NAME, EDIT_PARAM_INSTRUCTION, EDIT_PARAM_OLD_STRING, EDIT_PARAM_NEW_STRING, EDIT_PARAM_ALLOW_MULTIPLE, WEB_SEARCH_TOOL_NAME, WEB_SEARCH_PARAM_QUERY, WRITE_TODOS_TOOL_NAME, TODOS_PARAM_TODOS, TODOS_ITEM_PARAM_DESCRIPTION, TODOS_ITEM_PARAM_STATUS, WEB_FETCH_TOOL_NAME, WEB_FETCH_PARAM_PROMPT, READ_MANY_FILES_TOOL_NAME, READ_MANY_PARAM_INCLUDE, READ_MANY_PARAM_EXCLUDE, READ_MANY_PARAM_RECURSIVE, READ_MANY_PARAM_USE_DEFAULT_EXCLUDES, MEMORY_TOOL_NAME, MEMORY_PARAM_FACT, GET_INTERNAL_DOCS_TOOL_NAME, DOCS_PARAM_PATH, ACTIVATE_SKILL_TOOL_NAME, SKILL_PARAM_NAME, ASK_USER_TOOL_NAME, ASK_USER_PARAM_QUESTIONS, ASK_USER_QUESTION_PARAM_QUESTION, ASK_USER_QUESTION_PARAM_HEADER, ASK_USER_QUESTION_PARAM_TYPE, ASK_USER_QUESTION_PARAM_OPTIONS, ASK_USER_QUESTION_PARAM_MULTI_SELECT, ASK_USER_QUESTION_PARAM_PLACEHOLDER, ASK_USER_OPTION_PARAM_LABEL, ASK_USER_OPTION_PARAM_DESCRIPTION, EXIT_PLAN_MODE_TOOL_NAME, EXIT_PLAN_PARAM_PLAN_FILENAME, ENTER_PLAN_MODE_TOOL_NAME, PLAN_MODE_PARAM_REASON;
 var init_base_declarations = __esm({
   "packages/core/dist/src/tools/definitions/base-declarations.js"() {
     "use strict";
@@ -194343,7 +194343,7 @@ var init_base_declarations = __esm({
     ASK_USER_OPTION_PARAM_LABEL = "label";
     ASK_USER_OPTION_PARAM_DESCRIPTION = "description";
     EXIT_PLAN_MODE_TOOL_NAME = "exit_plan_mode";
-    EXIT_PLAN_PARAM_PLAN_PATH = "plan_path";
+    EXIT_PLAN_PARAM_PLAN_FILENAME = "plan_filename";
     ENTER_PLAN_MODE_TOOL_NAME = "enter_plan_mode";
     PLAN_MODE_PARAM_REASON = "reason";
   }
@@ -195989,17 +195989,17 @@ function getShellDeclaration(enableInteractiveShell, enableEfficiency) {
     }
   };
 }
-function getExitPlanModeDeclaration(plansDir) {
+function getExitPlanModeDeclaration() {
   return {
     name: EXIT_PLAN_MODE_TOOL_NAME,
     description: "Finalizes the planning phase and transitions to implementation by presenting the plan for user approval. This tool MUST be used to exit Plan Mode before any source code edits can be performed. Call this whenever a plan is ready or the user requests implementation.",
     parametersJsonSchema: {
       type: "object",
-      required: [EXIT_PLAN_PARAM_PLAN_PATH],
+      required: [EXIT_PLAN_PARAM_PLAN_FILENAME],
       properties: {
-        [EXIT_PLAN_PARAM_PLAN_PATH]: {
+        [EXIT_PLAN_PARAM_PLAN_FILENAME]: {
           type: "string",
-          description: `The file path to the finalized plan (e.g., "${plansDir}/feature-x.md"). This path MUST be within the designated plans directory: ${plansDir}/`
+          description: `The filename of the finalized plan (e.g., "feature-x.md"). Do not provide an absolute path.`
         }
       }
     }
@@ -196614,7 +196614,7 @@ The agent did not use the todo list because this task could be completed by a ti
           }
         }
       },
-      exit_plan_mode: (plansDir) => getExitPlanModeDeclaration(plansDir),
+      exit_plan_mode: () => getExitPlanModeDeclaration(),
       activate_skill: (skillNames) => getActivateSkillDeclaration(skillNames)
     };
   }
@@ -197181,7 +197181,7 @@ The agent did not use the todo list because this task could be completed by a ti
           }
         }
       },
-      exit_plan_mode: (plansDir) => getExitPlanModeDeclaration(plansDir),
+      exit_plan_mode: () => getExitPlanModeDeclaration(),
       activate_skill: (skillNames) => getActivateSkillDeclaration(skillNames)
     };
   }
@@ -197204,10 +197204,10 @@ function getShellDefinition(enableInteractiveShell, enableEfficiency) {
     overrides: (modelId) => getToolSet(modelId).run_shell_command(enableInteractiveShell, enableEfficiency)
   };
 }
-function getExitPlanModeDefinition(plansDir) {
+function getExitPlanModeDefinition() {
   return {
-    base: getExitPlanModeDeclaration(plansDir),
-    overrides: (modelId) => getToolSet(modelId).exit_plan_mode(plansDir)
+    base: getExitPlanModeDeclaration(),
+    overrides: (modelId) => getToolSet(modelId).exit_plan_mode()
   };
 }
 function getActivateSkillDefinition(skillNames) {
@@ -198935,8 +198935,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 = "e88b56bbc";
-    CLI_VERSION = "0.35.0-preview.5";
+    GIT_COMMIT_INFO = "8804fb770";
+    CLI_VERSION = "0.35.1";
   }
 });
 
@@ -322410,9 +322410,12 @@ var init_edit = __esm({
       config;
       resolvedPath;
       constructor(config3, params, messageBus, toolName, displayName) {
-        super(params, messageBus, toolName, displayName);
+        super(params, messageBus, toolName, displayName, void 0, void 0);
         this.config = config3;
-        if (!path26.isAbsolute(this.params.file_path)) {
+        if (this.config.isPlanMode()) {
+          const safeFilename = path26.basename(this.params.file_path);
+          this.resolvedPath = path26.join(this.config.storage.getPlansDir(), safeFilename);
+        } else if (!path26.isAbsolute(this.params.file_path)) {
           const result2 = correctPath(this.params.file_path, this.config);
           if (result2.success) {
             this.resolvedPath = result2.correctedPath;
@@ -323074,9 +323077,14 @@ var init_write_file = __esm({
       config;
       resolvedPath;
       constructor(config3, params, messageBus, toolName, displayName) {
-        super(params, messageBus, toolName, displayName);
+        super(params, messageBus, toolName, displayName, void 0, void 0);
         this.config = config3;
-        this.resolvedPath = path27.resolve(this.config.getTargetDir(), this.params.file_path);
+        if (this.config.isPlanMode()) {
+          const safeFilename = path27.basename(this.params.file_path);
+          this.resolvedPath = path27.join(this.config.storage.getPlansDir(), safeFilename);
+        } else {
+          this.resolvedPath = path27.resolve(this.config.getTargetDir(), this.params.file_path);
+        }
       }
       toolLocations() {
         return [{ path: this.resolvedPath }];
@@ -328503,7 +328511,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname3);
-    return "0.35.0-preview.5";
+    return "0.35.1";
   })();
   return versionPromise;
 }
@@ -357939,7 +357947,7 @@ var init_xdg_basedir = __esm({
 
 // node_modules/@joshua.litt/get-ripgrep/dist/downloadRipGrep.js
 import * as os23 from "node:os";
-import { dirname as dirname9, join as join14 } from "node:path";
+import { dirname as dirname9, join as join15 } from "node:path";
 import { pipeline as pipeline3 } from "node:stream/promises";
 import { fileURLToPath as fileURLToPath11 } from "node:url";
 import path47 from "path";
@@ -357957,7 +357965,7 @@ var init_downloadRipGrep = __esm({
     __dirname5 = dirname9(fileURLToPath11(import.meta.url));
     REPOSITORY = `microsoft/ripgrep-prebuilt`;
     VERSION3 = process.env.RIPGREP_VERSION || "v13.0.0-10";
-    BIN_PATH = join14(__dirname5, "../bin");
+    BIN_PATH = join15(__dirname5, "../bin");
     getTarget = () => {
       const arch4 = process.env.npm_config_arch || os23.arch();
       const platform11 = process.env.platform || os23.platform();
@@ -358052,14 +358060,14 @@ var init_downloadRipGrep = __esm({
 });
 
 // node_modules/@joshua.litt/get-ripgrep/dist/index.js
-import { dirname as dirname10, join as join15 } from "node:path";
+import { dirname as dirname10, join as join16 } from "node:path";
 import { fileURLToPath as fileURLToPath12 } from "node:url";
 var __dirname6, rgPath;
 var init_dist5 = __esm({
   "node_modules/@joshua.litt/get-ripgrep/dist/index.js"() {
     init_downloadRipGrep();
     __dirname6 = dirname10(fileURLToPath12(import.meta.url));
-    rgPath = join15(__dirname6, "..", "bin", `rg${process.platform === "win32" ? ".exe" : ""}`);
+    rgPath = join16(__dirname6, "..", "bin", `rg${process.platform === "win32" ? ".exe" : ""}`);
   }
 });
 
@@ -370968,8 +370976,8 @@ function many(p2) {
 function many1(p2) {
   return ab(p2, many(p2), (head, tail) => [head, ...tail]);
 }
-function ab(pa, pb, join34) {
-  return (data, i4) => mapOuter(pa(data, i4), (ma) => mapInner(pb(data, ma.position), (vb, j2) => join34(ma.value, vb, data, i4, j2)));
+function ab(pa, pb, join35) {
+  return (data, i4) => mapOuter(pa(data, i4), (ma) => mapInner(pb(data, ma.position), (vb, j2) => join35(ma.value, vb, data, i4, j2)));
 }
 function left(pa, pb) {
   return ab(pa, pb, (va) => va);
@@ -370977,8 +370985,8 @@ function left(pa, pb) {
 function right(pa, pb) {
   return ab(pa, pb, (va, vb) => vb);
 }
-function abc(pa, pb, pc, join34) {
-  return (data, i4) => mapOuter(pa(data, i4), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j2) => join34(ma.value, mb.value, vc, data, i4, j2))));
+function abc(pa, pb, pc, join35) {
+  return (data, i4) => mapOuter(pa(data, i4), (ma) => mapOuter(pb(data, ma.position), (mb) => mapInner(pc(data, mb.position), (vc, j2) => join35(ma.value, mb.value, vc, data, i4, j2))));
 }
 function middle(pa, pb, pc) {
   return abc(pa, pb, pc, (ra, rb) => rb);
@@ -376524,12 +376532,13 @@ ${answerEntries.map(([index, answer]) => {
 
 // packages/core/dist/src/utils/planUtils.js
 import path54 from "node:path";
-async function validatePlanPath(planPath, plansDir, targetDir) {
-  const resolvedPath = path54.resolve(targetDir, planPath);
+async function validatePlanPath(planPath, plansDir) {
+  const safeFilename = path54.basename(planPath);
+  const resolvedPath = path54.join(plansDir, safeFilename);
   const realPath = resolveToRealPath(resolvedPath);
   const realPlansDir = resolveToRealPath(plansDir);
   if (!isSubpath(realPlansDir, realPath)) {
-    return PlanErrorMessages.PATH_ACCESS_DENIED;
+    return PlanErrorMessages.PATH_ACCESS_DENIED(planPath, realPlansDir);
   }
   if (!await fileExists(resolvedPath)) {
     return PlanErrorMessages.FILE_NOT_FOUND(planPath);
@@ -376554,7 +376563,7 @@ var init_planUtils = __esm({
     init_fileUtils();
     init_paths();
     PlanErrorMessages = {
-      PATH_ACCESS_DENIED: "Access denied: plan path must be within the designated plans directory.",
+      PATH_ACCESS_DENIED: (planPath, plansDir) => `Access denied: plan path (${planPath}) must be within the designated plans directory (${plansDir}).`,
       FILE_NOT_FOUND: (path85) => `Plan file does not exist: ${path85}. You must create the plan file before requesting approval.`,
       FILE_EMPTY: "Plan file is empty. You must write content to the plan file before requesting approval.",
       READ_FAILURE: (detail) => `Failed to read plan file: ${detail}`
@@ -376623,20 +376632,20 @@ var init_exit_plan_mode = __esm({
       config;
       static Name = EXIT_PLAN_MODE_TOOL_NAME;
       constructor(config3, messageBus) {
-        const plansDir = config3.storage.getPlansDir();
-        const definition = getExitPlanModeDefinition(plansDir);
+        const definition = getExitPlanModeDefinition();
         super(_ExitPlanModeTool.Name, "Exit Plan Mode", definition.base.description, Kind.Plan, definition.base.parametersJsonSchema, messageBus);
         this.config = config3;
       }
       validateToolParamValues(params) {
-        if (!params.plan_path || params.plan_path.trim() === "") {
-          return "plan_path is required.";
+        if (!params.plan_filename || params.plan_filename.trim() === "") {
+          return "plan_filename is required.";
         }
+        const safeFilename = path55.basename(params.plan_filename);
         const plansDir = resolveToRealPath(this.config.storage.getPlansDir());
-        const resolvedPath = path55.resolve(this.config.getTargetDir(), params.plan_path);
+        const resolvedPath = path55.join(this.config.storage.getPlansDir(), safeFilename);
         const realPath = resolveToRealPath(resolvedPath);
         if (!isSubpath(plansDir, realPath)) {
-          return `Access denied: plan path must be within the designated plans directory.`;
+          return `Access denied: plan path (${resolvedPath}) must be within the designated plans directory (${plansDir}).`;
         }
         return null;
       }
@@ -376644,8 +376653,7 @@ var init_exit_plan_mode = __esm({
         return new ExitPlanModeInvocation(params, messageBus, toolName, toolDisplayName, this.config);
       }
       getSchema(modelId) {
-        const plansDir = this.config.storage.getPlansDir();
-        return resolveToolDeclaration(getExitPlanModeDefinition(plansDir), modelId);
+        return resolveToolDeclaration(getExitPlanModeDefinition(), modelId);
       }
     };
     ExitPlanModeInvocation = class extends BaseToolInvocation {
@@ -376659,7 +376667,7 @@ var init_exit_plan_mode = __esm({
       }
       async shouldConfirmExecute(abortSignal) {
         const resolvedPlanPath = this.getResolvedPlanPath();
-        const pathError = await validatePlanPath(this.params.plan_path, this.config.storage.getPlansDir(), this.config.getTargetDir());
+        const pathError = await validatePlanPath(this.params.plan_filename, this.config.storage.getPlansDir());
         if (pathError) {
           this.planValidationError = pathError;
           return false;
@@ -376694,14 +376702,15 @@ var init_exit_plan_mode = __esm({
         };
       }
       getDescription() {
-        return `Requesting plan approval for: ${this.params.plan_path}`;
+        return `Requesting plan approval for: ${path55.join(this.config.storage.getPlansDir(), this.params.plan_filename)}`;
       }
       /**
        * Returns the resolved plan path.
        * Note: Validation is done in validateToolParamValues, so this assumes the path is valid.
        */
       getResolvedPlanPath() {
-        return path55.resolve(this.config.getTargetDir(), this.params.plan_path);
+        const safeFilename = path55.basename(this.params.plan_filename);
+        return path55.join(this.config.storage.getPlansDir(), safeFilename);
       }
       async execute(_signal) {
         const resolvedPlanPath = this.getResolvedPlanPath();
@@ -431325,6 +431334,9 @@ ${sections.join("\n")}
       getApprovalMode() {
         return this.policyEngine.getApprovalMode();
       }
+      isPlanMode() {
+        return this.getApprovalMode() === ApprovalMode.PLAN;
+      }
       getPolicyUpdateConfirmationRequest() {
         return this.policyUpdateConfirmationRequest;
       }
@@ -452650,7 +452662,7 @@ var wo = (s5) => {
 var fse = __toESM(require_lib7(), 1);
 init_dist7();
 import { promises as fsPromises12, createReadStream as createReadStream5 } from "node:fs";
-import { join as join28 } from "node:path";
+import { join as join29 } from "node:path";
 
 // packages/a2a-server/src/config/config.ts
 var dotenv = __toESM(require_main2(), 1);
@@ -453007,7 +453019,7 @@ var GCSTaskStore = class {
       if (await fse.pathExists(workDir)) {
         const entries2 = await fsPromises12.readdir(workDir);
         if (entries2.length > 0) {
-          const tmpArchiveFile = join28(tmpdir(), getTmpArchiveFilename(taskId));
+          const tmpArchiveFile = join29(tmpdir(), getTmpArchiveFilename(taskId));
           try {
             await zn(
               {
@@ -453129,7 +453141,7 @@ var GCSTaskStore = class {
       const workspaceFile = this.storage.bucket(this.bucketName).file(workspaceObjectPath);
       const [workspaceExists] = await workspaceFile.exists();
       if (workspaceExists) {
-        const tmpArchiveFile = join28(tmpdir(), getTmpArchiveFilename(taskId));
+        const tmpArchiveFile = join29(tmpdir(), getTmpArchiveFilename(taskId));
         try {
           await workspaceFile.download({ destination: tmpArchiveFile });
           await lo({ file: tmpArchiveFile, cwd: workDir });