@corbits/mcp 0.2.0 → 0.3.0

package/README.md

@@ -112,7 +112,7 @@ mountMcpDiscovery(mcpRoutes, {
 
 Mount `mcpRoutes` on the hub app under `/api/tenants/:tenantId`, behind the hub's auth and tenant middleware.
 
-`POST /api/tenants/:tenantId/mcp/discover` with `{ url, credentialId? }` returns `{ data: { serverInfo, tools } }`. `url` must be https; plain-http loopback is refused unless the host sets `allowLoopback: true` for local development. `credentialId` names a tenant credential whose secret is sent as a bearer; a credential holding `MCP_NO_TOKEN_SENTINEL` from `@corbits/credential-http` sends no `authorization` header. Errors: 400 for a bad body or URL, 404 for an unknown credential or one that is not active or has expired, 422 when the server fails discovery, the secret is not a valid header value, or the request would leave the credential's origin. A 422 carries only this package's own messages and never the upstream HTTP status; any other failure reads as a generic handshake error, so no response or `onError` text quotes the secret. `requireGrant` is the host's own grant middleware for this route.
+`POST /api/tenants/:tenantId/mcp/discover` with `{ url, credentialId? }` returns `{ data: { serverInfo, tools } }`. `url` must be https; plain-http loopback is refused unless the host sets `allowLoopback: true` for local development. `credentialId` names a tenant credential whose secret is sent as a bearer; the credential's type must be `api_key` or `oauth_token`, and any other type reads as not found. An `oauth_token` credential's secret is its current access token, which [`@corbits/oauth-core`](https://github.com/corbitsdev/corbits-oauth-core)'s refresher renews in place, so nothing here refreshes it, and one past its `expiresAt` or marked `error` reads as not found until it is renewed or the user signs in again; a credential holding `MCP_NO_TOKEN_SENTINEL` from `@corbits/credential-http` sends no `authorization` header. Errors: 400 for a bad body or URL, 404 for an unknown credential or one that is not active or has expired, 422 when the server fails discovery, the secret is not a valid header value, or the request would leave the credential's origin. A 422 carries only this package's own messages and never the upstream HTTP status; any other failure reads as a generic handshake error, so no response or `onError` text quotes the secret. `requireGrant` is the host's own grant middleware for this route.
 
 When a secret is sent, the fetch is pinned to the origin of the credential's provider `apiBaseUrl`; with no credential or a keyless one, to the URL's origin. Redirects are always refused, so the secret never leaves that origin. Each discovery request times out after 30 seconds.
 
@@ -163,6 +163,10 @@ Each catalog entry becomes a tool named `<handle>.<tool>`, with the remote `inpu
 
 `handle` is the credential handle the host binds this server's token to. The bundle resolves it from the runtime `credentials` capability and expects an `http` credential, such as the one `@corbits/credential-http`'s MCP provider returns. The package manifest declares the `mcp-server` credential for this.
 
+#### OAuth servers
+
+A host records how a server authenticates in the credential's `metadata.mcp.auth`: `"none"` (the keyless sentinel), `"token"` (a pasted `api_key`) or `"oauth"` (an `oauth_token` login through `@corbits/oauth-core`, using `discoverMcpLoginEntry` and `mcpClientConfig` above). This package does not read the value; it reads the credential's type, so pass the `oauth_token` credential's id as `credentialId`. At run time the credential's provider shapes the handle from the credential's current secret, so a refreshed token reaches running agents without any change to the bundle.
+
 ### Grant access
 
 Grant the agent's principal `tool:deepwiki.*` for the whole server, or `tool:deepwiki.<tool>` per tool, with `allow`, `ask` or `deny`.

package/dist/hub/discover.d.ts

@@ -34,8 +34,8 @@ export type McpCredential = {
 /**
  * Read a tenant credential's decrypted secret and the origin it is pinned to.
  * Scoped by tenant so a credential id from another tenant reads as absent,
- * not as a secret; a revoked, errored or expired credential reads as absent
- * too.
+ * not as a secret; a revoked, errored or expired credential, or one that holds no bearer
+ * token (a certificate, say), reads as absent too.
  */
 export declare function readCredential(opts: {
     readonly db: DB["db"];

package/dist/hub/discover.js

@@ -13,17 +13,24 @@ const DiscoverBody = type({
     url: "string > 0",
     "credentialId?": "string > 0",
 });
+/**
+ * Credential types whose secret is a bearer token. An `oauth_token` row's
+ * secret is the current access token, which `@corbits/oauth-core`'s refresher
+ * rewrites in place, so it is read here like any other and never refreshed.
+ */
+const BEARER_CREDENTIAL_TYPES = ["api_key", "oauth_token"];
 /**
  * Read a tenant credential's decrypted secret and the origin it is pinned to.
  * Scoped by tenant so a credential id from another tenant reads as absent,
- * not as a secret; a revoked, errored or expired credential reads as absent
- * too.
+ * not as a secret; a revoked, errored or expired credential, or one that holds no bearer
+ * token (a certificate, say), reads as absent too.
  */
 export async function readCredential(opts) {
     const [row] = await opts.db
         .select({
         id: credential.id,
         secret: credential.secret,
+        type: credential.type,
         status: credential.status,
         expiresAt: credential.expiresAt,
         apiBaseUrl: provider.apiBaseUrl,
@@ -33,6 +40,7 @@ export async function readCredential(opts) {
         .where(and(eq(credential.id, opts.credentialId), eq(credential.tenantId, opts.tenantId)))
         .limit(1);
     if (row === undefined ||
+        !BEARER_CREDENTIAL_TYPES.includes(row.type) ||
         row.status !== "active" ||
         (row.expiresAt !== null && row.expiresAt.getTime() <= Date.now())) {
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corbits/mcp",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "MCP client tool package for Interchange: streamable HTTP, per-tool grants, OAuth.",
   "keywords": [
     "corbits",
@@ -55,7 +55,7 @@
     "check": "bun run typecheck && bun run lint && bun run format:check && bun run test"
   },
   "dependencies": {
-    "@corbits/oauth-core": "^0.2.0",
+    "@corbits/oauth-core": "^0.3.0",
     "@intx/types": "^0.4.0",
     "arktype": "^2.2.3"
   },