@uzqw/mcp 0.1.6 → 0.1.8

package/dist/index.js

@@ -235,12 +235,12 @@ function registerTools(server2, client2) {
 
 // src/index.ts
 var CALLBACK_PORT = 8199;
-var LOGIN_TIMEOUT_MS = 12e4;
+var LOGIN_TIMEOUT_MS = 3e5;
 var require2 = createRequire(import.meta.url);
 var MCP_VERSION = require2("../package.json").version;
 var sub = process.argv[2];
 if (sub === "install" || sub === "uninstall") {
-  const { runInstall, runUninstall, parseEnvFlag } = await import("./install-D7FNIM42.js");
+  const { runInstall, runUninstall, parseEnvFlag } = await import("./install-5NYCT73T.js");
   const args = process.argv.slice(3);
   const yes = args.includes("--yes") || args.includes("-y");
   const noLogin = args.includes("--no-login");
@@ -268,27 +268,36 @@ var READ_ONLY2 = { readOnlyHint: true, destructiveHint: false, openWorldHint: tr
 server.registerTool(
   "login",
   {
-    description: "\u767B\u5F55 Recolx\uFF08OAuth PKCE\uFF09\uFF1A\u6253\u5F00\u6D4F\u89C8\u5668\u8DF3\u8F6C\u6388\u6743\u9875\uFF0C\u540C\u610F\u540E\u5728\u672C\u5730 8199 \u56DE\u8C03\u6536\u53D6 token \u5E76\u5199\u5165 ~/.recolx/tokens-mcp-{env}.json\uFF08\u6BCF\u73AF\u5883\u72EC\u7ACB\uFF09\uFF1B\u5DF2\u767B\u5F55\u65F6\u76F4\u63A5\u8FD4\u56DE",
+    description: "\u767B\u5F55 Recolx\uFF08OAuth PKCE\uFF09\uFF1A\u6253\u5F00\u6D4F\u89C8\u5668\u8DF3\u8F6C\u6388\u6743\u9875\uFF0C\u540C\u610F\u540E\u5728\u672C\u5730 8199 \u56DE\u8C03\u6536\u53D6 token \u5E76\u5199\u5165 ~/.recolx/tokens-mcp-{env}.json\uFF08\u6BCF\u73AF\u5883\u72EC\u7ACB\uFF09\uFF1B\u5DF2\u767B\u5F55\u65F6\u76F4\u63A5\u8FD4\u56DE\u3002\u767B\u51FA\u540E\u7B2C\u4E00\u6B21 login \u4F1A\u81EA\u52A8\u5F3A\u5236\u91CD\u65B0\u8BA4\u8BC1\uFF08\u5F39 Logto \u9875\uFF09\uFF0C\u65E0\u9700\u989D\u5916\u53C2\u6570",
     annotations: { title: "\u767B\u5F55 Recolx", ...READ_ONLY2 },
     inputSchema: LoginInput
   },
-  async () => {
-    const existingToken = await client.auth.getAccessToken();
-    if (existingToken) {
-      try {
-        await client.getCurrentUser();
-        return { content: [{ type: "text", text: "\u5DF2\u767B\u5F55\u3002" }] };
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (msg.includes("401") || msg.includes("\u672A\u767B\u5F55")) {
-          await client.auth.logout();
-        } else {
-          return { content: [{ type: "text", text: `\u767B\u5F55\u6001\u6821\u9A8C\u5931\u8D25\uFF1A${msg}` }], isError: true };
+  async (args = {}) => {
+    if (!args.force && !await client.auth.isForceLoginPending()) {
+      const existingToken = await client.auth.getAccessToken();
+      if (existingToken) {
+        try {
+          await client.getCurrentUser();
+          return {
+            content: [
+              {
+                type: "text",
+                text: "\u5DF2\u767B\u5F55\u3002\u60F3\u6362\u8D26\u53F7\uFF1A\u5148 logout \u518D login\uFF08\u4F1A\u81EA\u52A8\u5F3A\u5236\u91CD\u65B0\u8BA4\u8BC1\u5F39\u51FA\u767B\u5F55\u9875\uFF09\uFF0C\u6216\u76F4\u63A5 login(force: true)\u3002"
+              }
+            ]
+          };
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          if (msg.includes("401") || msg.includes("\u672A\u767B\u5F55")) {
+            await client.auth.logout();
+          } else {
+            return { content: [{ type: "text", text: `\u767B\u5F55\u6001\u6821\u9A8C\u5931\u8D25\uFF1A${msg}` }], isError: true };
+          }
         }
       }
     }
     const devUserId = process.env.RECOLX_DEV_USER_ID;
-    const authReq = client.auth.createAuthorizationRequest(devUserId ? { user_id: devUserId } : {});
+    const authReq = await client.auth.createAuthorizationRequest(devUserId ? { user_id: devUserId } : args.force ? { prompt: "login" } : {});
     const authUrlFile = process.env.RECOLX_DEV_AUTH_URL_FILE;
     const result = await runOAuthCallback({
       port: CALLBACK_PORT,
@@ -320,10 +329,9 @@ server.registerTool(
           content: [
             {
               type: "text",
-              text: `\u6388\u6743\u8D85\u65F6\uFF082 \u5206\u949F\uFF09\u3002\u82E5\u6D4F\u89C8\u5668\u672A\u81EA\u52A8\u6253\u5F00\uFF0C\u8BF7\u624B\u52A8\u8BBF\u95EE\uFF1A
-${authReq.url}
+              text: `\u6388\u6743\u7B49\u5F85\u8D85\u65F6\uFF085 \u5206\u949F\uFF09\u3002\u82E5\u6D4F\u89C8\u5668\u5DF2\u8DF3\u8F6C\u5E76\u663E\u793A "localhost:8199 \u65E0\u6CD5\u8BBF\u95EE"\uFF0C\u8BF4\u660E\u672C\u6B21\u6388\u6743\u7A97\u53E3\u5DF2\u8FC7\u671F\u2014\u2014\u8BF7\u91CD\u65B0\u8C03\u7528 login \u518D\u8BD5\uFF08\u767B\u5F55\u9700\u5728 5 \u5206\u949F\u5185\u5B8C\u6210\uFF09\u3002
 
-\u8FDC\u7A0B/\u65E0\u5934\u673A\u5668\uFF1A\u53EF\u8BBE RECOLX_DEV_AUTH_URL_FILE=/path/url.txt \u8BA9 login \u628A\u6388\u6743 URL \u5199\u5165\u6587\u4EF6\u540E\u518D\u624B\u52A8\u5904\u7406\uFF1B\u5E76\u9700\u8F6C\u53D1\u672C\u5730\u7AEF\u53E3 ${CALLBACK_PORT}\uFF1Assh -L ${CALLBACK_PORT}:localhost:${CALLBACK_PORT}`
+\u65E0\u5934/\u8FDC\u7A0B\u673A\u5668\uFF1A\u53EF\u8BBE RECOLX_DEV_AUTH_URL_FILE=/path/url.txt \u8BA9 login \u628A\u6388\u6743 URL \u5199\u5165\u6587\u4EF6\u540E\u518D\u624B\u52A8\u5904\u7406\uFF1B\u5E76\u9700\u8F6C\u53D1\u672C\u5730\u7AEF\u53E3 ${CALLBACK_PORT}\uFF1Assh -L ${CALLBACK_PORT}:localhost:${CALLBACK_PORT}`
             }
           ],
           isError: true
@@ -355,15 +363,15 @@ server.registerTool(
   },
   async () => {
     const existingToken = await client.auth.getAccessToken();
-    if (!existingToken) {
-      return { content: [{ type: "text", text: "\u5C1A\u672A\u767B\u5F55\u3002" }] };
-    }
-    try {
-      await client.revokeCurrentUser();
-    } catch {
+    if (existingToken) {
+      try {
+        await client.revokeCurrentUser();
+      } catch {
+      }
     }
     await client.auth.logout();
-    return { content: [{ type: "text", text: "\u5DF2\u767B\u51FA\u5E76\u64A4\u9500\u6388\u6743\u3002" }] };
+    const text = existingToken ? "\u5DF2\u767B\u51FA\u5E76\u64A4\u9500 Recolx \u6388\u6743\uFF08\u672C\u5730 token \u5DF2\u5220\u9664\uFF09\u3002\u4E0B\u6B21 login \u4F1A\u81EA\u52A8\u5F3A\u5236\u91CD\u65B0\u8BA4\u8BC1\uFF1A\u6D4F\u89C8\u5668\u5F39\u51FA Logto \u767B\u5F55\u9875\uFF0C\u53EF\u76F4\u63A5\u6362\u8D26\u53F7\u3002" : "\u5C1A\u672A\u767B\u5F55\uFF08\u672C\u5730\u65E0 token\uFF09\u3002\u5DF2\u6807\u8BB0\uFF1A\u4E0B\u6B21 login \u4F1A\u8D70\u5F3A\u5236\u91CD\u65B0\u8BA4\u8BC1\uFF08\u5F39 Logto \u767B\u5F55\u9875\uFF09\u3002";
+    return { content: [{ type: "text", text }] };
   }
 );
 registerTools(server, client);

package/dist/{install-D7FNIM42.js → install-5NYCT73T.js}

@@ -453,7 +453,7 @@ function pickIdentity(user) {
 async function runLogin() {
   const client = new RecolxClient({});
   const devUserId = process.env.RECOLX_DEV_USER_ID;
-  const authReq = client.auth.createAuthorizationRequest(devUserId ? { user_id: devUserId } : {});
+  const authReq = await client.auth.createAuthorizationRequest(devUserId ? { user_id: devUserId } : {});
   const authUrlFile = process.env.RECOLX_DEV_AUTH_URL_FILE;
   const result = await runOAuthCallback({
     port: CALLBACK_PORT,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uzqw/mcp",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Recolx read-only MCP server (stdio) — 7 read-only tools, readOnlyHint: true",
   "mcpName": "io.github.uzqw/recolx-mcp",
   "publishConfig": {