@zivis/mcp 0.1.0-alpha.2 → 0.1.0-alpha.20

package/dist/api-client.d.ts

@@ -1,27 +1,27 @@
 /**
  * ZIVIS API Client
  *
- * HTTPS client that attaches the appropriate auth header
- * based on the active auth method:
- * - OAuth: Authorization: Bearer <token>
- * - API Key: X-API-Key: <key>
- *
- * Handles 401 responses by attempting token refresh (OAuth)
- * before returning an auth error.
+ * Uses API keys for all requests (X-API-Key). OAuth in the CLI exists to mint
+ * org-scoped keys via `zivis auth bind`; Bearer access tokens are not used here.
  */
 import type { ZivisConfig } from "./types.js";
 export declare class ApiClient {
     private config;
     constructor(config?: ZivisConfig);
+    /**
+     * Return a config with the session resolved from the project binding when
+     * no explicit session was set at server startup. Called on every request so
+     * that a globally-installed MCP server automatically uses the right session
+     * for whichever workspace it's called from, without needing a per-project
+     * `zivis mcp install`.
+     */
+    resolveEffectiveConfig(cwd?: string): ZivisConfig;
     /**
      * Build auth headers from current credentials
      */
     private buildAuthHeaders;
     /**
-     * Make an authenticated request to the ZIVIS API.
-     *
-     * Automatically resolves credentials and attaches auth headers.
-     * On 401 with OAuth, attempts one token refresh and retries.
+     * Make an authenticated request to the ZIVIS API using an MCP API key (X-API-Key).
      */
     request<T>(method: string, path: string, body?: unknown): Promise<T>;
     private doRequest;

package/dist/api-client.js

@@ -1,21 +1,44 @@
 /**
  * ZIVIS API Client
  *
- * HTTPS client that attaches the appropriate auth header
- * based on the active auth method:
- * - OAuth: Authorization: Bearer <token>
- * - API Key: X-API-Key: <key>
- *
- * Handles 401 responses by attempting token refresh (OAuth)
- * before returning an auth error.
+ * Uses API keys for all requests (X-API-Key). OAuth in the CLI exists to mint
+ * org-scoped keys via `zivis auth bind`; Bearer access tokens are not used here.
  */
 import { resolveAuth } from "./auth/index.js";
+import { detectProjectBinding, resolveConfigFromBinding, resolveMcpSessionForWorkspace, } from "./project-binding.js";
 import { DEFAULT_CONFIG } from "./types.js";
 export class ApiClient {
     config;
     constructor(config = DEFAULT_CONFIG) {
         this.config = config;
     }
+    /**
+     * Return a config with the session resolved from the project binding when
+     * no explicit session was set at server startup. Called on every request so
+     * that a globally-installed MCP server automatically uses the right session
+     * for whichever workspace it's called from, without needing a per-project
+     * `zivis mcp install`.
+     */
+    resolveEffectiveConfig(cwd) {
+        const ws = this.config.workspacePath ?? cwd ?? process.cwd();
+        const detected = detectProjectBinding(ws);
+        if (!detected) {
+            return this.config;
+        }
+        const { binding } = detected;
+        const fromBinding = resolveConfigFromBinding(ws);
+        // Same session precedence as server startup (see resolveMcpSessionForWorkspace).
+        // Always overlay binding for this workspace (OAuth URL, API host, keychain bucket).
+        return {
+            ...this.config,
+            session: resolveMcpSessionForWorkspace(this.config, ws, detected, fromBinding),
+            ...(binding.apiBaseUrl ? { apiBaseUrl: binding.apiBaseUrl } : {}),
+            ...(binding.oauthApiUrl ? { oauthApiUrl: binding.oauthApiUrl } : {}),
+            ...(binding.oauthClientId ? { oauthClientId: binding.oauthClientId } : {}),
+            ...(binding.keychainPrefix ? { keychainPrefix: binding.keychainPrefix } : {}),
+            ...(binding.configDir ? { configDir: binding.configDir } : {}),
+        };
+    }
     /**
      * Build auth headers from current credentials
      */
@@ -30,41 +53,22 @@ export class ApiClient {
         }
     }
     /**
-     * Make an authenticated request to the ZIVIS API.
-     *
-     * Automatically resolves credentials and attaches auth headers.
-     * On 401 with OAuth, attempts one token refresh and retries.
+     * Make an authenticated request to the ZIVIS API using an MCP API key (X-API-Key).
      */
     async request(method, path, body) {
-        const creds = await resolveAuth(this.config);
+        const effectiveConfig = this.resolveEffectiveConfig();
+        const creds = await resolveAuth(effectiveConfig, "apikey");
         if (creds.method === "none") {
-            throw new ApiError("Not authenticated. Run: zivis auth login", 401, "AUTH_REQUIRED");
-        }
-        const result = await this.doRequest(method, path, body, creds);
-        // If 401 and using OAuth, try refreshing
-        if (result.status === 401 && creds.method === "oauth") {
-            const freshCreds = await resolveAuth(this.config);
-            if (freshCreds.method === "oauth" &&
-                freshCreds.accessToken !== creds.accessToken) {
-                // Token was refreshed, retry
-                const retryResult = await this.doRequest(method, path, body, freshCreds);
-                if (retryResult.status === 401) {
-                    throw new ApiError("Session expired. Run: zivis auth login", 401, "SESSION_EXPIRED");
-                }
-                if (!retryResult.ok) {
-                    throw new ApiError(retryResult.errorMessage || "API request failed", retryResult.status, "API_ERROR");
-                }
-                return retryResult.data;
-            }
-            throw new ApiError("Session expired. Run: zivis auth login", 401, "SESSION_EXPIRED");
+            throw new ApiError("Not authenticated. MCP uses API keys only — run: zivis auth bind (or zivis auth token sk_... --session <name>)", 401, "AUTH_REQUIRED");
         }
+        const result = await this.doRequest(method, path, body, creds, effectiveConfig.apiBaseUrl);
         if (!result.ok) {
             throw new ApiError(result.errorMessage || `API request failed: ${method} ${path}`, result.status, "API_ERROR");
         }
         return result.data;
     }
-    async doRequest(method, path, body, creds) {
-        const url = `${this.config.apiBaseUrl}${path}`;
+    async doRequest(method, path, body, creds, apiBaseUrl) {
+        const url = `${apiBaseUrl}${path}`;
         const headers = {
             "Content-Type": "application/json",
             "User-Agent": "@zivis-ai/cli",
@@ -104,11 +108,12 @@ export class ApiClient {
      * Used for artifact content streaming where the response is not JSON.
      */
     async getText(path) {
-        const creds = await resolveAuth(this.config);
+        const effectiveConfig = this.resolveEffectiveConfig();
+        const creds = await resolveAuth(effectiveConfig, "apikey");
         if (creds.method === "none") {
-            throw new ApiError("Not authenticated. Run: zivis auth login", 401, "AUTH_REQUIRED");
+            throw new ApiError("Not authenticated. MCP uses API keys only — run: zivis auth bind", 401, "AUTH_REQUIRED");
         }
-        const url = `${this.config.apiBaseUrl}${path}`;
+        const url = `${effectiveConfig.apiBaseUrl}${path}`;
         const headers = {
             "User-Agent": "@zivis-ai/cli",
             ...this.buildAuthHeaders(creds),

package/dist/api-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,6BAA6B,GAC9B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,OAAO,SAAS;IACZ,MAAM,CAAc;IAE5B,YAAY,SAAsB,cAAc;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;;;;OAMG;IACH,sBAAsB,CAAC,GAAY;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAC7D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,WAAW,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;QACjD,iFAAiF;QACjF,oFAAoF;QACpF,OAAO;YACL,GAAG,IAAI,CAAC,MAAM;YACd,OAAO,EAAE,6BAA6B,CACpC,IAAI,CAAC,MAAM,EACX,EAAE,EACF,QAAQ,EACR,WAAW,CACZ;YACD,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/D,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,gBAAgB,CACtB,KAAsB;QAEtB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;YACrB,KAAK,OAAO;gBACV,OAAO,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YAC1D,KAAK,QAAQ;gBACX,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,MAAO,EAAE,CAAC;YACxC,KAAK,MAAM;gBACT,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CACX,MAAc,EACd,IAAY,EACZ,IAAc;QAEd,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE3D,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC5B,MAAM,IAAI,QAAQ,CAChB,gHAAgH,EAChH,GAAG,EACH,eAAe,CAChB,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CACjC,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,eAAe,CAAC,UAAU,CAC3B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,IAAI,QAAQ,CAChB,MAAM,CAAC,YAAY,IAAI,uBAAuB,MAAM,IAAI,IAAI,EAAE,EAC9D,MAAM,CAAC,MAAM,EACb,WAAW,CACZ,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC,IAAK,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,MAAc,EACd,IAAY,EACZ,IAAa,EACb,KAAsB,EACtB,UAAkB;QAOlB,MAAM,GAAG,GAAG,GAAG,UAAU,GAAG,IAAI,EAAE,CAAC;QACnC,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,YAAY,EAAE,eAAe;YAC7B,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;SAChC,CAAC;QAEF,MAAM,YAAY,GAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QACtD,IAAI,IAAI,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YAC7B,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YAEhD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1D,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,YAAY,EACT,SAAoC,CAAC,OAAO;wBAC5C,SAAoC,CAAC,KAAK;wBAC3C,QAAQ,QAAQ,CAAC,MAAM,EAAE;iBAC5B,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,CAAC;YAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QACrD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,gBAAgB;YAChB,MAAM,OAAO,GACX,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC;YAChE,MAAM,IAAI,QAAQ,CAChB,mCAAmC,GAAG,MAAM,OAAO,EAAE,EACrD,CAAC,EACD,eAAe,CAChB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,4BAA4B;IAE5B,KAAK,CAAC,GAAG,CAAI,IAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAI,KAAK,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE3D,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC5B,MAAM,IAAI,QAAQ,CAChB,kEAAkE,EAClE,GAAG,EACH,eAAe,CAChB,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,UAAU,GAAG,IAAI,EAAE,CAAC;QACnD,MAAM,OAAO,GAA2B;YACtC,YAAY,EAAE,eAAe;YAC7B,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;SAChC,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1D,MAAM,IAAI,QAAQ,CACf,SAAoC,CAAC,OAAO;gBAC1C,SAAoC,CAAC,KAAK;gBAC3C,QAAQ,QAAQ,CAAC,MAAM,EAAE,EAC3B,QAAQ,CAAC,MAAM,EACf,WAAW,CACZ,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,KAAK,CAAI,IAAY,EAAE,IAAa;QACxC,OAAO,IAAI,CAAC,OAAO,CAAI,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,IAAY,EAAE,IAAa;QACvC,OAAO,IAAI,CAAC,OAAO,CAAI,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,IAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAI,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;CACF;AAED,MAAM,OAAO,QAAS,SAAQ,KAAK;IAGf;IACA;IAHlB,YACE,OAAe,EACC,MAAc,EACd,IAAY;QAE5B,KAAK,CAAC,OAAO,CAAC,CAAC;QAHC,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAQ;QAG5B,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF"}

package/dist/auth/index.d.ts

@@ -2,15 +2,19 @@
  * Auth Orchestrator
  *
  * Resolves credentials using the defined precedence:
- * 1. OS Keychain — OAuth tokens (preferred, user-scoped, auto-refresh)
- * 2. OS Keychain — API key (fallback, org-scoped)
- * 3. ZIVIS_API_KEY env var (CI environments)
- * 4. Not authenticated (tools return auth error with setup instructions)
+ * 1. OS Keychain — Local Project Binding Token / API key (apikey.<session>)
+ *    Minted by `zivis auth bind` — org-scoped, never expires, no refresh drift.
+ *    The MCP server resolves with forceMethod=`"apikey"` only: OAuth is for
+ *    browser login that *mints* this key, not for Bearer access to tenant APIs.
+ * 2. ZIVIS_API_KEY env var (CI environments)
+ * 3. OS Keychain — OAuth tokens (CLI `zivis auth status` / token refresh only — not MCP)
+ * 4. OS Keychain — default API key (no named session)
+ * 5. Not authenticated
  */
 import type { AuthCredentials, AuthMethod, ZivisConfig } from "../types.js";
 export { login } from "./oauth.js";
 export { keychainClearAll, keychainClearSession, getStorageName, getSessionAccount } from "./keychain.js";
-export { keychainStore, keychainRead } from "./keychain.js";
+export { keychainStore, keychainRead, keychainDelete } from "./keychain.js";
 export { loadTokens } from "./token-refresh.js";
 export { loadSessionIndex, saveSessionEntry, removeSessionEntry, listSessions } from "./sessions.js";
 /**

package/dist/auth/index.js

@@ -2,17 +2,21 @@
  * Auth Orchestrator
  *
  * Resolves credentials using the defined precedence:
- * 1. OS Keychain — OAuth tokens (preferred, user-scoped, auto-refresh)
- * 2. OS Keychain — API key (fallback, org-scoped)
- * 3. ZIVIS_API_KEY env var (CI environments)
- * 4. Not authenticated (tools return auth error with setup instructions)
+ * 1. OS Keychain — Local Project Binding Token / API key (apikey.<session>)
+ *    Minted by `zivis auth bind` — org-scoped, never expires, no refresh drift.
+ *    The MCP server resolves with forceMethod=`"apikey"` only: OAuth is for
+ *    browser login that *mints* this key, not for Bearer access to tenant APIs.
+ * 2. ZIVIS_API_KEY env var (CI environments)
+ * 3. OS Keychain — OAuth tokens (CLI `zivis auth status` / token refresh only — not MCP)
+ * 4. OS Keychain — default API key (no named session)
+ * 5. Not authenticated
  */
 import { keychainRead } from "./keychain.js";
 import { getValidAccessToken } from "./token-refresh.js";
-import { DEFAULT_CONFIG } from "../types.js";
+import { DEFAULT_CONFIG, credentialStorageFromConfig } from "../types.js";
 export { login } from "./oauth.js";
 export { keychainClearAll, keychainClearSession, getStorageName, getSessionAccount } from "./keychain.js";
-export { keychainStore, keychainRead } from "./keychain.js";
+export { keychainStore, keychainRead, keychainDelete } from "./keychain.js";
 export { loadTokens } from "./token-refresh.js";
 export { loadSessionIndex, saveSessionEntry, removeSessionEntry, listSessions } from "./sessions.js";
 /**
@@ -26,34 +30,46 @@ export { loadSessionIndex, saveSessionEntry, removeSessionEntry, listSessions }
  */
 export async function resolveAuth(config = DEFAULT_CONFIG, forceMethod) {
     const session = config.session;
-    // 1. OAuth tokens (unless forced to apikey)
-    if (forceMethod !== "apikey") {
-        const accessToken = await getValidAccessToken(config);
-        if (accessToken) {
-            return { method: "oauth", accessToken };
+    const st = credentialStorageFromConfig(config);
+    // 1. Per-session keychain API key — Local Project Binding Token (preferred).
+    //    Minted by `zivis auth bind` and stored under `apikey.<session>`.
+    //    Org-scoped at the WorkOS level, never refreshes, no drift risk.
+    //    Also covers `zivis auth token sk_xxx --session <name>` for CI injection.
+    if (forceMethod !== "oauth") {
+        const apiKeyAccount = session ? `apikey.${session}` : null;
+        if (apiKeyAccount) {
+            const sessionApiKey = await keychainRead(apiKeyAccount, st);
+            if (sessionApiKey) {
+                return { method: "apikey", apiKey: sessionApiKey };
+            }
         }
     }
-    // 2. ZIVIS_API_KEY env var — always checked, even for named sessions.
-    // This is an explicit user action (they set the env var in their MCP config),
-    // so it's safe to use regardless of session scope.
+    // 2. ZIVIS_API_KEY env var (CI environments — explicit, no session ambiguity).
     const envKey = process.env.ZIVIS_API_KEY;
     if (envKey) {
         return { method: "apikey", apiKey: envKey };
     }
+    // 3. OAuth tokens (fallback for `zivis auth login` users who haven't run bind).
+    if (forceMethod !== "apikey") {
+        const accessToken = await getValidAccessToken(config);
+        if (accessToken) {
+            return { method: "oauth", accessToken };
+        }
+    }
     // CROSS-TENANT SAFETY: If a named session is active, do NOT fall through
     // to default keychain credentials. This prevents accidentally using admin tokens
     // when working in a customer's project.
     if (session) {
         return { method: "none" };
     }
-    // 3. API key from keychain (only for default/no-session)
+    // 4. Default API key from keychain (no named session).
     if (forceMethod !== "oauth") {
-        const apiKey = await keychainRead("apikey");
+        const apiKey = await keychainRead("apikey", st);
         if (apiKey) {
             return { method: "apikey", apiKey };
         }
     }
-    // 4. Not authenticated
+    // 5. Not authenticated
     return { method: "none" };
 }
 /**

package/dist/auth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC1G,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAErG;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,SAAsB,cAAc,EACpC,WAAwB;IAExB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAE/B,4CAA4C;IAC5C,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,sEAAsE;IACtE,8EAA8E;IAC9E,mDAAmD;IACnD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IACzC,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9C,CAAC;IAED,yEAAyE;IACzE,iFAAiF;IACjF,wCAAwC;IACxC,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED,yDAAyD;IACzD,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtC,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,SAAsB,cAAc;IAEpC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,OAAO;YACV,OAAO,sBAAsB,CAAC;QAChC,KAAK,QAAQ;YACX,OAAO,YAAY,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QACpG,KAAK,MAAM;YACT,OAAO,mBAAmB,CAAC;IAC/B,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}

package/dist/auth/keychain.d.ts

@@ -10,24 +10,25 @@
  *
  * Falls back to encrypted file if keychain CLI is unavailable.
  */
+import { type CredentialStorage } from "../types.js";
 /**
  * Returns the keychain account key for a given session.
  * - No session or undefined → "oauth" (backward compatible)
  * - Named session → "oauth.{session}"
  */
 export declare function getSessionAccount(session?: string): string;
-export declare function keychainStore(account: string, value: string): Promise<void>;
-export declare function keychainRead(account: string): Promise<string | null>;
-export declare function keychainDelete(account: string): Promise<void>;
+export declare function keychainStore(account: string, value: string, storage?: CredentialStorage): Promise<void>;
+export declare function keychainRead(account: string, storage?: CredentialStorage): Promise<string | null>;
+export declare function keychainDelete(account: string, storage?: CredentialStorage): Promise<void>;
 /**
  * Delete credentials for a specific session
  */
-export declare function keychainClearSession(session?: string): Promise<void>;
+export declare function keychainClearSession(session?: string, storage?: CredentialStorage): Promise<void>;
 /**
  * Delete all stored credentials (default OAuth + API key).
  * Does NOT clear named sessions — use keychainClearSession() for those.
  */
-export declare function keychainClearAll(): Promise<void>;
+export declare function keychainClearAll(storage?: CredentialStorage): Promise<void>;
 /**
  * Returns the storage mechanism name for display purposes
  */

package/dist/auth/keychain.js

@@ -18,8 +18,12 @@ import * as os from "node:os";
 import * as crypto from "node:crypto";
 import { ENV_CONFIG } from "../types.js";
 const execFileAsync = promisify(execFile);
-// Use environment-aware prefix so staging and production credentials are isolated
-const SERVICE_PREFIX = ENV_CONFIG.keychainPrefix;
+function resolvedStorage(storage) {
+    return (storage ?? {
+        keychainPrefix: ENV_CONFIG.keychainPrefix,
+        configDir: ENV_CONFIG.configDir,
+    });
+}
 /**
  * Returns the keychain account key for a given session.
  * - No session or undefined → "oauth" (backward compatible)
@@ -28,38 +32,52 @@ const SERVICE_PREFIX = ENV_CONFIG.keychainPrefix;
 export function getSessionAccount(session) {
     return session ? `oauth.${session}` : "oauth";
 }
-function getServiceName(account) {
-    return `${SERVICE_PREFIX}.${account}`;
+function getServiceName(account, keychainPrefix) {
+    return `${keychainPrefix}.${account}`;
 }
-function getFallbackDir() {
-    // Use environment-aware config dir so staging and production are isolated
-    const configDir = ENV_CONFIG.configDir;
+function getFallbackDir(configDir) {
     if (process.platform === "win32") {
         return path.join(process.env.APPDATA || os.homedir(), configDir);
     }
     return path.join(os.homedir(), ".config", configDir);
 }
-function getFallbackPath(account) {
-    return path.join(getFallbackDir(), `${account}.enc`);
+function getFallbackPath(account, storage) {
+    return path.join(getFallbackDir(storage.configDir), `${account}.enc`);
 }
 // ── macOS Keychain ──
-async function macosStore(account, value) {
-    const service = getServiceName(account);
-    // Delete existing entry first (ignore errors if not found)
-    try {
-        await execFileAsync("security", [
-            "delete-generic-password",
-            "-a",
-            "zivis-mcp",
-            "-s",
-            service,
-        ]);
-    }
-    catch {
-        // Entry didn't exist, that's fine
+/**
+ * Drains every entry that matches `-a zivis-mcp -s <service>`. The macOS
+ * keychain happily keeps duplicate entries for the same service+account pair
+ * (different creation timestamps), so a single delete leaves stragglers behind.
+ * Loop until the command errors (no entries left).
+ */
+async function macosDeleteAll(service) {
+    for (let i = 0; i < 100; i++) {
+        try {
+            await execFileAsync("security", [
+                "delete-generic-password",
+                "-a",
+                "zivis-mcp",
+                "-s",
+                service,
+            ]);
+        }
+        catch {
+            return; // No more entries.
+        }
     }
+}
+async function macosStore(account, value, keychainPrefix) {
+    const service = getServiceName(account, keychainPrefix);
+    // Drain stale duplicates before writing — guards against history left by
+    // older builds that didn't clean up after themselves.
+    await macosDeleteAll(service);
+    // -U updates in place if a matching entry exists, otherwise creates one.
+    // Belt-and-braces with the drain above; together they keep the keychain
+    // from accumulating duplicate generic-password entries.
     await execFileAsync("security", [
         "add-generic-password",
+        "-U",
         "-a",
         "zivis-mcp",
         "-s",
@@ -68,8 +86,8 @@ async function macosStore(account, value) {
         value,
     ]);
 }
-async function macosRead(account) {
-    const service = getServiceName(account);
+async function macosRead(account, keychainPrefix) {
+    const service = getServiceName(account, keychainPrefix);
     try {
         const { stdout } = await execFileAsync("security", [
             "find-generic-password",
@@ -85,29 +103,17 @@ async function macosRead(account) {
         return null;
     }
 }
-async function macosDelete(account) {
-    const service = getServiceName(account);
-    try {
-        await execFileAsync("security", [
-            "delete-generic-password",
-            "-a",
-            "zivis-mcp",
-            "-s",
-            service,
-        ]);
-    }
-    catch {
-        // Entry didn't exist
-    }
+async function macosDelete(account, keychainPrefix) {
+    await macosDeleteAll(getServiceName(account, keychainPrefix));
 }
 // ── Linux Secret Service ──
-async function linuxStore(account, value) {
+async function linuxStore(account, value, keychainPrefix) {
     const child = execFileAsync("secret-tool", [
         "store",
         "--label",
         `ZIVIS MCP ${account}`,
         "service",
-        SERVICE_PREFIX,
+        keychainPrefix,
         "account",
         account,
     ]);
@@ -116,12 +122,12 @@ async function linuxStore(account, value) {
     child.child.stdin?.end();
     await child;
 }
-async function linuxRead(account) {
+async function linuxRead(account, keychainPrefix) {
     try {
         const { stdout } = await execFileAsync("secret-tool", [
             "lookup",
             "service",
-            SERVICE_PREFIX,
+            keychainPrefix,
             "account",
             account,
         ]);
@@ -131,12 +137,12 @@ async function linuxRead(account) {
         return null;
     }
 }
-async function linuxDelete(account) {
+async function linuxDelete(account, keychainPrefix) {
     try {
         await execFileAsync("secret-tool", [
             "clear",
             "service",
-            SERVICE_PREFIX,
+            keychainPrefix,
             "account",
             account,
         ]);
@@ -151,7 +157,7 @@ function deriveKey() {
     const seed = `zivis-mcp:${os.hostname()}:${os.userInfo().username}`;
     return crypto.createHash("sha256").update(seed).digest();
 }
-async function fileStore(account, value) {
+async function fileStore(account, value, storage) {
     const key = deriveKey();
     const iv = crypto.randomBytes(16);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -159,13 +165,13 @@ async function fileStore(account, value) {
     let encrypted = cipher.update(value, "utf8", "hex");
     encrypted += cipher.final("hex");
     const data = JSON.stringify({ iv: iv.toString("hex"), data: encrypted });
-    const dir = getFallbackDir();
+    const dir = getFallbackDir(storage.configDir);
     await fs.mkdir(dir, { recursive: true });
-    await fs.writeFile(getFallbackPath(account), data, { mode: 0o600 });
+    await fs.writeFile(getFallbackPath(account, storage), data, { mode: 0o600 });
 }
-async function fileRead(account) {
+async function fileRead(account, storage) {
     try {
-        const raw = await fs.readFile(getFallbackPath(account), "utf8");
+        const raw = await fs.readFile(getFallbackPath(account, storage), "utf8");
         const { iv, data } = JSON.parse(raw);
         const key = deriveKey();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -178,9 +184,9 @@ async function fileRead(account) {
         return null;
     }
 }
-async function fileDelete(account) {
+async function fileDelete(account, storage) {
     try {
-        await fs.unlink(getFallbackPath(account));
+        await fs.unlink(getFallbackPath(account, storage));
     }
     catch {
         // File didn't exist
@@ -211,51 +217,58 @@ async function useKeychain() {
     return keychainAvailable;
 }
 // ── Public API ──
-export async function keychainStore(account, value) {
+export async function keychainStore(account, value, storage) {
+    const st = resolvedStorage(storage);
     // Always store to encrypted file as fallback (for environments where keychain CLI
     // may not be available, e.g., MCP servers spawned by IDEs with different $PATH)
-    await fileStore(account, value);
+    await fileStore(account, value, st);
     // Also store to native keychain if available
     if (await useKeychain()) {
         if (process.platform === "darwin") {
-            await macosStore(account, value);
+            await macosStore(account, value, st.keychainPrefix);
         }
         else if (process.platform === "linux") {
-            await linuxStore(account, value);
+            await linuxStore(account, value, st.keychainPrefix);
         }
     }
 }
-export async function keychainRead(account) {
+export async function keychainRead(account, storage) {
+    const st = resolvedStorage(storage);
     if (await useKeychain()) {
         if (process.platform === "darwin")
-            return macosRead(account);
+            return macosRead(account, st.keychainPrefix);
         if (process.platform === "linux")
-            return linuxRead(account);
+            return linuxRead(account, st.keychainPrefix);
     }
-    return fileRead(account);
+    return fileRead(account, st);
 }
-export async function keychainDelete(account) {
+export async function keychainDelete(account, storage) {
+    const st = resolvedStorage(storage);
+    // keychainStore writes to BOTH the native keychain AND the encrypted file
+    // fallback (so MCP servers spawned by IDEs can still read credentials when
+    // the `security` CLI is unreachable on $PATH). Delete must wipe both, or
+    // a stale OAuth/api-key file silently outlives a logout.
+    await fileDelete(account, st);
     if (await useKeychain()) {
         if (process.platform === "darwin")
-            return macosDelete(account);
+            return macosDelete(account, st.keychainPrefix);
         if (process.platform === "linux")
-            return linuxDelete(account);
+            return linuxDelete(account, st.keychainPrefix);
     }
-    return fileDelete(account);
 }
 /**
  * Delete credentials for a specific session
  */
-export async function keychainClearSession(session) {
-    await keychainDelete(getSessionAccount(session));
+export async function keychainClearSession(session, storage) {
+    await keychainDelete(getSessionAccount(session), storage);
 }
 /**
  * Delete all stored credentials (default OAuth + API key).
  * Does NOT clear named sessions — use keychainClearSession() for those.
  */
-export async function keychainClearAll() {
-    await keychainDelete("oauth");
-    await keychainDelete("apikey");
+export async function keychainClearAll(storage) {
+    await keychainDelete("oauth", storage);
+    await keychainDelete("apikey", storage);
 }
 /**
  * Returns the storage mechanism name for display purposes