@google/gemini-cli-a2a-server 0.42.0-nightly.20260504.g37edd1d4d → 0.42.0-preview.0

package/dist/a2a-server.mjs

@@ -114791,9 +114791,6 @@ var init_storage = __esm({
       static getUserAgentSkillsDir() {
         return path6.join(_Storage.getGlobalAgentsDir(), "skills");
       }
-      static getGlobalMemoryFilePath() {
-        return path6.join(_Storage.getGlobalGeminiDir(), "memory.md");
-      }
       static getUserPoliciesDir() {
         return path6.join(_Storage.getGlobalGeminiDir(), "policies");
       }
@@ -209441,8 +209438,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 = "37edd1d4d";
-    CLI_VERSION = "0.42.0-nightly.20260504.g37edd1d4d";
+    GIT_COMMIT_INFO = "0803007c8";
+    CLI_VERSION = "0.42.0-preview.0";
   }
 });
 
@@ -283012,6 +283009,25 @@ function convertToFunctionResponse(toolName, callId, llmContent, model, config3)
       ];
     }
   }
+  const filteredInlineDataParts = [];
+  const unsupportedInlineDataParts = [];
+  for (const part2 of inlineDataParts) {
+    const mimeType = part2.inlineData?.mimeType;
+    if (mimeType && (mimeType.startsWith("audio/") || mimeType.startsWith("video/"))) {
+      unsupportedInlineDataParts.push(part2);
+    } else {
+      filteredInlineDataParts.push(part2);
+    }
+  }
+  if (unsupportedInlineDataParts.length > 0) {
+    const uniqueMimes = Array.from(new Set(unsupportedInlineDataParts.map((p2) => p2.inlineData?.mimeType ?? ""))).join(", ");
+    const isReadFileTool2 = toolName === "read_file" || toolName === "read_many_files";
+    if (isReadFileTool2) {
+      textParts.unshift(`Binary content (${uniqueMimes}) read successfully. Content will be injected for analysis in the next sequence.`);
+    } else {
+      textParts.unshift(`[SYSTEM: Binary content (${uniqueMimes}) stripped from response due to protocol limitations.]`);
+    }
+  }
   const part = {
     functionResponse: {
       id: callId,
@@ -283019,17 +283035,25 @@ function convertToFunctionResponse(toolName, callId, llmContent, model, config3)
       response: textParts.length > 0 ? { output: textParts.join("\n") } : {}
     }
   };
+  const isReadFileTool = toolName === "read_file" || toolName === "read_many_files";
+  if (unsupportedInlineDataParts.length > 0 && isReadFileTool) {
+    if (part.functionResponse) {
+      Object.assign(part.functionResponse.response, {
+        [BINARY_INJECTION_KEY]: unsupportedInlineDataParts
+      });
+    }
+  }
   const isMultimodalFRSupported = supportsMultimodalFunctionResponse(model, config3);
   const siblingParts = [...fileDataParts];
-  if (inlineDataParts.length > 0) {
+  if (filteredInlineDataParts.length > 0) {
     if (isMultimodalFRSupported) {
-      part.functionResponse.parts = inlineDataParts;
+      Object.assign(part.functionResponse, { parts: filteredInlineDataParts });
     } else {
-      siblingParts.push(...inlineDataParts);
+      siblingParts.push(...filteredInlineDataParts);
     }
   }
-  if (textParts.length === 0 && (inlineDataParts.length > 0 || fileDataParts.length > 0)) {
-    const totalBinaryItems = inlineDataParts.length + fileDataParts.length;
+  if (textParts.length === 0 && (filteredInlineDataParts.length > 0 || fileDataParts.length > 0)) {
+    const totalBinaryItems = filteredInlineDataParts.length + fileDataParts.length;
     part.functionResponse.response = {
       output: `Binary content provided (${totalBinaryItems} item(s)).`
     };
@@ -283047,12 +283071,14 @@ function getCitations(resp) {
     return citation.uri;
   });
 }
+var BINARY_INJECTION_KEY;
 var init_generateContentResponseUtilities = __esm({
   "packages/core/dist/src/utils/generateContentResponseUtilities.js"() {
     "use strict";
     init_partUtils();
     init_models();
     init_debugLogger();
+    BINARY_INJECTION_KEY = "__binary_injection__";
   }
 });
 
@@ -329482,7 +329508,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.42.0-nightly.20260504.g37edd1d4d";
+    return "0.42.0-preview.0";
   })();
   return versionPromise;
 }
@@ -331065,7 +331091,8 @@ var init_retry = __esm({
       // Generic protocol error (often SSL-related)
       "UND_ERR_HEADERS_TIMEOUT",
       "UND_ERR_BODY_TIMEOUT",
-      "UND_ERR_CONNECT_TIMEOUT"
+      "UND_ERR_CONNECT_TIMEOUT",
+      "ERR_STREAM_PREMATURE_CLOSE"
     ];
     RETRYABLE_SSL_ERROR_PATTERN = /^ERR_SSL_.*BAD_RECORD_MAC/i;
     FETCH_FAILED_MESSAGE = "fetch failed";
@@ -355878,7 +355905,7 @@ ${truncated}`;
             }
           };
           abortSignal.addEventListener("abort", abortHandler, { once: true });
-          child.on("exit", (code, signal) => {
+          child.on("close", (code, signal) => {
             handleExit(code, signal);
           });
           return { pid: child.pid, result: result2 };
@@ -363448,7 +363475,29 @@ var init_ask_user = __esm({
         return null;
       }
       createInvocation(params, messageBus, toolName, toolDisplayName) {
-        return new AskUserInvocation(params, messageBus, toolName, toolDisplayName);
+        const unescape4 = (str2) => str2.replace(/\\r\\n/g, "\n").replace(/\\n/g, "\n");
+        const normalizedParams = {
+          questions: params.questions.map((q2) => {
+            const normalizedQ = {
+              ...q2,
+              type: q2.type,
+              question: unescape4(q2.question)
+            };
+            if (q2.header)
+              normalizedQ.header = unescape4(q2.header);
+            if (q2.placeholder)
+              normalizedQ.placeholder = unescape4(q2.placeholder);
+            if (q2.options) {
+              normalizedQ.options = q2.options.map((opt) => ({
+                ...opt,
+                label: unescape4(opt.label),
+                description: opt.description?.trim() ? unescape4(opt.description.trim()) : ""
+              }));
+            }
+            return normalizedQ;
+          })
+        };
+        return new AskUserInvocation(normalizedParams, messageBus, toolName, toolDisplayName);
       }
       async validateBuildAndExecute(params, abortSignal) {
         const result2 = await super.validateBuildAndExecute(params, abortSignal);
@@ -364040,6 +364089,7 @@ var init_geminiChat = __esm({
     init_messageInspectors();
     init_historyHardening();
     init_geminiRequest();
+    init_generateContentResponseUtilities();
     init_tokenCalculation();
     init_policyHelpers();
     init_events();
@@ -364144,7 +364194,7 @@ var init_geminiChat = __esm({
           streamDoneResolver = resolve24;
         });
         this.sendPromise = streamDonePromise;
-        const userContent = createUserContent(message);
+        let userContent = createUserContent(message);
         const { model } = this.context.config.modelConfigService.getResolvedConfig(modelConfigKey);
         if (!isFunctionResponse(userContent)) {
           const userMessageParts = userContent.parts || [];
@@ -364164,6 +364214,24 @@ var init_geminiChat = __esm({
             displayContent: finalDisplayContent
           });
         }
+        const binaryInjections = this.extractBinaryInjections(userContent.parts);
+        if (binaryInjections) {
+          this.agentHistory.push(userContent);
+          this.agentHistory.push({
+            role: "model",
+            parts: [
+              {
+                text: "Binary content received. Proceeding with analysis.",
+                thought: true,
+                thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE2
+              }
+            ]
+          });
+          userContent = {
+            role: "user",
+            parts: binaryInjections
+          };
+        }
         this.agentHistory.push(userContent);
         const requestContents = this.getHistory(true);
         const streamWithRetries = async function* () {
@@ -364244,6 +364312,23 @@ var init_geminiChat = __esm({
         };
         return streamWithRetries.call(this);
       }
+      extractBinaryInjections(parts2) {
+        if (!parts2) {
+          return void 0;
+        }
+        const binaryInjections = [];
+        for (const part of parts2) {
+          const response = part.functionResponse?.response;
+          if (response && BINARY_INJECTION_KEY in response) {
+            const binaryParts = response[BINARY_INJECTION_KEY];
+            delete response[BINARY_INJECTION_KEY];
+            if (Array.isArray(binaryParts)) {
+              binaryInjections.push(...binaryParts);
+            }
+          }
+        }
+        return binaryInjections.length > 0 ? binaryInjections : void 0;
+      }
       async makeApiCallAndProcessStream(modelConfigKey, requestContents, prompt_id, abortSignal, role) {
         const scrubbedContents = this.context.config.isContextManagementEnabled() ? scrubHistory([...requestContents]) : [...requestContents];
         const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(scrubbedContents);
@@ -364391,7 +364476,7 @@ var init_geminiChat = __esm({
        */
       getHistory(curated = false) {
         const history = curated ? extractCuratedHistory2([...this.agentHistory.get()]) : this.agentHistory.get();
-        return [...history];
+        return this.context.config.isContextManagementEnabled() ? scrubHistory([...history]) : [...history];
       }
       /**
        * Clears the chat history.
@@ -376436,6 +376521,7 @@ var init_registry = __esm({
     init_storage();
     init_events();
     init_types14();
+    init_types14();
     init_agentLoader();
     init_codebase_investigator();
     init_cli_help_agent();
@@ -376480,12 +376566,45 @@ var init_registry = __esm({
        * Clears the current registry and re-scans for agents.
        */
       async reload() {
+        const previousAgents = new Map(this.agents);
+        const reloadErrors = [];
         this.config.getA2AClientManager()?.clearCache();
         await this.config.reloadAgents();
-        this.agents.clear();
-        this.allDefinitions.clear();
-        await this.loadAgents();
+        await this.loadAgents(reloadErrors);
+        const currentAgents = Array.from(this.agents.values());
+        const newAgents = [];
+        const updatedAgents = [];
+        const deletedAgents = [];
+        let localCount = 0;
+        let remoteCount = 0;
+        for (const agent of currentAgents) {
+          if (agent.kind === "local") {
+            localCount++;
+          } else if (agent.kind === "remote") {
+            remoteCount++;
+          }
+          const prev = previousAgents.get(agent.name);
+          if (!prev) {
+            newAgents.push(agent.name);
+          } else if (agent.metadata?.hash !== prev.metadata?.hash) {
+            updatedAgents.push(agent.name);
+          }
+        }
+        for (const prevName of previousAgents.keys()) {
+          if (!this.agents.has(prevName)) {
+            deletedAgents.push(prevName);
+          }
+        }
         coreEvents.emitAgentsRefreshed();
+        return {
+          totalLoaded: currentAgents.length,
+          localCount,
+          remoteCount,
+          newAgents,
+          updatedAgents,
+          deletedAgents,
+          errors: reloadErrors
+        };
       }
       /**
        * Acknowledges and registers a previously unacknowledged agent.
@@ -376505,7 +376624,7 @@ var init_registry = __esm({
       dispose() {
         coreEvents.off(CoreEvent.ModelChanged, this.onModelChanged);
       }
-      async loadAgents() {
+      async loadAgents(errors) {
         this.agents.clear();
         this.allDefinitions.clear();
         this.loadBuiltInAgents();
@@ -376517,14 +376636,19 @@ var init_registry = __esm({
         const userAgents = await loadAgentsFromDirectory(userAgentsDir);
         for (const error2 of userAgents.errors) {
           debugLogger.warn(`[AgentRegistry] Error loading user agent: ${error2.message}`);
-          coreEvents.emitFeedback("error", `Agent loading error: ${error2.message}`);
+          const msg = `Agent loading error: ${error2.message}`;
+          errors?.push(msg);
+          coreEvents.emitFeedback("error", msg);
         }
         await Promise.allSettled(userAgents.agents.map(async (agent) => {
           try {
-            await this.registerAgent(agent);
+            this.ensureRemoteAgentHash(agent);
+            await this.registerAgent(agent, errors);
           } catch (e3) {
-            debugLogger.warn(`[AgentRegistry] Error registering user agent "${agent.name}":`, e3);
-            coreEvents.emitFeedback("error", `Error registering user agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`);
+            const msg = `Error registering user agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`;
+            debugLogger.warn(`[AgentRegistry] ${msg}`, e3);
+            errors?.push(msg);
+            coreEvents.emitFeedback("error", msg);
           }
         }));
         const folderTrustEnabled = this.config.getFolderTrust();
@@ -376533,19 +376657,16 @@ var init_registry = __esm({
           const projectAgentsDir = this.config.storage.getProjectAgentsDir();
           const projectAgents = await loadAgentsFromDirectory(projectAgentsDir);
           for (const error2 of projectAgents.errors) {
-            coreEvents.emitFeedback("error", `Agent loading error: ${error2.message}`);
+            const msg = `Agent loading error: ${error2.message}`;
+            errors?.push(msg);
+            coreEvents.emitFeedback("error", msg);
           }
           const ackService = this.config.getAcknowledgedAgentsService();
           const projectRoot = this.config.getProjectRoot();
           const unacknowledgedAgents = [];
           const agentsToRegister = [];
           for (const agent of projectAgents.agents) {
-            if (agent.kind === "remote") {
-              if (!agent.metadata) {
-                agent.metadata = {};
-              }
-              agent.metadata.hash = agent.agentCardUrl ?? (agent.agentCardJson ? crypto21.createHash("sha256").update(agent.agentCardJson).digest("hex") : void 0);
-            }
+            this.ensureRemoteAgentHash(agent);
             if (!agent.metadata?.hash) {
               agentsToRegister.push(agent);
               continue;
@@ -376562,10 +376683,12 @@ var init_registry = __esm({
           }
           await Promise.allSettled(agentsToRegister.map(async (agent) => {
             try {
-              await this.registerAgent(agent);
+              await this.registerAgent(agent, errors);
             } catch (e3) {
-              debugLogger.warn(`[AgentRegistry] Error registering project agent "${agent.name}":`, e3);
-              coreEvents.emitFeedback("error", `Error registering project agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`);
+              const msg = `Error registering project agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`;
+              debugLogger.warn(`[AgentRegistry] ${msg}`, e3);
+              errors?.push(msg);
+              coreEvents.emitFeedback("error", msg);
             }
           }));
         } else {
@@ -376575,10 +376698,12 @@ var init_registry = __esm({
           if (extension.isActive && extension.agents) {
             await Promise.allSettled(extension.agents.map(async (agent) => {
               try {
-                await this.registerAgent(agent);
+                await this.registerAgent(agent, errors);
               } catch (e3) {
-                debugLogger.warn(`[AgentRegistry] Error registering extension agent "${agent.name}":`, e3);
-                coreEvents.emitFeedback("error", `Error registering extension agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`);
+                const msg = `Error registering extension agent "${agent.name}": ${e3 instanceof Error ? e3.message : String(e3)}`;
+                debugLogger.warn(`[AgentRegistry] ${msg}`, e3);
+                errors?.push(msg);
+                coreEvents.emitFeedback("error", msg);
               }
             }));
           }
@@ -376616,11 +376741,11 @@ var init_registry = __esm({
        * it will be overwritten, respecting the precedence established by the
        * initialization order.
        */
-      async registerAgent(definition) {
+      async registerAgent(definition, errors) {
         if (definition.kind === "local") {
           this.registerLocalAgent(definition);
         } else if (definition.kind === "remote") {
-          await this.registerRemoteAgent(definition);
+          await this.registerRemoteAgent(definition, errors);
         }
       }
       /**
@@ -376686,7 +376811,7 @@ var init_registry = __esm({
        * - Agent card fetch failures (404, 401/403, network errors)
        * - Missing authentication configuration
        */
-      async registerRemoteAgent(definition) {
+      async registerRemoteAgent(definition, errors) {
         if (definition.kind !== "remote") {
           return;
         }
@@ -376762,11 +376887,14 @@ ${skillsList}`);
           this.agents.set(definition.name, definition);
           this.addAgentPolicy(definition);
         } catch (e3) {
+          let msg;
           if (e3 instanceof A2AAgentError) {
-            coreEvents.emitFeedback("error", `[${definition.name}] ${e3.userMessage}`);
+            msg = `[${definition.name}] ${e3.userMessage}`;
           } else {
-            coreEvents.emitFeedback("error", `[${definition.name}] Failed to load remote agent: ${e3 instanceof Error ? e3.message : String(e3)}`);
+            msg = `[${definition.name}] Failed to load remote agent: ${e3 instanceof Error ? e3.message : String(e3)}`;
           }
+          errors?.push(msg);
+          coreEvents.emitFeedback("error", msg);
           debugLogger.warn(`[AgentRegistry] Error loading A2A agent "${definition.name}":`, e3);
         }
       }
@@ -376883,6 +377011,22 @@ ${skillsList}`);
       getDiscoveredDefinition(name3) {
         return this.allDefinitions.get(name3);
       }
+      /**
+       * Ensures that remote agents have a content-based hash for trust verification and change detection.
+       */
+      ensureRemoteAgentHash(agent) {
+        if (agent.kind !== "remote") {
+          return;
+        }
+        if (!agent.metadata) {
+          agent.metadata = {};
+        }
+        if (agent.agentCardUrl) {
+          agent.metadata.hash = agent.agentCardUrl;
+        } else if (agent.agentCardJson) {
+          agent.metadata.hash = crypto21.createHash("sha256").update(agent.agentCardJson).digest("hex");
+        }
+      }
     };
   }
 });
@@ -379485,9 +379629,9 @@ var init_snapshotGenerator = __esm({
       }
       async synthesizeSnapshot(nodes, systemInstruction) {
         const systemPrompt = systemInstruction ?? `You are an expert Context Memory Manager. You will be provided with a raw transcript of older conversation turns between a user and an AI assistant.
-Your task is to synthesize these turns into a single, dense, factual snapshot that preserves all critical context, preferences, active tasks, and factual knowledge, but discards conversational filler, pleasantries, and redundant back-and-forth iterations.
+Your task is to synthesize these turns into a single, dense, factual snapshot that preserves all critical context, preferences, active tasks, and factual knowledge.
 
-Output ONLY the raw factual snapshot, formatted compactly. Do not include markdown wrappers, prefixes like "Here is the snapshot", or conversational elements.`;
+Discard conversational filler, pleasantries, and redundant back-and-forth iterations. Output ONLY the raw factual snapshot, formatted compactly. Do not include markdown wrappers, prefixes like "Here is the snapshot", or conversational elements.`;
         let userPromptText = "TRANSCRIPT TO SNAPSHOT:\n\n";
         for (const node of nodes) {
           const payload = node.payload;
@@ -379737,7 +379881,8 @@ var init_profiles = __esm({
       config: {
         budget: {
           retainedTokens: 65e3,
-          maxTokens: 15e4
+          maxTokens: 15e4,
+          coalescingThresholdTokens: 5e3
         }
       },
       buildPipelines: (env, config3) => (
@@ -379763,10 +379908,10 @@ var init_profiles = __esm({
             triggers: ["retained_exceeded"],
             processors: [
               createNodeDistillationProcessor("NodeDistillation", env, resolveProcessorOptions(config3, "NodeDistillation", {
-                nodeThresholdTokens: 1e3
+                nodeThresholdTokens: 3e3
               })),
               createNodeTruncationProcessor("NodeTruncation", env, resolveProcessorOptions(config3, "NodeTruncation", {
-                maxTokensPerNode: 1200
+                maxTokensPerNode: 4e3
               }))
             ]
           },
@@ -379857,6 +380002,10 @@ function getContextManagementConfigSchema(registry2) {
           maxTokens: {
             type: "number",
             description: "The absolute maximum token count allowed before synchronous truncation kicks in."
+          },
+          coalescingThresholdTokens: {
+            type: "number",
+            description: 'Only trigger background consolidation (snapshots) when at least this many tokens have aged out. Prevents "turn-by-turn" utility model churn.'
           }
         }
       },
@@ -381176,12 +381325,16 @@ var init_contextManager = __esm({
             }
           }
           if (agedOutNodes.size > 0) {
-            this.env.tokenCalculator.garbageCollectCache(new Set(this.buffer.nodes.map((n2) => n2.id)));
-            this.eventBus.emitConsolidationNeeded({
-              nodes: this.buffer.nodes,
-              targetDeficit: currentTokens - this.sidecar.config.budget.retainedTokens,
-              targetNodeIds: agedOutNodes
-            });
+            const targetDeficit = currentTokens - this.sidecar.config.budget.retainedTokens;
+            const threshold = this.sidecar.config.budget.coalescingThresholdTokens || 0;
+            if (targetDeficit >= threshold) {
+              this.env.tokenCalculator.garbageCollectCache(new Set(this.buffer.nodes.map((n2) => n2.id)));
+              this.eventBus.emitConsolidationNeeded({
+                nodes: this.buffer.nodes,
+                targetDeficit,
+                targetNodeIds: agedOutNodes
+              });
+            }
           }
         }
       }
@@ -383557,6 +383710,18 @@ function getWorkspaceContextOverride() {
 function runWithScopedWorkspaceContext(scopedContext, fn2) {
   return workspaceContextOverride.run(scopedContext, fn2);
 }
+function hasScopedMemoryInboxAccess() {
+  return memoryInboxAccessOverride.getStore() === true;
+}
+function runWithScopedMemoryInboxAccess(fn2) {
+  return memoryInboxAccessOverride.run(true, fn2);
+}
+function hasScopedAutoMemoryExtractionWriteAccess() {
+  return autoMemoryExtractionWriteAccessOverride.getStore() === true;
+}
+function runWithScopedAutoMemoryExtractionWriteAccess(fn2) {
+  return autoMemoryExtractionWriteAccessOverride.run(true, fn2);
+}
 function createScopedWorkspaceContext(parentContext, additionalDirectories) {
   if (additionalDirectories.length === 0) {
     return parentContext;
@@ -383575,12 +383740,14 @@ function createScopedWorkspaceContext(parentContext, additionalDirectories) {
     ...additionalDirectories
   ]);
 }
-var workspaceContextOverride;
+var workspaceContextOverride, memoryInboxAccessOverride, autoMemoryExtractionWriteAccessOverride;
 var init_scoped_config = __esm({
   "packages/core/dist/src/config/scoped-config.js"() {
     "use strict";
     init_workspaceContext();
     workspaceContextOverride = new AsyncLocalStorage3();
+    memoryInboxAccessOverride = new AsyncLocalStorage3();
+    autoMemoryExtractionWriteAccessOverride = new AsyncLocalStorage3();
   }
 });
 
@@ -384182,12 +384349,19 @@ var init_local_executor = __esm({
        * @returns A promise that resolves to the agent's final output.
        */
       async run(inputs, signal) {
-        const dirs = this.definition.workspaceDirectories;
-        if (dirs && dirs.length > 0) {
-          const scopedCtx = createScopedWorkspaceContext(this.context.config.getWorkspaceContext(), dirs);
-          return runWithScopedWorkspaceContext(scopedCtx, () => this.runInternal(inputs, signal));
+        const runWithWorkspaceScope = () => {
+          const dirs = this.definition.workspaceDirectories;
+          if (dirs && dirs.length > 0) {
+            const scopedCtx = createScopedWorkspaceContext(this.context.config.getWorkspaceContext(), dirs);
+            return runWithScopedWorkspaceContext(scopedCtx, () => this.runInternal(inputs, signal));
+          }
+          return this.runInternal(inputs, signal);
+        };
+        const runWithInboxScope = () => this.definition.memoryInboxAccess ? runWithScopedMemoryInboxAccess(runWithWorkspaceScope) : runWithWorkspaceScope();
+        if (this.definition.autoMemoryExtractionWriteAccess) {
+          return runWithScopedAutoMemoryExtractionWriteAccess(runWithInboxScope);
         }
-        return this.runInternal(inputs, signal);
+        return runWithInboxScope();
       }
       async runInternal(inputs, signal) {
         const startTime = Date.now();
@@ -423993,6 +424167,28 @@ ${sections.join("\n")}
       setIdeMode(value) {
         this.ideMode = value;
       }
+      isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot) {
+        if (!hasScopedMemoryInboxAccess()) {
+          return false;
+        }
+        const normalizedPath = path86.resolve(absolutePath);
+        const isCanonicalPatchPath = ["private", "global"].some((kind) => normalizedPath === path86.resolve(inboxRoot, kind, "extraction.patch"));
+        if (!isCanonicalPatchPath) {
+          return false;
+        }
+        const resolvedMemoryRoot = resolveToRealPath(this.storage.getProjectMemoryTempDir());
+        return isSubpath(resolvedMemoryRoot, resolvedPath);
+      }
+      isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath) {
+        if (!hasScopedAutoMemoryExtractionWriteAccess()) {
+          return false;
+        }
+        const resolvedSkillsMemoryDir = resolveToRealPath(this.storage.getProjectSkillsMemoryDir());
+        if (isSubpath(resolvedSkillsMemoryDir, resolvedPath)) {
+          return true;
+        }
+        return this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, path86.join(this.storage.getProjectMemoryTempDir(), ".inbox"));
+      }
       /**
        * Get the current FileSystemService
        */
@@ -424006,11 +424202,27 @@ ${sections.join("\n")}
        * file (the latter is the only file under `~/.gemini/` that is reachable —
        * settings, credentials, keybindings, etc. remain disallowed).
        *
+       * One subtree is *carved back out*: `<projectMemoryDir>/.inbox/` is owned by
+       * the auto-memory extraction agent and the `/memory inbox` review flow. The
+       * main agent is denied access to it even though it falls inside the project
+       * temp dir; the extraction agent receives a narrow execution-scoped exception
+       * for `.inbox/{private,global}/extraction.patch`.
+       *
        * @param absolutePath The absolute path to check.
        * @returns true if the path is allowed, false otherwise.
        */
       isPathAllowed(absolutePath) {
         const resolvedPath = resolveToRealPath(absolutePath);
+        const inboxRoot = path86.join(this.storage.getProjectMemoryTempDir(), ".inbox");
+        const resolvedInboxRoot = resolveToRealPath(inboxRoot);
+        const normalizedPath = path86.resolve(absolutePath);
+        const normalizedInboxRoot = path86.resolve(inboxRoot);
+        if (resolvedPath === resolvedInboxRoot || isSubpath(resolvedInboxRoot, resolvedPath) || normalizedPath === normalizedInboxRoot || isSubpath(normalizedInboxRoot, normalizedPath)) {
+          if (this.isScopedMemoryInboxPatchPathAllowed(absolutePath, resolvedPath, inboxRoot)) {
+            return true;
+          }
+          return false;
+        }
         const workspaceContext = this.getWorkspaceContext();
         if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
           return true;
@@ -424035,6 +424247,13 @@ ${sections.join("\n")}
        * @returns An error message string if the path is disallowed, null otherwise.
        */
       validatePathAccess(absolutePath, checkType = "write") {
+        if (checkType === "write" && hasScopedAutoMemoryExtractionWriteAccess()) {
+          const resolvedPath = resolveToRealPath(absolutePath);
+          if (this.isScopedAutoMemoryExtractionWritePathAllowed(absolutePath, resolvedPath)) {
+            return null;
+          }
+          return `Auto-memory extraction write denied: Attempted path "${absolutePath}" is outside the extraction write allowlist. Extraction may only write extracted skills under ${this.storage.getProjectSkillsMemoryDir()} and canonical inbox patches under ${path86.join(this.storage.getProjectMemoryTempDir(), ".inbox", "{private,global}", "extraction.patch")}.`;
+        }
         if (checkType === "read") {
           if (this.getWorkspaceContext().isPathReadable(absolutePath)) {
             return null;
@@ -425761,7 +425980,7 @@ var init_skill_extraction_agent = __esm({
     init_tool_names();
     init_models();
     SkillExtractionSchema = external_exports.object({
-      response: external_exports.string().describe("A summary of the skills extracted or updated.")
+      response: external_exports.string().describe("A summary of the memories or skills extracted or updated.")
     });
   }
 });
@@ -425775,7 +425994,7 @@ var init_sessionScratchpadUtils = __esm({
 });
 
 // packages/core/dist/src/services/memoryService.js
-var LOCK_STALE_MS, MIN_IDLE_MS;
+var LOCK_STALE_MS, MIN_EXTRACTION_INTERVAL_MS, MIN_IDLE_MS;
 var init_memoryService = __esm({
   "packages/core/dist/src/services/memoryService.js"() {
     "use strict";
@@ -425799,6 +426018,7 @@ var init_memoryService = __esm({
     init_memoryPatchUtils();
     init_sessionScratchpadUtils();
     LOCK_STALE_MS = 35 * 60 * 1e3;
+    MIN_EXTRACTION_INTERVAL_MS = 30 * 60 * 1e3;
     MIN_IDLE_MS = 3 * 60 * 60 * 1e3;
   }
 });
@@ -425885,6 +426105,7 @@ var init_memory2 = __esm({
     init_storage();
     init_memory();
     init_skillLoader();
+    init_memoryTool();
     init_memoryPatchUtils();
     init_memoryService();
     init_memoryDiscovery();
@@ -446529,6 +446750,8 @@ var Task4 = class _Task {
   // For tool waiting logic
   pendingToolCalls = /* @__PURE__ */ new Map();
   //toolCallId --> status
+  pendingOutcomes = /* @__PURE__ */ new Map();
+  // toolCallId --> outcome
   toolsAlreadyConfirmed = /* @__PURE__ */ new Set();
   toolCompletionPromise;
   toolCompletionNotifier;
@@ -446766,7 +446989,7 @@ var Task4 = class _Task {
     this.scheduler.dispose();
   }
   handleEventDrivenToolCallsUpdate(event) {
-    if (event.type !== MessageBusType.TOOL_CALLS_UPDATE) {
+    if (event.type !== MessageBusType.TOOL_CALLS_UPDATE || event.schedulerId !== this.id) {
       return;
     }
     const toolCalls = event.toolCalls;
@@ -446778,15 +447001,18 @@ var Task4 = class _Task {
   handleEventDrivenToolCall(tc) {
     const callId = tc.request.callId;
     if (this.processedToolCallIds.has(callId) || this.completedToolCalls.some((c2) => c2.request.callId === callId)) {
-      return;
+      return false;
     }
     const previousStatus = this.pendingToolCalls.get(callId);
-    const hasChanged = previousStatus !== tc.status;
+    const previousOutcome = this.pendingOutcomes.get(callId);
+    const hasChanged = previousStatus !== tc.status || previousOutcome !== tc.outcome;
+    this.pendingOutcomes.set(callId, tc.outcome);
     if (tc.status === "executing" && tc.liveOutput) {
       this._schedulerOutputUpdate(callId, tc.liveOutput);
     }
     if (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") {
       this.toolsAlreadyConfirmed.delete(callId);
+      this.pendingOutcomes.delete(callId);
       if (hasChanged) {
         logger.info(
           `[Task] Tool call ${callId} completed with status: ${tc.status}`
@@ -446819,6 +447045,7 @@ var Task4 = class _Task {
       );
       this.eventBus?.publish(statusUpdate);
     }
+    return hasChanged;
   }
   checkInputRequiredState() {
     if (this.isYoloMatch) {
@@ -446827,9 +447054,9 @@ var Task4 = class _Task {
     let isAwaitingApproval = false;
     let isExecuting = false;
     for (const [callId, status2] of this.pendingToolCalls.entries()) {
-      if (status2 === "executing" || status2 === "scheduled") {
+      if (status2 === CoreToolCallStatus.Executing || status2 === CoreToolCallStatus.Scheduled || status2 === CoreToolCallStatus.Validating || this.toolsAlreadyConfirmed.has(callId)) {
         isExecuting = true;
-      } else if (status2 === "awaiting_approval" && !this.toolsAlreadyConfirmed.has(callId)) {
+      } else if (status2 === CoreToolCallStatus.AwaitingApproval) {
         isAwaitingApproval = true;
       }
     }
@@ -446866,8 +447093,12 @@ var Task4 = class _Task {
       "status",
       "confirmationDetails",
       "liveOutput",
-      "response"
+      "response",
+      "outcome"
     );
+    if (serializableToolCall.status === CoreToolCallStatus.Validating) {
+      serializableToolCall.status = CoreToolCallStatus.Scheduled;
+    }
     if (tc.tool) {
       const toolFields = this._pickFields(
         tc.tool,