@zapier/zapier-sdk 0.64.0 → 0.67.0

package/dist/plugins/deprecated/inputFields.js

@@ -5,20 +5,21 @@
  * `listActionInputFieldChoices`, `getActionInputFieldsSchema`) to
  * disambiguate from the trigger-side variants. The unprefixed names
  * stay exported here as deprecated aliases that delegate to the
- * renamed implementations, so existing callers keep working. They're
- * marked `categories: ["deprecated"]` so generated docs and CLI help
- * hide them.
+ * renamed implementations, so existing callers keep working. Each carries
+ * a `deprecation` field so generated docs and CLI help hide them.
  *
  * @deprecated Use the action-prefixed equivalents:
  * - listInputFields -> listActionInputFields
  * - listInputFieldChoices -> listActionInputFieldChoices
  * - getInputFieldsSchema -> getActionInputFieldsSchema
  */
-import { definePlugin } from "../../utils/plugin-utils";
+import { definePlugin } from "kitcore";
 import { ListActionInputFieldsInputSchema } from "../listActionInputFields/schemas";
 import { ListActionInputFieldChoicesInputSchema, InputFieldChoiceItemSchema, } from "../listActionInputFieldChoices/schemas";
 import { GetActionInputFieldsSchemaInputSchema } from "../getActionInputFieldsSchema/schemas";
 import { RootFieldItemSchema } from "../../schemas/Field";
+import { rootFieldItemFormatter } from "../../formatters/field";
+import { inputFieldChoiceItemFormatter } from "../../formatters/inputFieldChoice";
 import { DEFAULT_PAGE_SIZE } from "../../constants";
 /**
  * @deprecated Use listActionInputFields instead.
@@ -28,11 +29,13 @@ export const listInputFieldsDeprecatedPlugin = definePlugin((sdk) => ({
     context: {
         meta: {
             listInputFields: {
-                categories: ["action", "deprecated"],
+                categories: ["action"],
+                deprecation: { message: "Use listActionInputFields instead." },
                 type: "list",
                 itemType: "RootField",
                 inputSchema: ListActionInputFieldsInputSchema,
                 outputSchema: RootFieldItemSchema,
+                formatter: rootFieldItemFormatter,
                 defaultPageSize: DEFAULT_PAGE_SIZE,
             },
         },
@@ -46,11 +49,15 @@ export const listInputFieldChoicesDeprecatedPlugin = definePlugin((sdk) => ({
     context: {
         meta: {
             listInputFieldChoices: {
-                categories: ["action", "deprecated"],
+                categories: ["action"],
+                deprecation: {
+                    message: "Use listActionInputFieldChoices instead.",
+                },
                 type: "list",
                 itemType: "InputFieldChoiceItem",
                 inputSchema: ListActionInputFieldChoicesInputSchema,
                 outputSchema: InputFieldChoiceItemSchema,
+                formatter: inputFieldChoiceItemFormatter,
                 defaultPageSize: DEFAULT_PAGE_SIZE,
             },
         },
@@ -64,7 +71,8 @@ export const getInputFieldsSchemaDeprecatedPlugin = definePlugin((sdk) => ({
     context: {
         meta: {
             getInputFieldsSchema: {
-                categories: ["action", "deprecated"],
+                categories: ["action"],
+                deprecation: { message: "Use getActionInputFieldsSchema instead." },
                 type: "function",
                 inputSchema: GetActionInputFieldsSchemaInputSchema,
             },

package/dist/plugins/eventEmission/event-emission-hook.d.ts

@@ -0,0 +1,10 @@
+import type { OnMethodEnd } from "kitcore";
+import type { MethodCalledEventData } from "./types";
+/**
+ * Build the `onMethodEnd` hook that translates the toolkit-generic
+ * end-of-call event into the Zapier-shaped `MethodCalledEvent` payload that
+ * `emitMethodCalled` accepts. Bridges the framework's neutral hook surface
+ * to the SDK's transport-specific event schema.
+ */
+export declare function makeMethodEndHook(emitMethodCalled: (data: MethodCalledEventData) => void): OnMethodEnd;
+//# sourceMappingURL=event-emission-hook.d.ts.map

package/dist/plugins/eventEmission/event-emission-hook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-emission-hook.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/event-emission-hook.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAuBrD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,gBAAgB,EAAE,CAAC,IAAI,EAAE,qBAAqB,KAAK,IAAI,GACtD,WAAW,CAoBb"}

package/dist/plugins/eventEmission/event-emission-hook.js

@@ -0,0 +1,47 @@
+import { getMethodMetadata } from "./method-metadata";
+/**
+ * Compute the historical `argument_count` telemetry field. Methods built
+ * through `createPluginMethod` pass a single options object; we count its
+ * fields. Variadic callers (e.g. fetch) pass positional args; we count the
+ * defined ones.
+ */
+function computeArgumentCount(args) {
+    if (args.length === 1) {
+        const arg0 = args[0];
+        if (arg0 !== null &&
+            typeof arg0 === "object" &&
+            !Array.isArray(arg0) &&
+            Object.getPrototypeOf(arg0) === Object.prototype) {
+            return Object.keys(arg0).length;
+        }
+    }
+    return args.filter((a) => a !== undefined).length;
+}
+/**
+ * Build the `onMethodEnd` hook that translates the toolkit-generic
+ * end-of-call event into the Zapier-shaped `MethodCalledEvent` payload that
+ * `emitMethodCalled` accepts. Bridges the framework's neutral hook surface
+ * to the SDK's transport-specific event schema.
+ */
+export function makeMethodEndHook(emitMethodCalled) {
+    return ({ methodName, args, isPaginated, depth, durationMs, error }) => {
+        // Only top-level invocations emit telemetry; nested SDK-method
+        // calls would otherwise produce duplicate `MethodCalledEvent`s for
+        // the same logical work.
+        if (depth > 0)
+            return;
+        const metadata = getMethodMetadata();
+        emitMethodCalled({
+            method_name: methodName,
+            execution_duration_ms: durationMs,
+            success_flag: !error,
+            error_message: error?.message ?? null,
+            error_type: error?.constructor.name ?? null,
+            argument_count: computeArgumentCount(args),
+            is_paginated: isPaginated,
+            selected_api: metadata?.selectedApi ?? null,
+            operation_type: metadata?.operationType ?? null,
+            operation_key: metadata?.operationKey ?? null,
+        });
+    };
+}

package/dist/plugins/eventEmission/index.d.ts

@@ -6,8 +6,8 @@
  */
 import type { BaseSdkOptions } from "../../types/sdk";
 import type { BaseEvent } from "../../types/telemetry-events";
+import type { OnMethodEnd } from "kitcore";
 import type { EventTransport, TransportConfig } from "./transport";
-import type { MethodCalledEventData } from "./types";
 /**
  * Removes all registered process event listeners.
  * Useful for test cleanup to prevent listener accumulation.
@@ -24,10 +24,12 @@ export interface EventEmissionContext {
         config: EventEmissionConfig;
         emit<T extends any>(subject: string, event: T): void;
         createBaseEvent(): Promise<BaseEvent>;
-        emitMethodCalled(data: MethodCalledEventData): void;
         flush(): Promise<void>;
         close(exitCode?: number): Promise<void>;
     };
+    hooks: {
+        onMethodEnd: OnMethodEnd;
+    };
 }
 export declare const eventEmissionPlugin: (sdk: {
     context: {
@@ -35,7 +37,7 @@ export declare const eventEmissionPlugin: (sdk: {
     };
 } & {
     context: {
-        meta: Record<string, import("../..").PluginMeta>;
+        meta: Record<string, import("kitcore").PluginMeta>;
     };
 }) => {
     context: EventEmissionContext;

package/dist/plugins/eventEmission/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAyCnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;QAEpD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAIvB,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzC,CAAC;CACH;AAyFD,eAAO,MAAM,mBAAmB;aAEnB;QAAE,OAAO,CAAC,EAAE,cAAc,CAAA;KAAE;;;;;;aACxB,oBAAoB;CAsVpC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAG3E,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,SAAS,EACT,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAqDnE;;;GAGG;AACH,wBAAgB,qBAAqB,SAEpC;AAGD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;CACrC;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAIvB,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzC,CAAC;IACF,KAAK,EAAE;QACL,WAAW,EAAE,WAAW,CAAC;KAC1B,CAAC;CACH;AAyFD,eAAO,MAAM,mBAAmB;aAEnB;QAAE,OAAO,CAAC,EAAE,cAAc,CAAA;KAAE;;;;;;aACxB,oBAAoB;CA6VpC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAG3E,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,SAAS,EACT,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,cAAc,SAAS,CAAC"}

package/dist/plugins/eventEmission/index.js

@@ -4,12 +4,13 @@
  * Provides silent telemetry event emission capability to the SDK.
  * All events are emitted asynchronously and failures are silently handled.
  */
-import { definePlugin } from "../../utils/plugin-utils";
+import { definePlugin } from "kitcore";
 import { createTransport } from "./transport";
 import { generateEventId, getCurrentTimestamp, getReleaseId } from "./utils";
 import { extractUserIdsFromJwt } from "../../api/auth";
 import { resolveAuthToken } from "../../auth";
 import { buildApplicationLifecycleEvent, buildErrorEventWithContext, buildMethodCalledEvent, } from "./builders";
+import { makeMethodEndHook } from "./event-emission-hook";
 import { getTrackingBaseUrl } from "../../utils/url-utils";
 // Maximum time to wait for telemetry emission before allowing process to exit
 const TELEMETRY_EMIT_TIMEOUT_MS = 300;
@@ -154,6 +155,7 @@ export const eventEmissionPlugin = definePlugin((sdk) => {
     }
     // If disabled, return noop implementations
     if (!config.enabled) {
+        const noopEmitMethodCalled = () => { };
         return {
             context: {
                 eventEmission: {
@@ -170,10 +172,12 @@ export const eventEmissionPlugin = definePlugin((sdk) => {
                         visitor_id: null,
                         correlation_id: null,
                     }),
-                    emitMethodCalled: () => { },
                     flush: async () => { },
                     close: async () => { },
                 },
+                hooks: {
+                    onMethodEnd: makeMethodEndHook(noopEmitMethodCalled),
+                },
             },
         };
     }
@@ -350,6 +354,13 @@ export const eventEmissionPlugin = definePlugin((sdk) => {
         await emitWithTimeout(transport, APPLICATION_LIFECYCLE_EVENT_SUBJECT, exitEvent);
         removeExistingListeners();
     };
+    const emitMethodCalled = (data) => {
+        const event = {
+            ...buildMethodCalledEvent(data),
+            call_context: config.callContext ?? "sdk",
+        };
+        trackEmission(silentEmit(transport, METHOD_CALLED_EVENT_SUBJECT, event, getUserContext));
+    };
     return {
         context: {
             eventEmission: {
@@ -359,16 +370,12 @@ export const eventEmissionPlugin = definePlugin((sdk) => {
                     trackEmission(silentEmit(transport, subject, event, getUserContext));
                 },
                 createBaseEvent: createBaseEventHelper,
-                emitMethodCalled: (data) => {
-                    const event = {
-                        ...buildMethodCalledEvent(data),
-                        call_context: config.callContext ?? "sdk",
-                    };
-                    trackEmission(silentEmit(transport, METHOD_CALLED_EVENT_SUBJECT, event, getUserContext));
-                },
                 flush,
                 close,
             },
+            hooks: {
+                onMethodEnd: makeMethodEndHook(emitMethodCalled),
+            },
         },
     };
 });

package/dist/plugins/eventEmission/method-metadata.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Zapier-specific method metadata stored on the toolkit's per-call scope.
+ * Plugins set fields here during a method's execution; eventEmission's
+ * `onMethodEnd` hook reads them out when emitting the `MethodCalledEvent`.
+ *
+ * The toolkit owns the AsyncLocalStorage scope object; this module just
+ * reserves the `methodMetadata` key on it for Zapier's purposes.
+ */
+export interface MethodMetadata {
+    selectedApi?: string | null;
+    operationType?: string | null;
+    operationKey?: string | null;
+}
+export declare function setMethodMetadata(metadata: MethodMetadata): void;
+export declare function getMethodMetadata(): MethodMetadata | undefined;
+//# sourceMappingURL=method-metadata.d.ts.map

package/dist/plugins/eventEmission/method-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"method-metadata.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/method-metadata.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAKhE;AAED,wBAAgB,iBAAiB,IAAI,cAAc,GAAG,SAAS,CAE9D"}

package/dist/plugins/eventEmission/method-metadata.js

@@ -0,0 +1,20 @@
+/**
+ * Zapier-specific method metadata stored on the toolkit's per-call scope.
+ * Plugins set fields here during a method's execution; eventEmission's
+ * `onMethodEnd` hook reads them out when emitting the `MethodCalledEvent`.
+ *
+ * The toolkit owns the AsyncLocalStorage scope object; this module just
+ * reserves the `methodMetadata` key on it for Zapier's purposes.
+ */
+import { getCurrentScope } from "kitcore";
+const SCOPE_KEY = "methodMetadata";
+export function setMethodMetadata(metadata) {
+    const scope = getCurrentScope();
+    if (!scope)
+        return;
+    const existing = scope[SCOPE_KEY];
+    scope[SCOPE_KEY] = { ...existing, ...metadata };
+}
+export function getMethodMetadata() {
+    return getCurrentScope()?.[SCOPE_KEY];
+}

package/dist/plugins/eventEmission/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/transport.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAGD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,cAAc,CAwDjB;AAGD,wBAAgB,sBAAsB,IAAI,cAAc,CAavD;AAGD,wBAAgB,mBAAmB,IAAI,cAAc,CAMpD;AAGD,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,cAAc,CAyBvE"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/transport.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAGD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,cAAc,CAwDjB;AAGD,wBAAgB,sBAAsB,IAAI,cAAc,CAcvD;AAGD,wBAAgB,mBAAmB,IAAI,cAAc,CAMpD;AAGD,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,cAAc,CAyBvE"}

package/dist/plugins/eventEmission/transport.js

@@ -60,7 +60,8 @@ export function createConsoleTransport() {
     return {
         async emit(subject, event) {
             try {
-                console.log("[SDK Telemetry]", JSON.stringify({ subject, properties: event }, null, 2));
+                // stderr: telemetry is diagnostic, not the program's data output.
+                console.error("[SDK Telemetry]", JSON.stringify({ subject, properties: event }, null, 2));
             }
             catch {
                 // Silent failure - never throw

package/dist/plugins/fetch/index.d.ts

@@ -1,6 +1,7 @@
 import type { ApiClient } from "../../api";
 import type { ConnectionsPluginProvides } from "../connections";
 import { z } from "zod";
+import type { AdaptError, MethodHooks } from "kitcore";
 export interface ZapierFetchInitOptions extends RequestInit {
     /** @deprecated Use `connection` instead. */
     connectionId?: string | number;
@@ -18,12 +19,14 @@ export interface ZapierFetchInitOptions extends RequestInit {
 export declare const fetchPlugin: (sdk: {
     context: {
         api: ApiClient;
+        hooks: MethodHooks;
+        core?: {
+            adaptError?: AdaptError;
+        };
     } & ConnectionsPluginProvides["context"];
-} & {
-    context: import("../eventEmission").EventEmissionContext;
 } & {
     context: {
-        meta: Record<string, import("../..").PluginMeta>;
+        meta: Record<string, import("kitcore").PluginMeta>;
     };
 }) => {
     fetch: (url: string | URL, init?: ZapierFetchInitOptions) => Promise<Response>;
@@ -32,7 +35,10 @@ export declare const fetchPlugin: (sdk: {
             fetch: {
                 description: string;
                 packages: string[];
-                categories: string[];
+                categories: {
+                    key: string;
+                    title: string;
+                }[];
                 returnType: string;
                 inputParameters: ({
                     name: string;
@@ -43,8 +49,8 @@ export declare const fetchPlugin: (sdk: {
                         method: z.ZodOptional<z.ZodEnum<{
                             POST: "POST";
                             GET: "GET";
-                            PUT: "PUT";
                             DELETE: "DELETE";
+                            PUT: "PUT";
                             PATCH: "PATCH";
                             HEAD: "HEAD";
                             OPTIONS: "OPTIONS";

package/dist/plugins/fetch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/fetch/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAMhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAkBxB,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAkHD;;;GAGG;AACH,eAAO,MAAM,WAAW;aAGT;QAAE,GAAG,EAAE,SAAS,CAAA;KAAE,GAAG,yBAAyB,CAAC,SAAS,CAAC;;;;;;;;iBAK3D,MAAM,GAAG,GAAG,SACV,sBAAsB,KAC5B,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6JzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/fetch/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAMhE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEvD,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAgHD;;;GAGG;AACH,eAAO,MAAM,WAAW;aAEX;QACP,GAAG,EAAE,SAAS,CAAC;QACf,KAAK,EAAE,WAAW,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,UAAU,CAAC,EAAE,UAAU,CAAA;SAAE,CAAC;KACpC,GAAG,yBAAyB,CAAC,SAAS,CAAC;;;;;;iBAU/B,MAAM,GAAG,GAAG,SACV,sBAAsB,KAC5B,OAAO,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiKzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/plugins/fetch/index.js

@@ -1,4 +1,4 @@
-import { definePlugin } from "../../utils/plugin-utils";
+import { definePlugin } from "kitcore";
 import { ZapierRelayError, ZapierTimeoutError } from "../../types/errors";
 import { FetchUrlSchema, FetchInitSchema, FetchInitZapierFieldsSchema, } from "./schemas";
 import { z } from "zod";
@@ -6,11 +6,11 @@ import { resolveConnectionId } from "../../utils/domain-utils";
 import { combineAbortSignals, createTimeoutAbortSignal, } from "../../utils/abort-utils";
 import { isPlainObject } from "../../utils/type-guard-utils";
 import { buildHttpRequestContext } from "@zapier/policy-context";
-// fetch() doesn't use createFunction/createPaginatedFunction (its signature
-// doesn't fit the single-options-object pattern), so we wire up telemetry
-// context tracking manually.
-import { isTelemetryNested, runWithTelemetryContext, } from "../../utils/telemetry-context";
-import { createValidator } from "../../utils/validation";
+// fetch() doesn't go through createPluginMethod (its signature is variadic,
+// not single-options), so it enters its own method scope and fires
+// onMethodStart / onMethodEnd hooks directly.
+import { getCurrentDepth, runInMethodScope } from "kitcore";
+import { createValidator } from "kitcore";
 /**
  * Transforms full URLs into Relay format: /relay/{domain}/{path}
  */
@@ -92,18 +92,31 @@ function buildAbortHandle({ maxTimeSeconds, callerSignal, }) {
 const FetchInitSdkValidationSchema = z
     .looseObject(FetchInitZapierFieldsSchema.shape)
     .optional();
-const validateFetchInit = createValidator(FetchInitSdkValidationSchema);
 /**
  * Fetch plugin, the primary way to make authenticated HTTP requests through Zapier's Relay service.
  * Mirrors the native fetch(url, init?) signature with additional Zapier-specific options.
  */
 export const fetchPlugin = definePlugin((sdk) => {
+    // Bind the validator to the head's `adaptError` so validation
+    // failures surface as `ZapierValidationError` rather than the
+    // neutral `CoreError` kitcore would otherwise fall back to.
+    const validateFetchInit = createValidator(FetchInitSdkValidationSchema, {
+        adaptError: sdk.context.core?.adaptError,
+    });
     return {
         fetch: async function fetch(url, init) {
-            return runWithTelemetryContext(async () => {
+            return runInMethodScope(async () => {
                 const { api } = sdk.context;
+                const { onMethodStart, onMethodEnd } = sdk.context.hooks;
                 const startTime = Date.now();
-                const isNested = isTelemetryNested();
+                const depth = getCurrentDepth();
+                const args = init === undefined ? [url] : [url, init];
+                onMethodStart?.({
+                    methodName: "fetch",
+                    args,
+                    isPaginated: false,
+                    depth,
+                });
                 try {
                     if (init) {
                         validateFetchInit(init);
@@ -167,17 +180,13 @@ export const fetchPlugin = definePlugin((sdk) => {
                                 statusCode: result.status,
                             });
                         }
-                        if (!isNested) {
-                            sdk.context.eventEmission.emitMethodCalled({
-                                method_name: "fetch",
-                                execution_duration_ms: Date.now() - startTime,
-                                success_flag: true,
-                                error_message: null,
-                                error_type: null,
-                                argument_count: init ? 2 : 1,
-                                is_paginated: false,
-                            });
-                        }
+                        onMethodEnd?.({
+                            methodName: "fetch",
+                            args,
+                            isPaginated: false,
+                            depth,
+                            durationMs: Date.now() - startTime,
+                        });
                         return result;
                     }
                     catch (error) {
@@ -192,17 +201,14 @@ export const fetchPlugin = definePlugin((sdk) => {
                     }
                 }
                 catch (error) {
-                    if (!isNested) {
-                        sdk.context.eventEmission.emitMethodCalled({
-                            method_name: "fetch",
-                            execution_duration_ms: Date.now() - startTime,
-                            success_flag: false,
-                            error_message: error instanceof Error ? error.message : String(error),
-                            error_type: error instanceof Error ? error.constructor.name : "Unknown",
-                            argument_count: init ? 2 : 1,
-                            is_paginated: false,
-                        });
-                    }
+                    onMethodEnd?.({
+                        methodName: "fetch",
+                        args,
+                        isPaginated: false,
+                        depth,
+                        durationMs: Date.now() - startTime,
+                        error: error instanceof Error ? error : new Error(String(error)),
+                    });
                     throw error;
                 }
             });
@@ -215,7 +221,11 @@ export const fetchPlugin = definePlugin((sdk) => {
                         "(OAuth tokens, API keys, etc.) into the outgoing request. " +
                         "Mirrors the native fetch(url, init?) signature with additional Zapier-specific options.",
                     packages: ["sdk", "cli", "mcp"],
-                    categories: ["http"],
+                    // Auto-derive would produce "Http"/"Https" from the key alone;
+                    // declare the title explicitly here so the registry renders
+                    // "HTTP Request". Other plugins in this category use the bare
+                    // string "http"; the object form wins regardless of order.
+                    categories: [{ key: "http", title: "HTTP Request" }],
                     returnType: "Response",
                     inputParameters: [
                         { name: "url", schema: FetchUrlSchema },

package/dist/plugins/fetch/schemas.d.ts

@@ -11,8 +11,8 @@ export declare const FetchInitSchema: z.ZodOptional<z.ZodObject<{
     method: z.ZodOptional<z.ZodEnum<{
         POST: "POST";
         GET: "GET";
-        PUT: "PUT";
         DELETE: "DELETE";
+        PUT: "PUT";
         PATCH: "PATCH";
         HEAD: "HEAD";
         OPTIONS: "OPTIONS";

package/dist/plugins/findFirstConnection/index.d.ts

@@ -20,7 +20,7 @@ export declare const findFirstConnectionPlugin: (sdk: {
         cursor?: string;
         pageSize?: number;
         maxItems?: number;
-    }) | undefined) => import("../..").PaginatedSdkResult<{
+    }) | undefined) => import("kitcore").PaginatedSdkResult<{
         date: string;
         is_invite_only: boolean;
         is_private: boolean;
@@ -52,14 +52,14 @@ export declare const findFirstConnectionPlugin: (sdk: {
 } & {
     context: {
         meta: {
-            listConnections: import("../..").PluginMeta;
+            listConnections: import("kitcore").PluginMeta<unknown>;
         };
     };
 } & {
     context: import("../eventEmission").EventEmissionContext;
 } & {
     context: {
-        meta: Record<string, import("../..").PluginMeta>;
+        meta: Record<string, import("kitcore").PluginMeta>;
     };
 }) => {
     findFirstConnection: (options?: {
@@ -107,7 +107,7 @@ export declare const findFirstConnectionPlugin: (sdk: {
 } & {
     context: {
         meta: {
-            findFirstConnection: import("../..").PluginMeta;
+            findFirstConnection: import("kitcore").PluginMeta<unknown>;
         };
     };
 };

package/dist/plugins/findFirstConnection/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/findFirstConnection/index.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBrC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,UAAU,CACxD,OAAO,yBAAyB,CACjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/findFirstConnection/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BrC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,UAAU,CACxD,OAAO,yBAAyB,CACjC,CAAC"}

package/dist/plugins/findFirstConnection/index.js

@@ -1,7 +1,8 @@
-import { definePlugin } from "../../utils/plugin-utils";
-import { createPluginMethod } from "../../utils/plugin-utils";
+import { definePlugin } from "kitcore";
+import { createPluginMethod } from "kitcore";
 import { FindFirstConnectionSchema } from "./schemas";
 import { ConnectionItemSchema } from "../../schemas/Connection";
+import { connectionItemFormatter } from "../../formatters/connection";
 import { ZapierResourceNotFoundError } from "../../types/errors";
 export const findFirstConnectionPlugin = definePlugin((sdk) => createPluginMethod(sdk, {
     name: "findFirstConnection",
@@ -10,6 +11,7 @@ export const findFirstConnectionPlugin = definePlugin((sdk) => createPluginMetho
     itemType: "Connection",
     inputSchema: FindFirstConnectionSchema,
     outputSchema: ConnectionItemSchema,
+    formatter: connectionItemFormatter,
     handler: async ({ sdk, options = {} }) => {
         const connectionsResponse = await sdk.listConnections({
             ...options,

package/dist/plugins/findFirstConnection/schemas.d.ts

@@ -4,10 +4,10 @@ export declare const FindFirstConnectionSchema: z.ZodObject<{
     title: z.ZodOptional<z.ZodString>;
     search: z.ZodOptional<z.ZodString>;
     appKey: z.ZodOptional<z.ZodString & {
-        _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
+        _def: z.core.$ZodStringDef & import("kitcore").PositionalMetadata;
     }>;
     app: z.ZodOptional<z.ZodString & {
-        _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
+        _def: z.core.$ZodStringDef & import("kitcore").PositionalMetadata;
     }>;
     owner: z.ZodOptional<z.ZodString>;
     account: z.ZodOptional<z.ZodString>;

package/dist/plugins/findUniqueConnection/index.d.ts

@@ -20,7 +20,7 @@ export declare const findUniqueConnectionPlugin: (sdk: {
         cursor?: string;
         pageSize?: number;
         maxItems?: number;
-    }) | undefined) => import("../..").PaginatedSdkResult<{
+    }) | undefined) => import("kitcore").PaginatedSdkResult<{
         date: string;
         is_invite_only: boolean;
         is_private: boolean;
@@ -52,14 +52,14 @@ export declare const findUniqueConnectionPlugin: (sdk: {
 } & {
     context: {
         meta: {
-            listConnections: import("../..").PluginMeta;
+            listConnections: import("kitcore").PluginMeta<unknown>;
         };
     };
 } & {
     context: import("../eventEmission").EventEmissionContext;
 } & {
     context: {
-        meta: Record<string, import("../..").PluginMeta>;
+        meta: Record<string, import("kitcore").PluginMeta>;
     };
 }) => {
     findUniqueConnection: (options?: {
@@ -107,7 +107,7 @@ export declare const findUniqueConnectionPlugin: (sdk: {
 } & {
     context: {
         meta: {
-            findUniqueConnection: import("../..").PluginMeta;
+            findUniqueConnection: import("kitcore").PluginMeta<unknown>;
         };
     };
 };

package/dist/plugins/findUniqueConnection/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/findUniqueConnection/index.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BtC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,UAAU,CACzD,OAAO,0BAA0B,CAClC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/findUniqueConnection/index.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCtC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG,UAAU,CACzD,OAAO,0BAA0B,CAClC,CAAC"}

package/dist/plugins/findUniqueConnection/index.js

@@ -1,8 +1,9 @@
-import { definePlugin } from "../../utils/plugin-utils";
-import { createPluginMethod } from "../../utils/plugin-utils";
+import { definePlugin } from "kitcore";
+import { createPluginMethod } from "kitcore";
 import { FindUniqueConnectionSchema } from "./schemas";
 import { ZapierResourceNotFoundError, ZapierValidationError, } from "../../types/errors";
 import { ConnectionItemSchema } from "../../schemas/Connection";
+import { connectionItemFormatter } from "../../formatters/connection";
 export const findUniqueConnectionPlugin = definePlugin((sdk) => createPluginMethod(sdk, {
     name: "findUniqueConnection",
     categories: ["connection"],
@@ -10,6 +11,7 @@ export const findUniqueConnectionPlugin = definePlugin((sdk) => createPluginMeth
     itemType: "Connection",
     inputSchema: FindUniqueConnectionSchema,
     outputSchema: ConnectionItemSchema,
+    formatter: connectionItemFormatter,
     handler: async ({ sdk, options = {} }) => {
         const connectionsResponse = await sdk.listConnections({
             ...options,

package/dist/plugins/findUniqueConnection/schemas.d.ts

@@ -4,10 +4,10 @@ export declare const FindUniqueConnectionSchema: z.ZodObject<{
     title: z.ZodOptional<z.ZodString>;
     search: z.ZodOptional<z.ZodString>;
     appKey: z.ZodOptional<z.ZodString & {
-        _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
+        _def: z.core.$ZodStringDef & import("kitcore").PositionalMetadata;
     }>;
     app: z.ZodOptional<z.ZodString & {
-        _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
+        _def: z.core.$ZodStringDef & import("kitcore").PositionalMetadata;
     }>;
     owner: z.ZodOptional<z.ZodString>;
     account: z.ZodOptional<z.ZodString>;