@sourcegraph/amp-sdk 0.1.0-20260123161216-g2f422d1 → 0.1.0-20260124003735-gfa566b5

package/README.md

@@ -843,20 +843,26 @@ interface UserInputMessage {
 
 ### MCPConfig
 
-Configuration for MCP (Model Context Protocol) servers.
+Configuration for MCP (Model Context Protocol) servers. Supports both stdio-based and HTTP-based servers.
 
 ```typescript
 type MCPConfig = Record<string, MCPServer>
 
-interface MCPServer {
-	command: string
-	args?: string[]
-	env?: Record<string, string>
-	disabled?: boolean
+// MCPServer is a union of stdio and HTTP server configurations
+```
+
+`MCPServer` accepts either a stdio server config (with `command`) or an HTTP server config (with `url`):
+
+```typescript
+const mcpConfig: MCPConfig = {
+	playwright: { command: 'npx', args: ['-y', '@playwright/mcp'] },
+	remote: { url: 'https://api.example.com/mcp' },
 }
 ```
 
-#### Properties
+#### MCPServer Properties
+
+**Stdio server:**
 
 | Property   | Type                     | Required | Description                          |
 | ---------- | ------------------------ | -------- | ------------------------------------ |
@@ -865,6 +871,27 @@ interface MCPServer {
 | `env`      | `Record<string, string>` | No       | Environment variables for the server |
 | `disabled` | `boolean`                | No       | Whether this server is disabled      |
 
+**HTTP server:**
+
+| Property    | Type                     | Required | Description                            |
+| ----------- | ------------------------ | -------- | -------------------------------------- |
+| `url`       | `string`                 | Yes      | URL of the HTTP MCP server             |
+| `headers`   | `Record<string, string>` | No       | HTTP headers to send with requests     |
+| `transport` | `string`                 | No       | Transport type (e.g., "sse")           |
+| `oauth`     | `object`                 | No       | OAuth configuration for authentication |
+| `disabled`  | `boolean`                | No       | Whether this server is disabled        |
+
+**OAuth config (for HTTP servers):**
+
+| Property       | Type       | Required | Description             |
+| -------------- | ---------- | -------- | ----------------------- |
+| `clientId`     | `string`   | Yes      | OAuth client ID         |
+| `clientSecret` | `string`   | No       | OAuth client secret     |
+| `authUrl`      | `string`   | Yes      | OAuth authorization URL |
+| `tokenUrl`     | `string`   | Yes      | OAuth token URL         |
+| `scopes`       | `string[]` | No       | OAuth scopes            |
+| `redirectUrl`  | `string`   | No       | OAuth redirect URL      |
+
 ### Permission
 
 Individual permission rule for controlling tool usage.

package/dist/index.js

@@ -4032,12 +4032,28 @@ var PermissionSchema = exports_external.object({
     });
   }
 });
-var MCPServerSchema = exports_external.object({
+var MCPOAuthConfigSchema = exports_external.object({
+  clientId: exports_external.string().describe("OAuth client ID"),
+  clientSecret: exports_external.string().describe("OAuth client secret").optional(),
+  authUrl: exports_external.string().describe("OAuth authorization URL"),
+  tokenUrl: exports_external.string().describe("OAuth token URL"),
+  scopes: exports_external.array(exports_external.string()).describe("OAuth scopes").optional(),
+  redirectUrl: exports_external.string().describe("OAuth redirect URL").optional()
+}).describe("OAuth configuration for HTTP MCP servers");
+var MCPStdioServerSchema = exports_external.object({
   command: exports_external.string().describe("Command to run the MCP server"),
   args: exports_external.array(exports_external.string()).describe("Arguments for the MCP server command").optional(),
   env: exports_external.record(exports_external.string(), exports_external.string()).describe("Environment variables for the server").optional(),
   disabled: exports_external.boolean().describe("Whether the server is disabled").optional()
 });
+var MCPHttpServerSchema = exports_external.object({
+  url: exports_external.string().describe("URL of the HTTP MCP server"),
+  headers: exports_external.record(exports_external.string(), exports_external.string()).describe("HTTP headers to send with requests").optional(),
+  transport: exports_external.string().describe('Transport type (e.g., "sse")').optional(),
+  oauth: MCPOAuthConfigSchema.describe("OAuth configuration for authentication").optional(),
+  disabled: exports_external.boolean().describe("Whether the server is disabled").optional()
+});
+var MCPServerSchema = exports_external.union([MCPStdioServerSchema, MCPHttpServerSchema]);
 var MCPConfigSchema = exports_external.record(exports_external.string(), MCPServerSchema).describe("MCP server configurations keyed by server name");
 var AmpOptionsSchema = exports_external.object({
   cwd: exports_external.string().describe("Current working directory").optional(),
@@ -4180,7 +4196,7 @@ function buildEnvironmentVariables(options) {
   if (options.env) {
     Object.assign(env, options.env);
   }
-  env.AMP_SDK_VERSION = "0.1.0-20260123161216-g2f422d1";
+  env.AMP_SDK_VERSION = "0.1.0-20260124003735-gfa566b5";
   return env;
 }
 function spawnAmpCli(args, options) {
@@ -4384,4 +4400,4 @@ export {
   AmpOptionsSchema
 };
 
-//# debugId=EF5EB93EB4F4BB2064756E2164756E21
+//# debugId=0A3D5327B9004F5564756E2164756E21

package/dist/types.d.ts

@@ -36,6 +36,8 @@ interface BaseMessage {
     type: 'system' | 'assistant' | 'user' | 'result';
     session_id: string;
 }
+/** MCP server connection status */
+export type MCPConnectionStatus = 'awaiting-approval' | 'authenticating' | 'connecting' | 'reconnecting' | 'connected' | 'denied' | 'failed' | 'blocked-by-registry';
 /** System initialization message containing session info and available tools */
 export interface SystemMessage extends BaseMessage {
     type: 'system';
@@ -44,7 +46,7 @@ export interface SystemMessage extends BaseMessage {
     tools: string[];
     mcp_servers: {
         name: string;
-        status: 'connected' | 'connecting' | 'connection-failed' | 'disabled';
+        status: MCPConnectionStatus;
     }[];
 }
 /** AI assistant response message with text and tool usage */
@@ -184,41 +186,147 @@ export declare const PermissionSchema: z.ZodEffects<z.ZodObject<{
 export type Permission = z.infer<typeof PermissionSchema>;
 /** Permissions list */
 export type PermissionsList = Permission[];
-/** MCP server configuration schema */
-export declare const MCPServerSchema: z.ZodObject<{
+/** MCP server configuration schema (stdio or HTTP) */
+export declare const MCPServerSchema: z.ZodUnion<[z.ZodObject<{
     command: z.ZodString;
     args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     disabled: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     command: string;
-    disabled?: boolean | undefined;
     args?: string[] | undefined;
     env?: Record<string, string> | undefined;
+    disabled?: boolean | undefined;
 }, {
     command: string;
-    disabled?: boolean | undefined;
     args?: string[] | undefined;
     env?: Record<string, string> | undefined;
-}>;
+    disabled?: boolean | undefined;
+}>, z.ZodObject<{
+    url: z.ZodString;
+    headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    transport: z.ZodOptional<z.ZodString>;
+    oauth: z.ZodOptional<z.ZodObject<{
+        clientId: z.ZodString;
+        clientSecret: z.ZodOptional<z.ZodString>;
+        authUrl: z.ZodString;
+        tokenUrl: z.ZodString;
+        scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        redirectUrl: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    }, {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    }>>;
+    disabled: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    url: string;
+    disabled?: boolean | undefined;
+    headers?: Record<string, string> | undefined;
+    transport?: string | undefined;
+    oauth?: {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    } | undefined;
+}, {
+    url: string;
+    disabled?: boolean | undefined;
+    headers?: Record<string, string> | undefined;
+    transport?: string | undefined;
+    oauth?: {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    } | undefined;
+}>]>;
 /** MCP configuration schema */
-export declare const MCPConfigSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
+export declare const MCPConfigSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
     command: z.ZodString;
     args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     disabled: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     command: string;
-    disabled?: boolean | undefined;
     args?: string[] | undefined;
     env?: Record<string, string> | undefined;
+    disabled?: boolean | undefined;
 }, {
     command: string;
-    disabled?: boolean | undefined;
     args?: string[] | undefined;
     env?: Record<string, string> | undefined;
-}>>;
-/** MCP server configuration */
+    disabled?: boolean | undefined;
+}>, z.ZodObject<{
+    url: z.ZodString;
+    headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    transport: z.ZodOptional<z.ZodString>;
+    oauth: z.ZodOptional<z.ZodObject<{
+        clientId: z.ZodString;
+        clientSecret: z.ZodOptional<z.ZodString>;
+        authUrl: z.ZodString;
+        tokenUrl: z.ZodString;
+        scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        redirectUrl: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    }, {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    }>>;
+    disabled: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    url: string;
+    disabled?: boolean | undefined;
+    headers?: Record<string, string> | undefined;
+    transport?: string | undefined;
+    oauth?: {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    } | undefined;
+}, {
+    url: string;
+    disabled?: boolean | undefined;
+    headers?: Record<string, string> | undefined;
+    transport?: string | undefined;
+    oauth?: {
+        clientId: string;
+        authUrl: string;
+        tokenUrl: string;
+        clientSecret?: string | undefined;
+        scopes?: string[] | undefined;
+        redirectUrl?: string | undefined;
+    } | undefined;
+}>]>>;
+/** MCP server configuration (stdio or HTTP) */
 export type MCPServer = z.infer<typeof MCPServerSchema>;
 /** MCP configuration object */
 export type MCPConfig = z.infer<typeof MCPConfigSchema>;
@@ -231,22 +339,75 @@ export declare const AmpOptionsSchema: z.ZodObject<{
     settingsFile: z.ZodOptional<z.ZodString>;
     logLevel: z.ZodOptional<z.ZodEnum<["debug", "info", "warn", "error", "audit"]>>;
     logFile: z.ZodOptional<z.ZodString>;
-    mcpConfig: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
+    mcpConfig: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         command: z.ZodString;
         args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
         env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
         disabled: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         command: string;
-        disabled?: boolean | undefined;
         args?: string[] | undefined;
         env?: Record<string, string> | undefined;
+        disabled?: boolean | undefined;
     }, {
         command: string;
-        disabled?: boolean | undefined;
         args?: string[] | undefined;
         env?: Record<string, string> | undefined;
-    }>>]>>;
+        disabled?: boolean | undefined;
+    }>, z.ZodObject<{
+        url: z.ZodString;
+        headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        transport: z.ZodOptional<z.ZodString>;
+        oauth: z.ZodOptional<z.ZodObject<{
+            clientId: z.ZodString;
+            clientSecret: z.ZodOptional<z.ZodString>;
+            authUrl: z.ZodString;
+            tokenUrl: z.ZodString;
+            scopes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            redirectUrl: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        }, {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        }>>;
+        disabled: z.ZodOptional<z.ZodBoolean>;
+    }, "strip", z.ZodTypeAny, {
+        url: string;
+        disabled?: boolean | undefined;
+        headers?: Record<string, string> | undefined;
+        transport?: string | undefined;
+        oauth?: {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        } | undefined;
+    }, {
+        url: string;
+        disabled?: boolean | undefined;
+        headers?: Record<string, string> | undefined;
+        transport?: string | undefined;
+        oauth?: {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        } | undefined;
+    }>]>>]>>;
     env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     continue: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodString]>>;
     toolbox: z.ZodOptional<z.ZodString>;
@@ -295,9 +456,22 @@ export declare const AmpOptionsSchema: z.ZodObject<{
     logFile?: string | undefined;
     mcpConfig?: string | Record<string, {
         command: string;
-        disabled?: boolean | undefined;
         args?: string[] | undefined;
         env?: Record<string, string> | undefined;
+        disabled?: boolean | undefined;
+    } | {
+        url: string;
+        disabled?: boolean | undefined;
+        headers?: Record<string, string> | undefined;
+        transport?: string | undefined;
+        oauth?: {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        } | undefined;
     }> | undefined;
     continue?: string | boolean | undefined;
     toolbox?: string | undefined;
@@ -322,9 +496,22 @@ export declare const AmpOptionsSchema: z.ZodObject<{
     logFile?: string | undefined;
     mcpConfig?: string | Record<string, {
         command: string;
-        disabled?: boolean | undefined;
         args?: string[] | undefined;
         env?: Record<string, string> | undefined;
+        disabled?: boolean | undefined;
+    } | {
+        url: string;
+        disabled?: boolean | undefined;
+        headers?: Record<string, string> | undefined;
+        transport?: string | undefined;
+        oauth?: {
+            clientId: string;
+            authUrl: string;
+            tokenUrl: string;
+            clientSecret?: string | undefined;
+            scopes?: string[] | undefined;
+            redirectUrl?: string | undefined;
+        } | undefined;
     }> | undefined;
     continue?: string | boolean | undefined;
     toolbox?: string | undefined;

package/package.json

@@ -44,7 +44,7 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.1.0-20260123161216-g2f422d1",
+  "version": "0.1.0-20260124003735-gfa566b5",
   "scripts": {
     "build": "bun run scripts/build.ts",
     "dev": "pnpm exec tsc -b --watch",