@uzqw/mcp 0.1.0 → 0.1.1

package/dist/index.js

@@ -237,7 +237,7 @@ var CALLBACK_PORT = 8199;
 var LOGIN_TIMEOUT_MS = 12e4;
 var sub = process.argv[2];
 if (sub === "install" || sub === "uninstall") {
-  const { runInstall, runUninstall } = await import("./install-VFWABBBV.js");
+  const { runInstall, runUninstall } = await import("./install-2GRD6TZR.js");
   const args = process.argv.slice(3);
   const yes = args.includes("--yes") || args.includes("-y");
   const noLogin = args.includes("--no-login");

package/dist/{install-VFWABBBV.js → install-2GRD6TZR.js}

@@ -12,10 +12,13 @@ import { dirname, join } from "path";
 import { spawnSync } from "child_process";
 import { createInterface } from "readline/promises";
 import open from "open";
-import { RecolxClient, runOAuthCallback } from "@uzqw/shared";
+import { RecolxClient, DEFAULT_API_BASE, runOAuthCallback } from "@uzqw/shared";
 var SERVER_NAME = "recolx";
 var CALLBACK_PORT = 8199;
 var LOGIN_TIMEOUT_MS = 12e4;
+function resolveApiBase() {
+  return (process.env.RECOLX_API_BASE?.trim() || DEFAULT_API_BASE).replace(/\/+$/, "");
+}
 function findNodeBinCommand(command) {
   const commandName = platform() === "win32" ? `${command}.cmd` : command;
   const sibling = join(dirname(process.execPath), commandName);
@@ -30,10 +33,8 @@ function isLocalPackageSpec(spec) {
 }
 function getMcpEntry() {
   const packageSpec = process.env.RECOLX_MCP_PACKAGE_SPEC?.trim() || "@uzqw/mcp@latest";
-  if (isLocalPackageSpec(packageSpec)) {
-    return { command: findNodeBinCommand("npm"), args: ["exec", "--yes", "--package", packageSpec, "--", "recolx-mcp"] };
-  }
-  return { command: findNodeBinCommand("npx"), args: ["-y", packageSpec] };
+  const base = isLocalPackageSpec(packageSpec) ? { command: findNodeBinCommand("npm"), args: ["exec", "--yes", "--package", packageSpec, "--", "recolx-mcp"] } : { command: findNodeBinCommand("npx"), args: ["-y", packageSpec] };
+  return { ...base, env: { RECOLX_API_BASE: resolveApiBase() } };
 }
 function commandPathIsStale(command) {
   if (!command) return false;
@@ -64,6 +65,9 @@ function configPaths() {
     claudeCodeDir: join(h, ".claude")
   };
 }
+function entryEnv(e) {
+  return e.env && Object.keys(e.env).length > 0 ? e.env : void 0;
+}
 function isJsonObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -75,9 +79,18 @@ function entryAutoUpdates(entry) {
   const args = Array.isArray(entry.args) ? entry.args : [];
   return args.some((a) => typeof a === "string" && a.includes("@uzqw/mcp@latest"));
 }
+function entryEnvMatches(entry, expected) {
+  if (!isJsonObject(entry)) return false;
+  const env = isJsonObject(entry.env) ? entry.env : {};
+  if (!expected) return true;
+  return Object.entries(expected).every(([k, v]) => env[k] === v);
+}
 function jsonAdapter(spec) {
   const rootKey = spec.rootKey ?? "mcpServers";
-  const toEntry = spec.toEntry ?? ((e) => ({ command: e.command, args: e.args }));
+  const toEntry = spec.toEntry ?? ((e) => {
+    const env = entryEnv(e);
+    return env ? { command: e.command, args: e.args, env } : { command: e.command, args: e.args };
+  });
   async function load() {
     try {
       const parsed = JSON.parse(await readFile(spec.configPath, "utf8"));
@@ -106,7 +119,7 @@ function jsonAdapter(spec) {
       const existing = servers[SERVER_NAME];
       if (existing && entryAutoUpdates(existing)) {
         const cmd = isJsonObject(existing) && typeof existing.command === "string" ? existing.command : void 0;
-        if (!commandPathIsStale(cmd)) {
+        if (!commandPathIsStale(cmd) && entryEnvMatches(existing, entryEnv(ctx.entry))) {
           return { status: "already-configured", message: "\u5DF2\u914D\u7F6E\uFF08npx @latest \u81EA\u52A8\u66F4\u65B0\uFF09", restartHint: spec.restartHint };
         }
       }
@@ -136,9 +149,25 @@ function codexBlockText(entry) {
   const win = platform() === "win32";
   const command = win ? normalizeWindowsPath(entry.command, "win32") : entry.command;
   const args = (win ? entry.args.map((a) => normalizeWindowsPath(a, "win32")) : entry.args).map((a) => JSON.stringify(a)).join(", ");
+  const env = entryEnv(entry);
+  const envLine = env ? `
+env = { ${Object.entries(env).map(([k, v]) => `${JSON.stringify(k)} = ${JSON.stringify(v)}`).join(", ")} }` : "";
   return `${CODEX_HEADER}
 command = ${JSON.stringify(command)}
-args = [${args}]`;
+args = [${args}]${envLine}`;
+}
+function extractTomlEnv(lines) {
+  for (const line of lines) {
+    const m = line.match(/^\s*env\s*=\s*\{(.*)\}\s*$/);
+    if (!m) continue;
+    const env = {};
+    for (const pair of m[1].split(",")) {
+      const kv = pair.match(/"([^"]+)"\s*=\s*"([^"]*)"/);
+      if (kv) env[kv[1]] = kv[2];
+    }
+    return env;
+  }
+  return void 0;
 }
 function codexBlockRange(lines) {
   const start = lines.findIndex((l) => l.trim() === CODEX_HEADER);
@@ -184,13 +213,13 @@ function codexAdapter(configPath) {
       const block = codexBlockText(ctx.entry);
       if (range) {
         const existingCommand = extractTomlCommand(lines.slice(range.start, range.end));
-        if (!commandPathIsStale(existingCommand)) {
+        if (!commandPathIsStale(existingCommand) && entryEnvMatches({ env: extractTomlEnv(lines.slice(range.start, range.end)) }, entryEnv(ctx.entry))) {
           return { status: "already-configured", message: "\u5DF2\u914D\u7F6E\uFF08npx @latest \u81EA\u52A8\u66F4\u65B0\uFF09" };
         }
         const rebuilt = [...lines.slice(0, range.start), ...block.split("\n"), ...lines.slice(range.end)].join("\n");
         await mkdir(dirname(configPath), { recursive: true });
         await writeFile(configPath, rebuilt, "utf8");
-        return { status: "configured", message: "\u5DF2\u4FEE\u590D\u5931\u6548\u542F\u52A8\u8DEF\u5F84\uFF08npx @latest\uFF09" };
+        return { status: "configured", message: "\u5DF2\u4FEE\u590D\u542F\u52A8\u8DEF\u5F84/env\uFF08npx @latest\uFF09" };
       }
       await mkdir(dirname(configPath), { recursive: true });
       await writeFile(configPath, `${content}${content && !content.endsWith("\n") ? "\n" : ""}
@@ -297,13 +326,16 @@ function zedAdapter(configPath) {
       const existing = servers[SERVER_NAME];
       if (existing && entryAutoUpdates(existing)) {
         const path = isJsonObject(existing) && isJsonObject(existing.command) && typeof existing.command.path === "string" ? existing.command.path : void 0;
-        if (!commandPathIsStale(path)) {
+        const existingCommand = isJsonObject(existing) && isJsonObject(existing.command) ? existing.command : void 0;
+        if (!commandPathIsStale(path) && entryEnvMatches(existingCommand, entryEnv(ctx.entry))) {
           return { status: "already-configured", message: "\u5DF2\u914D\u7F6E\uFF08npx @latest \u81EA\u52A8\u66F4\u65B0\uFF09" };
         }
       }
+      const env = entryEnv(ctx.entry);
+      const commandObj = env ? { path: ctx.entry.command, args: ctx.entry.args, env } : { path: ctx.entry.command, args: ctx.entry.args };
       config.context_servers = {
         ...servers,
-        [SERVER_NAME]: { command: { path: ctx.entry.command, args: ctx.entry.args } }
+        [SERVER_NAME]: { command: commandObj }
       };
       await mkdir(dirname(configPath), { recursive: true });
       await writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
@@ -370,7 +402,10 @@ function detectClients() {
       label: "VS Code",
       configPath: p.vsCode,
       rootKey: "servers",
-      toEntry: (e) => ({ type: "stdio", command: e.command, args: e.args }),
+      toEntry: (e) => {
+        const env = entryEnv(e);
+        return env ? { type: "stdio", command: e.command, args: e.args, env } : { type: "stdio", command: e.command, args: e.args };
+      },
       configuredMessage: "\u5DF2\u5199\u5165 .vscode/mcp.json",
       restartHint: RESTART_HINTS.vscode
     }),
@@ -604,8 +639,10 @@ export {
   codexBlockRange,
   codexBlockText,
   commandPathIsStale,
+  extractTomlEnv,
   getMcpEntry,
   normalizeWindowsPath,
+  resolveApiBase,
   runInstall,
   runUninstall
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uzqw/mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Recolx read-only MCP server (stdio) — 7 read-only tools, readOnlyHint: true",
   "mcpName": "io.github.uzqw/recolx-mcp",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "type": "module",
   "bin": {
-    "recolx-mcp": "./dist/index.js"
+    "recolx-mcp": "dist/index.js"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -18,7 +18,10 @@
       "import": "./dist/index.js"
     }
   },
-  "files": ["dist", "skills"],
+  "files": [
+    "dist",
+    "skills"
+  ],
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts --clean",
     "test": "tsx --test test/*.test.ts"