web-access-cli 0.3.0 → 0.4.0

package/dist/providers/xai.js

@@ -0,0 +1,208 @@
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { WebAccessError } from "../core/errors.js";
+import { buildEndpoint } from "../transport/http.js";
+import { VERSION } from "../version.js";
+import { assertOk, normalizeHits, parseJsonResponse, ref, requireBaseUrl, } from "./common.js";
+const XAI_TYPES = new Set(["xai_x_search", "xai_web_search"]);
+const PROTECTED_HEADERS = new Set([
+    "authorization",
+    "content-type",
+    "accept",
+    "x-xai-token-auth",
+    "x-grok-client-version",
+    "x-grok-client-identifier",
+    "x-authenticateresponse",
+    "user-agent",
+]);
+function isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function redact(value, secrets) {
+    if (typeof value === "string") {
+        return secrets.reduce((text, secret) => secret.length >= 4 ? text.split(secret).join("[REDACTED]") : text, value);
+    }
+    if (Array.isArray(value))
+        return value.map((item) => redact(item, secrets));
+    if (!isRecord(value))
+        return value;
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, redact(item, secrets)]));
+}
+function authError(request, message, secrets = []) {
+    return new WebAccessError("auth_error", message, {
+        provider: ref(request.instance),
+        retryable: false,
+        raw: redact({ path: request.instance.authJson }, secrets),
+    });
+}
+function readAccessToken(request) {
+    const authPath = request.instance.authJson;
+    if (!authPath)
+        throw authError(request, "xAI OAuth authJson 未配置");
+    let parsed;
+    try {
+        parsed = JSON.parse(readFileSync(resolve(authPath), "utf8"));
+    }
+    catch {
+        throw authError(request, "xAI OAuth authJson 无法读取或解析");
+    }
+    if (!isRecord(parsed) || parsed.disabled === true)
+        throw authError(request, "xAI OAuth 凭据已禁用");
+    const token = parsed.access_token;
+    if (typeof token !== "string" || token.trim() === "")
+        throw authError(request, "xAI OAuth authJson 缺少 access_token");
+    return token;
+}
+function snippet(text, start, end) {
+    if (typeof start !== "number" || typeof end !== "number")
+        return "";
+    const value = text
+        .slice(Math.max(0, start - 120), Math.min(text.length, end + 120))
+        .replace(/\[([^\]]*)\]\([^)]*\)/g, "$1")
+        .trim();
+    return value.length > 300 ? `${value.slice(0, 297)}...` : value;
+}
+function mapResponse(parsed, request) {
+    const output = Array.isArray(parsed.output)
+        ? parsed.output.filter(isRecord)
+        : [];
+    const expectedCall = request.instance.type === "xai_x_search"
+        ? "custom_tool_call"
+        : "web_search_call";
+    if (!output.some((item) => item.type === expectedCall))
+        throw new WebAccessError("provider_error", `xAI ${request.instance.type} 未返回搜索工具调用`, { provider: ref(request.instance), retryable: true, raw: parsed });
+    const items = [];
+    for (const item of output) {
+        if (item.type === "message" && Array.isArray(item.content)) {
+            for (const block of item.content.filter(isRecord)) {
+                const annotations = Array.isArray(block.annotations)
+                    ? block.annotations.filter(isRecord)
+                    : [];
+                for (const annotation of annotations) {
+                    if (annotation.type !== "url_citation" ||
+                        typeof annotation.url !== "string")
+                        continue;
+                    items.push({
+                        url: annotation.url,
+                        ...(typeof annotation.title === "string"
+                            ? { title: annotation.title }
+                            : {}),
+                        snippet: snippet(typeof block.text === "string" ? block.text : "", annotation.start_index, annotation.end_index),
+                    });
+                }
+            }
+        }
+    }
+    for (const item of output) {
+        if (request.instance.type === "xai_web_search" &&
+            item.type === "web_search_call") {
+            const sources = isRecord(item.action) && Array.isArray(item.action.sources)
+                ? item.action.sources.filter(isRecord)
+                : [];
+            for (const source of sources) {
+                if (typeof source.url !== "string")
+                    continue;
+                items.push({
+                    url: source.url,
+                    ...(typeof source.title === "string" ? { title: source.title } : {}),
+                    snippet: "",
+                });
+            }
+        }
+    }
+    return {
+        results: normalizeHits(items, request.limit, request.includeDomains, request.excludeDomains),
+    };
+}
+function requestHeaders(request, token) {
+    const headers = Object.fromEntries(Object.entries(request.instance.headers).filter(([name]) => !PROTECTED_HEADERS.has(name.toLowerCase())));
+    return {
+        ...headers,
+        Authorization: `Bearer ${token}`,
+        "X-XAI-Token-Auth": "xai-grok-cli",
+        "x-grok-client-version": "0.2.120",
+        "x-grok-client-identifier": "grok-shell",
+        "x-authenticateresponse": "authenticate-response",
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        "User-Agent": `web-access-cli/${VERSION}`,
+    };
+}
+function createAdapter(type) {
+    return {
+        type,
+        capabilities: ["search"],
+        isConfigured: (instance) => XAI_TYPES.has(instance.type) &&
+            !!instance.baseUrl &&
+            !!instance.authJson &&
+            existsSync(resolve(instance.authJson)),
+        async search(request) {
+            if (type === "xai_x_search" && request.freshness)
+                throw new WebAccessError("provider_unavailable", "xAI x_search 不支持 freshness", { provider: ref(request.instance), retryable: true });
+            if (type === "xai_web_search" &&
+                request.includeDomains.length > 0 &&
+                request.excludeDomains.length > 0)
+                throw new WebAccessError("provider_unavailable", "xAI web_search 不能同时设置 include-domain 和 exclude-domain", { provider: ref(request.instance), retryable: true });
+            if (type === "xai_web_search" &&
+                (request.includeDomains.length > 5 || request.excludeDomains.length > 5))
+                throw new WebAccessError("provider_unavailable", "xAI web_search 每次最多支持 5 个域名", { provider: ref(request.instance), retryable: true });
+            const token = readAccessToken(request);
+            const tool = type === "xai_x_search"
+                ? { type: "x_search" }
+                : {
+                    type: "web_search",
+                    ...(request.includeDomains.length > 0 ||
+                        request.excludeDomains.length > 0
+                        ? {
+                            filters: {
+                                ...(request.includeDomains.length > 0
+                                    ? {
+                                        allowed_domains: request.includeDomains.slice(0, 5),
+                                    }
+                                    : {}),
+                                ...(request.excludeDomains.length > 0
+                                    ? {
+                                        excluded_domains: request.excludeDomains.slice(0, 5),
+                                    }
+                                    : {}),
+                            },
+                        }
+                        : {}),
+                };
+            const response = await request.transport.request(buildEndpoint(requireBaseUrl(request.instance), "responses"), {
+                method: "POST",
+                headers: requestHeaders(request, token),
+                body: JSON.stringify({
+                    model: request.instance.model ?? "grok-4.6",
+                    input: `Search the web for: ${request.query}`,
+                    tools: [tool],
+                }),
+                signal: request.signal,
+                maxResponseBytes: request.maxResponseBytes,
+                maxRedirects: 0,
+            });
+            try {
+                assertOk(response, request.instance);
+                const parsed = parseJsonResponse(response, request.instance);
+                return {
+                    data: mapResponse(parsed, request),
+                    raw: redact(parsed, [token]),
+                };
+            }
+            catch (error) {
+                if (!(error instanceof WebAccessError))
+                    throw error;
+                throw new WebAccessError(error.code, error.message, {
+                    retryable: error.retryable,
+                    provider: error.provider,
+                    httpStatus: error.httpStatus,
+                    details: redact(error.details, [token]),
+                    raw: redact(error.raw, [token]),
+                });
+            }
+        },
+    };
+}
+export const XAI_X_SEARCH_ADAPTER = createAdapter("xai_x_search");
+export const XAI_WEB_SEARCH_ADAPTER = createAdapter("xai_web_search");
+//# sourceMappingURL=xai.js.map

package/dist/providers/xai.js.map

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

package/dist/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "0.3.0";
+export const VERSION = "0.4.0";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-access-cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Agent-neutral web search and content extraction CLI",
   "license": "MIT",
   "repository": {

package/schemas/config.schema.json

@@ -82,6 +82,14 @@
                   {
                     "type": "string",
                     "const": "deepseek"
+                  },
+                  {
+                    "type": "string",
+                    "const": "xai_x_search"
+                  },
+                  {
+                    "type": "string",
+                    "const": "xai_web_search"
                   }
                 ]
               }
@@ -150,6 +158,71 @@
               }
             },
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "id",
+              "type"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "pattern": "^[a-z][a-z0-9_-]{0,63}$"
+              },
+              "apiKey": {
+                "type": "string"
+              },
+              "apiKeyEnv": {
+                "type": "string",
+                "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+              },
+              "baseUrl": {
+                "type": "string",
+                "format": "uri"
+              },
+              "baseUrlEnv": {
+                "type": "string",
+                "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+              },
+              "headers": {
+                "type": "object",
+                "patternProperties": {
+                  "^[^\\r\\n]+$": {
+                    "type": "string",
+                    "pattern": "^[^\\r\\n]*$"
+                  }
+                },
+                "additionalProperties": false
+              },
+              "authJson": {
+                "type": "string"
+              },
+              "authJsonEnv": {
+                "type": "string",
+                "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+              },
+              "model": {
+                "type": "string"
+              },
+              "modelEnv": {
+                "type": "string",
+                "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+              },
+              "type": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "const": "xai_x_search"
+                  },
+                  {
+                    "type": "string",
+                    "const": "xai_web_search"
+                  }
+                ]
+              }
+            },
+            "additionalProperties": false
           }
         ]
       }

package/schemas/output.schema.json

@@ -147,6 +147,14 @@
                     {
                       "type": "string",
                       "const": "deepseek"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_x_search"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_web_search"
                     }
                   ]
                 }
@@ -217,6 +225,14 @@
                           {
                             "type": "string",
                             "const": "deepseek"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_x_search"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_web_search"
                           }
                         ]
                       }
@@ -310,6 +326,14 @@
                               {
                                 "type": "string",
                                 "const": "deepseek"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_x_search"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_web_search"
                               }
                             ]
                           }
@@ -387,6 +411,14 @@
                         {
                           "type": "string",
                           "const": "deepseek"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_x_search"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_web_search"
                         }
                       ]
                     }
@@ -543,6 +575,14 @@
                     {
                       "type": "string",
                       "const": "deepseek"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_x_search"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_web_search"
                     }
                   ]
                 }
@@ -613,6 +653,14 @@
                           {
                             "type": "string",
                             "const": "deepseek"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_x_search"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_web_search"
                           }
                         ]
                       }
@@ -706,6 +754,14 @@
                               {
                                 "type": "string",
                                 "const": "deepseek"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_x_search"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_web_search"
                               }
                             ]
                           }
@@ -783,6 +839,14 @@
                         {
                           "type": "string",
                           "const": "deepseek"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_x_search"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_web_search"
                         }
                       ]
                     }
@@ -987,6 +1051,14 @@
                     {
                       "type": "string",
                       "const": "deepseek"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_x_search"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_web_search"
                     }
                   ]
                 }
@@ -1057,6 +1129,14 @@
                           {
                             "type": "string",
                             "const": "deepseek"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_x_search"
+                          },
+                          {
+                            "type": "string",
+                            "const": "xai_web_search"
                           }
                         ]
                       }
@@ -1150,6 +1230,14 @@
                               {
                                 "type": "string",
                                 "const": "deepseek"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_x_search"
+                              },
+                              {
+                                "type": "string",
+                                "const": "xai_web_search"
                               }
                             ]
                           }
@@ -1227,6 +1315,14 @@
                         {
                           "type": "string",
                           "const": "deepseek"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_x_search"
+                        },
+                        {
+                          "type": "string",
+                          "const": "xai_web_search"
                         }
                       ]
                     }
@@ -1437,6 +1533,14 @@
                     {
                       "type": "string",
                       "const": "deepseek"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_x_search"
+                    },
+                    {
+                      "type": "string",
+                      "const": "xai_web_search"
                     }
                   ]
                 }