@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{supabase-SK7DQ42N.js → supabase-BKNZ35ER.js}

@@ -1,21 +1,27 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/supabase/api.ts
 var SERVICE = "supabase";
 var API_BASE = "https://api.supabase.com/v1";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var PROJECT_STATUSES = /* @__PURE__ */ new Set([
   "ACTIVE_HEALTHY",
   "ACTIVE_UNHEALTHY",
@@ -34,19 +40,8 @@ var PROJECT_STATUSES = /* @__PURE__ */ new Set([
   "RESIZING"
 ]);
 var API_KEY_TYPES = /* @__PURE__ */ new Set(["legacy", "publishable", "secret", "unknown"]);
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
 function nullableText(value) {
-  return value === null ? null : text(value);
-}
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
+  return value === null ? null : trimmedText(value);
 }
 function inputError(message) {
   return new TBError("invalid_argument", message);
@@ -55,12 +50,12 @@ function malformed(message) {
   return new TBError("unavailable", `malformed supabase response: ${message}`, { retryable: true });
 }
 function requireInputText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw inputError(`${field} is required.`);
   return result;
 }
 function requireRecord(value, label) {
-  const result = record(value);
+  const result = asJsonObject(value);
   if (result === void 0) throw malformed(`missing ${label}`);
   return result;
 }
@@ -69,7 +64,7 @@ function requireArray(value, label) {
   return value;
 }
 function requireField(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw malformed(`missing ${field}`);
   return result;
 }
@@ -83,45 +78,31 @@ function requireNumber(value, field) {
   return parsed;
 }
 function errorMessage(status, payload) {
-  const detail = record(payload);
+  const detail = asJsonObject(payload);
   if (detail === void 0) return `supabase request failed with ${status}`;
-  const code = text(detail.code) ?? text(detail.error);
+  const code = trimmedText(detail.code) ?? trimmedText(detail.error);
   if (code === "invalid_grant") return "supabase grant is invalid or expired";
-  return text(detail.message) ?? text(detail.msg) ?? text(detail.error_description) ?? `supabase request failed with ${status}`;
+  return trimmedText(detail.message) ?? trimmedText(detail.msg) ?? trimmedText(detail.error_description) ?? `supabase request failed with ${status}`;
 }
 async function request(ctx, input) {
-  const url = new URL(`${API_BASE}${input.path}`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value === void 0) continue;
-    if (Array.isArray(value)) {
-      for (const item of value) url.searchParams.append(key, item);
-      continue;
-    }
-    url.searchParams.set(key, String(value));
-  }
   const hasBody = input.body !== void 0;
-  const response = await guardedFetch(url.toString(), {
+  const { data } = await http.request({
+    path: input.path,
     method: input.method ?? "GET",
+    // health 的 services 靠**重复同名参数**表达;statuses 那种逗号串在调用处就拼好了。
+    query: Object.entries(input.query ?? {}),
     headers: {
       accept: "application/json",
-      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`,
-      ...hasBody ? { "content-type": "application/json" } : {}
+      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
     },
-    body: hasBody ? JSON.stringify(input.body) : void 0
+    ...hasBody ? { json: input.body } : {},
+    invalidJsonMessage: "malformed supabase response: malformed supabase json response",
+    mapError: ({ data: payload2, status }) => upstreamError(
+      status,
+      errorMessage(status, typeof payload2 === "string" ? { message: payload2 } : payload2)
+    )
   });
-  const raw = await response.text();
-  let payload;
-  if (raw.trim() === "") {
-    payload = null;
-  } else {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      if (response.ok) throw malformed("malformed supabase json response");
-      payload = { message: raw };
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(response.status, payload));
+  const payload = data ?? null;
   if (payload === null && input.allowEmpty !== true) throw malformed("empty body");
   return payload;
 }
@@ -142,35 +123,35 @@ function normalizeOrganization(payload) {
 }
 function normalizeOrganizationDetail(payload) {
   const item = requireRecord(payload, "organization");
-  return compact({
+  return compactDefined({
     ...item,
     id: requireField(item.id, "organization.id"),
     name: requireField(item.name, "organization.name"),
-    plan: text(item.plan)
+    plan: trimmedText(item.plan)
   });
 }
 function normalizeOrganizationMember(payload) {
   const item = requireRecord(payload, "member");
-  return compact({
+  return compactDefined({
     ...item,
     userId: requireField(item.user_id, "member.user_id"),
     userName: requireField(item.user_name, "member.user_name"),
-    email: text(item.email),
+    email: trimmedText(item.email),
     roleName: requireField(item.role_name, "member.role_name"),
     mfaEnabled: requireBoolean(item.mfa_enabled, "member.mfa_enabled")
   });
 }
 function normalizeOrganizationProject(payload) {
   const item = requireRecord(payload, "organization project");
-  return compact({
+  return compactDefined({
     ...item,
     ref: requireField(item.ref, "organizationProject.ref"),
     name: requireField(item.name, "organizationProject.name"),
-    cloudProvider: text(item.cloud_provider),
+    cloudProvider: trimmedText(item.cloud_provider),
     region: requireField(item.region, "organizationProject.region"),
     isBranch: typeof item.is_branch === "boolean" ? item.is_branch : void 0,
     status: normalizeProjectStatus(requireField(item.status, "organizationProject.status")) ?? "UNKNOWN",
-    insertedAt: text(item.inserted_at),
+    insertedAt: trimmedText(item.inserted_at),
     databases: Array.isArray(item.databases) ? item.databases.map((entry) => requireRecord(entry, "database")) : void 0
   });
 }
@@ -185,9 +166,9 @@ function normalizePagination(payload) {
 function normalizeProjectDatabaseSummary(payload) {
   if (payload === void 0 || payload === null) return void 0;
   const item = requireRecord(payload, "project.database");
-  return compact({
-    host: text(item.host),
-    version: text(item.version),
+  return compactDefined({
+    host: trimmedText(item.host),
+    version: trimmedText(item.version),
     postgresEngine: nullableText(item.postgres_engine),
     releaseChannel: nullableText(item.release_channel)
   });
@@ -208,7 +189,7 @@ function normalizeProjectSummary(payload) {
     organizationId: requireField(item.organization_id, "project.organization_id"),
     name: requireField(item.name, "project.name"),
     region: requireField(item.region, "project.region"),
-    status: normalizeProjectStatus(text(item.status)),
+    status: normalizeProjectStatus(trimmedText(item.status)),
     createdAt: requireField(item.created_at, "project.created_at"),
     database: normalizeProjectDatabaseSummary(item.database)
   };
@@ -229,17 +210,17 @@ function normalizeProjectDetail(payload) {
 }
 function normalizeApiKey(payload) {
   const item = requireRecord(payload, "api key");
-  return compact({
+  return compactDefined({
     id: requireField(item.id, "apiKey.id"),
     name: requireField(item.name, "apiKey.name"),
     type: normalizeApiKeyType(requireField(item.type, "apiKey.type")),
     prefix: requireField(item.prefix, "apiKey.prefix"),
     hash: requireField(item.hash, "apiKey.hash"),
     description: nullableText(item.description),
-    apiKey: text(item.api_key),
-    insertedAt: text(item.inserted_at),
-    updatedAt: text(item.updated_at),
-    secretJwtTemplate: item.secret_jwt_template === null ? null : record(item.secret_jwt_template)
+    apiKey: trimmedText(item.api_key),
+    insertedAt: trimmedText(item.inserted_at),
+    updatedAt: trimmedText(item.updated_at),
+    secretJwtTemplate: item.secret_jwt_template === null ? null : asJsonObject(item.secret_jwt_template)
   });
 }
 function normalizeApiKeyList(payload) {
@@ -250,21 +231,21 @@ function normalizeApiKeyList(payload) {
 }
 function normalizeSecret(payload) {
   const item = requireRecord(payload, "secret");
-  return compact({
+  return compactDefined({
     name: requireField(item.name, "secret.name"),
-    value: text(item.value),
-    updatedAt: text(item.updated_at)
+    value: trimmedText(item.value),
+    updatedAt: trimmedText(item.updated_at)
   });
 }
 function normalizeHealthService(payload) {
   const item = requireRecord(payload, "health");
-  return compact({
+  return compactDefined({
     ...item,
     name: requireField(item.name, "health.name"),
     healthy: requireBoolean(item.healthy, "health.healthy"),
     status: requireField(item.status, "health.status"),
-    error: text(item.error),
-    info: item.info === null ? null : record(item.info)
+    error: trimmedText(item.error),
+    info: item.info === null ? null : asJsonObject(item.info)
   });
 }
 function normalizeRecordList(payload, label) {
@@ -273,7 +254,7 @@ function normalizeRecordList(payload, label) {
 function secretInputList(payload) {
   if (!Array.isArray(payload)) throw inputError("supabase secrets input must be an array");
   return payload.map((entry) => {
-    const item = record(entry);
+    const item = asJsonObject(entry);
     if (item === void 0) throw inputError("secret is required.");
     return {
       name: requireInputText(item.name, "secret.name"),
@@ -309,8 +290,8 @@ async function listOrganizationProjects(input, ctx) {
     query: {
       offset: input.offset,
       limit: input.limit,
-      search: text(input.search),
-      sort: text(input.sort),
+      search: trimmedText(input.search),
+      sort: trimmedText(input.sort),
       // statuses 是**逗号串**(不像 services 那样重复同名参数)。
       statuses: input.statuses === void 0 ? void 0 : input.statuses.join(",")
     }
@@ -333,9 +314,9 @@ async function listAvailableRegions(input, ctx) {
   const payload = await request(ctx, {
     path: "/projects/available-regions",
     query: {
-      organization_slug: text(input.organizationSlug),
-      continent: text(input.continent),
-      desired_instance_size: text(input.desiredInstanceSize)
+      organization_slug: trimmedText(input.organizationSlug),
+      continent: trimmedText(input.continent),
+      desired_instance_size: trimmedText(input.desiredInstanceSize)
     }
   });
   return { regions: requireRecord(payload, "regions") };
@@ -373,7 +354,7 @@ async function getProjectApiKey(input, ctx) {
 }
 async function createProjectApiKey(input, ctx) {
   const ref = requireInputText(input.projectRef, "projectRef");
-  const type = text(input.type);
+  const type = trimmedText(input.type);
   if (input.secretJwtTemplate !== void 0 && type !== "secret") {
     throw inputError("secretJwtTemplate is only supported for secret API keys");
   }
@@ -381,12 +362,12 @@ async function createProjectApiKey(input, ctx) {
     method: "POST",
     path: `/projects/${encodeURIComponent(ref)}/api-keys`,
     query: { reveal: revealFlag(input.reveal) },
-    body: compact({
-      name: text(input.name),
+    body: compactDefined({
+      name: trimmedText(input.name),
       type,
       // description 不去空白:上游用 optionalRawString 原样发(空串是合法的"没有描述")。
       description: typeof input.description === "string" ? input.description : void 0,
-      secret_jwt_template: record(input.secretJwtTemplate)
+      secret_jwt_template: asJsonObject(input.secretJwtTemplate)
     })
   });
   return { apiKey: normalizeApiKey(payload) };
@@ -402,10 +383,10 @@ async function updateProjectApiKey(input, ctx) {
     path: `/projects/${encodeURIComponent(ref)}/api-keys/${encodeURIComponent(apiKeyId)}`,
     query: { reveal: revealFlag(input.reveal) },
     // description 与 secret_jwt_template 是三态字段:未给不改、null 清空、有值改成它。
-    body: compact({
-      name: text(input.name),
+    body: compactDefined({
+      name: trimmedText(input.name),
       description: typeof input.description === "string" || input.description === null ? input.description : void 0,
-      secret_jwt_template: input.secretJwtTemplate === null ? null : record(input.secretJwtTemplate)
+      secret_jwt_template: input.secretJwtTemplate === null ? null : asJsonObject(input.secretJwtTemplate)
     })
   });
   return { apiKey: normalizeApiKey(payload) };
@@ -419,7 +400,7 @@ async function deleteProjectApiKey(input, ctx) {
     query: {
       reveal: revealFlag(input.reveal),
       was_compromised: input.wasCompromised,
-      reason: text(input.reason)
+      reason: trimmedText(input.reason)
     }
   });
   return { apiKey: normalizeApiKey(payload) };
@@ -470,7 +451,7 @@ async function runReadOnlyQuery(input, ctx) {
   const result = await request(ctx, {
     method: "POST",
     path: `/projects/${encodeURIComponent(ref)}/database/query/read-only`,
-    body: compact({
+    body: compactDefined({
       // SQL 不去空白:缩进与换行是语义的一部分(上游 optionalRawString)。
       query: typeof input.query === "string" ? input.query : void 0,
       parameters: Array.isArray(input.parameters) ? input.parameters : void 0

package/dist/{tavily-YCG5VQMH.js → tavily-YFSDEUTL.js}

@@ -1,92 +1,67 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  messageFrom
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
-  TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/tavily/api.ts
 var SERVICE = "tavily";
-var API_BASE = "https://api.tavily.com";
 var REQUEST_TIMEOUT_MS = 3e4;
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
-function errorMessage(payload, status) {
-  if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const body = record(payload);
-  return text(body?.detail) ?? text(body?.error) ?? text(body?.message) ?? `Tavily \u8FD4\u56DE HTTP ${status}`;
-}
+var http = createProviderHttpClient({ baseUrl: "https://api.tavily.com/", service: SERVICE });
 async function request(ctx, options) {
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-  };
-  if (options.body !== void 0) headers["content-type"] = "application/json";
-  let response;
-  try {
-    response = await guardedFetch(`${API_BASE}${options.path}`, {
-      method: options.method,
-      headers,
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-      ...options.body === void 0 ? {} : { body: JSON.stringify(options.body) }
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    if (error instanceof Error && error.name === "TimeoutError") {
-      throw upstreamError(504, `Tavily ${REQUEST_TIMEOUT_MS / 1e3}s \u5185\u6CA1\u6709\u8FD4\u56DE`);
-    }
-    throw upstreamError(502, error instanceof Error ? `Tavily \u8BF7\u6C42\u5931\u8D25:${error.message}` : "Tavily \u8BF7\u6C42\u5931\u8D25");
-  }
-  const raw = await response.text().catch(() => "");
-  let payload = null;
-  if (raw !== "") {
-    try {
-      payload = JSON.parse(raw);
-    } catch {
-      if (response.ok) throw upstreamError(502, "Tavily \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94");
-      payload = raw;
-    }
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload, response.status));
-  if (raw === "") return {};
-  const result = record(payload);
+  const { data } = await http.request({
+    path: options.path,
+    method: options.method,
+    headers: {
+      accept: "application/json",
+      authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
+    },
+    ...options.body === void 0 ? {} : { json: options.body },
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    invalidJsonMessage: "Tavily \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
+    mapError: ({ data: payload, status }) => upstreamError(
+      status,
+      messageFrom(payload, ["detail", "error", "message"], `Tavily \u8FD4\u56DE HTTP ${status}`)
+    ),
+    mapTransportError: ({ kind, message }) => kind === "timeout" ? upstreamError(504, `Tavily ${REQUEST_TIMEOUT_MS / 1e3}s \u5185\u6CA1\u6709\u8FD4\u56DE`) : upstreamError(502, message === void 0 ? "Tavily \u8BF7\u6C42\u5931\u8D25" : `Tavily \u8BF7\u6C42\u5931\u8D25:${message}`)
+  });
+  if (data === void 0) return {};
+  const result = asJsonObject(data);
   if (result === void 0) throw upstreamError(502, "Tavily \u54CD\u5E94\u4E0D\u662F\u5BF9\u8C61");
   return result;
 }
 function search(input, ctx) {
-  return request(ctx, { method: "POST", path: "/search", body: input });
+  return request(ctx, { method: "POST", path: "search", body: input });
 }
 function extract(input, ctx) {
-  return request(ctx, { method: "POST", path: "/extract", body: input });
+  return request(ctx, { method: "POST", path: "extract", body: input });
 }
 function map(input, ctx) {
-  return request(ctx, { method: "POST", path: "/map", body: input });
+  return request(ctx, { method: "POST", path: "map", body: input });
 }
 function crawl(input, ctx) {
-  return request(ctx, { method: "POST", path: "/crawl", body: input });
+  return request(ctx, { method: "POST", path: "crawl", body: input });
 }
 function createResearch(input, ctx) {
-  return request(ctx, { method: "POST", path: "/research", body: input });
+  return request(ctx, { method: "POST", path: "research", body: input });
 }
 function getResearch(input, ctx) {
-  return request(ctx, { method: "GET", path: `/research/${encodeURIComponent(input.request_id)}` });
+  return request(ctx, { method: "GET", path: `research/${encodeURIComponent(input.request_id)}` });
 }
 function getUsage(_input, ctx) {
-  return request(ctx, { method: "GET", path: "/usage" });
+  return request(ctx, { method: "GET", path: "usage" });
 }
 
 // ../plugins/src/tavily/schema.ts