@google/adk 2.3.0 → 2.5.0

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."
     );
   }
 }
@@ -81,12 +81,12 @@ function generateAuthToken(authCredential) {
 }
 __name(generateAuthToken, "generateAuthToken");
 function exchangeCredential(authScheme, authCredential) {
-  var _a, _b;
+  var _a;
   checkSchemeCredentialType(authScheme, authCredential);
   if (authCredential.http) {
     return authCredential;
   }
-  if (((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) || ((_b = authCredential.oauth2) == null ? void 0 : _b.refreshToken)) {
+  if ((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) {
     return generateAuthToken(authCredential);
   }
   return null;

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

@@ -54,15 +54,27 @@ const VALID_SCHEMA_TYPES = /* @__PURE__ */ new Set([
   "string"
 ]);
 let OpenApiSpecParser = class {
+  /**
+   * @param options.preservePropertyNames Keeps the original parameter and
+   *     function names instead of converting them to snake_case.
+   * @param options.unconstrainedObjectBodyAsParameter Emits a whole-body
+   *     parameter named `body` when an object request body schema has no
+   *     properties. Defaults to `false`.
+   *     @deprecated Retained for backwards compatibility; empty object schemas
+   *     produce no parameters by default. This option will be removed in a
+   *     future release.
+   */
   constructor(options = {}) {
-    var _a;
+    var _a, _b;
     this.preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
+    this.unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
   }
   parse(openapiSpec) {
     const resolvedSpec = resolveReferences(openapiSpec);
     const sanitizedSpec = sanitizeSchemaTypes(resolvedSpec);
     return collectOperations(sanitizedSpec, {
-      preservePropertyNames: this.preservePropertyNames
+      preservePropertyNames: this.preservePropertyNames,
+      unconstrainedObjectBodyAsParameter: this.unconstrainedObjectBodyAsParameter
     });
   }
 };
@@ -197,17 +209,18 @@ function resolveServerUrl(server) {
 }
 __name(resolveServerUrl, "resolveServerUrl");
 function collectOperations(spec, options = {}) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
+  const unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
   const operations = [];
-  const server = (_b = spec.servers) == null ? void 0 : _b[0];
+  const server = (_c = spec.servers) == null ? void 0 : _c[0];
   const baseUrl = server ? resolveServerUrl(server) : "";
   const globalSecurity = spec.security || [];
   let globalSchemeName;
   if (globalSecurity.length > 0) {
     globalSchemeName = Object.keys(globalSecurity[0])[0];
   }
-  const authSchemes = ((_c = spec.components) == null ? void 0 : _c.securitySchemes) || {};
+  const authSchemes = ((_d = spec.components) == null ? void 0 : _d.securitySchemes) || {};
   for (const [path, pathItem] of Object.entries(spec.paths || {})) {
     if (!pathItem) continue;
     const methods = [
@@ -230,7 +243,8 @@ function collectOperations(spec, options = {}) {
         operation.operationId = (0, import_case_utils.toSnakeCaseName)(`${path}_${method}`);
       }
       const parser = new import_operation_parser.OperationParser(operation, {
-        preservePropertyNames
+        preservePropertyNames,
+        unconstrainedObjectBodyAsParameter
       });
       let authSchemeName;
       if (operation.security && operation.security.length > 0) {

package/dist/cjs/tools/openapi_tool/openapi_spec_parser/operation_parser.js

@@ -52,13 +52,20 @@ let OperationParser = class {
    *     function names instead of converting them to snake_case.
    * @param options.shouldParse Whether to parse the operation during
    *     construction. Defaults to `true`.
+   * @param options.unconstrainedObjectBodyAsParameter Emits a whole-body
+   *     parameter named `body` when an object request body schema has no
+   *     properties. Defaults to `false`.
+   *     @deprecated Retained for backwards compatibility; empty object schemas
+   *     produce no parameters by default. This option will be removed in a
+   *     future release.
    */
   constructor(operation, options = {}) {
     this.params = [];
-    var _a, _b;
+    var _a, _b, _c;
     this.operation = typeof operation === "string" ? JSON.parse(operation) : operation;
     this.preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
-    if ((_b = options.shouldParse) != null ? _b : true) {
+    this.unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
+    if ((_c = options.shouldParse) != null ? _c : true) {
       this.processOperationParameters();
       this.processRequestBody();
       this.returnValue = this.processReturnValue();
@@ -78,6 +85,7 @@ let OperationParser = class {
     return (0, import_case_utils.renameReservedKeywords)((0, import_case_utils.toSnakeCaseName)(originalName));
   }
   processOperationParameters() {
+    var _a;
     const parameters = this.operation.parameters || [];
     for (const param of parameters) {
       if ("name" in param) {
@@ -88,9 +96,12 @@ let OperationParser = class {
         this.params.push({
           originalName,
           paramLocation: location,
-          paramSchema: schema,
+          paramSchema: {
+            ...schema,
+            description: schema.description || description || void 0
+          },
           description,
-          required: param.required || false,
+          required: (_a = param.required) != null ? _a : false,
           name: this.getParamName(originalName)
         });
       }
@@ -126,7 +137,7 @@ let OperationParser = class {
               });
             }
           }
-        } else {
+        } else if (this.unconstrainedObjectBodyAsParameter) {
           this.params.push({
             originalName: "",
             paramLocation: "body",
@@ -147,7 +158,7 @@ let OperationParser = class {
         });
       } else {
         this.params.push({
-          originalName: "body",
+          originalName: "",
           paramLocation: "body",
           paramSchema: schema,
           description,

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

@@ -46,7 +46,7 @@ __export(openapi_toolset_exports, {
   OpenAPIToolset: () => OpenAPIToolset
 });
 module.exports = __toCommonJS(openapi_toolset_exports);
-var import_js_yaml = __toESM(require("js-yaml"), 1);
+var yaml = __toESM(require("js-yaml"), 1);
 var import_experimental = require("../../utils/experimental.js");
 var import_logger = require("../../utils/logger.js");
 var import_base_toolset = require("../base_toolset.js");
@@ -64,7 +64,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     let spec = options.specDict;
     if (!spec && options.specStr) {
       if (options.specType === "yaml" || !options.specType && options.specStr.trim().startsWith("---")) {
-        spec = import_js_yaml.default.load(options.specStr);
+        spec = yaml.load(options.specStr);
       } else if (options.specType === "json" || !options.specType) {
         spec = JSON.parse(options.specStr);
       } else {
@@ -75,7 +75,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
       throw new Error("Either specDict or specStr must be provided.");
     }
     const parser = new import_openapi_spec_parser.OpenApiSpecParser({
-      preservePropertyNames: options.preservePropertyNames
+      preservePropertyNames: options.preservePropertyNames,
+      unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
     });
     const parsedOperations = parser.parse(spec);
     for (const op of parsedOperations) {
@@ -96,7 +97,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
         {
           preservePropertyNames: options.preservePropertyNames,
           headerProvider: options.headerProvider,
-          credentialKey: options.credentialKey
+          credentialKey: options.credentialKey,
+          unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
         }
       );
       this.tools.push(tool);
@@ -111,15 +113,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     }
   }
   async getTools(context) {
-    return this.tools.filter((tool) => {
-      if (Array.isArray(this.toolFilter) && this.toolFilter.length > 0) {
-        return this.toolFilter.includes(tool.name);
-      }
-      if (context) {
-        return this.isToolSelected(tool, context);
-      }
-      return true;
-    });
+    return this.tools.filter((tool) => this.isToolSelected(tool, context));
   }
   getTool(toolName) {
     return this.tools.find((tool) => tool.name === toolName);

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

@@ -203,6 +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 appendParamValue(target, name, value) {
+  if (!Array.isArray(value)) {
+    target.append(name, serializeQueryValue(value));
+    return;
+  }
+  for (const item of value) {
+    if (item !== void 0 && item !== null) {
+      target.append(name, serializeQueryValue(item));
+    }
+  }
+}
+__name(appendParamValue, "appendParamValue");
 function prepareRequestParams(endpoint, parameters, args) {
   const headers = {};
   const queryParams = new URLSearchParams();
@@ -217,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 !== "") {
-        queryParams.append(originalName, String(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;
@@ -262,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) {
@@ -272,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