@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{chunk-BB6ZLMTU.js → chunk-TLNUIPFZ.js}

@@ -1,3 +1,6 @@
+import {
+  createGuardedFetch
+} from "./chunk-U5UHT7CX.js";
 import {
   AnnotationStore,
   CONTEXT_CAPABILITIES,
@@ -27,7 +30,6 @@ import {
   PG_SEARCH_TOOLS_TABLE,
   PG_SEARCH_WRITE_LOCK_KEY,
   PRESIGN_TTL_SEC_DEFAULT,
-  PRESIGN_TTL_SEC_MAX,
   RemoteAllowlistStore,
   SKILLHUB_CAPABILITIES,
   SKRegistryStore,
@@ -88,11 +90,24 @@ import {
   deviceFsHelpModel,
   deviceShellHelpModel,
   discriminatedUnion,
+  dispatchContextCmd,
+  dispatchContextUploadCmd,
+  dispatchSkillhubCmd,
   effectFor,
   email,
   encodeCallContext,
   encodeDeviceFrame,
   encodePluginCall,
+  external_exports,
+  feedbackDetailSchema,
+  feedbackListSchema,
+  feedbackRemoveResponseSchema,
+  feedbackSubmitRequestSchema,
+  feedbackSubmitResponseSchema,
+  feedbackViewSchema,
+  feedbackVoteRequestSchema,
+  healthResponseSchema,
+  helpJsonSchema,
   identify,
   intersection,
   isContextExpired,
@@ -101,23 +116,30 @@ import {
   iso_exports,
   lazy,
   literal,
+  livenessResponseSchema,
   looseObject,
   mintKey,
   negotiate,
-  normalizeCanonicalOrigin,
+  nodeInputSchema,
   normalizeEntryPath,
   normalizePath,
   normalizeToolSearchLimit,
   normalizeToolSearchPath,
   normalizeUpstreamError,
   number,
+  oauthAuthorizeRequestSchema,
+  oauthAuthorizeResponseSchema,
   object,
   objectBodyToBytes,
   optional,
   optionalMethodsForCapabilities,
+  parseContextCmdArgs,
   parseCredentialValues,
   parseFeedbackEntries,
   parseNodeInput,
+  parseNonNegativeIntEnv,
+  parsePortEnv,
+  parseRuntimeEnv,
   parseTokenResponse,
   parseVia,
   pgBulkInsertSql,
@@ -125,7 +147,9 @@ import {
   pluginTokenSecretName,
   prefixUpperBound,
   preprocess,
+  readinessResponseSchema,
   record,
+  registryNodeSchema,
   renderHelpDsl,
   renderHelpJson,
   renderHelpMarkdown,
@@ -141,59 +165,39 @@ import {
   skillhubScopeForCmd,
   storeUri,
   string,
+  tbErrorBodySchema,
   toJSONSchema,
   toolHelpModel,
+  toolSearchPageSchema,
+  toolSearchRequestSchema,
   toolSearchSnapshotDigest,
   toolsToHelpModel,
+  treeJsonSchema,
   union,
   unknown,
   url,
   validatePath,
   virtualizeTools
-} from "./chunk-YB2FLNWI.js";
+} from "./chunk-RVWZN3CI.js";
 
 // src/config.ts
 var DEFAULT_PORT = 8787;
-var DEFAULT_MAX_HOPS = 4;
 var DEFAULT_DEVICE_RECLAIM_SEC = 24 * 60 * 60;
 var DEFAULT_STORE_CLEANUP_INTERVAL_SEC = 15 * 60;
-function positiveIntEnv(value) {
-  const n = Number(value);
-  return Number.isFinite(n) && n > 0 ? Math.floor(n) : void 0;
-}
-function presignTtlEnv(value) {
-  const ttl = positiveIntEnv(value);
-  return ttl === void 0 ? void 0 : Math.min(ttl, PRESIGN_TTL_SEC_MAX);
-}
-function portEnv(value) {
-  if (value === void 0 || value === "") return void 0;
-  const n = Number(value);
-  return Number.isInteger(n) && n >= 0 && n <= 65535 ? n : void 0;
-}
 function configFromEnv(env = process.env) {
-  const allowInsecure = env.TB_ALLOW_INSECURE_HTTP === "true";
-  const allowlist = (env.TB_REMOTE_ALLOWLIST ?? "").split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+  const runtime = parseRuntimeEnv(env);
   const config = {
+    ...runtime,
     // TB_PORT 优先,PORT 兜底:Railway / Fly / Cloud Run / CF Container 等 PaaS 只注入
     // PORT,不认识 TB_PORT —— 不兜底的话容器会监听 8787 而平台探活另一个端口,部署直接失败。
-    port: portEnv(env.TB_PORT) ?? portEnv(env.PORT) ?? DEFAULT_PORT,
+    port: parsePortEnv(env.TB_PORT) ?? parsePortEnv(env.PORT) ?? DEFAULT_PORT,
     host: env.TB_HOST !== void 0 && env.TB_HOST.length > 0 ? env.TB_HOST : "0.0.0.0",
     dataDir: env.TB_DATA_DIR !== void 0 && env.TB_DATA_DIR.length > 0 ? env.TB_DATA_DIR : "./data",
-    allowInsecureHttp: allowInsecure,
     allowInsecureBootstrap: env.TB_ALLOW_INSECURE_BOOTSTRAP === "true",
-    remote: {
-      allowlist,
-      maxHops: positiveIntEnv(env.TB_MAX_HOPS) ?? DEFAULT_MAX_HOPS,
-      ...env.TB_INSTANCE_ID !== void 0 && env.TB_INSTANCE_ID.length > 0 ? { instanceId: env.TB_INSTANCE_ID } : {},
-      allowInsecure
-    },
-    deviceReclaimSec: positiveIntEnv(env.TB_DEVICE_RECLAIM_SEC) ?? DEFAULT_DEVICE_RECLAIM_SEC,
-    storeCleanupIntervalSec: positiveIntEnv(env.TB_STORE_CLEANUP_INTERVAL_SEC) ?? DEFAULT_STORE_CLEANUP_INTERVAL_SEC,
-    // 0 合法(立即关停,本地/单机默认);positiveIntEnv 拒 0,故单独解析。
-    shutdownDrainSec: (() => {
-      const n = Number(env.TB_SHUTDOWN_DRAIN_SEC);
-      return Number.isInteger(n) && n >= 0 ? n : 0;
-    })()
+    deviceReclaimSec: runtime.deviceReclaimSec ?? DEFAULT_DEVICE_RECLAIM_SEC,
+    storeCleanupIntervalSec: runtime.storeCleanupIntervalSec ?? DEFAULT_STORE_CLEANUP_INTERVAL_SEC,
+    // 0 合法(立即关停，本地/单机默认)。
+    shutdownDrainSec: parseNonNegativeIntEnv(env.TB_SHUTDOWN_DRAIN_SEC) ?? 0
   };
   if (env.TB_UI_DIR !== void 0 && env.TB_UI_DIR.length > 0) config.uiDir = env.TB_UI_DIR;
   if (env.TB_DATABASE_URL !== void 0 && env.TB_DATABASE_URL.length > 0) {
@@ -230,47 +234,9 @@ function configFromEnv(env = process.env) {
   if (env.TB_BOOTSTRAP_ADMIN_SK !== void 0 && env.TB_BOOTSTRAP_ADMIN_SK.length > 0) {
     config.adminSk = env.TB_BOOTSTRAP_ADMIN_SK;
   }
-  const canonicalOrigin = normalizeCanonicalOrigin(env.TB_CANONICAL_ORIGIN);
-  if (canonicalOrigin !== void 0) config.canonicalOrigin = canonicalOrigin;
   if (env.TB_SECRET_ENCRYPTION_KEY !== void 0 && env.TB_SECRET_ENCRYPTION_KEY.length > 0) {
     config.encryptionKey = env.TB_SECRET_ENCRYPTION_KEY;
   }
-  const ttl = positiveIntEnv(env.TB_TOOL_CACHE_TTL);
-  if (ttl !== void 0) config.toolCacheTtlSec = ttl;
-  const refThreshold = positiveIntEnv(env.TB_REF_THRESHOLD_BYTES);
-  if (refThreshold !== void 0) config.refThresholdBytes = refThreshold;
-  const refTtl = presignTtlEnv(env.TB_REF_TTL_SEC);
-  if (refTtl !== void 0) config.refTtlSec = refTtl;
-  const uploadGrantTtl = presignTtlEnv(env.TB_UPLOAD_GRANT_TTL_SEC);
-  if (uploadGrantTtl !== void 0) config.uploadGrantTtlSec = uploadGrantTtl;
-  const storeMaxObjectBytes = positiveIntEnv(env.TB_STORE_MAX_OBJECT_BYTES);
-  if (storeMaxObjectBytes !== void 0) config.storeMaxObjectBytes = storeMaxObjectBytes;
-  const storeRelayMaxBytes = positiveIntEnv(env.TB_STORE_RELAY_MAX_BYTES);
-  if (storeRelayMaxBytes !== void 0) config.storeRelayMaxBytes = storeRelayMaxBytes;
-  const storeUploadTtlSec = presignTtlEnv(env.TB_STORE_UPLOAD_TTL_SEC);
-  if (storeUploadTtlSec !== void 0) config.storeUploadTtlSec = storeUploadTtlSec;
-  const storeShareTtlSec = presignTtlEnv(env.TB_STORE_SHARE_TTL_SEC);
-  if (storeShareTtlSec !== void 0) config.storeShareTtlSec = storeShareTtlSec;
-  const storeReadTtlSec = presignTtlEnv(env.TB_STORE_READ_TTL_SEC);
-  if (storeReadTtlSec !== void 0) config.storeReadTtlSec = storeReadTtlSec;
-  const storeCallMaxBytes = positiveIntEnv(env.TB_STORE_CALL_MAX_BYTES);
-  if (storeCallMaxBytes !== void 0) config.storeCallMaxBytes = storeCallMaxBytes;
-  const storeCallMaxObjectBytes = positiveIntEnv(env.TB_STORE_CALL_MAX_OBJECT_BYTES);
-  if (storeCallMaxObjectBytes !== void 0) {
-    config.storeCallMaxObjectBytes = storeCallMaxObjectBytes;
-  }
-  const storeCallMaxObjects = positiveIntEnv(env.TB_STORE_CALL_MAX_OBJECTS);
-  if (storeCallMaxObjects !== void 0) config.storeCallMaxObjects = storeCallMaxObjects;
-  const storeCallAllowedContentTypes = (env.TB_STORE_CALL_ALLOWED_CONTENT_TYPES ?? "").split(",").map((value) => value.trim()).filter((value) => value.length > 0);
-  if (storeCallAllowedContentTypes.length > 0) {
-    config.storeCallAllowedContentTypes = storeCallAllowedContentTypes;
-  }
-  if (env.TB_STORE_TOKEN_SECRET !== void 0 && env.TB_STORE_TOKEN_SECRET.length > 0) {
-    if (env.TB_STORE_TOKEN_SECRET.length < 16) {
-      throw new Error("TB_STORE_TOKEN_SECRET \u81F3\u5C11\u9700\u8981 16 \u4E2A\u5B57\u7B26");
-    }
-    config.storeTokenSecret = env.TB_STORE_TOKEN_SECRET;
-  }
   return config;
 }
 
@@ -607,6 +573,48 @@ async function presignS3Put(client, url2, ttlSec, opts) {
   return { method: "PUT", url: signed.url, headers };
 }
 
+// ../app/src/objectBodyStream.ts
+function toWebObjectBodyStream(source, options = {}) {
+  const reader = source.getReader();
+  let released = false;
+  const release = () => {
+    if (released) return;
+    released = true;
+    reader.releaseLock();
+  };
+  const strategy = options.highWaterMark === void 0 ? void 0 : { highWaterMark: options.highWaterMark };
+  return new ReadableStream({
+    async pull(controller) {
+      try {
+        const { done, value } = await reader.read();
+        if (done) {
+          release();
+          controller.close();
+        } else if (value !== void 0) {
+          controller.enqueue(value);
+        }
+      } catch (error) {
+        try {
+          release();
+        } catch {
+        }
+        controller.error(error);
+      }
+    },
+    async cancel(reason) {
+      try {
+        if (reader.cancel !== void 0) await reader.cancel(reason);
+        else await source.cancel?.(reason);
+      } finally {
+        try {
+          release();
+        } catch {
+        }
+      }
+    }
+  }, strategy);
+}
+
 // ../app/src/providers/s3Object.ts
 var META_HEADER_PREFIX = "x-amz-meta-";
 function stripEtagQuotes(etag) {
@@ -637,16 +645,12 @@ function createS3ObjectStore(cfg, opts) {
   const secErr = assertSecureUrl(cfg.endpoint, opts.allowInsecure);
   if (secErr) throw secErr;
   const client = new AwsClient({
-    accessKeyId: cfg.accessKeyId,
-    secretAccessKey: cfg.secretAccessKey,
-    service: "s3",
-    region: cfg.region ?? "auto"
-  });
-  const putClient = new AwsClient({
     accessKeyId: cfg.accessKeyId,
     secretAccessKey: cfg.secretAccessKey,
     service: "s3",
     region: cfg.region ?? "auto",
+    // Store 的重试由上层按操作幂等性统一决定。传输层不得自动重放写入，
+    // 也不能让读/删路径悄悄继承 aws4fetch 的默认 10 次重试。
     retries: 0
   });
   const base = cfg.endpoint.replace(/\/+$/, "");
@@ -670,38 +674,7 @@ function createS3ObjectStore(cfg, opts) {
     if (body instanceof Uint8Array) {
       return body.buffer instanceof ArrayBuffer ? new Uint8Array(body.buffer, body.byteOffset, body.byteLength) : new Uint8Array(body);
     }
-    const source = body;
-    const reader = source.getReader();
-    return new ReadableStream({
-      async pull(controller) {
-        try {
-          const chunk = await reader.read();
-          if (chunk.done) {
-            reader.releaseLock();
-            controller.close();
-          } else if (chunk.value !== void 0) {
-            controller.enqueue(chunk.value);
-          }
-        } catch (error) {
-          try {
-            reader.releaseLock();
-          } catch {
-          }
-          controller.error(error);
-        }
-      },
-      async cancel(reason) {
-        try {
-          if (reader.cancel !== void 0) await reader.cancel(reason);
-          else await source.cancel?.(reason);
-        } finally {
-          try {
-            reader.releaseLock();
-          } catch {
-          }
-        }
-      }
-    }, { highWaterMark: 0 });
+    return toWebObjectBodyStream(body, { highWaterMark: 0 });
   };
   const metaFromHeaders = (key, headers) => {
     const metadata = {};
@@ -750,7 +723,7 @@ function createS3ObjectStore(cfg, opts) {
       }
       if (putOpts?.ifMatchEtag !== void 0) headers["if-match"] = `"${putOpts.ifMatchEtag}"`;
       if (putOpts?.ifNoneMatch !== void 0) headers["if-none-match"] = putOpts.ifNoneMatch;
-      const resp = await s3FetchWith(putClient, urlFor(key), {
+      const resp = await s3Fetch(urlFor(key), {
         method: "PUT",
         headers,
         body: fetchBody(body)
@@ -1256,8 +1229,8 @@ async function defaultStoreRuntime(deps) {
     service: new StoreService(deps.state, objects, serviceOptions(deps, tokenSecret))
   };
 }
-function requestOrigin(runtime, deps) {
-  const raw = deps.canonicalOrigin ?? runtime?.requestOrigin;
+function resolveStoreRequestOrigin(rawRequestOrigin, canonicalOrigin) {
+  const raw = rawRequestOrigin ?? canonicalOrigin;
   if (raw === void 0) {
     throw new TBError("unavailable", "request origin is unavailable", { retryable: false });
   }
@@ -1270,11 +1243,26 @@ function requestOrigin(runtime, deps) {
   if (url2.protocol !== "https:" && url2.protocol !== "http:" || url2.username !== "" || url2.password !== "") {
     throw new TBError("unavailable", "request origin is invalid", { retryable: false });
   }
+  if (rawRequestOrigin !== void 0 && canonicalOrigin !== void 0) {
+    let canonical;
+    try {
+      canonical = new URL(canonicalOrigin);
+    } catch {
+      throw new TBError("unavailable", "canonical origin is invalid", { retryable: false });
+    }
+    if (canonical.protocol !== "https:" && canonical.protocol !== "http:" || canonical.username !== "" || canonical.password !== "") {
+      throw new TBError("unavailable", "canonical origin is invalid", { retryable: false });
+    }
+    url2.protocol = canonical.protocol;
+  }
   return url2.origin;
 }
-function storeUploadGrant(start, origin2) {
+function requestOrigin(runtime, deps) {
+  return resolveStoreRequestOrigin(runtime?.requestOrigin, deps.canonicalOrigin);
+}
+function storeUploadGrant(start, origin) {
   const useRelay = start.alreadyCompleted || start.signedRequest === void 0;
-  const url2 = useRelay ? `${origin2}/~store/uploads/${encodeURIComponent(start.uploadId)}` : start.signedRequest.url;
+  const url2 = useRelay ? `${origin}/~store/uploads/${encodeURIComponent(start.uploadId)}` : start.signedRequest.url;
   const headers = useRelay ? { [STORE_UPLOAD_HEADER]: start.uploadToken } : start.signedRequest.headers;
   return {
     uploadId: start.uploadId,
@@ -1369,10 +1357,10 @@ function lazyDefaultStoreModule(deps) {
     }
   };
 }
-async function beginCapabilityUpload(deps, input, capabilityToken, origin2) {
+async function beginCapabilityUpload(deps, input, capabilityToken, origin) {
   const store = await defaultStoreRuntime(deps);
   const start = await store.service.beginCallUpload(input, capabilityToken);
-  return storeUploadGrant(start, origin2);
+  return storeUploadGrant(start, origin);
 }
 async function completeCapabilityUpload(deps, uploadId2, uploadToken) {
   return await (await defaultStoreRuntime(deps)).service.completeUploadWithToken(
@@ -1400,37 +1388,7 @@ async function relayStoreUpload(deps, uploadId2, uploadToken, body) {
 async function storeObjectResponse(objects, object2) {
   const got = await objects.get(object2.driverKey);
   if (got === null) throw TBError.notFound("not found");
-  const reader = got.body.getReader();
-  const body = new ReadableStream({
-    async pull(controller) {
-      try {
-        const chunk = await reader.read();
-        if (chunk.done) {
-          reader.releaseLock();
-          controller.close();
-        } else if (chunk.value !== void 0) {
-          controller.enqueue(chunk.value);
-        }
-      } catch (error) {
-        try {
-          reader.releaseLock();
-        } catch {
-        }
-        controller.error(error);
-      }
-    },
-    async cancel(reason) {
-      try {
-        if (reader.cancel !== void 0) await reader.cancel(reason);
-        else await got.body.cancel?.(reason);
-      } finally {
-        try {
-          reader.releaseLock();
-        } catch {
-        }
-      }
-    }
-  });
+  const body = toWebObjectBodyStream(got.body);
   return new Response(body, {
     headers: {
       "content-type": object2.contentType,
@@ -1502,7 +1460,6 @@ function cleanupProgress(value) {
     "objects",
     "shares",
     "callCapabilities",
-    "driverObjects",
     "idempotencyBindings"
   ]) {
     const cursor = cursors[field];
@@ -1516,7 +1473,6 @@ function emptyCleanupResult() {
   return {
     abandonedObjects: 0,
     deletedBytes: 0,
-    deletedOrphans: 0,
     deletedStaging: 0,
     expiredCallCapabilities: 0,
     expiredIdempotencyBindings: 0,
@@ -1527,7 +1483,6 @@ function emptyCleanupResult() {
 function addCleanupResult(target, page) {
   target.abandonedObjects += page.abandonedObjects;
   target.deletedBytes += page.deletedBytes;
-  target.deletedOrphans += page.deletedOrphans;
   target.deletedStaging += page.deletedStaging;
   target.expiredCallCapabilities += page.expiredCallCapabilities;
   target.expiredIdempotencyBindings += page.expiredIdempotencyBindings;
@@ -5804,8 +5759,8 @@ var LADDER_ERROR_HTTP_STATUS = {
 function parseSchema(schema, data) {
   return safeParse(schema, data);
 }
-function shapeKeys(schemas) {
-  return new Set(schemas.flatMap((schema) => Object.keys(schema.shape)));
+function shapeKeys(schemas2) {
+  return new Set(schemas2.flatMap((schema) => Object.keys(schema.shape)));
 }
 function isStandardSchema(schema) {
   if (schema == null) return false;
@@ -10980,14 +10935,14 @@ var require_core$3 = /* @__PURE__ */ __commonJSMin(((exports) => {
       }
       return metaSchema;
     }
-    _removeAllSchemas(schemas, regex3) {
-      for (const keyRef in schemas) {
-        const sch = schemas[keyRef];
+    _removeAllSchemas(schemas2, regex3) {
+      for (const keyRef in schemas2) {
+        const sch = schemas2[keyRef];
         if (!regex3 || regex3.test(keyRef)) {
-          if (typeof sch == "string") delete schemas[keyRef];
+          if (typeof sch == "string") delete schemas2[keyRef];
           else if (sch && !sch.meta) {
             this._cache.delete(sch.schema);
-            delete schemas[keyRef];
+            delete schemas2[keyRef];
           }
         }
       }
@@ -19288,8 +19243,8 @@ var GatewayMcpOAuthProvider = class {
   }
   get redirectUrl() {
     if (this.opts.redirectUri !== void 0) return this.opts.redirectUri;
-    const origin2 = this.opts.origin ?? "https://tool-bridge.invalid";
-    return `${origin2}${OAUTH_CALLBACK_PATH}`;
+    const origin = this.opts.origin ?? "https://tool-bridge.invalid";
+    return `${origin}${OAUTH_CALLBACK_PATH}`;
   }
   get clientMetadata() {
     return {
@@ -19738,15 +19693,6 @@ async function clientCredential(secrets, authRef) {
     ...values.clientSecret === void 0 ? {} : { clientSecret: values.clientSecret }
   };
 }
-function parseTokenErrorMessage(payload) {
-  if (typeof payload !== "object" || payload === null || Array.isArray(payload)) return void 0;
-  const record2 = payload;
-  for (const key of ["error_description", "error", "msg", "message"]) {
-    const value = record2[key];
-    if (typeof value === "string" && value !== "") return value;
-  }
-  return void 0;
-}
 async function writeTokens(store, nodePath, next, previous) {
   const merged = {
     ...next,
@@ -19770,10 +19716,10 @@ async function requestTokens(opts) {
   let response;
   try {
     response = await opts.fetcher(endpoint, { method: "POST", headers, body });
-  } catch (err) {
+  } catch {
     throw new TBError(
       "unavailable",
-      `\u4EE4\u724C\u7AEF\u70B9\u4E0D\u53EF\u8FBE:${err instanceof Error ? err.message : String(err)}`,
+      "\u4EE4\u724C\u7AEF\u70B9\u4E0D\u53EF\u8FBE",
       { retryable: true }
     );
   }
@@ -19785,14 +19731,20 @@ async function requestTokens(opts) {
     payload = null;
   }
   if (!response.ok) {
-    const parsed = payload === null ? void 0 : parseTokenErrorMessage(payload);
-    const detail = parsed ?? `HTTP ${response.status}`;
+    const detail = `HTTP ${response.status}`;
     if (response.status >= 500) {
       throw new TBError("unavailable", `\u4EE4\u724C\u7AEF\u70B9\u8FD4\u56DE ${detail}`, { retryable: true });
     }
     throw new TBError("invalid_argument", `\u4EE4\u724C\u7AEF\u70B9\u62D2\u7EDD\u4E86\u8BF7\u6C42:${detail}`);
   }
-  return parseTokenResponse(payload, opts.config, opts.now);
+  try {
+    return parseTokenResponse(payload, opts.config, opts.now);
+  } catch (err) {
+    if (isTBError(err) && err.code === "invalid_argument") {
+      throw new TBError("invalid_argument", "\u4EE4\u724C\u7AEF\u70B9\u8FD4\u56DE\u4E86\u65E0\u6548\u54CD\u5E94");
+    }
+    throw err;
+  }
 }
 function base64url(bytes) {
   let binary = "";
@@ -19804,7 +19756,14 @@ async function createPkce() {
   const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(verifier));
   return { verifier, challenge: base64url(new Uint8Array(digest)) };
 }
+function requireProviderOAuthFetch(fetcher) {
+  if (fetcher === void 0) {
+    throw new TBError("unavailable", "Provider OAuth \u51FA\u7AD9\u901A\u9053\u672A\u914D\u7F6E", { retryable: false });
+  }
+  return fetcher;
+}
 async function startProviderAuthorization(opts) {
+  const fetcher = requireProviderOAuthFetch(opts.fetcher);
   const existing = await readTokens(opts.store, opts.nodePath);
   if (existing !== void 0 && !shouldRefresh(existing, opts.now)) {
     return { status: "authorized" };
@@ -19814,7 +19773,7 @@ async function startProviderAuthorization(opts) {
       const client2 = await clientCredential(opts.secrets, opts.authRef);
       const refreshed = await requestTokens({
         config: opts.config,
-        fetcher: opts.fetcher,
+        fetcher,
         now: opts.now,
         grant: { refreshToken: existing.refreshToken },
         ...client2
@@ -19847,10 +19806,11 @@ async function startProviderAuthorization(opts) {
   };
 }
 async function finishProviderAuthorization(opts) {
+  const fetcher = requireProviderOAuthFetch(opts.fetcher);
   const client = await clientCredential(opts.secrets, opts.authRef);
   const tokens = await requestTokens({
     config: opts.config,
-    fetcher: opts.fetcher,
+    fetcher,
     now: opts.now,
     grant: { code: opts.code, redirectUri: opts.origin + PROVIDER_OAUTH_CALLBACK_PATH },
     ...opts.codeVerifier === "" ? {} : { codeVerifier: opts.codeVerifier },
@@ -19859,6 +19819,7 @@ async function finishProviderAuthorization(opts) {
   await writeTokens(opts.store, opts.nodePath, tokens);
 }
 async function resolveProviderAccessToken(opts) {
+  const fetcher = requireProviderOAuthFetch(opts.fetcher);
   const tokens = await readTokens(opts.store, opts.nodePath);
   if (tokens === void 0) throw providerReauthorizeRequired(opts.nodePath);
   if (opts.force !== true && !shouldRefresh(tokens, opts.now)) return tokens.accessToken;
@@ -19868,7 +19829,7 @@ async function resolveProviderAccessToken(opts) {
   try {
     refreshed = await requestTokens({
       config: opts.config,
-      fetcher: opts.fetcher,
+      fetcher,
       now: opts.now,
       grant: { refreshToken: tokens.refreshToken },
       ...client
@@ -19972,7 +19933,7 @@ async function providerAccessTokenFor(opts) {
     config: opts.config,
     encryptionKey,
     ...opts.force === true ? { force: true } : {},
-    fetcher: fetch,
+    fetcher: opts.deps.providerOAuthFetch,
     nodePath: opts.nodePath,
     now: /* @__PURE__ */ new Date(),
     // 调用期不需要 origin(只在构造授权 URL 时用);传空串会被 buildAuthorizationUrl 用到,
@@ -20313,11 +20274,11 @@ async function contextProviderFor(node, cfg, deps, requestUrl) {
   if (deps.refTtlSec !== void 0) opts.presignTtlSec = deps.refTtlSec;
   const encKey = deps.encryptionKey;
   if (encKey !== void 0) {
-    const origin2 = new URL(requestUrl).origin;
+    const origin = new URL(requestUrl).origin;
     const relayTtlSec = deps.refTtlSec ?? PRESIGN_TTL_SEC_DEFAULT;
     opts.relayRefUrl = async (key) => {
       const exp = Math.floor(Date.now() / 1e3) + relayTtlSec;
-      return `${origin2}/~ref/${await signRefToken({ p: node.path, k: key, exp }, encKey)}`;
+      return `${origin}/~ref/${await signRefToken({ p: node.path, k: key, exp }, encKey)}`;
     };
   }
   return createObjectContextProvider(objects, opts);
@@ -20338,69 +20299,20 @@ async function skillhubProviderFor(node, cfg, deps, requestUrl) {
   if (deps.refTtlSec !== void 0) opts.presignTtlSec = deps.refTtlSec;
   const encKey = deps.encryptionKey;
   if (encKey !== void 0) {
-    const origin2 = new URL(requestUrl).origin;
+    const origin = new URL(requestUrl).origin;
     const relayTtlSec = deps.refTtlSec ?? PRESIGN_TTL_SEC_DEFAULT;
     opts.relayRefUrl = async (key) => {
       const exp = Math.floor(Date.now() / 1e3) + relayTtlSec;
-      return `${origin2}/~ref/${await signRefToken({ p: node.path, k: key, exp }, encKey)}`;
+      return `${origin}/~ref/${await signRefToken({ p: node.path, k: key, exp }, encKey)}`;
     };
   }
   return createSkillhubProvider(objects, opts);
 }
-async function dispatchSkillhubCmd(provider, command, args) {
-  switch (command.toLowerCase()) {
-    case "list":
-      return await provider.list(args.opts);
-    case "get":
-      return typeof args.file === "string" ? await provider.get_file(args.id, args.file) : await provider.get(args.id);
-    case "search":
-      return await provider.search(args.query, args.opts);
-    case "publish":
-      if (!Array.isArray(args.files)) {
-        throw new TBError("invalid_argument", "publish \u9700\u8981\u6570\u7EC4 'files'");
-      }
-      return await provider.publish({
-        ...typeof args.id === "string" ? { id: args.id } : {},
-        files: args.files
-      });
-    case "remove":
-      return await provider.remove(args.id);
-    default:
-      throw new TBError("invalid_argument", `unknown cmd '${command}'`);
-  }
-}
-async function dispatchContextCmd(provider, command, args) {
-  const unimplemented = () => {
-    throw new TBError("invalid_argument", `unknown cmd '${command}'(provider \u672A\u5B9E\u73B0)`);
-  };
-  switch (command.toLowerCase()) {
-    case "list":
-      if (provider.list === void 0) return unimplemented();
-      return await provider.list(args.path ?? "", args.opts);
-    case "get":
-      if (provider.get === void 0) return unimplemented();
-      return await provider.get(args.path);
-    case "write":
-      if (provider.write === void 0) return unimplemented();
-      if (typeof args.entry !== "object" || args.entry === null) {
-        throw new TBError("invalid_argument", "write \u9700\u8981\u5BF9\u8C61 'entry'");
-      }
-      return await provider.write(args.path, args.entry);
-    case "update":
-      if (provider.update === void 0) return unimplemented();
-      if (typeof args.patch !== "object" || args.patch === null) {
-        throw new TBError("invalid_argument", "update \u9700\u8981\u5BF9\u8C61 'patch'");
-      }
-      return await provider.update(args.path, args.patch);
-    case "delete":
-      if (provider.delete === void 0) return unimplemented();
-      return await provider.delete(args.path);
-    case "search":
-      if (provider.search === void 0) return unimplemented();
-      return await provider.search(args.query, args.opts);
-    default:
-      throw new TBError("invalid_argument", `unknown cmd '${command}'`);
-  }
+async function dispatchSkillhubCmd2(provider, command, args) {
+  return await dispatchSkillhubCmd(provider, command, args);
+}
+async function dispatchContextCmd2(provider, command, args) {
+  return await dispatchContextCmd(provider, command, args);
 }
 async function assertContextAlive(node, cfg, registry) {
   if (!isContextExpired(node.createdAt, cfg.ttl, Date.now())) return;
@@ -23845,8 +23757,8 @@ var LADDER_ERROR_HTTP_STATUS2 = {
   [ProtocolErrorCode2.MissingRequiredClientCapability]: 400,
   [HEADER_MISMATCH_ERROR_CODE2]: 400
 };
-function httpStatusForErrorCode(code, origin2) {
-  if (origin2 === "in-band") return code === ProtocolErrorCode2.MissingRequiredClientCapability ? 400 : 200;
+function httpStatusForErrorCode(code, origin) {
+  if (origin === "in-band") return code === ProtocolErrorCode2.MissingRequiredClientCapability ? 400 : 200;
   return LADDER_ERROR_HTTP_STATUS2[code] ?? 400;
 }
 function rejection(rung, cell, httpStatus, error, settled) {
@@ -24059,8 +23971,8 @@ function modernOnlyStrictRejection(route, supportedVersions) {
 function parseSchema2(schema, data) {
   return safeParse(schema, data);
 }
-function shapeKeys2(schemas) {
-  return new Set(schemas.flatMap((schema) => Object.keys(schema.shape)));
+function shapeKeys2(schemas2) {
+  return new Set(schemas2.flatMap((schema) => Object.keys(schema.shape)));
 }
 function isStandardSchema2(schema) {
   if (schema == null) return false;
@@ -29157,14 +29069,14 @@ var require_core$32 = /* @__PURE__ */ __commonJSMin2(((exports) => {
       }
       return metaSchema;
     }
-    _removeAllSchemas(schemas, regex3) {
-      for (const keyRef in schemas) {
-        const sch = schemas[keyRef];
+    _removeAllSchemas(schemas2, regex3) {
+      for (const keyRef in schemas2) {
+        const sch = schemas2[keyRef];
         if (!regex3 || regex3.test(keyRef)) {
-          if (typeof sch == "string") delete schemas[keyRef];
+          if (typeof sch == "string") delete schemas2[keyRef];
           else if (sch && !sch.meta) {
             this._cache.delete(sch.schema);
-            delete schemas[keyRef];
+            delete schemas2[keyRef];
           }
         }
       }
@@ -36523,6 +36435,273 @@ async function passthroughRemote(opts) {
 // ../app/src/tbApp.ts
 import { Hono } from "hono";
 
+// ../core/src/protocol/openapi.ts
+var schemaRegistry = external_exports.registry();
+var schemas = {
+  Error: tbErrorBodySchema,
+  FeedbackDetail: feedbackDetailSchema,
+  FeedbackList: feedbackListSchema,
+  FeedbackRemoveResponse: feedbackRemoveResponseSchema,
+  FeedbackSubmitRequest: feedbackSubmitRequestSchema,
+  FeedbackSubmitResponse: feedbackSubmitResponseSchema,
+  FeedbackView: feedbackViewSchema,
+  FeedbackVoteRequest: feedbackVoteRequestSchema,
+  Health: healthResponseSchema,
+  Help: helpJsonSchema,
+  Liveness: livenessResponseSchema,
+  NodeInput: nodeInputSchema,
+  OAuthAuthorizeRequest: oauthAuthorizeRequestSchema,
+  OAuthAuthorizeResponse: oauthAuthorizeResponseSchema,
+  Readiness: readinessResponseSchema,
+  RegistryNode: registryNodeSchema,
+  SearchRequest: toolSearchRequestSchema,
+  SearchResponse: toolSearchPageSchema,
+  Tree: treeJsonSchema
+};
+for (const [id, schema] of Object.entries(schemas)) schemaRegistry.add(schema, { id });
+function asOpenApiSchema(value) {
+  if (Array.isArray(value)) return value.map(asOpenApiSchema);
+  if (value === null || typeof value !== "object") return value;
+  const out = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (key === "$schema") continue;
+    if (key === "$ref" && typeof entry === "string" && !entry.startsWith("#/")) {
+      out[key] = `#/components/schemas/${entry}`;
+    } else {
+      out[key] = asOpenApiSchema(entry);
+    }
+  }
+  return out;
+}
+var generated = external_exports.toJSONSchema(schemaRegistry);
+var componentSchemas = Object.fromEntries(
+  Object.entries(generated.schemas).map(([name, schema]) => [name, asOpenApiSchema(schema)])
+);
+var jsonContent = (schema) => ({
+  "application/json": { schema: { $ref: `#/components/schemas/${schema}` } }
+});
+var jsonResponse = (description, schema) => ({
+  description,
+  content: jsonContent(schema)
+});
+var errorResponses = {
+  400: jsonResponse("Invalid request", "Error"),
+  401: jsonResponse("Unauthenticated", "Error"),
+  403: jsonResponse("Permission denied", "Error"),
+  404: jsonResponse("Not found or not visible", "Error"),
+  409: jsonResponse("Conflict", "Error"),
+  429: jsonResponse("Rate limited", "Error"),
+  500: jsonResponse("Internal error", "Error"),
+  503: jsonResponse("Unavailable", "Error")
+};
+var bearerSecurity = [{ bearerAuth: [] }];
+var pathParameter = {
+  in: "path",
+  name: "path",
+  required: true,
+  description: "Slash-delimited Tool Bridge tree path; each segment is URL encoded.",
+  schema: { type: "string" }
+};
+var fixedControlPlaneOpenApi = {
+  openapi: "3.1.0",
+  info: {
+    title: "Tool Bridge fixed control plane",
+    version: "1.0.0"
+  },
+  components: {
+    securitySchemes: {
+      bearerAuth: { type: "http", scheme: "bearer" }
+    },
+    schemas: componentSchemas
+  },
+  paths: {
+    "/healthz": {
+      get: {
+        operationId: "getHealth",
+        security: [],
+        responses: { 200: jsonResponse("Deployment health", "Health") }
+      }
+    },
+    "/livez": {
+      get: {
+        operationId: "getLiveness",
+        security: [],
+        responses: { 200: jsonResponse("Process liveness", "Liveness") }
+      }
+    },
+    "/readyz": {
+      get: {
+        operationId: "getReadiness",
+        security: [],
+        responses: {
+          200: jsonResponse("Ready", "Readiness"),
+          503: jsonResponse("Not ready", "Readiness")
+        }
+      }
+    },
+    "/~help": {
+      get: {
+        operationId: "getRootHelp",
+        security: bearerSecurity,
+        parameters: [{
+          in: "query",
+          name: "schemas",
+          schema: { type: "string", enum: ["1"] }
+        }],
+        responses: { 200: jsonResponse("Root HTBP help", "Help"), ...errorResponses }
+      }
+    },
+    "/{path}/~help": {
+      get: {
+        "operationId": "getHelp",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, {
+          in: "query",
+          name: "schemas",
+          schema: { type: "string", enum: ["1"] }
+        }],
+        "responses": { 200: jsonResponse("HTBP help", "Help"), ...errorResponses },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/~tree": {
+      get: {
+        operationId: "getRootTree",
+        security: bearerSecurity,
+        parameters: [{ in: "query", name: "depth", schema: { type: "integer", minimum: 1, maximum: 8 } }],
+        responses: { 200: jsonResponse("Root tree", "Tree"), ...errorResponses }
+      }
+    },
+    "/{path}/~tree": {
+      get: {
+        "operationId": "getTree",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, {
+          in: "query",
+          name: "depth",
+          schema: { type: "integer", minimum: 1, maximum: 8 }
+        }],
+        "responses": { 200: jsonResponse("Subtree", "Tree"), ...errorResponses },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/~search": {
+      post: {
+        operationId: "searchTools",
+        security: bearerSecurity,
+        requestBody: { required: true, content: jsonContent("SearchRequest") },
+        responses: { 200: jsonResponse("Visible tool page", "SearchResponse"), ...errorResponses }
+      }
+    },
+    "/{path}/~authorize": {
+      post: {
+        "operationId": "startOAuthAuthorization",
+        "security": bearerSecurity,
+        "parameters": [pathParameter],
+        "requestBody": { required: false, content: jsonContent("OAuthAuthorizeRequest") },
+        "responses": {
+          200: jsonResponse("Authorization status or redirect", "OAuthAuthorizeResponse"),
+          ...errorResponses
+        },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/{path}/~register": {
+      post: {
+        "operationId": "registerNode",
+        "security": bearerSecurity,
+        "parameters": [pathParameter],
+        "requestBody": { required: true, content: jsonContent("NodeInput") },
+        "responses": {
+          200: jsonResponse("Registered node", "RegistryNode"),
+          ...errorResponses
+        },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/{path}/~feedback": {
+      get: {
+        "operationId": "listFeedback",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, {
+          in: "query",
+          name: "hidden",
+          schema: { type: "string", enum: ["1"] }
+        }],
+        "responses": { 200: jsonResponse("Feedback list", "FeedbackList"), ...errorResponses },
+        "x-tool-bridge-greedy-path": true
+      },
+      post: {
+        "operationId": "submitFeedback",
+        "security": bearerSecurity,
+        "parameters": [pathParameter],
+        "requestBody": { required: true, content: jsonContent("FeedbackSubmitRequest") },
+        "responses": {
+          200: jsonResponse("Submitted feedback", "FeedbackSubmitResponse"),
+          ...errorResponses
+        },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/{path}/~feedback/{id}": {
+      get: {
+        "operationId": "getFeedback",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, { in: "path", name: "id", required: true, schema: { type: "string" } }],
+        "responses": { 200: jsonResponse("Feedback detail", "FeedbackDetail"), ...errorResponses },
+        "x-tool-bridge-greedy-path": true
+      },
+      post: {
+        "operationId": "voteFeedback",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, { in: "path", name: "id", required: true, schema: { type: "string" } }],
+        "requestBody": { required: true, content: jsonContent("FeedbackVoteRequest") },
+        "responses": { 200: jsonResponse("Updated feedback", "FeedbackView"), ...errorResponses },
+        "x-tool-bridge-greedy-path": true
+      },
+      delete: {
+        "operationId": "removeFeedback",
+        "security": bearerSecurity,
+        "parameters": [pathParameter, { in: "path", name: "id", required: true, schema: { type: "string" } }],
+        "responses": {
+          200: jsonResponse("Feedback removed", "FeedbackRemoveResponse"),
+          ...errorResponses
+        },
+        "x-tool-bridge-greedy-path": true
+      }
+    },
+    "/{commandPath}": {
+      post: {
+        "operationId": "invoke",
+        "security": bearerSecurity,
+        "parameters": [{
+          in: "path",
+          name: "commandPath",
+          required: true,
+          schema: { type: "string" },
+          description: "Complete HTBP command path, including the command/tool leaf."
+        }],
+        "requestBody": {
+          required: true,
+          description: "Raw command arguments; there is no {tool, arguments} envelope.",
+          content: { "application/json": { schema: {} } }
+        },
+        "responses": {
+          200: {
+            description: "Raw JSON or Markdown according to Accept.",
+            content: {
+              "application/json": { schema: {} },
+              "text/markdown": { schema: { type: "string" } }
+            }
+          },
+          ...errorResponses
+        },
+        "x-tool-bridge-greedy-path": true
+      }
+    }
+  }
+};
+
 // ../app/src/paths.ts
 function scopeForCmd(mod, nodePath, cmd) {
   return mod.help(nodePath).cmds.find((c) => c.name === cmd);
@@ -36606,7 +36785,9 @@ function indexByParent(nodes) {
 }
 
 // ../app/src/routes/feedback.ts
-var feedbackJson = (value) => new Response(JSON.stringify(value), { headers: { "content-type": contentTypeFor("json") } });
+var feedbackJson = (schema, value) => new Response(JSON.stringify(schema.parse(value)), {
+  headers: { "content-type": contentTypeFor("json") }
+});
 async function handleFeedbackGet(c) {
   const target = splitFeedback(new URL(c.req.url).pathname);
   if (target === null || target.path === "") throw TBError.notFound("no such path");
@@ -36615,7 +36796,7 @@ async function handleFeedbackGet(c) {
   const fb = new FeedbackStore(c.get("store"));
   if (target.id !== void 0) {
     const e = await fb.get(target.path, target.id);
-    return feedbackJson({
+    return feedbackJson(feedbackDetailSchema, {
       id: e.id,
       path: target.path,
       title: e.title,
@@ -36629,7 +36810,7 @@ async function handleFeedbackGet(c) {
   }
   const views = await fb.listViews(target.path);
   const items = c.req.query("hidden") === "1" ? views : views.filter((v) => v.score > FEEDBACK_HIDE_SCORE);
-  return feedbackJson({ items });
+  return feedbackJson(feedbackListSchema, { items });
 }
 async function handleFeedbackPost(c, env) {
   const { searchSync } = env;
@@ -36651,23 +36832,32 @@ async function handleFeedbackPost(c, env) {
       await searchSync?.reconcileNodeQuietly(path, { feedback: entries, marker });
     });
     if (target.id !== void 0) {
-      const vote = body.vote;
-      if (vote !== "up" && vote !== "down" && vote !== "clear") {
+      const input2 = feedbackVoteRequestSchema.safeParse(body);
+      if (!input2.success) {
         throw new TBError("invalid_argument", `body.vote must be 'up' | 'down' | 'clear'`);
       }
-      return feedbackJson(await fb.vote(target.path, target.id, ctx.owner, vote));
+      return feedbackJson(
+        feedbackViewSchema,
+        await fb.vote(target.path, target.id, ctx.owner, input2.data.vote)
+      );
     }
-    if (typeof body.title !== "string" || typeof body.detail !== "string") {
+    const input = feedbackSubmitRequestSchema.safeParse(body);
+    if (!input.success) {
       throw new TBError("invalid_argument", "body must be { title: string, detail: string }");
     }
     await new NodeRegistryStore(store).resolve(target.path);
     const entry = await fb.submit(
       target.path,
-      { title: body.title, detail: body.detail },
+      input.data,
       ctx.owner,
       (/* @__PURE__ */ new Date()).toISOString()
     );
-    return feedbackJson({ id: entry.id, path: target.path, title: entry.title, at: entry.at });
+    return feedbackJson(feedbackSubmitResponseSchema, {
+      id: entry.id,
+      path: target.path,
+      title: entry.title,
+      at: entry.at
+    });
   } catch (error) {
     await searchSync?.abort(marker);
     throw error;
@@ -36693,12 +36883,12 @@ async function handleFeedbackDelete(c, env) {
     await searchSync?.abort(marker);
     throw error;
   }
-  return feedbackJson({ ok: true });
+  return feedbackJson(feedbackRemoveResponseSchema, { ok: true });
 }
 
 // ../app/src/responses.ts
 function tbErrorResponse(err) {
-  return new Response(JSON.stringify(err.toJSON()), {
+  return new Response(JSON.stringify(tbErrorBodySchema.parse(err.toJSON())), {
     status: err.httpStatus,
     headers: { "content-type": "application/json; charset=utf-8" }
   });
@@ -36735,7 +36925,7 @@ async function runHandler(fn) {
 }
 function renderHelp(model, rep) {
   if (rep === "json") {
-    return new Response(JSON.stringify(renderHelpJson(model)), {
+    return new Response(JSON.stringify(helpJsonSchema.parse(renderHelpJson(model))), {
       headers: { "content-type": contentTypeFor("json") }
     });
   }
@@ -36939,14 +37129,14 @@ async function authorizeToolNode(c, env, node, encryptionKey) {
     authRef: config.authRef,
     config: exported.oauth,
     encryptionKey,
-    fetcher: fetch,
+    fetcher: deps.providerOAuthFetch,
     nodePath: node.path,
     now: /* @__PURE__ */ new Date(),
     origin: deps.canonicalOrigin ?? new URL(c.req.url).origin,
     secrets: deps.secrets,
     store: deps.state
   });
-  return new Response(JSON.stringify(result), {
+  return new Response(JSON.stringify(oauthAuthorizeResponseSchema.parse(result)), {
     headers: { "content-type": contentTypeFor("json") }
   });
 }
@@ -36993,7 +37183,7 @@ async function handleRegister(c, env) {
   await invalidateProviderOAuth(store, body.path);
   await searchSync?.reconcileNodeQuietly(body.path, { marker });
   if (await refreshDynamicSearchNode(node, ctx, deps)) await searchSync?.abort(marker);
-  return new Response(JSON.stringify(node), {
+  return new Response(JSON.stringify(registryNodeSchema.parse(node)), {
     headers: { "content-type": contentTypeFor("json") }
   });
 }
@@ -37020,6 +37210,11 @@ async function handleAuthorize(c, env) {
   } catch {
     throw TBError.notFound("not found");
   }
+  const rawBody = await c.req.json().catch(() => ({}));
+  const body = oauthAuthorizeRequestSchema.safeParse(rawBody);
+  if (!body.success) {
+    throw new TBError("invalid_argument", "body only accepts optional redirectUri string");
+  }
   if (node.kind === "tool" && node.config?.kind === "tool") {
     return await authorizeToolNode(c, env, node, encKey);
   }
@@ -37029,8 +37224,7 @@ async function handleAuthorize(c, env) {
       `'${path}' \u65E2\u4E0D\u662F auth:'oauth' \u7684 mcp \u6302\u8F7D,\u4E5F\u4E0D\u662F\u58F0\u660E\u4E86 oauth \u7684 tool \u6302\u8F7D`
     );
   }
-  const body = await c.req.json().catch(() => null);
-  const redirectUri = body !== null && typeof body.redirectUri === "string" ? body.redirectUri : void 0;
+  const redirectUri = body.data.redirectUri;
   const result = await startMcpAuthorization({
     store,
     encryptionKey: encKey,
@@ -37039,7 +37233,7 @@ async function handleAuthorize(c, env) {
     origin: deps.canonicalOrigin ?? new URL(c.req.url).origin,
     ...redirectUri !== void 0 ? { redirectUri } : {}
   });
-  return new Response(JSON.stringify(result), {
+  return new Response(JSON.stringify(oauthAuthorizeResponseSchema.parse(result)), {
     headers: { "content-type": contentTypeFor("json") }
   });
 }
@@ -37141,16 +37335,6 @@ function uploadId(body) {
   }
   return body.uploadId;
 }
-function origin(c, canonicalOrigin) {
-  let url2;
-  try {
-    url2 = new URL(canonicalOrigin ?? c.req.url);
-  } catch {
-    throw new TBError("unavailable", "request origin is invalid", { retryable: false });
-  }
-  if (url2.protocol !== "https:" && url2.protocol !== "http:" || url2.username !== "" || url2.password !== "") throw new TBError("unavailable", "request origin is invalid", { retryable: false });
-  return url2.origin;
-}
 function registerStoreCapabilityRoutes(app, deps) {
   app.post("/system/store/create_upload", async (c, next) => {
     if (c.req.header(STORE_CALL_CAPABILITY_HEADER) === void 0) return await next();
@@ -37162,7 +37346,7 @@ function registerStoreCapabilityRoutes(app, deps) {
         deps,
         body,
         capability,
-        origin(c, deps.canonicalOrigin)
+        resolveStoreRequestOrigin(c.req.url, deps.canonicalOrigin)
       );
       return c.json(result);
     });
@@ -37262,7 +37446,7 @@ async function finishToolAuthorization(opts) {
       codeVerifier: opts.verifier,
       config: exported.oauth,
       encryptionKey: opts.encryptionKey,
-      fetcher: fetch,
+      fetcher: opts.deps.providerOAuthFetch,
       nodePath: opts.node.path,
       now: /* @__PURE__ */ new Date(),
       origin: opts.origin,
@@ -37279,21 +37463,23 @@ function registerPublicRoutes(app, env) {
   app.get("/healthz", async (c) => {
     const catalog = deps.pluginCatalog;
     const digest = await env.pluginCatalogDigest();
-    return c.json({
+    return c.json(healthResponseSchema.parse({
       healthy: true,
       version: deps.version,
       ...catalog !== void 0 && digest !== void 0 ? { catalog: { count: Object.keys(catalog).length, digest } } : {}
-    });
+    }));
   });
-  app.get("/livez", (c) => c.json({ live: true }));
+  app.get("/livez", (c) => c.json(livenessResponseSchema.parse({ live: true })));
   app.get("/readyz", async (c) => {
     const probe = deps.readiness;
-    if (probe === void 0) return c.json({ checks: {}, ready: true });
+    if (probe === void 0) {
+      return c.json(readinessResponseSchema.parse({ checks: {}, ready: true }));
+    }
     try {
-      const report = await probe();
+      const report = readinessResponseSchema.parse(await probe());
       return c.json(report, report.ready ? 200 : 503);
     } catch {
-      return c.json({ checks: {}, ready: false }, 503);
+      return c.json(readinessResponseSchema.parse({ checks: {}, ready: false }), 503);
     }
   });
   app.get(
@@ -37453,7 +37639,11 @@ function registerSearchRoute(app, env) {
       if (opts.cursor !== void 0 && typeof opts.cursor !== "string") {
         throw new TBError("invalid_argument", "opts.cursor must be a string");
       }
-      const query = body.query.trim();
+      const wireRequest = toolSearchRequestSchema.parse({
+        query: body.query,
+        ...rawOpts === void 0 ? {} : { opts }
+      });
+      const query = wireRequest.query;
       await searchSync?.ensureReady();
       const ctx = c.get("ctx");
       const registry = new NodeRegistryStore(c.get("store"));
@@ -37531,7 +37721,7 @@ function registerSearchRoute(app, env) {
       }
       if (items.length === 0) responseCursor = void 0;
       const result = responseCursor === void 0 ? { items } : { items, cursor: responseCursor };
-      return new Response(JSON.stringify(result), {
+      return new Response(JSON.stringify(toolSearchPageSchema.parse(result)), {
         headers: { "content-type": contentTypeFor("json") }
       });
     })
@@ -38102,27 +38292,27 @@ async function handleInvoke(c, env) {
       throw new TBError("permission_denied", `readOnly \u6302\u8F7D\u62D2\u7EDD '${command}'`);
     }
     if (directUpload) {
-      const result3 = await createContextUploadGrant(
-        node,
-        cfg,
-        deps,
-        args2
+      const result3 = await dispatchContextUploadCmd(
+        args2,
+        (input) => createContextUploadGrant(node, cfg, deps, input)
       );
       return renderResult(result3, negotiate(c.req.header("accept")));
     }
     if (cfg.provider === "device-fs") {
+      const forwardedArgs = parseContextCmdArgs(command, args2);
       const result3 = await invokeDevice(deps, deviceIdForDeviceFs(cfg), {
         path: `fs/${command}`,
-        arguments: args2,
+        arguments: forwardedArgs,
         context: deviceCallContextFrom(ctx)
       });
       return renderResult(result3, negotiate(c.req.header("accept")));
     }
     const contextMarker = deviceMarkerOf(cfg.providerConfig);
     if (cfg.provider !== "r2" && cfg.provider !== "s3" && contextMarker !== null) {
+      const forwardedArgs = parseContextCmdArgs(command, args2);
       const result3 = await invokeDevice(deps, contextMarker.deviceId, {
         path: `${relativeDevicePath(node.path, contextMarker.mountPath)}/${command}`,
-        arguments: args2,
+        arguments: forwardedArgs,
         context: deviceCallContextFrom(ctx)
       });
       return renderResult(result3, negotiate(c.req.header("accept")));
@@ -38130,7 +38320,7 @@ async function handleInvoke(c, env) {
     if (cfg.provider !== "r2" && cfg.provider !== "s3") {
       const local = localContext(deps, node);
       if (local !== null) {
-        const result4 = await dispatchContextCmd(local, command, args2);
+        const result4 = await dispatchContextCmd2(local, command, args2);
         return renderResult(result4, negotiate(c.req.header("accept")));
       }
       const { manifest, export: exported } = await requirePluginExport(
@@ -38150,11 +38340,11 @@ async function handleInvoke(c, env) {
         ...cfg.authRef !== void 0 ? { upstreamAuthRef: cfg.authRef } : {},
         ...deps.pluginBindings !== void 0 ? { bindings: deps.pluginBindings } : {}
       });
-      const result3 = await dispatchContextCmd(provider2, command, args2);
+      const result3 = await dispatchContextCmd2(provider2, command, args2);
       return renderResult(result3, negotiate(c.req.header("accept")));
     }
     const provider = await contextProviderFor(node, cfg, deps, c.req.url);
-    const result2 = await dispatchContextCmd(provider, command, args2);
+    const result2 = await dispatchContextCmd2(provider, command, args2);
     return renderResult(result2, negotiate(c.req.header("accept")));
   }
   if (node.kind === "skillhub" && node.config?.kind === "skillhub") {
@@ -38172,7 +38362,7 @@ async function handleInvoke(c, env) {
       throw new TBError("permission_denied", `readOnly \u6302\u8F7D\u62D2\u7EDD '${command}'`);
     }
     const provider = await skillhubProviderFor(node, cfg, deps, c.req.url);
-    const result2 = await dispatchSkillhubCmd(provider, command, args2);
+    const result2 = await dispatchSkillhubCmd2(provider, command, args2);
     return renderResult(result2, negotiate(c.req.header("accept")));
   }
   if (node.kind !== "builtin" || node.config?.kind !== "builtin") {
@@ -38228,7 +38418,7 @@ async function handleInvoke(c, env) {
   let result;
   try {
     result = await mod.dispatch(cmd, args, ctx, {
-      requestOrigin: deps.canonicalOrigin ?? new URL(c.req.url).origin
+      requestOrigin: resolveStoreRequestOrigin(c.req.url, deps.canonicalOrigin)
     });
   } catch (error) {
     await searchSync?.abort(registryMarker);
@@ -38340,7 +38530,7 @@ async function handleHelp(c, env) {
   if (remote) return remote;
   const builtins = builtinsOf(store);
   const refresh = c.req.query("refresh") === "1";
-  const schemas = c.req.query("schemas") === "1";
+  const schemas2 = c.req.query("schemas") === "1";
   let node;
   try {
     node = await registry.get(path);
@@ -38349,14 +38539,14 @@ async function handleHelp(c, env) {
     if (toolModel !== null) return renderHelp(await enrichHelp(toolModel, path, store), rep);
     const cmdModel = await commandHelpModelFor(registry, ctx, builtins, deps, path, {
       refresh,
-      schemas
+      schemas: schemas2
     });
     if (cmdModel !== null) return renderHelp(await enrichHelp(cmdModel, path, store), rep);
     throw TBError.notFound("not found");
   }
   const model = await helpModelFor(node, registry, ctx, builtins, deps, {
     refresh,
-    schemas,
+    schemas: schemas2,
     now: (/* @__PURE__ */ new Date()).toISOString()
   });
   return renderHelp(await enrichHelp(model, path, store), rep);
@@ -38408,7 +38598,7 @@ async function handleTree(c, env) {
   });
   const rep = negotiate(c.req.header("accept"));
   if (rep === "json") {
-    return new Response(JSON.stringify(tree), {
+    return new Response(JSON.stringify(treeJsonSchema.parse(tree)), {
       headers: { "content-type": contentTypeFor("json") }
     });
   }
@@ -39841,7 +40031,7 @@ import { join as join4 } from "path";
 // package.json
 var package_default = {
   name: "@tool-bridge/server",
-  version: "0.16.0",
+  version: "0.17.0",
   description: "tool-bridge self-hosted server: run the HTBP gateway on Node with SQLite or PostgreSQL persistence, filesystem object storage and WebSocket device channel \u2014 single container via docker run",
   type: "module",
   license: "MIT",
@@ -40023,6 +40213,7 @@ function resolveUiAssets(uiDirOverride) {
 }
 
 // src/server.ts
+var providerOAuthFetch = createGuardedFetch({ crossOriginRedirect: "error" });
 function pgBackends(databaseUrl) {
   const sql = postgres(databaseUrl, { onnotice: () => {
   } });
@@ -40136,6 +40327,7 @@ function createTbServer(config) {
   const deps = {
     state,
     secrets,
+    providerOAuthFetch,
     version: package_default.version,
     remote: config.remote,
     search,