ogment 0.2.2 → 0.2.3

package/dist/config.d.ts

@@ -19,5 +19,5 @@ export declare const CONFIG_DIR: string;
 export declare const CREDENTIALS_PATH: string;
 export declare const CLI_CLIENT_NAME = "Ogment CLI";
 export declare const CLI_REDIRECT_HOST = "127.0.0.1";
-export declare const VERSION = "0.2.2";
+export declare const VERSION = "0.2.3";
 //# sourceMappingURL=config.d.ts.map

package/dist/config.js

@@ -33,4 +33,4 @@ export const CLI_REDIRECT_HOST = '127.0.0.1';
 // ---------------------------------------------------------------------------
 // Version
 // ---------------------------------------------------------------------------
-export const VERSION = '0.2.2';
+export const VERSION = '0.2.3';

package/dist/mcp-client.d.ts

@@ -1,7 +1,10 @@
 /**
  * MCP HTTP client — sends JSON-RPC requests to Ogment's MCP proxy.
  *
- * Shared by both the stdio bridge (serve.ts) and CLI commands (servers, call).
+ * Handles the MCP Streamable HTTP transport:
+ *   1. Initialize session on first request to a server
+ *   2. Cache session ID (mcp-session-id header)
+ *   3. Re-initialize automatically if session expires
  */
 export interface McpTool {
     name: string;

package/dist/mcp-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-client.d.ts","sourceRoot":"","sources":["../src/mcp-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,UAAU,iBAAiB;IACzB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAmDD,qDAAqD;AACrD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAKlF;AAED,qDAAqD;AACrD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,8BAM9B"}
+{"version":3,"file":"mcp-client.d.ts","sourceRoot":"","sources":["../src/mcp-client.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,UAAU,iBAAiB;IACzB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAyHD,qDAAqD;AACrD,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,sBAKlF;AAED,qDAAqD;AACrD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,8BAM9B"}

package/dist/mcp-client.js

@@ -1,14 +1,62 @@
 /**
  * MCP HTTP client — sends JSON-RPC requests to Ogment's MCP proxy.
  *
- * Shared by both the stdio bridge (serve.ts) and CLI commands (servers, call).
+ * Handles the MCP Streamable HTTP transport:
+ *   1. Initialize session on first request to a server
+ *   2. Cache session ID (mcp-session-id header)
+ *   3. Re-initialize automatically if session expires
  */
-import { MCP_ENDPOINT } from './config.js';
+import { MCP_ENDPOINT, VERSION } from './config.js';
 // ---------------------------------------------------------------------------
-// Core JSON-RPC request
+// Session management
+// ---------------------------------------------------------------------------
+/** Per-endpoint session cache (endpoint URL → session ID). */
+const sessions = new Map();
+/** Initialize an MCP session and return the session ID. */
+async function initializeSession(endpoint, token) {
+    const res = await fetch(endpoint, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify({
+            jsonrpc: '2.0',
+            method: 'initialize',
+            id: Date.now(),
+            params: {
+                protocolVersion: '2024-11-05',
+                capabilities: {},
+                clientInfo: { name: 'ogment-cli', version: VERSION },
+            },
+        }),
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        const sanitized = text.length > 200 ? text.slice(0, 200) + '…' : text;
+        throw new Error(`MCP session init failed (${res.status}): ${sanitized}`);
+    }
+    const sessionId = res.headers.get('mcp-session-id');
+    if (!sessionId) {
+        throw new Error('MCP server did not return a session ID');
+    }
+    return sessionId;
+}
+/** Ensure a session exists for the given endpoint, initializing if needed. */
+async function ensureSession(endpoint, token) {
+    const existing = sessions.get(endpoint);
+    if (existing)
+        return existing;
+    const sessionId = await initializeSession(endpoint, token);
+    sessions.set(endpoint, sessionId);
+    return sessionId;
+}
+// ---------------------------------------------------------------------------
+// Core JSON-RPC request (with session handling)
 // ---------------------------------------------------------------------------
 async function mcpRequest(orgSlug, serverPath, token, method, params) {
     const endpoint = MCP_ENDPOINT(orgSlug, serverPath);
+    const sessionId = await ensureSession(endpoint, token);
     const body = {
         jsonrpc: '2.0',
         method,
@@ -16,17 +64,32 @@ async function mcpRequest(orgSlug, serverPath, token, method, params) {
     };
     if (params)
         body.params = params;
-    const res = await fetch(endpoint, {
+    let res = await fetch(endpoint, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             Authorization: `Bearer ${token}`,
+            'mcp-session-id': sessionId,
         },
         body: JSON.stringify(body),
     });
+    // Session expired — re-initialize once and retry
+    if (res.status === 404 || res.status === 400) {
+        sessions.delete(endpoint);
+        const newSessionId = await initializeSession(endpoint, token);
+        sessions.set(endpoint, newSessionId);
+        res = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${token}`,
+                'mcp-session-id': newSessionId,
+            },
+            body: JSON.stringify(body),
+        });
+    }
     if (!res.ok) {
         const text = await res.text();
-        // Truncate error bodies to avoid leaking server internals into agent logs
         const sanitized = text.length > 200 ? text.slice(0, 200) + '…' : text;
         throw new Error(`MCP request failed (${res.status}): ${sanitized}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ogment",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Ogment Vault CLI — secure your AI agents' SaaS credentials",
   "type": "module",
   "bin": {