@google/adk 2.4.0 → 2.5.0

package/dist/cjs/tools/load_artifacts_tool.js

@@ -51,7 +51,7 @@ function normalizeMimeType(mimeType) {
   if (!mimeType) {
     return void 0;
   }
-  return mimeType.split(";")[0].trim();
+  return mimeType.split(";")[0].trim().toLowerCase();
 }
 __name(normalizeMimeType, "normalizeMimeType");
 function isInlineMimeTypeSupported(mimeType) {
@@ -69,23 +69,33 @@ function base64ByteLength(data) {
   return Math.floor(digits * 3 / 4);
 }
 __name(base64ByteLength, "base64ByteLength");
-function asSafePartForLlm(artifact, artifactName) {
+function asSafePartForLlm(artifact, artifactName, options) {
+  if ((options == null ? void 0 : options.inlineMediaAsPlaceholder) && !artifact.inlineData && artifact.fileData) {
+    const fileUri = artifact.fileData.fileUri || "unknown";
+    const mimeType2 = normalizeMimeType(artifact.fileData.mimeType) || "application/octet-stream";
+    return {
+      text: `[Artifact: ${artifactName}, uri: ${fileUri}, type: ${mimeType2}.]`
+    };
+  }
   const inlineData = artifact.inlineData;
   if (!inlineData) {
     return artifact;
   }
-  if (isInlineMimeTypeSupported(inlineData.mimeType)) {
+  if (!(options == null ? void 0 : options.inlineMediaAsPlaceholder) && isInlineMimeTypeSupported(inlineData.mimeType)) {
     return artifact;
   }
   const mimeType = normalizeMimeType(inlineData.mimeType) || "application/octet-stream";
+  const isTextLike = mimeType.startsWith("text/") || TEXT_LIKE_MIME_TYPES.has(mimeType);
   const data = inlineData.data;
-  if (!data) {
+  if (data === void 0 || data === null || !isTextLike && data === "") {
     return {
       text: `[Artifact: ${artifactName}, type: ${mimeType}. No inline data was provided.]`
     };
   }
-  const isTextLike = mimeType.startsWith("text/") || TEXT_LIKE_MIME_TYPES.has(mimeType);
   if (isTextLike) {
+    if (data === "") {
+      return { text: "" };
+    }
     try {
       return { text: (0, import_env_aware_utils.base64Decode)(data.replace(/-/g, "+").replace(/_/g, "/")) };
     } catch {

package/dist/cjs/tools/load_memory_tool.js

@@ -42,7 +42,7 @@ const _LoadMemoryTool = class _LoadMemoryTool extends import_base_tool.BaseTool
     var _a;
     super({
       name: "load_memory",
-      description: "Loads the memory for the current user.\n\nNOTE: Currently this tool only uses text part from the memory."
+      description: "Loads the memory for the current user."
     });
     this.textOnlyContent = (_a = options.textOnlyContent) != null ? _a : false;
   }
@@ -62,10 +62,7 @@ const _LoadMemoryTool = class _LoadMemoryTool extends import_base_tool.BaseTool
       }
     };
   }
-  async runAsync({
-    args,
-    toolContext
-  }) {
+  async runAsync({ args, toolContext }) {
     const query = args["query"];
     if (!toolContext.invocationContext.memoryService) {
       throw new Error("Memory service is not initialized.");

package/dist/cjs/tools/mcp/mcp_session_manager.js

@@ -38,6 +38,7 @@ __export(mcp_session_manager_exports, {
   MCPSessionManager: () => MCPSessionManager
 });
 module.exports = __toCommonJS(mcp_session_manager_exports);
+var import_instrumentation = require("../../telemetry/api/instrumentation.js");
 var import_client_labels = require("../../utils/client_labels.js");
 var import_error_utils = require("../../utils/error_utils.js");
 var import_logger = require("../../utils/logger.js");
@@ -63,7 +64,8 @@ function buildTransportOptions(params) {
     requestInit: {
       ...transportOptions == null ? void 0 : transportOptions.requestInit,
       headers: (0, import_client_labels.mergeTrackingHeaders)(callerHeaders)
-    }
+    },
+    fetch: (0, import_instrumentation.instrumentMcpFetch)(transportOptions == null ? void 0 : transportOptions.fetch)
   };
 }
 __name(buildTransportOptions, "buildTransportOptions");
@@ -75,7 +77,8 @@ function buildSseTransportOptions(params) {
     requestInit: {
       ...transportOptions == null ? void 0 : transportOptions.requestInit,
       headers: (0, import_client_labels.mergeTrackingHeaders)(callerHeaders)
-    }
+    },
+    fetch: (0, import_instrumentation.instrumentMcpFetch)(transportOptions == null ? void 0 : transportOptions.fetch)
   };
 }
 __name(buildSseTransportOptions, "buildSseTransportOptions");
@@ -84,6 +87,23 @@ const _MCPSessionManager = class _MCPSessionManager {
     this.activeSessions = /* @__PURE__ */ new Set();
     this.connectionParams = connectionParams;
   }
+  /**
+   * Builds per-request options for MCP client operations.
+   *
+   * For a stdio connection with a configured `timeout`, the timeout is
+   * converted from seconds to milliseconds. Otherwise the MCP SDK applies its
+   * own default request timeout.
+   *
+   * @param signal Optional abort signal to attach to the request.
+   * @return The request options for the MCP SDK client.
+   */
+  getRequestOptions(signal) {
+    const options = signal !== void 0 ? { signal } : {};
+    if (this.connectionParams.type === "StdioConnectionParams" && this.connectionParams.timeout !== void 0) {
+      options.timeout = this.connectionParams.timeout * 1e3;
+    }
+    return options;
+  }
   async createSession() {
     const { Client } = await (0, import_optional_peer.loadOptionalPeer)(
       MCP_SDK,
@@ -101,7 +121,7 @@ const _MCPSessionManager = class _MCPSessionManager {
             this.connectionParams.serverParams
           );
           transport.onerror = logTransportError;
-          await client.connect(transport);
+          await client.connect(transport, this.getRequestOptions());
           break;
         }
         case "StreamableHTTPConnectionParams": {

package/dist/cjs/tools/mcp/mcp_tool.js

@@ -57,9 +57,13 @@ const _MCPTool = class _MCPTool extends import_base_tool.BaseTool {
     try {
       const callRequest = {};
       callRequest.params = { name: this.originalName, arguments: request.args };
-      const result = await session.callTool(callRequest.params, void 0, {
-        signal: request.toolContext.abortSignal
-      });
+      const result = await session.callTool(
+        callRequest.params,
+        void 0,
+        this.mcpSessionManager.getRequestOptions(
+          request.toolContext.abortSignal
+        )
+      );
       return result;
     } finally {
       await this.mcpSessionManager.closeSession(session);

package/dist/cjs/tools/mcp/mcp_toolset.js

@@ -46,7 +46,10 @@ const _MCPToolset = class _MCPToolset extends import_base_toolset.BaseToolset {
     const session = await this.mcpSessionManager.createSession();
     let listResult;
     try {
-      listResult = await session.listTools();
+      listResult = await session.listTools(
+        void 0,
+        this.mcpSessionManager.getRequestOptions()
+      );
     } finally {
       await this.mcpSessionManager.closeSession(session);
     }
@@ -71,7 +74,10 @@ const _MCPToolset = class _MCPToolset extends import_base_toolset.BaseToolset {
   async listResources() {
     const session = await this.mcpSessionManager.createSession();
     try {
-      const result = await session.listResources();
+      const result = await session.listResources(
+        void 0,
+        this.mcpSessionManager.getRequestOptions()
+      );
       return result.resources.map((resource) => resource.name);
     } finally {
       await this.mcpSessionManager.closeSession(session);
@@ -88,7 +94,10 @@ const _MCPToolset = class _MCPToolset extends import_base_toolset.BaseToolset {
     const session = await this.mcpSessionManager.createSession();
     let result;
     try {
-      result = await session.listResources();
+      result = await session.listResources(
+        void 0,
+        this.mcpSessionManager.getRequestOptions()
+      );
     } finally {
       await this.mcpSessionManager.closeSession(session);
     }
@@ -118,9 +127,12 @@ const _MCPToolset = class _MCPToolset extends import_base_toolset.BaseToolset {
     }
     const session = await this.mcpSessionManager.createSession();
     try {
-      const result = await session.readResource({
-        uri: resourceInfo.uri
-      });
+      const result = await session.readResource(
+        {
+          uri: resourceInfo.uri
+        },
+        this.mcpSessionManager.getRequestOptions()
+      );
       return result.contents;
     } finally {
       await this.mcpSessionManager.closeSession(session);

package/dist/cjs/tools/openapi_tool/auth/auth_helpers.js

@@ -30,10 +30,10 @@ __export(auth_helpers_exports, {
   createApiKeyScheme: () => createApiKeyScheme,
   createBearerScheme: () => createBearerScheme,
   credentialToParam: () => credentialToParam,
-  dictToAuthScheme: () => dictToAuthScheme,
-  openidDictToSchemeCredential: () => openidDictToSchemeCredential,
+  openidRecordToSchemeCredential: () => openidRecordToSchemeCredential,
   openidUrlToSchemeCredential: () => openidUrlToSchemeCredential,
-  serviceAccountDictToSchemeCredential: () => serviceAccountDictToSchemeCredential,
+  recordToAuthScheme: () => recordToAuthScheme,
+  serviceAccountRecordToSchemeCredential: () => serviceAccountRecordToSchemeCredential,
   serviceAccountSchemeCredential: () => serviceAccountSchemeCredential,
   tokenToSchemeCredential: () => tokenToSchemeCredential
 });
@@ -41,6 +41,7 @@ module.exports = __toCommonJS(auth_helpers_exports);
 var import_zod = require("zod");
 var import_auth_credential = require("../../../auth/auth_credential.js");
 var import_case_utils = require("../../../utils/case_utils.js");
+var import_error_utils = require("../../../utils/error_utils.js");
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -199,7 +200,7 @@ function tokenToSchemeCredential(tokenType, location, name, credentialValue) {
   throw new Error(`Invalid security scheme type: ${tokenType}`);
 }
 __name(tokenToSchemeCredential, "tokenToSchemeCredential");
-function serviceAccountDictToSchemeCredential(config, scopes) {
+function serviceAccountRecordToSchemeCredential(config, scopes) {
   const authCredential = {
     authType: import_auth_credential.AuthCredentialTypes.SERVICE_ACCOUNT,
     serviceAccount: {
@@ -213,7 +214,7 @@ function serviceAccountDictToSchemeCredential(config, scopes) {
   };
   return [bearerJwtScheme(), authCredential];
 }
-__name(serviceAccountDictToSchemeCredential, "serviceAccountDictToSchemeCredential");
+__name(serviceAccountRecordToSchemeCredential, "serviceAccountRecordToSchemeCredential");
 function serviceAccountSchemeCredential(config) {
   const authCredential = {
     authType: import_auth_credential.AuthCredentialTypes.SERVICE_ACCOUNT,
@@ -222,9 +223,9 @@ function serviceAccountSchemeCredential(config) {
   return [bearerJwtScheme(), authCredential];
 }
 __name(serviceAccountSchemeCredential, "serviceAccountSchemeCredential");
-function openidDictToSchemeCredential(configDict, scopes, credentialDict) {
+function openidRecordToSchemeCredential(configRecord, scopes, credentialRecord) {
   const parsedConfig = OpenIdConnectConfigSchema.safeParse(
-    (0, import_case_utils.camelCaseKeys)(configDict)
+    (0, import_case_utils.camelCaseKeys)(configRecord)
   );
   if (!parsedConfig.success) {
     throw new Error(
@@ -232,33 +233,33 @@ function openidDictToSchemeCredential(configDict, scopes, credentialDict) {
     );
   }
   const openidScheme = { ...parsedConfig.data, scopes };
-  const values = Object.values(credentialDict);
+  const values = Object.values(credentialRecord);
   if (values.length === 1) {
     const wrapped = JsonObjectSchema.safeParse(values[0]);
     if (wrapped.success && "client_id" in wrapped.data && "client_secret" in wrapped.data) {
-      credentialDict = wrapped.data;
+      credentialRecord = wrapped.data;
     }
   }
   const missingFields = REQUIRED_CREDENTIAL_FIELDS.filter(
-    (field) => !(field in credentialDict)
+    (field) => !(field in credentialRecord)
   );
   if (missingFields.length > 0) {
     throw new Error(
-      `Missing required fields in credential_dict: ${missingFields.join(", ")}`
+      `Missing required fields in credentialRecord: ${missingFields.join(", ")}`
     );
   }
   const authCredential = {
     authType: import_auth_credential.AuthCredentialTypes.OPEN_ID_CONNECT,
     oauth2: {
-      clientId: String(credentialDict["client_id"]),
-      clientSecret: String(credentialDict["client_secret"]),
-      redirectUri: "redirect_uri" in credentialDict ? String(credentialDict["redirect_uri"]) : void 0
+      clientId: String(credentialRecord["client_id"]),
+      clientSecret: String(credentialRecord["client_secret"]),
+      redirectUri: "redirect_uri" in credentialRecord ? String(credentialRecord["redirect_uri"]) : void 0
     }
   };
   return [openidScheme, authCredential];
 }
-__name(openidDictToSchemeCredential, "openidDictToSchemeCredential");
-async function openidUrlToSchemeCredential(openidUrl, scopes, credentialDict) {
+__name(openidRecordToSchemeCredential, "openidRecordToSchemeCredential");
+async function openidUrlToSchemeCredential(openidUrl, scopes, credentialRecord) {
   let response;
   try {
     response = await fetch(openidUrl, {
@@ -269,21 +270,21 @@ async function openidUrlToSchemeCredential(openidUrl, scopes, credentialDict) {
     }
   } catch (e) {
     throw new Error(
-      `Failed to fetch OpenID configuration from ${openidUrl}: ${String(e)}`
+      `Failed to fetch OpenID configuration from ${openidUrl}: ${(0, import_error_utils.formatError)(e)}`
     );
   }
-  let configDict;
+  let configRecord;
   try {
-    configDict = JsonObjectSchema.parse(await response.json());
+    configRecord = JsonObjectSchema.parse(await response.json());
   } catch (e) {
     throw new Error(
-      `Invalid JSON response from OpenID configuration endpoint ${openidUrl}: ${String(e)}`
+      `Invalid JSON response from OpenID configuration endpoint ${openidUrl}: ${(0, import_error_utils.formatError)(e)}`
     );
   }
-  return openidDictToSchemeCredential(
-    { ...configDict, openIdConnectUrl: openidUrl },
+  return openidRecordToSchemeCredential(
+    { ...configRecord, openIdConnectUrl: openidUrl },
     scopes,
-    credentialDict
+    credentialRecord
   );
 }
 __name(openidUrlToSchemeCredential, "openidUrlToSchemeCredential");
@@ -334,9 +335,9 @@ function parseSecurityScheme(schema, data) {
   return result.data;
 }
 __name(parseSecurityScheme, "parseSecurityScheme");
-function dictToAuthScheme(data) {
+function recordToAuthScheme(data) {
   if (!("type" in data)) {
-    throw new Error("Missing 'type' field in security scheme dictionary.");
+    throw new Error("Missing 'type' field in security scheme object.");
   }
   const securityType = data["type"];
   switch (securityType) {
@@ -352,7 +353,7 @@ function dictToAuthScheme(data) {
       throw new Error(`Invalid security scheme type: ${securityType}`);
   }
 }
-__name(dictToAuthScheme, "dictToAuthScheme");
+__name(recordToAuthScheme, "recordToAuthScheme");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   INTERNAL_AUTH_PREFIX,
@@ -360,10 +361,10 @@ __name(dictToAuthScheme, "dictToAuthScheme");
   createApiKeyScheme,
   createBearerScheme,
   credentialToParam,
-  dictToAuthScheme,
-  openidDictToSchemeCredential,
+  openidRecordToSchemeCredential,
   openidUrlToSchemeCredential,
-  serviceAccountDictToSchemeCredential,
+  recordToAuthScheme,
+  serviceAccountRecordToSchemeCredential,
   serviceAccountSchemeCredential,
   tokenToSchemeCredential
 });

package/dist/cjs/tools/openapi_tool/auth/credential_exchangers/oauth2_exchanger.js

@@ -50,7 +50,7 @@ var import_experimental = require("../../../../utils/experimental.js");
 function checkSchemeCredentialType(authScheme, authCredential) {
   if (!authCredential) {
     throw new Error(
-      "auth_credential is empty. Please create AuthCredential using OAuth2Auth."
+      "authCredential is empty. Please create AuthCredential using OAuth2Auth."
     );
   }
   if (authScheme.type !== import_auth_schemes.AuthSchemeType.OPEN_ID_CONNECT && authScheme.type !== import_auth_schemes.AuthSchemeType.OAUTH2) {
@@ -60,7 +60,7 @@ function checkSchemeCredentialType(authScheme, authCredential) {
   }
   if (!authCredential.oauth2 && !authCredential.http) {
     throw new Error(
-      "auth_credential is not configured with oauth2. Please create AuthCredential and set OAuth2Auth."
+      "authCredential is not configured with oauth2. Please create AuthCredential and set OAuth2Auth."
     );
   }
 }

package/dist/cjs/tools/openapi_tool/rest_api_tool.js

@@ -203,22 +203,32 @@ function encodePathParamValue(name, value) {
   return encodeURIComponent(value);
 }
 __name(encodePathParamValue, "encodePathParamValue");
+function toParamString(value) {
+  if (Array.isArray(value)) {
+    return value.filter((item) => item !== void 0 && item !== null).map(toParamString).join(",");
+  }
+  if (typeof value === "object" && value !== null) {
+    return Object.entries(value).filter(([, v]) => v !== void 0 && v !== null).map(([k, v]) => `${k},${toParamString(v)}`).join(",");
+  }
+  return String(value);
+}
+__name(toParamString, "toParamString");
 function serializeQueryValue(value) {
   return typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
 }
 __name(serializeQueryValue, "serializeQueryValue");
-function appendQueryParam(queryParams, name, value) {
+function appendParamValue(target, name, value) {
   if (!Array.isArray(value)) {
-    queryParams.append(name, serializeQueryValue(value));
+    target.append(name, serializeQueryValue(value));
     return;
   }
   for (const item of value) {
     if (item !== void 0 && item !== null) {
-      queryParams.append(name, serializeQueryValue(item));
+      target.append(name, serializeQueryValue(item));
     }
   }
 }
-__name(appendQueryParam, "appendQueryParam");
+__name(appendParamValue, "appendParamValue");
 function prepareRequestParams(endpoint, parameters, args) {
   const headers = {};
   const queryParams = new URLSearchParams();
@@ -233,18 +243,24 @@ function prepareRequestParams(endpoint, parameters, args) {
     const originalName = param.originalName;
     const location = param.paramLocation;
     if (location === "path") {
-      pathParams[originalName] = encodePathParamValue(
-        originalName,
-        String(argValue)
-      );
+      if (argValue !== void 0 && argValue !== null) {
+        pathParams[originalName] = encodePathParamValue(
+          originalName,
+          toParamString(argValue)
+        );
+      }
     } else if (location === "query") {
       if (argValue !== void 0 && argValue !== null && argValue !== "") {
-        appendQueryParam(queryParams, originalName, argValue);
+        appendParamValue(queryParams, originalName, argValue);
       }
     } else if (location === "header") {
-      headers[originalName] = String(argValue);
+      if (argValue !== void 0 && argValue !== null) {
+        headers[originalName] = toParamString(argValue);
+      }
     } else if (location === "cookie") {
-      cookies[originalName] = String(argValue);
+      if (argValue !== void 0 && argValue !== null) {
+        cookies[originalName] = toParamString(argValue);
+      }
     } else if (location === "body") {
       if (originalName === "body" || originalName === "array" || originalName === "") {
         body = argValue;
@@ -278,6 +294,18 @@ function isRawBody(value) {
   return typeof value === "string" || ArrayBuffer.isView(value) || value instanceof ArrayBuffer || value instanceof Blob;
 }
 __name(isRawBody, "isRawBody");
+function isFormFields(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+__name(isFormFields, "isFormFields");
+function appendFormFields(target, fields) {
+  for (const [name, value] of Object.entries(fields)) {
+    if (value !== void 0 && value !== null) {
+      appendParamValue(target, name, value);
+    }
+  }
+}
+__name(appendFormFields, "appendFormFields");
 function prepareRequestBody(requestBody, body, bodyData, headers) {
   const finalData = body !== void 0 ? body : Object.keys(bodyData).length > 0 ? bodyData : void 0;
   if (requestBody && "content" in requestBody) {
@@ -288,13 +316,16 @@ function prepareRequestBody(requestBody, body, bodyData, headers) {
         headers["Content-Type"] = mimeType;
         return typeof finalData === "string" ? finalData : JSON.stringify(finalData);
       } else if (mimeType === "application/x-www-form-urlencoded") {
+        if (isFormFields(finalData)) {
+          const formParams = new URLSearchParams();
+          appendFormFields(formParams, finalData);
+          return formParams;
+        }
         return new URLSearchParams(finalData);
       } else if (mimeType === "multipart/form-data") {
         const formData = new FormData();
         if (typeof finalData === "object" && finalData !== null) {
-          for (const [key, value] of Object.entries(finalData)) {
-            formData.append(key, String(value));
-          }
+          appendFormFields(formData, finalData);
         }
         return formData;
       } else if (mimeType === "application/octet-stream") {

package/dist/cjs/tools/skill/load_skill_resource_tool.js

@@ -48,6 +48,7 @@ __export(load_skill_resource_tool_exports, {
 module.exports = __toCommonJS(load_skill_resource_tool_exports);
 var import_genai = require("@google/genai");
 var import_node_path = __toESM(require("node:path"), 1);
+var import_instrumentation = require("../../telemetry/api/instrumentation.js");
 var import_experimental = require("../../utils/experimental.js");
 var import_file_utils = require("../../utils/file_utils.js");
 var import_base_tool = require("../base_tool.js");
@@ -105,6 +106,11 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
       };
     }
     resourcePath = import_node_path.default.posix.normalize(resourcePath);
+    const skillActivity = (0, import_instrumentation.recordSkillActivity)({
+      kind: "resource",
+      skillName,
+      resourcePath
+    });
     let skill;
     try {
       skill = await this.toolset.getOrFetchSkill(
@@ -123,6 +129,7 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
         error_code: "SKILL_NOT_FOUND"
       };
     }
+    skillActivity.recordSkill(skill);
     let content;
     const skillResources = skill.resources || {};
     if (resourcePath.startsWith("references/")) {

package/dist/cjs/tools/skill/load_skill_tool.js

@@ -38,6 +38,7 @@ __export(load_skill_tool_exports, {
 module.exports = __toCommonJS(load_skill_tool_exports);
 var import_genai = require("@google/genai");
 var import_invocation_context = require("../../agents/invocation_context.js");
+var import_instrumentation = require("../../telemetry/api/instrumentation.js");
 var import_experimental = require("../../utils/experimental.js");
 var import_base_tool = require("../base_tool.js");
 /**
@@ -80,6 +81,7 @@ let LoadSkillTool = class extends import_base_tool.BaseTool {
         error_code: "MISSING_SKILL_NAME"
       };
     }
+    const skillActivity = (0, import_instrumentation.recordSkillActivity)({ kind: "load", skillName });
     let skill;
     try {
       skill = await this.toolset.getOrFetchSkill(
@@ -98,6 +100,7 @@ let LoadSkillTool = class extends import_base_tool.BaseTool {
         error_code: "SKILL_NOT_FOUND"
       };
     }
+    skillActivity.recordSkill(skill);
     const agentName = (0, import_invocation_context.requireAgent)(toolContext.invocationContext).name;
     const stateKey = `_adk_activated_skill_${agentName}`;
     const currentActivated = toolContext.state.get(stateKey) || [];

package/dist/cjs/tools/skill/run_skill_script_tool.js

@@ -51,6 +51,7 @@ var import_genai = require("@google/genai");
 var path = __toESM(require("node:path"), 1);
 var import_llm_agent = require("../../agents/llm_agent.js");
 var import_code_execution_utils = require("../../code_executors/code_execution_utils.js");
+var import_instrumentation = require("../../telemetry/api/instrumentation.js");
 var import_experimental = require("../../utils/experimental.js");
 var import_file_extension_utils = require("../../utils/file_extension_utils.js");
 var import_file_utils = require("../../utils/file_utils.js");
@@ -112,6 +113,11 @@ let RunSkillScriptTool = class extends import_base_tool.BaseTool {
         errorCode: "MISSING_SCRIPT_PATH"
       };
     }
+    const skillActivity = (0, import_instrumentation.recordSkillActivity)({
+      kind: "script",
+      skillName,
+      scriptPath
+    });
     let skill;
     try {
       skill = await this.toolset.getOrFetchSkill(
@@ -130,9 +136,11 @@ let RunSkillScriptTool = class extends import_base_tool.BaseTool {
         errorCode: "SKILL_NOT_FOUND"
       };
     }
-    const relScriptPath = scriptPath.startsWith("scripts/") ? scriptPath.substring("scripts/".length) : scriptPath;
+    skillActivity.recordSkill(skill);
+    let relScriptPath = scriptPath.startsWith("scripts/") ? scriptPath.substring("scripts/".length) : scriptPath;
     let script = (_b = (_a = skill.resources) == null ? void 0 : _a.scripts) == null ? void 0 : _b[relScriptPath];
     if (!script) {
+      relScriptPath = scriptPath;
       script = (_d = (_c = skill.resources) == null ? void 0 : _c.scripts) == null ? void 0 : _d[scriptPath];
     }
     if (!script) {
@@ -159,7 +167,9 @@ let RunSkillScriptTool = class extends import_base_tool.BaseTool {
       const result = await codeExecutor.executeCode({
         invocationContext: toolContext.invocationContext,
         codeExecutionInput: {
-          code: buildWrapperCode(scriptPath, language),
+          // Scripts are always written under scripts/ (see
+          // getSkillResourceFiles), with or without the prefix in script_path.
+          code: buildWrapperCode(`scripts/${relScriptPath}`, language),
           inputFiles: getSkillResourceFiles(skill),
           language,
           args: scriptArgs