@context-engine-bridge/context-engine-mcp-bridge 0.0.19 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@context-engine-bridge/context-engine-mcp-bridge",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Context Engine MCP bridge (http/stdio proxy combining indexer + memory servers)",
   "bin": {
     "ctxce": "bin/ctxce.js",

package/src/cli.js

@@ -23,6 +23,7 @@ export async function runCli() {
     let indexerUrl = process.env.CTXCE_INDEXER_URL || "http://localhost:8003/mcp";
     let memoryUrl = process.env.CTXCE_MEMORY_URL || null;
     let port = Number.parseInt(process.env.CTXCE_HTTP_PORT || "30810", 10) || 30810;
+    let collection = null;
 
     for (let i = 0; i < args.length; i += 1) {
       const a = args[i];
@@ -57,13 +58,20 @@ export async function runCli() {
           continue;
         }
       }
+      if (a === "--collection") {
+        if (i + 1 < args.length) {
+          collection = args[i + 1];
+          i += 1;
+          continue;
+        }
+      }
     }
 
     // eslint-disable-next-line no-console
     console.error(
-      `[ctxce] Starting HTTP MCP bridge: workspace=${workspace}, port=${port}, indexerUrl=${indexerUrl}, memoryUrl=${memoryUrl || "disabled"}`,
+      `[ctxce] Starting HTTP MCP bridge: workspace=${workspace}, port=${port}, indexerUrl=${indexerUrl}, memoryUrl=${memoryUrl || "disabled"}, collection=${collection || "auto"}`,
     );
-    await runHttpMcpServer({ workspace, indexerUrl, memoryUrl, port });
+    await runHttpMcpServer({ workspace, indexerUrl, memoryUrl, port, collection });
     return;
   }
 
@@ -72,10 +80,12 @@ export async function runCli() {
     // Supported flags:
     //   --workspace / --path   : workspace root (default: cwd)
     //   --indexer-url          : override MCP indexer URL (default env CTXCE_INDEXER_URL or http://localhost:8003/mcp)
+    //   --collection           : collection name to use for MCP calls
     const args = argv.slice(1);
     let workspace = process.cwd();
     let indexerUrl = process.env.CTXCE_INDEXER_URL || "http://localhost:8003/mcp";
     let memoryUrl = process.env.CTXCE_MEMORY_URL || null;
+    let collection = null;
 
     for (let i = 0; i < args.length; i += 1) {
       const a = args[i];
@@ -100,13 +110,20 @@ export async function runCli() {
           continue;
         }
       }
+      if (a === "--collection") {
+        if (i + 1 < args.length) {
+          collection = args[i + 1];
+          i += 1;
+          continue;
+        }
+      }
     }
 
     // eslint-disable-next-line no-console
     console.error(
-      `[ctxce] Starting MCP bridge: workspace=${workspace}, indexerUrl=${indexerUrl}, memoryUrl=${memoryUrl || "disabled"}`,
+      `[ctxce] Starting MCP bridge: workspace=${workspace}, indexerUrl=${indexerUrl}, memoryUrl=${memoryUrl || "disabled"}, collection=${collection || "auto"}`,
     );
-    await runMcpServer({ workspace, indexerUrl, memoryUrl });
+    await runMcpServer({ workspace, indexerUrl, memoryUrl, collection });
     return;
   }
 
@@ -117,7 +134,7 @@ export async function runCli() {
 
   // eslint-disable-next-line no-console
   console.error(
-    `Usage: ${binName} mcp-serve [--workspace <path>] [--indexer-url <url>] [--memory-url <url>] | ${binName} mcp-http-serve [--workspace <path>] [--indexer-url <url>] [--memory-url <url>] [--port <port>] | ${binName} auth <login|status|logout> [--backend-url <url>] [--token <token>] [--username <name> --password <pass>]`,
+    `Usage: ${binName} mcp-serve [--workspace <path>] [--indexer-url <url>] [--memory-url <url>] [--collection <name>] | ${binName} mcp-http-serve [--workspace <path>] [--indexer-url <url>] [--memory-url <url>] [--port <port>] [--collection <name>] | ${binName} auth <login|status|logout> [--backend-url <url>] [--token <token>] [--username <name> --password <pass>]`,
   );
   process.exit(1);
 }

package/src/mcpServer.js

@@ -415,18 +415,8 @@ async function fetchBridgeCollectionState({
     if (!resp.ok) {
       if (resp.status === 401 || resp.status === 403) {
         debugLog(
-          `[ctxce] /bridge/state responded ${resp.status}; missing or invalid token/session, marking local session as expired.`,
+          `[ctxce] /bridge/state responded ${resp.status}; session may not be accepted by this endpoint.`,
         );
-        if (backendHint) {
-          try {
-            const entry = loadAuthEntry(backendHint);
-            if (entry) {
-              saveAuthEntry(backendHint, { ...entry, expiresAt: 1 });
-            }
-          } catch {
-            // ignore failures
-          }
-        }
         return null;
       }
       throw new Error(`bridge/state responded ${resp.status}`);
@@ -444,12 +434,15 @@ async function createBridgeServer(options) {
   const workspace = options.workspace || process.cwd();
   const indexerUrl = options.indexerUrl;
   const memoryUrl = options.memoryUrl;
+  const explicitCollection = options.collection;
 
   const config = loadConfig(workspace);
   const defaultCollection =
-    config && typeof config.default_collection === "string"
-      ? config.default_collection
-      : null;
+    explicitCollection && typeof explicitCollection === "string"
+      ? explicitCollection
+      : config && typeof config.default_collection === "string"
+        ? config.default_collection
+        : null;
   const defaultMode =
     config && typeof config.default_mode === "string" ? config.default_mode : null;
   const defaultUnder =
@@ -503,8 +496,8 @@ async function createBridgeServer(options) {
       expiresAt > 0 &&
       expiresAt < Math.floor(Date.now() / 1000)
     ) {
-      debugLog("[ctxce] Stored auth session appears expired; please run `ctxce auth login` again.");
-      return "";
+      debugLog("[ctxce] Stored auth session has local expiry in the past; attempting to use it anyway (server will validate).");
+      return entry.sessionId;
     }
     return entry.sessionId;
   }
@@ -646,9 +639,34 @@ async function createBridgeServer(options) {
       }
     }
 
+    // Build requestInit with Authorization header for nginx auth_request passthrough.
+    // When the bridge connects to a remote endpoint (e.g. https://dev.example.com/indexer/mcp),
+    // nginx's auth_request subrequest checks the Authorization header. Without it, the
+    // connection is rejected with 401.
+    const transportOpts = {};
+    if (sessionId && !sessionId.startsWith("ctxce-")) {
+      transportOpts.requestInit = {
+        headers: {
+          Authorization: `Bearer ${sessionId}`,
+        },
+      };
+      debugLog(`[ctxce] Transport auth: injecting Authorization header (session ${sessionId.slice(0, 8)}...)`);
+    } else {
+      // Check for API key in environment as fallback
+      const envApiKey = (process.env.CTXCE_API_KEY || process.env.CTXCE_AUTH_TOKEN || "").trim();
+      if (envApiKey) {
+        transportOpts.requestInit = {
+          headers: {
+            Authorization: `Bearer ${envApiKey}`,
+          },
+        };
+        debugLog("[ctxce] Transport auth: injecting Authorization header (env API key/token)");
+      }
+    }
+
     let nextIndexerClient = null;
     try {
-      const indexerTransport = new StreamableHTTPClientTransport(indexerUrl);
+      const indexerTransport = new StreamableHTTPClientTransport(indexerUrl, transportOpts);
       const client = new Client(
         {
           name: "ctx-context-engine-bridge-http-client",
@@ -672,7 +690,7 @@ async function createBridgeServer(options) {
     let nextMemoryClient = null;
     if (memoryUrl) {
       try {
-        const memoryTransport = new StreamableHTTPClientTransport(memoryUrl);
+        const memoryTransport = new StreamableHTTPClientTransport(memoryUrl, transportOpts);
         const client = new Client(
           {
             name: "ctx-context-engine-bridge-memory-client",
@@ -971,7 +989,8 @@ export async function runHttpMcpServer(options) {
 
   // Pre-warm: validate upstream connectivity (best-effort)
   try {
-    await createBridgeServer(options);
+    const warmupServer = await createBridgeServer(options);
+    await warmupServer.close();
     debugLog("[ctxce] HTTP bridge validated upstream connectivity");
   } catch (err) {
     debugLog("[ctxce] HTTP bridge warmup failed (non-fatal): " + String(err));

package/src/oauthHandler.js

@@ -277,7 +277,11 @@ export function getLoginPage(redirectUri, clientId, state, codeChallenge, codeCh
         throw new Error('No redirect URL');
       }
     } catch (err) {
-      result.innerHTML = '<p class="error">' + err.message + '</p>';
+      result.textContent = '';
+      var p = document.createElement('p');
+      p.className = 'error';
+      p.textContent = err.message;
+      result.appendChild(p);
     }
   });
   </script>