@nodetool-ai/agents 0.7.0-rc.23 → 0.8.1

package/dist/tools/control-tool.js

@@ -8,11 +8,12 @@
  * it creates a RunEvent for dispatch to the controlled node.
  */
 import { Tool } from "./base-tool.js";
+import { isObjectLike, isString } from "../utils/type-guards.js";
 /**
  * Convert a node title to a valid tool name (snake_case, max 64 chars).
  */
 export function sanitizeToolName(name) {
-    if (typeof name !== "string" || !name)
+    if (!isString(name) || !name)
         return "control_node";
     let s = name
         // Replace non-alphanumeric with underscores
@@ -21,11 +22,16 @@ export function sanitizeToolName(name) {
         .replace(/([a-z])([A-Z])/g, "$1_$2")
         .toLowerCase()
         // Collapse consecutive underscores
-        .replace(/_+/g, "_")
-        // Strip leading/trailing underscores
-        .replace(/^_+|_+$/g, "");
+        .replace(/_+/g, "_");
+    // Strip leading/trailing underscores.
+    // Stryker disable next-line Regex: after the collapse above, the edges hold at
+    // most one underscore, so `_+`→`_` at the edges matches identical text.
+    s = s.replace(/^_+|_+$/g, "");
     if (!s)
         return "control_node";
+    // Stryker disable next-line ConditionalExpression,EqualityOperator: at the
+    // 64-char boundary slice(0, 64) is a no-op, so `> 64`→`>= 64` and the
+    // always-truthy guard produce byte-identical output (equivalent mutants).
     if (s.length > 64)
         s = s.slice(0, 64);
     return s;
@@ -33,35 +39,33 @@ export function sanitizeToolName(name) {
 export class ControlNodeTool extends Tool {
     name;
     description;
-    inputSchema;
+    jsonSchema;
     targetNodeId;
     nodeInfo;
     constructor(targetNodeId, nodeInfo) {
         super();
         this.targetNodeId = targetNodeId;
         this.nodeInfo = nodeInfo;
-        // Build schema from the "run" action properties
         const actions = nodeInfo.control_actions ?? {};
         const runAction = actions["run"] ?? {};
         const rawProperties = runAction.properties ?? {};
         const properties = {};
         for (const [key, schema] of Object.entries(rawProperties)) {
-            if (typeof schema === "object" && schema !== null) {
+            if (isObjectLike(schema)) {
                 properties[key] = { ...schema };
             }
             else {
                 properties[key] = { type: "string", description: String(schema) };
             }
         }
-        this.inputSchema = {
+        this.jsonSchema = {
             type: "object",
             properties,
-            required: []
+            required: [],
+            additionalProperties: false
         };
-        // Set name from normalized node title
         const nodeTitle = nodeInfo.node_title || targetNodeId;
         this.name = sanitizeToolName(nodeTitle);
-        // Set description
         if (nodeInfo.node_description) {
             this.description = nodeInfo.node_description;
         }
@@ -74,11 +78,10 @@ export class ControlNodeTool extends Tool {
             this.description = desc;
         }
     }
-    /**
-     * Create a control event from tool arguments.
-     */
     createControlEvent(args) {
-        return { event_type: "run", properties: args };
+        const allowed = this.jsonSchema["properties"];
+        const properties = Object.fromEntries(Object.entries(args).filter(([key]) => Object.hasOwn(allowed, key)));
+        return { event_type: "run", properties };
     }
     userMessage(params) {
         const nodeTitle = this.nodeInfo.node_title || this.targetNodeId;

package/dist/tools/control-tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"control-tool.js","sourceRoot":"","sources":["../../src/tools/control-tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"control-tool.js","sourceRoot":"","sources":["../../src/tools/control-tool.ts"],"names":[],"mappings":"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"}

package/dist/tools/dataseo-tools.d.ts

@@ -1,38 +1,40 @@
 /**
- * DataForSEO search tools.
+ * The DataForSEO backends behind the routed `web_search` capability — its
+ * web, news, and image search types.
  *
- * Port of:
- *  - src/nodetool/agents/serp_providers/data_for_seo_provider.py
- *  - DataForSEO-specific tools from src/nodetool/agents/tools/serp_tools.py
+ * These are not tools. `capabilities/web.ts` picks the first configured backend
+ * and calls the functions below; the model never sees a `dataforseo_*` name,
+ * because choosing a search provider is the host's job, not the model's.
  */
 import type { ProcessingContext } from "@nodetool-ai/runtime";
-import { Tool } from "./base-tool.js";
-import type { SerpProvider } from "./serp-providers/index.js";
-export declare class DataForSEOSearchTool extends Tool {
-    readonly name = "dataforseo_search";
-    readonly description = "Search Google via DataForSEO to retrieve organic search results.";
-    readonly inputSchema: Record<string, unknown>;
-    private _provider?;
-    constructor(provider?: SerpProvider);
-    process(context: ProcessingContext, params: Record<string, unknown>): Promise<unknown>;
-    userMessage(params: Record<string, unknown>): string;
-}
-export declare class DataForSEONewsTool extends Tool {
-    readonly name = "dataforseo_news";
-    readonly description = "Search Google News via DataForSEO to retrieve live news articles.";
-    readonly inputSchema: Record<string, unknown>;
-    private _provider?;
-    constructor(provider?: SerpProvider);
-    process(context: ProcessingContext, params: Record<string, unknown>): Promise<unknown>;
-    userMessage(params: Record<string, unknown>): string;
-}
-export declare class DataForSEOImagesTool extends Tool {
-    readonly name = "dataforseo_images";
-    readonly description = "Search Google Images via DataForSEO to retrieve image results.";
-    readonly inputSchema: Record<string, unknown>;
-    private _provider?;
-    constructor(provider?: SerpProvider);
-    process(context: ProcessingContext, params: Record<string, unknown>): Promise<unknown>;
-    userMessage(params: Record<string, unknown>): string;
+/**
+ * Whether the DataForSEO backend is usable: both credentials are present in
+ * the secret store or the environment. Configuration is decided here, before
+ * any call — never by sniffing an error message afterwards.
+ */
+export declare function dataForSeoConfigured(context: ProcessingContext): Promise<boolean>;
+/** What every DataForSEO backend answers with. */
+interface DataForSEOResult {
+    success?: boolean;
+    results?: unknown;
+    error?: string;
+    details?: unknown;
 }
+/** Google organic results for a keyword. */
+export declare function dataForSeoSearch(context: ProcessingContext, params: {
+    keyword?: unknown;
+    num_results?: unknown;
+}): Promise<DataForSEOResult>;
+/** Google News articles for a keyword. */
+export declare function dataForSeoNews(context: ProcessingContext, params: {
+    keyword?: unknown;
+    num_results?: unknown;
+}): Promise<DataForSEOResult>;
+/** Google Images results for a keyword, or a reverse search for an image URL. */
+export declare function dataForSeoImages(context: ProcessingContext, params: {
+    keyword?: unknown;
+    image_url?: unknown;
+    num_results?: unknown;
+}): Promise<DataForSEOResult>;
+export {};
 //# sourceMappingURL=dataseo-tools.d.ts.map

package/dist/tools/dataseo-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataseo-tools.d.ts","sourceRoot":"","sources":["../../src/tools/dataseo-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAmH9D,qBAAa,oBAAqB,SAAQ,IAAI;IAC5C,QAAQ,CAAC,IAAI,uBAAuB;IACpC,QAAQ,CAAC,WAAW,sEACiD;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAc3C;IAEF,OAAO,CAAC,SAAS,CAAC,CAAe;gBAErB,QAAQ,CAAC,EAAE,YAAY;IAK7B,OAAO,CACX,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,OAAO,CAAC;IA6CnB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAKrD;AAMD,qBAAa,kBAAmB,SAAQ,IAAI;IAC1C,QAAQ,CAAC,IAAI,qBAAqB;IAClC,QAAQ,CAAC,WAAW,uEACkD;IACtE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAc3C;IAEF,OAAO,CAAC,SAAS,CAAC,CAAe;gBAErB,QAAQ,CAAC,EAAE,YAAY;IAK7B,OAAO,CACX,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,OAAO,CAAC;IAmDnB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAKrD;AAMD,qBAAa,oBAAqB,SAAQ,IAAI;IAC5C,QAAQ,CAAC,IAAI,uBAAuB;IACpC,QAAQ,CAAC,WAAW,oEAC+C;IACnE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAmB3C;IAEF,OAAO,CAAC,SAAS,CAAC,CAAe;gBAErB,QAAQ,CAAC,EAAE,YAAY;IAK7B,OAAO,CACX,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,OAAO,CAAC;IA+DnB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAQrD"}
+{"version":3,"file":"dataseo-tools.d.ts","sourceRoot":"","sources":["../../src/tools/dataseo-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAyB9D;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,OAAO,CAAC,CAOlB;AAuFD,kDAAkD;AAClD,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,4CAA4C;AAC5C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GACnD,OAAO,CAAC,gBAAgB,CAAC,CA2C3B;AAED,0CAA0C;AAC1C,wBAAsB,cAAc,CAClC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GACnD,OAAO,CAAC,gBAAgB,CAAC,CA+C3B;AAED,iFAAiF;AACjF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GACxE,OAAO,CAAC,gBAAgB,CAAC,CA6D3B"}

package/dist/tools/dataseo-tools.js

@@ -1,14 +1,12 @@
 /**
- * DataForSEO search tools.
+ * The DataForSEO backends behind the routed `web_search` capability — its
+ * web, news, and image search types.
  *
- * Port of:
- *  - src/nodetool/agents/serp_providers/data_for_seo_provider.py
- *  - DataForSEO-specific tools from src/nodetool/agents/tools/serp_tools.py
+ * These are not tools. `capabilities/web.ts` picks the first configured backend
+ * and calls the functions below; the model never sees a `dataforseo_*` name,
+ * because choosing a search provider is the host's job, not the model's.
  */
-import { Tool } from "./base-tool.js";
-/* ------------------------------------------------------------------ */
-/*  Helpers                                                           */
-/* ------------------------------------------------------------------ */
+import { isObjectLike, isString } from "../utils/type-guards.js";
 const API_BASE = "https://api.dataforseo.com";
 const DEFAULT_LOCATION_CODE = 2840; // United States
 const DEFAULT_LANGUAGE_CODE = "en";
@@ -22,6 +20,20 @@ async function getDataForSEOCredentials(context) {
     }
     return { login, password };
 }
+/**
+ * Whether the DataForSEO backend is usable: both credentials are present in
+ * the secret store or the environment. Configuration is decided here, before
+ * any call — never by sniffing an error message afterwards.
+ */
+export async function dataForSeoConfigured(context) {
+    try {
+        await getDataForSEOCredentials(context);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function makeAuthHeader(login, password) {
     const encoded = Buffer.from(`${login}:${password}`).toString("base64");
     return `Basic ${encoded}`;
@@ -31,10 +43,10 @@ function removeBase64Images(data) {
     if (Array.isArray(data)) {
         return data.map(removeBase64Images);
     }
-    if (data !== null && typeof data === "object") {
+    if (isObjectLike(data)) {
         const out = {};
         for (const [k, v] of Object.entries(data)) {
-            if (typeof v === "string" && v.startsWith("data:image/"))
+            if (isString(v) && v.startsWith("data:image/"))
                 continue;
             out[k] = removeBase64Images(v);
         }
@@ -69,7 +81,9 @@ async function dataForSEORequest(endpoint, payload, auth) {
         return (await res.json());
     }
     catch (e) {
-        return { error: `DataForSEO request failed: ${e.message}` };
+        return {
+            error: `DataForSEO request failed: ${e instanceof Error ? e.message : String(e)}`
+        };
     }
 }
 function extractItems(result) {
@@ -87,243 +101,144 @@ function extractItems(result) {
     }
     return [];
 }
-/* ------------------------------------------------------------------ */
-/*  DataForSEOSearchTool                                              */
-/* ------------------------------------------------------------------ */
-export class DataForSEOSearchTool extends Tool {
-    name = "dataforseo_search";
-    description = "Search Google via DataForSEO to retrieve organic search results.";
-    inputSchema = {
-        type: "object",
-        properties: {
-            keyword: {
-                type: "string",
-                description: "The keyword to search for."
-            },
-            num_results: {
-                type: "integer",
-                description: "Number of results to retrieve.",
-                default: 10
-            }
-        },
-        required: ["keyword"]
-    };
-    _provider;
-    constructor(provider) {
-        super();
-        this._provider = provider;
+/** Google organic results for a keyword. */
+export async function dataForSeoSearch(context, params) {
+    const keyword = params.keyword;
+    if (!keyword)
+        return { error: "keyword is required" };
+    const numResults = params.num_results ?? 10;
+    let creds;
+    try {
+        creds = await getDataForSEOCredentials(context);
     }
-    async process(context, params) {
-        const keyword = params.keyword;
-        if (!keyword)
-            return { error: "keyword is required" };
-        const numResults = params.num_results ?? 10;
-        let creds;
-        try {
-            creds = await getDataForSEOCredentials(context);
+    catch (e) {
+        return { error: e instanceof Error ? e.message : String(e) };
+    }
+    const auth = makeAuthHeader(creds.login, creds.password);
+    const payload = [
+        {
+            keyword,
+            location_code: DEFAULT_LOCATION_CODE,
+            language_code: DEFAULT_LANGUAGE_CODE,
+            device: "desktop",
+            os: "windows",
+            depth: numResults
         }
-        catch (e) {
-            return { error: e.message };
+    ];
+    const result = await dataForSEORequest("/v3/serp/google/organic/live/advanced", payload, auth);
+    const items = extractItems(result);
+    if (!Array.isArray(items))
+        return items;
+    const organicResults = items
+        .filter((item) => item.type === "organic")
+        .map((item) => ({
+        title: item.title ?? null,
+        url: item.url ?? null,
+        snippet: item.description ?? null,
+        position: item.rank_absolute ?? null,
+        type: "organic"
+    }));
+    return { success: true, results: removeBase64Images(organicResults) };
+}
+/** Google News articles for a keyword. */
+export async function dataForSeoNews(context, params) {
+    const keyword = params.keyword;
+    if (!keyword)
+        return { error: "keyword is required" };
+    const numResults = params.num_results ?? 10;
+    let creds;
+    try {
+        creds = await getDataForSEOCredentials(context);
+    }
+    catch (e) {
+        return { error: e instanceof Error ? e.message : String(e) };
+    }
+    const auth = makeAuthHeader(creds.login, creds.password);
+    const payload = [
+        {
+            keyword,
+            location_code: DEFAULT_LOCATION_CODE,
+            language_code: DEFAULT_LANGUAGE_CODE,
+            sort_by: "relevance",
+            depth: numResults
         }
-        const auth = makeAuthHeader(creds.login, creds.password);
-        const payload = [
-            {
-                keyword,
-                location_code: DEFAULT_LOCATION_CODE,
-                language_code: DEFAULT_LANGUAGE_CODE,
-                device: "desktop",
-                os: "windows",
-                depth: numResults
-            }
-        ];
-        const result = await dataForSEORequest("/v3/serp/google/organic/live/advanced", payload, auth);
-        const items = extractItems(result);
-        if (!Array.isArray(items))
-            return items;
-        const organicResults = items
-            .filter((item) => item.type === "organic")
-            .map((item) => ({
+    ];
+    const result = await dataForSEORequest("/v3/serp/google/news/live/advanced", payload, auth);
+    const items = extractItems(result);
+    if (!Array.isArray(items))
+        return items;
+    const newsResults = items
+        .filter((item) => item.type === "news_search" || item.type === "top_stories")
+        .map((item) => {
+        const timestamp = item.timestamp;
+        const publishedAt = timestamp ? timestamp.split(" ")[0] : null;
+        return {
             title: item.title ?? null,
             url: item.url ?? null,
+            source: item.source ?? null,
+            published_at: publishedAt,
             snippet: item.description ?? null,
-            position: item.rank_absolute ?? null,
-            type: "organic"
-        }));
-        return { success: true, results: removeBase64Images(organicResults) };
-    }
-    userMessage(params) {
-        const keyword = params.keyword ?? "something";
-        const msg = `Searching Google (DataForSEO) for '${keyword}'...`;
-        return msg.length > 80 ? "Searching Google (DataForSEO)..." : msg;
-    }
+            type: "news"
+        };
+    });
+    return { success: true, results: removeBase64Images(newsResults) };
 }
-/* ------------------------------------------------------------------ */
-/*  DataForSEONewsTool                                                */
-/* ------------------------------------------------------------------ */
-export class DataForSEONewsTool extends Tool {
-    name = "dataforseo_news";
-    description = "Search Google News via DataForSEO to retrieve live news articles.";
-    inputSchema = {
-        type: "object",
-        properties: {
-            keyword: {
-                type: "string",
-                description: "The keyword to search for in Google News."
-            },
-            num_results: {
-                type: "integer",
-                description: "Number of news results to retrieve.",
-                default: 10
-            }
-        },
-        required: ["keyword"]
-    };
-    _provider;
-    constructor(provider) {
-        super();
-        this._provider = provider;
+/** Google Images results for a keyword, or a reverse search for an image URL. */
+export async function dataForSeoImages(context, params) {
+    const keyword = params.keyword;
+    const imageUrl = params.image_url;
+    const numResults = params.num_results ?? 20;
+    if (!keyword && !imageUrl) {
+        return {
+            error: "One of 'keyword' or 'image_url' is required for image search."
+        };
     }
-    async process(context, params) {
-        const keyword = params.keyword;
-        if (!keyword)
-            return { error: "keyword is required" };
-        const numResults = params.num_results ?? 10;
-        let creds;
-        try {
-            creds = await getDataForSEOCredentials(context);
-        }
-        catch (e) {
-            return { error: e.message };
-        }
-        const auth = makeAuthHeader(creds.login, creds.password);
-        const payload = [
-            {
-                keyword,
-                location_code: DEFAULT_LOCATION_CODE,
-                language_code: DEFAULT_LANGUAGE_CODE,
-                sort_by: "relevance",
-                depth: numResults
-            }
-        ];
-        const result = await dataForSEORequest("/v3/serp/google/news/live/advanced", payload, auth);
-        const items = extractItems(result);
-        if (!Array.isArray(items))
-            return items;
-        const newsResults = items
-            .filter((item) => item.type === "news_search" || item.type === "top_stories")
-            .map((item) => {
-            const timestamp = item.timestamp;
-            const publishedAt = timestamp ? timestamp.split(" ")[0] : null;
-            return {
-                title: item.title ?? null,
-                url: item.url ?? null,
-                source: item.source ?? null,
-                published_at: publishedAt,
-                snippet: item.description ?? null,
-                type: "news"
-            };
-        });
-        return { success: true, results: removeBase64Images(newsResults) };
+    let creds;
+    try {
+        creds = await getDataForSEOCredentials(context);
     }
-    userMessage(params) {
-        const keyword = params.keyword ?? "something";
-        const msg = `Searching Google News (DataForSEO) for '${keyword}'...`;
-        return msg.length > 80 ? "Searching Google News (DataForSEO)..." : msg;
+    catch (e) {
+        return { error: e instanceof Error ? e.message : String(e) };
     }
-}
-/* ------------------------------------------------------------------ */
-/*  DataForSEOImagesTool                                              */
-/* ------------------------------------------------------------------ */
-export class DataForSEOImagesTool extends Tool {
-    name = "dataforseo_images";
-    description = "Search Google Images via DataForSEO to retrieve image results.";
-    inputSchema = {
-        type: "object",
-        properties: {
-            keyword: {
-                type: "string",
-                description: "Keyword for image search. (Optional if image_url is provided)"
-            },
-            image_url: {
-                type: "string",
-                description: "URL of an image for reverse search. (Optional if keyword is provided)"
-            },
-            num_results: {
-                type: "integer",
-                description: "Number of image results to retrieve.",
-                default: 20
-            }
-        }
+    const auth = makeAuthHeader(creds.login, creds.password);
+    const payloadDict = {
+        location_code: DEFAULT_LOCATION_CODE,
+        language_code: DEFAULT_LANGUAGE_CODE,
+        depth: numResults
     };
-    _provider;
-    constructor(provider) {
-        super();
-        this._provider = provider;
-    }
-    async process(context, params) {
-        const keyword = params.keyword;
-        const imageUrl = params.image_url;
-        const numResults = params.num_results ?? 20;
-        if (!keyword && !imageUrl) {
-            return {
-                error: "One of 'keyword' or 'image_url' is required for image search."
-            };
-        }
-        let creds;
-        try {
-            creds = await getDataForSEOCredentials(context);
-        }
-        catch (e) {
-            return { error: e.message };
+    if (keyword)
+        payloadDict.keyword = keyword;
+    if (imageUrl)
+        payloadDict.image_url = imageUrl;
+    const result = await dataForSEORequest("/v3/serp/google/images/live/advanced", [payloadDict], auth);
+    const items = extractItems(result);
+    if (!Array.isArray(items))
+        return items;
+    const imageResults = [];
+    for (const item of items) {
+        if (item.type === "images_search") {
+            imageResults.push({
+                title: item.title ?? null,
+                image_url: item.image_url ?? null,
+                source_url: item.source_url ?? null,
+                alt_text: item.alt ?? null,
+                type: "image"
+            });
         }
-        const auth = makeAuthHeader(creds.login, creds.password);
-        const payloadDict = {
-            location_code: DEFAULT_LOCATION_CODE,
-            language_code: DEFAULT_LANGUAGE_CODE,
-            depth: numResults
-        };
-        if (keyword)
-            payloadDict.keyword = keyword;
-        if (imageUrl)
-            payloadDict.image_url = imageUrl;
-        const result = await dataForSEORequest("/v3/serp/google/images/live/advanced", [payloadDict], auth);
-        const items = extractItems(result);
-        if (!Array.isArray(items))
-            return items;
-        const imageResults = [];
-        for (const item of items) {
-            if (item.type === "images_search") {
-                imageResults.push({
-                    title: item.title ?? null,
-                    image_url: item.image_url ?? null,
-                    source_url: item.source_url ?? null,
-                    alt_text: item.alt ?? null,
-                    type: "image"
-                });
-            }
-            else if (item.type === "carousel" && Array.isArray(item.items)) {
-                for (const ci of item.items) {
-                    if (ci.type === "carousel_element" && ci.image_url) {
-                        imageResults.push({
-                            title: ci.title ?? null,
-                            image_url: ci.image_url ?? null,
-                            source_url: ci.url ?? null,
-                            alt_text: ci.title ?? null,
-                            type: "image_carousel_element"
-                        });
-                    }
+        else if (item.type === "carousel" && Array.isArray(item.items)) {
+            for (const ci of item.items) {
+                if (ci.type === "carousel_element" && ci.image_url) {
+                    imageResults.push({
+                        title: ci.title ?? null,
+                        image_url: ci.image_url ?? null,
+                        source_url: ci.url ?? null,
+                        alt_text: ci.title ?? null,
+                        type: "image_carousel_element"
+                    });
                 }
             }
         }
-        return { success: true, results: removeBase64Images(imageResults) };
-    }
-    userMessage(params) {
-        const keyword = params.keyword;
-        if (keyword) {
-            const msg = `Searching Google Images (DataForSEO) for '${keyword}'...`;
-            return msg.length > 80 ? "Searching Google Images (DataForSEO)..." : msg;
-        }
-        return "Searching Google Images (DataForSEO)...";
     }
+    return { success: true, results: removeBase64Images(imageResults) };
 }
 //# sourceMappingURL=dataseo-tools.js.map