@01.software/cli 0.7.0 → 0.7.1

package/dist/index.js

@@ -440,17 +440,6 @@ function exitWithError(error, options = {}) {
 function isValidBearerToken(secret) {
   return secret.startsWith("sk01_") || secret.startsWith("pat01_");
 }
-var tenantHeaderInterceptorInstalled = false;
-function installTenantHeaderInterceptor(tenantId) {
-  if (tenantHeaderInterceptorInstalled) return;
-  tenantHeaderInterceptorInstalled = true;
-  const originalFetch = globalThis.fetch.bind(globalThis);
-  globalThis.fetch = async (input, init) => {
-    const headers = new Headers(init?.headers);
-    if (!headers.has("X-Tenant-Id")) headers.set("X-Tenant-Id", tenantId);
-    return originalFetch(input, { ...init, headers });
-  };
-}
 function resolveClient(apiKeyFlag) {
   let publishableKey = process.env.SOFTWARE_PUBLISHABLE_KEY;
   let secretKey = apiKeyFlag ?? process.env.SOFTWARE_SECRET_KEY;
@@ -460,7 +449,7 @@ function resolveClient(apiKeyFlag) {
     if (local) {
       publishableKey = publishableKey ?? local.publishableKey;
       secretKey = secretKey ?? local.secretKey;
-      tenantId = local.tenantId;
+      tenantId = tenantId ?? local.tenantId;
     }
   }
   if (!publishableKey || !secretKey) {
@@ -495,10 +484,16 @@ function resolveClient(apiKeyFlag) {
       }
     });
   }
-  if (tenantId) installTenantHeaderInterceptor(tenantId);
   const serverOptions = { publishableKey, secretKey, tenantId };
   return {
-    collections: new CollectionClient(publishableKey, secretKey),
+    collections: new CollectionClient(
+      publishableKey,
+      secretKey,
+      void 0,
+      void 0,
+      void 0,
+      tenantId
+    ),
     commerce: new ServerCommerceClient(serverOptions),
     publishableKey,
     secretKey
@@ -1428,13 +1423,28 @@ import { existsSync as existsSync2 } from "fs";
 import { spawn } from "child_process";
 import { fileURLToPath } from "url";
 var __dirname = dirname(fileURLToPath(import.meta.url));
-function findStdioEntry() {
-  for (const depth of ["../../../..", "../../.."]) {
-    const candidate = resolve(__dirname, depth, "apps/mcp/.xmcp/stdio.js");
-    if (existsSync2(candidate)) return candidate;
+function findStdioEntry(baseDir = __dirname) {
+  const packaged = resolve(baseDir, "mcp/stdio.js");
+  if (existsSync2(packaged)) return packaged;
+  const roots = ["../../../..", "../../..", "../.."];
+  const entries = ["apps/mcp/dist/stdio.js", "apps/mcp/.xmcp/stdio.js"];
+  for (const entry of entries) {
+    for (const root of roots) {
+      const candidate = resolve(baseDir, root, entry);
+      if (existsSync2(candidate)) return candidate;
+    }
   }
   return null;
 }
+function createMcpEnv(baseEnv, client) {
+  const env = {
+    ...baseEnv,
+    SOFTWARE_PUBLISHABLE_KEY: client.publishableKey,
+    SOFTWARE_SECRET_KEY: client.secretKey
+  };
+  delete env.SOFTWARE_TENANT_ID;
+  return env;
+}
 function registerMcpCommands(program2) {
   program2.command("mcp").description("Start MCP server over stdio").action(() => {
     const client = resolveClient(program2.opts().apiKey);
@@ -1447,11 +1457,7 @@ function registerMcpCommands(program2) {
       );
     }
     const child = spawn(process.execPath, [stdioEntry], {
-      env: {
-        ...process.env,
-        SOFTWARE_PUBLISHABLE_KEY: client.publishableKey,
-        SOFTWARE_SECRET_KEY: client.secretKey
-      },
+      env: createMcpEnv(process.env, client),
       stdio: ["inherit", "inherit", "inherit"]
     });
     child.on("error", (err) => {