@google/adk 1.5.0 → 1.6.0

package/dist/esm/artifacts/in_memory_artifact_service.js

@@ -70,16 +70,14 @@ class InMemoryArtifactService {
     userId,
     sessionId
   }) {
-    const sessionPrefix = `${appName}/${userId}/${sessionId}/`;
-    const usernamespacePrefix = `${appName}/${userId}/user/`;
+    const sessionPrefix = artifactPrefix("session", appName, userId, sessionId);
+    const userPrefix = artifactPrefix("user", appName, userId);
     const filenames = [];
     for (const path in this.artifacts) {
       if (path.startsWith(sessionPrefix)) {
-        const filename = path.replace(sessionPrefix, "");
-        filenames.push(filename);
-      } else if (path.startsWith(usernamespacePrefix)) {
-        const filename = path.replace(usernamespacePrefix, "");
-        filenames.push(filename);
+        filenames.push(decodeURIComponent(path.slice(sessionPrefix.length)));
+      } else if (path.startsWith(userPrefix)) {
+        filenames.push(decodeURIComponent(path.slice(userPrefix.length)));
       }
     }
     return Promise.resolve(filenames.sort());
@@ -150,9 +148,12 @@ class InMemoryArtifactService {
 }
 function artifactPath(appName, userId, sessionId, filename) {
   if (fileHasUserNamespace(filename)) {
-    return `${appName}/${userId}/user/${filename}`;
+    return `${artifactPrefix("user", appName, userId)}${encodeURIComponent(filename)}`;
   }
-  return `${appName}/${userId}/${sessionId}/${filename}`;
+  return `${artifactPrefix("session", appName, userId, sessionId)}${encodeURIComponent(filename)}`;
+}
+function artifactPrefix(scope, ...parts) {
+  return `${[scope, ...parts].map(encodeURIComponent).join("/")}/`;
 }
 function fileHasUserNamespace(filename) {
   return filename.startsWith("user:");

package/dist/esm/auth/credential_service/in_memory_credential_service.js

@@ -7,7 +7,18 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 class InMemoryCredentialService {
   constructor() {
-    this.credentials = {};
+    /**
+     * A map from app name to a map from user ID to a map from credential key to
+     * credential.
+     *
+     * `appName`, `userId` and `credentialKey` are all attacker-influenced, so
+     * every level is created with `Object.create(null)`. On an ordinary `{}`
+     * literal a key of `__proto__` resolves to the inherited `__proto__`
+     * accessor rather than creating an own property, so nested assignment
+     * pollutes every object in the process, and a lookup of an inherited key
+     * such as `toString` returns a function instead of `undefined`.
+     */
+    this.credentials = /* @__PURE__ */ Object.create(null);
   }
   loadCredential(authConfig, toolContext) {
     const credentialBucket = this.getBucketForCurrentContext(toolContext);
@@ -22,10 +33,10 @@ class InMemoryCredentialService {
   getBucketForCurrentContext(toolContext) {
     const { appName, userId } = toolContext.invocationContext.session;
     if (!this.credentials[appName]) {
-      this.credentials[appName] = {};
+      this.credentials[appName] = /* @__PURE__ */ Object.create(null);
     }
     if (!this.credentials[appName][userId]) {
-      this.credentials[appName][userId] = {};
+      this.credentials[appName][userId] = /* @__PURE__ */ Object.create(null);
     }
     return this.credentials[appName][userId];
   }

package/dist/esm/code_executors/unsafe_local_code_executor.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { spawn } from "child_process";
+import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -17,13 +17,21 @@ import {
   CodeExecutionLanguage
 } from "./code_execution_utils.js";
 const IS_WINDOWS = os.platform() === "win32";
+const POWERSHELL_BASE_ARGS = [
+  "-NoLogo",
+  "-NoProfile",
+  "-ExecutionPolicy",
+  "Bypass",
+  "-File"
+];
+const CMD_BASE_ARGS = ["/D", "/c"];
+function isPowerShellCommand(commandPath) {
+  return /^(powershell|pwsh)(\.exe)?$/i.test(path.win32.basename(commandPath));
+}
 async function createTempScriptFile(code, language, shellCommandPath) {
-  const tempDir = path.join(
-    os.tmpdir(),
-    "adk_js_unsafe_code_executor",
-    Date.now().toString() + "_" + Math.random().toString(36).slice(2)
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), "adk_js_unsafe_code_executor_")
   );
-  await fs.mkdir(tempDir, { recursive: true });
   const ext = getExtensionForLanguage(language, shellCommandPath) || ".js";
   const filePath = path.join(tempDir, `script${ext}`);
   await fs.writeFile(filePath, code);
@@ -43,6 +51,9 @@ function getExtensionForLanguage(language, shellCommandPath) {
     return ".bat";
   }
   if (language === CodeExecutionLanguage.SHELL) {
+    if (shellCommandPath && isPowerShellCommand(shellCommandPath)) {
+      return ".ps1";
+    }
     if (IS_WINDOWS) {
       if (shellCommandPath && shellCommandPath.toLowerCase().includes("cmd")) {
         return ".bat";
@@ -101,17 +112,17 @@ class UnsafeLocalCodeExecutor extends BaseCodeExecutor {
         command = this.pythonCommandPath;
       } else if (language === CodeExecutionLanguage.SHELL) {
         command = this.shellCommandPath;
-        if (this.shellCommandPath.toLowerCase().includes("powershell")) {
-          args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        if (isPowerShellCommand(this.shellCommandPath)) {
+          args = [...POWERSHELL_BASE_ARGS, filePath];
         } else if (this.shellCommandPath.toLowerCase().includes("cmd")) {
-          args = ["/c", filePath];
+          args = [...CMD_BASE_ARGS, filePath];
         }
       } else if (language === CodeExecutionLanguage.POWERSHELL) {
         command = IS_WINDOWS ? "powershell" : "pwsh";
-        args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        args = [...POWERSHELL_BASE_ARGS, filePath];
       } else if (language === CodeExecutionLanguage.WINDOWS_CMD) {
         command = "cmd.exe";
-        args = ["/c", filePath];
+        args = [...CMD_BASE_ARGS, filePath];
       }
       if (params.codeExecutionInput.args) {
         if (Array.isArray(params.codeExecutionInput.args)) {

package/dist/esm/common.js

@@ -121,6 +121,7 @@ import {
 import { ExampleTool } from "./tools/example_tool.js";
 import { EXIT_LOOP, ExitLoopTool } from "./tools/exit_loop_tool.js";
 import { FunctionTool, isFunctionTool } from "./tools/function_tool.js";
+import { getUserChoiceTool } from "./tools/get_user_choice_tool.js";
 import {
   GOOGLE_MAPS_GROUNDING,
   GoogleMapsGroundingTool
@@ -137,6 +138,7 @@ import {
   PRELOAD_MEMORY,
   PreloadMemoryTool
 } from "./tools/preload_memory_tool.js";
+import { requestInputTool } from "./tools/request_input_tool.js";
 import { ToolConfirmation } from "./tools/tool_confirmation.js";
 import { URL_CONTEXT, UrlContextTool } from "./tools/url_context_tool.js";
 import { VertexAiSearchTool } from "./tools/vertex_ai_search_tool.js";
@@ -305,6 +307,7 @@ export {
   getFunctionCalls,
   getFunctionResponses,
   getLogger,
+  getUserChoiceTool,
   hasThoughts,
   hasTrailingCodeExecutionResult,
   isAgentTool,
@@ -332,6 +335,7 @@ export {
   loadWebPage,
   populateClientFunctionCallId,
   pruneThoughts,
+  requestInputTool,
   runWithClientLabel,
   setLogLevel,
   setLogger,

package/dist/esm/context/agent_controlled_context_compactor.js

@@ -5,9 +5,9 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isCompactedEvent } from "../events/compacted_event.js";
 import { createEvent } from "../events/event.js";
 import { ContextCompactionTrigger } from "../plugins/base_plugin.js";
+import { getActiveEvents } from "./compaction_utils.js";
 class AgentControlledContextCompactor {
   constructor(options) {
     this.trigger = ContextCompactionTrigger.AgentControlled;
@@ -18,7 +18,7 @@ class AgentControlledContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const consolidateToolCallIndex = activeEvents.reduce(
       (acc, e, idx) => {
         var _a, _b;
@@ -66,15 +66,6 @@ class AgentControlledContextCompactor {
     delete invocationContext.session.state["temp:consolidate_context"];
     delete invocationContext.session.state["temp:consolidate_context_detail"];
   }
-  getActiveEvents(events) {
-    const latest = events.filter(isCompactedEvent).pop();
-    return latest ? [
-      latest,
-      ...events.filter(
-        (e) => !isCompactedEvent(e) && e.timestamp > latest.endTime
-      )
-    ] : events;
-  }
 }
 export {
   AgentControlledContextCompactor

package/dist/esm/context/compaction_utils.js

@@ -5,10 +5,20 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { isCompactedEvent } from "../events/compacted_event.js";
 import {
   getFunctionCalls,
   getFunctionResponses
 } from "../events/event.js";
+function getActiveEvents(events) {
+  const latest = events.filter(isCompactedEvent).pop();
+  return latest ? [
+    latest,
+    ...events.filter(
+      (e) => !isCompactedEvent(e) && e.timestamp > latest.endTime
+    )
+  ] : events;
+}
 function calculateRetainStartIndex(rawEvents, eventRetentionSize) {
   let retainStartIndex = Math.max(0, rawEvents.length - eventRetentionSize);
   while (retainStartIndex > 0) {
@@ -23,5 +33,6 @@ function calculateRetainStartIndex(rawEvents, eventRetentionSize) {
   return retainStartIndex;
 }
 export {
-  calculateRetainStartIndex
+  calculateRetainStartIndex,
+  getActiveEvents
 };

package/dist/esm/context/token_based_context_compactor.js

@@ -7,7 +7,10 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 import { getContents } from "../agents/processors/content_processor_utils.js";
 import { isCompactedEvent } from "../events/compacted_event.js";
-import { calculateRetainStartIndex } from "./compaction_utils.js";
+import {
+  calculateRetainStartIndex,
+  getActiveEvents
+} from "./compaction_utils.js";
 const CHARS_PER_TOKEN = 4;
 class TokenBasedContextCompactor {
   constructor(options) {
@@ -15,27 +18,9 @@ class TokenBasedContextCompactor {
     this.eventRetentionSize = options.eventRetentionSize;
     this.summarizer = options.summarizer;
   }
-  getActiveEvents(events) {
-    let latestCompactedEvent = void 0;
-    for (let i = events.length - 1; i >= 0; i--) {
-      const e = events[i];
-      if (isCompactedEvent(e)) {
-        if (!latestCompactedEvent || e.endTime > latestCompactedEvent.endTime) {
-          latestCompactedEvent = e;
-        }
-      }
-    }
-    if (!latestCompactedEvent) {
-      return events;
-    }
-    const activeRawEvents = events.filter(
-      (e) => !isCompactedEvent(e) && e.timestamp > latestCompactedEvent.endTime
-    );
-    return [latestCompactedEvent, ...activeRawEvents];
-  }
   shouldCompact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const rawEvents = activeEvents.filter((e) => !isCompactedEvent(e));
     if (rawEvents.length <= this.eventRetentionSize) {
       return false;
@@ -58,7 +43,7 @@ class TokenBasedContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const rawEvents = activeEvents.filter((e) => !isCompactedEvent(e));
     if (rawEvents.length <= this.eventRetentionSize) {
       return;

package/dist/esm/index.js

@@ -9,6 +9,7 @@ import { AGENT_CARD_PATH, RemoteA2AAgent } from "./a2a/a2a_remote_agent.js";
 import { getA2AAgentCard } from "./a2a/agent_card.js";
 import { A2AAgentExecutor } from "./a2a/agent_executor.js";
 import { toA2a } from "./a2a/agent_to_a2a.js";
+import { bearerTokenUserBuilder } from "./a2a/auth.js";
 import { InvocationContext } from "./agents/invocation_context.js";
 import { FileArtifactService } from "./artifacts/file_artifact_service.js";
 import { GcsArtifactService } from "./artifacts/gcs_artifact_service.js";
@@ -56,6 +57,7 @@ export {
   RunSkillScriptTool,
   UnsafeLocalCodeExecutor,
   VertexAiSessionService,
+  bearerTokenUserBuilder,
   getA2AAgentCard,
   getArtifactServiceFromUri,
   getSessionServiceFromUri,

package/dist/esm/memory/in_memory_memory_service.js

@@ -8,12 +8,23 @@ const require = topLevelCreateRequire(import.meta.url);
 class InMemoryMemoryService {
   constructor() {
     this.memories = [];
-    this.sessionEvents = {};
+    /**
+     * A map from user key to a map from session ID to events.
+     *
+     * The inner map is keyed by `session.id`, which arrives off the request path
+     * and contains no `/`, so it can be exactly `__proto__`. On a plain object
+     * literal that key would reach the inherited `__proto__` setter and
+     * re-parent the map instead of creating an own property, silently dropping
+     * the session from the `Object.values` scan in `searchMemory`. The outer key
+     * always contains a `/` (see `getUserKey`) and cannot collide, but is
+     * created the same way for consistency.
+     */
+    this.sessionEvents = /* @__PURE__ */ Object.create(null);
   }
   async addSessionToMemory(session) {
     const userKey = getUserKey(session.appName, session.userId);
     if (!this.sessionEvents[userKey]) {
-      this.sessionEvents[userKey] = {};
+      this.sessionEvents[userKey] = /* @__PURE__ */ Object.create(null);
     }
     this.sessionEvents[userKey][session.id] = session.events.filter(
       (event) => {

package/dist/esm/memory/vertex_ai_memory_bank_service.js

@@ -8,7 +8,10 @@ const require = topLevelCreateRequire(import.meta.url);
 import { Client } from "@google-cloud/vertexai";
 import { createUserContent } from "@google/genai";
 import { logger } from "../utils/logger.js";
-import { getExpressModeApiKey } from "../utils/vertex_ai_utils.js";
+import {
+  EXPRESS_MODE_UNSUPPORTED_MESSAGE,
+  getExpressModeApiKey
+} from "../utils/vertex_ai_utils.js";
 const GENERATE_MEMORIES_KNOWN_FIELDS = [
   "disableConsolidation",
   "waitForCompletion",
@@ -89,6 +92,9 @@ class VertexAiMemoryBankService {
     if (options.client) {
       this.memories = options.client.agentEnginesInternal.memories;
     } else {
+      if (this.expressModeApiKey && (!this.projectId || !this.location)) {
+        throw new Error(EXPRESS_MODE_UNSUPPORTED_MESSAGE);
+      }
       const client = new Client({
         project: this.projectId,
         location: this.location

package/dist/esm/plugins/base_plugin.js

@@ -73,8 +73,10 @@ class BasePlugin {
    * @param params.invocationContext The context for the entire invocation.
    * @param params.event The event raised by the runner.
    * @returns An optional value. A non-`undefined` return may be used by the
-   *     framework to modify or replace the response. Returning `undefined`
-   *     allows the original response to be used.
+   *     framework to modify or replace the response. Copy `params.event` when
+   *     constructing a replacement to preserve fields that are not being
+   *     modified, such as event actions. Returning `undefined` allows the
+   *     original response to be used.
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async onEventCallback(params) {

package/dist/esm/runner/runner.js

@@ -120,7 +120,7 @@ class Runner {
         ctx,
         this,
         async function* () {
-          var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+          var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           const session = await this.sessionService.getSession({
             appName: this.appName,
             userId,
@@ -237,24 +237,31 @@ class Runner {
                 if ((_h = params.abortSignal) == null ? void 0 : _h.aborted) {
                   return;
                 }
-                if (!event.partial) {
-                  await this.sessionService.appendEvent({ session, event });
-                }
                 const modifiedEvent = await this.pluginManager.runOnEventCallback({
                   invocationContext,
                   event
                 });
-                if ((_i = params.abortSignal) == null ? void 0 : _i.aborted) {
-                  return;
+                const outputEvent = modifiedEvent ? {
+                  ...modifiedEvent,
+                  id: event.id,
+                  invocationId: event.invocationId,
+                  timestamp: event.timestamp,
+                  author: modifiedEvent.author || event.author,
+                  branch: (_i = modifiedEvent.branch) != null ? _i : event.branch
+                } : event;
+                if (!event.partial) {
+                  await this.sessionService.appendEvent({
+                    session,
+                    event: outputEvent
+                  });
                 }
-                if (modifiedEvent) {
-                  yield modifiedEvent;
-                } else {
-                  yield event;
+                if ((_j = params.abortSignal) == null ? void 0 : _j.aborted) {
+                  return;
                 }
+                yield outputEvent;
               }
               await this.pluginManager.runAfterRunCallback({ invocationContext });
-              if ((_j = params.abortSignal) == null ? void 0 : _j.aborted) {
+              if ((_k = params.abortSignal) == null ? void 0 : _k.aborted) {
                 return;
               }
             }

package/dist/esm/sessions/base_session_service.js

@@ -61,7 +61,12 @@ class BaseSessionService {
       if (key.startsWith(State.TEMP_PREFIX)) {
         continue;
       }
-      session.state[key] = value;
+      Object.defineProperty(session.state, key, {
+        value,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
     }
   }
 }
@@ -70,7 +75,7 @@ function trimTempDeltaState(event) {
     return event;
   }
   const stateDelta = event.actions.stateDelta;
-  const filteredStateDelta = {};
+  const filteredStateDelta = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of Object.entries(stateDelta)) {
     if (!key.startsWith(State.TEMP_PREFIX)) {
       filteredStateDelta[key] = value;
@@ -80,7 +85,7 @@ function trimTempDeltaState(event) {
   return event;
 }
 function trimTempState(state) {
-  const filteredState = {};
+  const filteredState = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of Object.entries(state)) {
     if (!key.startsWith(State.TEMP_PREFIX)) {
       filteredState[key] = value;

package/dist/esm/sessions/in_memory_session_service.js

@@ -25,15 +25,15 @@ class InMemorySessionService extends BaseSessionService {
      * A map from app name to a map from user ID to a map from session ID to
      * session.
      */
-    this.sessions = {};
+    this.sessions = /* @__PURE__ */ Object.create(null);
     /**
      * A map from app name to a map from user ID to a map from key to the value.
      */
-    this.userState = {};
+    this.userState = /* @__PURE__ */ Object.create(null);
     /**
      * A map from app name to a map from key to the value.
      */
-    this.appState = {};
+    this.appState = /* @__PURE__ */ Object.create(null);
   }
   async createSession({
     appName,
@@ -52,10 +52,10 @@ class InMemorySessionService extends BaseSessionService {
       lastUpdateTime: Date.now()
     });
     if (!this.sessions[appName]) {
-      this.sessions[appName] = {};
+      this.sessions[appName] = /* @__PURE__ */ Object.create(null);
     }
     if (!this.sessions[appName][userId]) {
-      this.sessions[appName][userId] = {};
+      this.sessions[appName][userId] = /* @__PURE__ */ Object.create(null);
     }
     this.sessions[appName][userId][session.id] = session;
     const copiedSession = cloneDeep(session);
@@ -220,12 +220,12 @@ class InMemorySessionService extends BaseSessionService {
     if (event.actions && event.actions.stateDelta) {
       for (const key of Object.keys(event.actions.stateDelta)) {
         if (key.startsWith(State.APP_PREFIX)) {
-          this.appState[appName] = this.appState[appName] || {};
+          this.appState[appName] = this.appState[appName] || /* @__PURE__ */ Object.create(null);
           this.appState[appName][key.replace(State.APP_PREFIX, "")] = event.actions.stateDelta[key];
         }
         if (key.startsWith(State.USER_PREFIX)) {
-          this.userState[appName] = this.userState[appName] || {};
-          this.userState[appName][userId] = this.userState[appName][userId] || {};
+          this.userState[appName] = this.userState[appName] || /* @__PURE__ */ Object.create(null);
+          this.userState[appName][userId] = this.userState[appName][userId] || /* @__PURE__ */ Object.create(null);
           this.userState[appName][userId][key.replace(State.USER_PREFIX, "")] = event.actions.stateDelta[key];
         }
       }

package/dist/esm/sessions/vertex_ai_session_service.js

@@ -19,7 +19,10 @@ import { Client } from "@google-cloud/vertexai/build/src/genai/client.js";
 import { isCompactedEvent } from "../events/compacted_event.js";
 import { experimental } from "../utils/experimental.js";
 import { logger } from "../utils/logger.js";
-import { getExpressModeApiKey } from "../utils/vertex_ai_utils.js";
+import {
+  EXPRESS_MODE_UNSUPPORTED_MESSAGE,
+  getExpressModeApiKey
+} from "../utils/vertex_ai_utils.js";
 import { partialCopy } from "../utils/partial_copy.js";
 import {
   BaseSessionService,
@@ -47,16 +50,14 @@ let VertexAiSessionService = class extends BaseSessionService {
       this.location,
       options.expressModeApiKey
     );
-    if (!options.sessions) {
-      if (!this.expressModeApiKey && (!this.projectId || !this.location)) {
-        throw new Error(
-          "Either (Project ID and Location) or an expressModeApiKey is required."
-        );
-      }
-    }
     if (options.sessions) {
       this.sessions = options.sessions;
     } else {
+      if (!this.projectId || !this.location) {
+        throw new Error(
+          this.expressModeApiKey ? EXPRESS_MODE_UNSUPPORTED_MESSAGE : "Project ID and Location are required."
+        );
+      }
       const client = new Client({
         project: this.projectId,
         location: this.location
@@ -80,13 +81,25 @@ let VertexAiSessionService = class extends BaseSessionService {
     }
     return match[3];
   }
+  /**
+   * Creates a session on Vertex AI Agent Engine.
+   *
+   * @throws if both `ttl` and `expireTime` are specified.
+   */
   async createSession({
     appName,
     userId,
     state,
-    sessionId
+    sessionId,
+    ttl,
+    expireTime
   }) {
     var _a;
+    if (ttl != null && expireTime != null) {
+      throw new Error(
+        "Cannot specify both 'ttl' and 'expireTime' simultaneously."
+      );
+    }
     const reasoningEngineId = this.getReasoningEngineId(appName);
     const filteredState = state ? trimTempState(state) : void 0;
     let apiResponse = await this.sessions.createInternal({
@@ -94,7 +107,9 @@ let VertexAiSessionService = class extends BaseSessionService {
       userId,
       config: {
         ...filteredState ? { sessionState: filteredState } : {},
-        ...sessionId ? { sessionId } : {}
+        ...sessionId ? { sessionId } : {},
+        ...ttl != null ? { ttl } : {},
+        ...expireTime != null ? { expireTime } : {}
       }
     });
     const operationName = apiResponse.name;
@@ -180,7 +195,7 @@ let VertexAiSessionService = class extends BaseSessionService {
       return session;
     } catch (error) {
       const err = error;
-      if (err.code === GRPC_NOT_FOUND || err.code === HTTP_NOT_FOUND) {
+      if (err.code === GRPC_NOT_FOUND || err.code === HTTP_NOT_FOUND || err.status === HTTP_NOT_FOUND) {
         return void 0;
       }
       logger.error(`Error getting session from Vertex AI: ${err.message}`);

package/dist/esm/skills/loader.js

@@ -18,6 +18,9 @@ const ALLOWED_FRONTMATTER_KEYS = /* @__PURE__ */ new Set([
   "description",
   "license",
   "allowed-tools",
+  // Camel-case alias: FrontmatterSchema's preprocessor derives `allowedTools`
+  // from `allowed-tools`, and `.loose()` passes either spelling through.
+  "allowedTools",
   "metadata",
   "compatibility"
 ]);
@@ -80,7 +83,7 @@ async function loadDir(directoryPath) {
   }
   return files;
 }
-function parseSkillMdContent(content) {
+function parseFrontmatterYaml(content) {
   if (!content.startsWith("---")) {
     throw new Error("SKILL.md must start with YAML frontmatter (---)");
   }
@@ -92,15 +95,34 @@ function parseSkillMdContent(content) {
   const body = parts.filter((_, i) => i >= 2).join("---").trim();
   try {
     const parsed = yaml.load(frontmatterStr);
-    if (typeof parsed !== "object" || parsed === null) {
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
       throw new Error("SKILL.md frontmatter must be a YAML mapping");
     }
-    const frontmatter = FrontmatterSchema.parse(parsed);
-    return { frontmatter, body };
+    return { raw: parsed, body };
   } catch (e) {
     throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
   }
 }
+function validateFrontmatter(raw) {
+  try {
+    return FrontmatterSchema.parse(raw);
+  } catch (e) {
+    throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
+  }
+}
+function parseSkillMdContent(content) {
+  const { raw, body } = parseFrontmatterYaml(content);
+  return { frontmatter: validateFrontmatter(raw), body };
+}
+function isDangerousZipEntryName(entryName) {
+  if (path.posix.isAbsolute(entryName) || path.win32.isAbsolute(entryName)) {
+    return true;
+  }
+  return entryName.split(/[/\\]/).some((segment) => segment === "..");
+}
+function isBareSkillName(name) {
+  return name !== "." && name !== ".." && path.basename(name) === name;
+}
 async function loadSkillFromDir(skillDir) {
   const resolvedDir = path.resolve(skillDir);
   const skill = await loadSkillFile(skillDir);
@@ -240,6 +262,11 @@ async function loadAllSkillsInDir(skillsBasePath) {
 function loadSkillFromZipBuffer(zipBuffer) {
   const zip = new AdmZip(zipBuffer);
   const entries = zip.getEntries();
+  for (const entry of entries) {
+    if (isDangerousZipEntryName(entry.entryName)) {
+      throw new Error(`Dangerous zip entry ignored: ${entry.entryName}`);
+    }
+  }
   let skillMdContent = "";
   for (const entry of entries) {
     if (entry.isDirectory) continue;
@@ -251,8 +278,15 @@ function loadSkillFromZipBuffer(zipBuffer) {
   if (!skillMdContent) {
     throw new Error("SKILL.md not found in zipped filesystem.");
   }
-  const { frontmatter: parsed, body } = parseSkillMdContent(skillMdContent);
-  const frontmatter = FrontmatterSchema.parse(parsed);
+  const { raw, body } = parseFrontmatterYaml(skillMdContent);
+  const skillName = raw["name"];
+  if (!skillName) {
+    throw new Error("SKILL.md frontmatter must contain 'name'");
+  }
+  if (typeof skillName !== "string" || !isBareSkillName(skillName)) {
+    throw new Error(`Invalid skill name in SKILL.md: ${String(skillName)}`);
+  }
+  const frontmatter = validateFrontmatter(raw);
   const references = {};
   const assets = {};
   const scripts = {};