multi-workspace-for-notion 0.1.0 → 0.2.0

package/plugin/server.mjs

@@ -15609,34 +15609,180 @@ var StdioServerTransport = class {
 };
 
 // src/config.ts
-import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { mkdir as mkdir2, readFile, rename, rm as rm2, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+
+// src/keychain.ts
+import { randomBytes } from "node:crypto";
+import { spawn } from "node:child_process";
+var SERVICE = "multi-workspace-for-notion";
+var CHUNK_CHARS = 3e3;
+var keychain = {
+  async get(account) {
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const manifest = await readItem(account);
+      if (manifest === void 0) return void 0;
+      const { generation, count } = parseManifest(manifest);
+      const chunks = [];
+      for (let i = 0; i < count; i++) {
+        const chunk = await readItem(chunkAccount(account, generation, i));
+        if (chunk === void 0) break;
+        chunks.push(chunk);
+      }
+      if (chunks.length === count) return Buffer.from(chunks.join(""), "base64").toString("utf8");
+    }
+    throw new Error(`\uD0A4\uCCB4\uC778 \uAC12\uC774 \uC77C\uBD80 \uC5C6\uC2B5\uB2C8\uB2E4: ${account}`);
+  },
+  async set(account, value) {
+    assertSafeAccount(account);
+    const previous = await readItem(account);
+    const encoded = Buffer.from(value, "utf8").toString("base64");
+    const generation = randomBytes(4).toString("hex");
+    const count = Math.max(1, Math.ceil(encoded.length / CHUNK_CHARS));
+    for (let i = 0; i < count; i++) {
+      await writeItem(chunkAccount(account, generation, i), encoded.slice(i * CHUNK_CHARS, (i + 1) * CHUNK_CHARS));
+    }
+    await writeItem(account, `${generation}:${count}`);
+    if (previous !== void 0) await deleteChunks(account, previous);
+  },
+  async delete(account) {
+    const manifest = await readItem(account);
+    if (manifest === void 0) return;
+    await deleteItem(account);
+    await deleteChunks(account, manifest);
+  }
+};
+function parseManifest(manifest) {
+  const match = /^([0-9a-f]+):(\d+)$/.exec(manifest);
+  if (!match) throw new Error(`\uD0A4\uCCB4\uC778 \uAC12 \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${manifest.slice(0, 20)}`);
+  return { generation: match[1], count: Number(match[2]) };
+}
+async function deleteChunks(account, manifest) {
+  const { generation, count } = parseManifest(manifest);
+  for (let i = 0; i < count; i++) await deleteItem(chunkAccount(account, generation, i));
+}
+var chunkAccount = (account, generation, index) => `${account}.${generation}.${index}`;
+function assertSafeAccount(account) {
+  if (!/^[A-Za-z0-9:_.-]+$/.test(account)) throw new Error(`\uD0A4\uCCB4\uC778 \uACC4\uC815 \uC774\uB984\uC5D0 \uC4F8 \uC218 \uC5C6\uB294 \uBB38\uC790: ${account}`);
+}
+async function readItem(account) {
+  const { code, stdout, stderr } = await run(["find-generic-password", "-s", SERVICE, "-a", account, "-w"]);
+  if (code === 44) return void 0;
+  if (code !== 0) throw new Error(`\uD0A4\uCCB4\uC778 \uC77D\uAE30 \uC2E4\uD328 (${code}): ${stderr.trim()}`);
+  return stdout.trim();
+}
+async function writeItem(account, value) {
+  const { stdout, stderr } = await run(["-i"], `add-generic-password -U -s ${SERVICE} -a ${account} -w ${value}
+`);
+  if (await readItem(account) !== value) {
+    throw new Error(`\uD0A4\uCCB4\uC778 \uC4F0\uAE30 \uC2E4\uD328: ${(stderr || stdout).trim()}`);
+  }
+}
+async function deleteItem(account) {
+  const { code, stderr } = await run(["delete-generic-password", "-s", SERVICE, "-a", account]);
+  if (code !== 0 && code !== 44) throw new Error(`\uD0A4\uCCB4\uC778 \uC0AD\uC81C \uC2E4\uD328 (${code}): ${stderr.trim()}`);
+}
+function run(args2, input) {
+  return new Promise((resolve, reject) => {
+    const child = spawn("/usr/bin/security", args2, { stdio: ["pipe", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => stdout += chunk);
+    child.stderr.on("data", (chunk) => stderr += chunk);
+    child.on("error", reject);
+    child.on("close", (code) => resolve({ code, stdout, stderr }));
+    child.stdin.end(input ?? "");
+  });
+}
+
+// src/lock.ts
+import { mkdir, rm, stat } from "node:fs/promises";
 import { join } from "node:path";
+var STALE_MS = 1e4;
+var RETRY_MS = 20;
+async function withFileLock(name, fn) {
+  const dir = join(configDir(), "locks");
+  const path = join(dir, `${name.replace(/[^A-Za-z0-9_.-]/g, "_")}.lock`);
+  await mkdir(dir, { recursive: true, mode: 448 });
+  for (; ; ) {
+    try {
+      await mkdir(path);
+      break;
+    } catch (error2) {
+      if (error2.code !== "EEXIST") throw error2;
+      const age = await stat(path).then((s) => Date.now() - s.mtimeMs, () => 0);
+      if (age > STALE_MS) await rm(path, { recursive: true, force: true });
+      else await new Promise((resolve) => setTimeout(resolve, RETRY_MS));
+    }
+  }
+  try {
+    return await fn();
+  } finally {
+    await rm(path, { recursive: true, force: true });
+  }
+}
+
+// src/config.ts
 function configDir() {
-  return process.env.MWN_CONFIG_DIR ?? join(homedir(), ".config", "multi-workspace-for-notion");
+  return process.env.MWN_CONFIG_DIR ?? join2(homedir(), ".config", "multi-workspace-for-notion");
+}
+var credentialAccount = (workspaceId) => `workspace:${workspaceId}`;
+var cachePath = (workspaceId) => join2(configDir(), "cache", `catalog-${workspaceId}.json`);
+var configPath = () => join2(configDir(), "config.json");
+function uniqueName(name, workspaceId, others) {
+  return others.some((w) => w.name === name) ? `${name} (${workspaceId.slice(0, 8)})` : name;
 }
-var configPath = () => join(configDir(), "config.json");
 async function loadWorkspaces() {
-  try {
-    const parsed = JSON.parse(await readFile(configPath(), "utf8"));
-    return parsed.workspaces;
-  } catch (error2) {
-    if (error2.code === "ENOENT") return [];
-    throw error2;
-  }
+  const file = await readConfig();
+  if (!file) return [];
+  if (file.version === 2) return file.workspaces;
+  return withFileLock("config", migrateIfNeeded);
 }
 async function saveWorkspaces(workspaces) {
-  await mkdir(configDir(), { recursive: true, mode: 448 });
+  await mkdir2(configDir(), { recursive: true, mode: 448 });
   const tmp = `${configPath()}.${process.pid}.tmp`;
-  const data = { version: 1, workspaces };
+  const data = { version: 2, workspaces };
   await writeFile(tmp, `${JSON.stringify(data, null, 2)}
 `, { mode: 384 });
   await rename(tmp, configPath());
 }
+async function updateWorkspaces(change) {
+  await withFileLock("config", async () => saveWorkspaces(change(await migrateIfNeeded())));
+}
+async function readConfig() {
+  try {
+    return JSON.parse(await readFile(configPath(), "utf8"));
+  } catch (error2) {
+    if (error2.code === "ENOENT") return void 0;
+    throw error2;
+  }
+}
+async function migrateIfNeeded() {
+  const file = await readConfig();
+  if (!file) return [];
+  if (file.version === 2) return file.workspaces;
+  const migrated = [];
+  for (const { alias, notionWorkspaceName, ...rest } of file.workspaces) {
+    const from = `workspace:${alias}`;
+    const to = credentialAccount(rest.notionWorkspaceId);
+    await withFileLock(from, async () => {
+      const credentials = await keychain.get(from);
+      if (credentials !== void 0) {
+        await keychain.set(to, credentials);
+        await keychain.delete(from);
+      }
+    });
+    await rm2(join2(configDir(), "cache", `catalog-${alias}.json`), { force: true });
+    migrated.push({ ...rest, name: uniqueName(notionWorkspaceName, rest.notionWorkspaceId, migrated) });
+  }
+  await saveWorkspaces(migrated);
+  return migrated;
+}
 
 // src/connect.ts
 import { spawn as spawn2 } from "node:child_process";
-import { rm as rm2 } from "node:fs/promises";
+import { rm as rm3 } from "node:fs/promises";
 
 // node_modules/pkce-challenge/dist/index.node.js
 var crypto;
@@ -16635,6 +16781,7 @@ async function registerClient(authorizationServerUrl, { metadata, clientMetadata
 import { createServer } from "node:http";
 async function startCallbackServer() {
   let deliver;
+  let expectedState;
   const received = new Promise((resolve) => deliver = resolve);
   const handler = (req, res) => {
     const url2 = new URL(req.url ?? "/", "http://localhost");
@@ -16645,12 +16792,18 @@ async function startCallbackServer() {
     }
     const error2 = url2.searchParams.get("error");
     const code = url2.searchParams.get("code");
+    const state = url2.searchParams.get("state");
+    if (!error2 && !code || expectedState === void 0 || state !== expectedState) {
+      res.writeHead(400, { "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-store" });
+      res.end(`<!doctype html><meta charset="utf-8"><p style="font-family:system-ui">\uC798\uBABB\uB41C \uCF5C\uBC31 \uC694\uCCAD\uC785\uB2C8\uB2E4.</p>`);
+      return;
+    }
     const ok = !error2 && code;
     res.writeHead(ok ? 200 : 400, { "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-store" });
     res.end(
       `<!doctype html><meta charset="utf-8"><title>Multi-Workspace for Notion</title><p style="font-family:system-ui;margin:20vh auto;max-width:420px">` + (ok ? "\uC778\uC99D\uC774 \uB05D\uB0AC\uC2B5\uB2C8\uB2E4. \uC774 \uCC3D\uC744 \uB2EB\uACE0 \uD130\uBBF8\uB110\uB85C \uB3CC\uC544\uAC00\uC138\uC694." : "\uC778\uC99D\uC774 \uCDE8\uC18C\uB418\uC5C8\uAC70\uB098 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uD130\uBBF8\uB110\uC744 \uD655\uC778\uD558\uC138\uC694.") + `</p>`
     );
-    deliver?.(ok ? { code, state: url2.searchParams.get("state") } : { error: error2 ?? "code\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4" });
+    deliver?.(ok ? { code, state } : { error: error2 ?? "code\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4" });
     deliver = void 0;
   };
   const servers = [createServer(handler)];
@@ -16660,7 +16813,8 @@ async function startCallbackServer() {
   if (await listen(ipv62, port, "::1").then(() => true, () => false)) servers.push(ipv62);
   return {
     redirectUrl: `http://localhost:${port}/callback`,
-    async waitForCode(expectedState, timeoutMs) {
+    async waitForCode(expected, timeoutMs) {
+      expectedState = expected;
       let timer;
       const timeout = new Promise((_, reject) => {
         timer = setTimeout(() => reject(new Error("\uC778\uC99D \uB300\uAE30 \uC2DC\uAC04\uC774 \uC9C0\uB0AC\uC2B5\uB2C8\uB2E4.")), timeoutMs);
@@ -16668,7 +16822,6 @@ async function startCallbackServer() {
       try {
         const result = await Promise.race([received, timeout]);
         if ("error" in result) throw new Error(`Notion \uC778\uC99D \uC2E4\uD328: ${result.error}`);
-        if (result.state !== expectedState) throw new Error("state\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC544 \uC778\uC99D \uC751\uB2F5\uC744 \uAC70\uBD80\uD588\uC2B5\uB2C8\uB2E4.");
         return result.code;
       } finally {
         clearTimeout(timer);
@@ -16689,89 +16842,6 @@ function listen(server, port, host) {
   });
 }
 
-// src/keychain.ts
-import { randomBytes } from "node:crypto";
-import { spawn } from "node:child_process";
-var SERVICE = "multi-workspace-for-notion";
-var CHUNK_CHARS = 3e3;
-var keychain = {
-  async get(account) {
-    for (let attempt = 0; attempt < 2; attempt++) {
-      const manifest = await readItem(account);
-      if (manifest === void 0) return void 0;
-      const { generation, count } = parseManifest(manifest);
-      const chunks = [];
-      for (let i = 0; i < count; i++) {
-        const chunk = await readItem(chunkAccount(account, generation, i));
-        if (chunk === void 0) break;
-        chunks.push(chunk);
-      }
-      if (chunks.length === count) return Buffer.from(chunks.join(""), "base64").toString("utf8");
-    }
-    throw new Error(`\uD0A4\uCCB4\uC778 \uAC12\uC774 \uC77C\uBD80 \uC5C6\uC2B5\uB2C8\uB2E4: ${account}`);
-  },
-  async set(account, value) {
-    assertSafeAccount(account);
-    const previous = await readItem(account);
-    const encoded = Buffer.from(value, "utf8").toString("base64");
-    const generation = randomBytes(4).toString("hex");
-    const count = Math.max(1, Math.ceil(encoded.length / CHUNK_CHARS));
-    for (let i = 0; i < count; i++) {
-      await writeItem(chunkAccount(account, generation, i), encoded.slice(i * CHUNK_CHARS, (i + 1) * CHUNK_CHARS));
-    }
-    await writeItem(account, `${generation}:${count}`);
-    if (previous !== void 0) await deleteChunks(account, previous);
-  },
-  async delete(account) {
-    const manifest = await readItem(account);
-    if (manifest === void 0) return;
-    await deleteItem(account);
-    await deleteChunks(account, manifest);
-  }
-};
-function parseManifest(manifest) {
-  const match = /^([0-9a-f]+):(\d+)$/.exec(manifest);
-  if (!match) throw new Error(`\uD0A4\uCCB4\uC778 \uAC12 \uD615\uC2DD\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${manifest.slice(0, 20)}`);
-  return { generation: match[1], count: Number(match[2]) };
-}
-async function deleteChunks(account, manifest) {
-  const { generation, count } = parseManifest(manifest);
-  for (let i = 0; i < count; i++) await deleteItem(chunkAccount(account, generation, i));
-}
-var chunkAccount = (account, generation, index) => `${account}.${generation}.${index}`;
-function assertSafeAccount(account) {
-  if (!/^[A-Za-z0-9:_.-]+$/.test(account)) throw new Error(`\uD0A4\uCCB4\uC778 \uACC4\uC815 \uC774\uB984\uC5D0 \uC4F8 \uC218 \uC5C6\uB294 \uBB38\uC790: ${account}`);
-}
-async function readItem(account) {
-  const { code, stdout, stderr } = await run(["find-generic-password", "-s", SERVICE, "-a", account, "-w"]);
-  if (code === 44) return void 0;
-  if (code !== 0) throw new Error(`\uD0A4\uCCB4\uC778 \uC77D\uAE30 \uC2E4\uD328 (${code}): ${stderr.trim()}`);
-  return stdout.trim();
-}
-async function writeItem(account, value) {
-  const { stdout, stderr } = await run(["-i"], `add-generic-password -U -s ${SERVICE} -a ${account} -w ${value}
-`);
-  if (await readItem(account) !== value) {
-    throw new Error(`\uD0A4\uCCB4\uC778 \uC4F0\uAE30 \uC2E4\uD328: ${(stderr || stdout).trim()}`);
-  }
-}
-async function deleteItem(account) {
-  const { code, stderr } = await run(["delete-generic-password", "-s", SERVICE, "-a", account]);
-  if (code !== 0 && code !== 44) throw new Error(`\uD0A4\uCCB4\uC778 \uC0AD\uC81C \uC2E4\uD328 (${code}): ${stderr.trim()}`);
-}
-function run(args2, input) {
-  return new Promise((resolve, reject) => {
-    const child = spawn("/usr/bin/security", args2, { stdio: ["pipe", "pipe", "pipe"] });
-    let stdout = "";
-    let stderr = "";
-    child.stdout.on("data", (chunk) => stdout += chunk);
-    child.stderr.on("data", (chunk) => stderr += chunk);
-    child.on("error", reject);
-    child.on("close", (code) => resolve({ code, stdout, stderr }));
-    child.stdin.end(input ?? "");
-  });
-}
-
 // node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
 function isZ4Schema(s) {
   const schema = s;
@@ -19238,7 +19308,7 @@ var StreamableHTTPClientTransport = class {
 
 // src/meta.ts
 var SERVER_NAME = "multi-workspace-for-notion";
-var SERVER_VERSION = "0.1.0";
+var SERVER_VERSION = "0.2.0";
 
 // src/notion.ts
 var NOTION_MCP_URL = new URL("https://mcp.notion.com/mcp");
@@ -19268,7 +19338,7 @@ var NotionSession = class _NotionSession {
   async callTool(name, args2) {
     return await this.client.callTool({ name, arguments: args2 });
   }
-  /** notion-get-self로 이 토큰이 실제로 어느 워크스페이스에 붙었는지 확인한다. */
+  /** Asks notion-get-self which workspace this token actually belongs to. */
   async getSelf() {
     const result = await this.client.callTool({ name: "notion-get-self", arguments: {} });
     const text2 = result.content.filter((part) => part.type === "text").map((part) => part.text ?? "").join("\n");
@@ -19280,66 +19350,15 @@ var NotionSession = class _NotionSession {
   }
 };
 function parseSelf(text2) {
-  const json2 = JSON.parse(text2);
-  const id = findString(json2, ["workspace_id", "workspaceId"]) ?? findNested(json2, "workspace", ["id"]);
-  const name = findString(json2, ["workspace_name", "workspaceName"]) ?? findNested(json2, "workspace", ["name"]);
-  if (!id || !name) throw new Error(`notion-get-self \uC751\uB2F5\uC5D0\uC11C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${text2.slice(0, 300)}`);
-  return { workspaceId: id, workspaceName: name };
-}
-function findString(value, keys) {
-  if (!value || typeof value !== "object") return void 0;
-  for (const [key, child] of Object.entries(value)) {
-    if (keys.includes(key) && typeof child === "string") return child;
-    const nested = findString(child, keys);
-    if (nested) return nested;
+  const workspace = JSON.parse(text2).workspace;
+  if (typeof workspace?.id !== "string" || typeof workspace.name !== "string") {
+    throw new Error(`notion-get-self \uC751\uB2F5\uC5D0\uC11C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${text2.slice(0, 300)}`);
   }
-  return void 0;
-}
-function findNested(value, parentKey, keys) {
-  if (!value || typeof value !== "object") return void 0;
-  for (const [key, child] of Object.entries(value)) {
-    if (key === parentKey) {
-      const found = findString(child, keys);
-      if (found) return found;
-    }
-    const nested = findNested(child, parentKey, keys);
-    if (nested) return nested;
-  }
-  return void 0;
+  return { workspaceId: workspace.id, workspaceName: workspace.name };
 }
 
 // src/oauth.ts
 import { randomBytes as randomBytes2 } from "node:crypto";
-
-// src/lock.ts
-import { mkdir as mkdir2, rm, stat } from "node:fs/promises";
-import { join as join2 } from "node:path";
-var STALE_MS = 1e4;
-var RETRY_MS = 20;
-async function withFileLock(name, fn) {
-  const dir = join2(configDir(), "locks");
-  const path = join2(dir, `${name.replace(/[^A-Za-z0-9_.-]/g, "_")}.lock`);
-  await mkdir2(dir, { recursive: true, mode: 448 });
-  for (; ; ) {
-    try {
-      await mkdir2(path);
-      break;
-    } catch (error2) {
-      if (error2.code !== "EEXIST") throw error2;
-      const age = await stat(path).then((s) => Date.now() - s.mtimeMs, () => 0);
-      if (age > STALE_MS) await rm(path, { recursive: true, force: true });
-      else await new Promise((resolve) => setTimeout(resolve, RETRY_MS));
-    }
-  }
-  try {
-    return await fn();
-  } finally {
-    await rm(path, { recursive: true, force: true });
-  }
-}
-
-// src/oauth.ts
-var credentialAccount = (alias) => `workspace:${alias}`;
 var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
   constructor(account, stored, onRedirect) {
     this.account = account;
@@ -19351,17 +19370,20 @@ var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
   onRedirect;
   verifier;
   expectedState;
-  /** 키체인에 값이 있는 것을 확인했거나 저장한 적이 있다. 그 뒤에 값이 사라졌다면 연결 해제나 별칭 변경 때문이다. */
+  /** The keychain value was seen or saved. If it disappears later, the workspace was disconnected. */
   persisted = false;
-  /** 새로 연결할 때. redirectUrl은 콜백 서버의 주소다. */
-  static forNewConnection(alias, redirectUrl, onRedirect) {
-    return new _WorkspaceAuthProvider(credentialAccount(alias), { redirectUrl }, onRedirect);
+  /**
+   * For a new connection. The workspace (and so its ID) is only known after sign-in, so this saves under a
+   * temporary account that the caller moves to `workspace:<id>` with moveTo(). redirectUrl is the callback server's address.
+   */
+  static forNewConnection(redirectUrl, onRedirect) {
+    return new _WorkspaceAuthProvider(`pending:${randomBytes2(8).toString("hex")}`, { redirectUrl }, onRedirect);
   }
-  /** 이미 연결된 워크스페이스를 쓸 때. 저장된 토큰이 없으면 undefined. */
-  static async forExisting(alias) {
-    const raw = await keychain.get(credentialAccount(alias));
+  /** For a connected workspace. Undefined when nothing is stored. */
+  static async forExisting(workspaceId) {
+    const raw = await keychain.get(credentialAccount(workspaceId));
     if (raw === void 0) return void 0;
-    const provider = new _WorkspaceAuthProvider(credentialAccount(alias), JSON.parse(raw), void 0);
+    const provider = new _WorkspaceAuthProvider(credentialAccount(workspaceId), JSON.parse(raw), void 0);
     provider.persisted = true;
     return provider;
   }
@@ -19381,7 +19403,7 @@ var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
     this.expectedState = randomBytes2(24).toString("base64url");
     return this.expectedState;
   }
-  /** 콜백 서버가 비교할 state. redirectToAuthorization() 이후에만 값이 있다. */
+  /** The state the callback must echo back. Set once auth() has started an authorization. */
   get pendingState() {
     return this.expectedState;
   }
@@ -19392,18 +19414,15 @@ var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
     await this.update((s) => s.clientInformation = clientInformation);
   }
   /**
-   * Claude 세션마다 서버 프로세스가 따로 뜨므로, 다른 프로세스가 갱신한 토큰을 바로 쓰도록 매번 키체인에서 다시 읽는다.
-   * 메모리의 옛 리프레시 토큰을 쓰면, 한 번만 쓸 수 있는 토큰이라 invalid_grant가 난다.
+   * Each Claude session runs its own server process, so re-read the keychain every time to pick up tokens another
+   * process refreshed. Refresh tokens are single-use: a stale one from memory fails with invalid_grant.
    */
   async tokens() {
     await this.reload();
     return this.stored.tokens;
   }
   async saveTokens(tokens) {
-    await this.update((s) => {
-      s.tokens = tokens;
-      s.tokensSavedAt = Date.now();
-    });
+    await this.update((s) => s.tokens = tokens);
   }
   async redirectToAuthorization(authorizationUrl) {
     if (!this.onRedirect) {
@@ -19411,7 +19430,7 @@ var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
     }
     await this.onRedirect(authorizationUrl);
   }
-  // PKCE verifier는 한 번의 인증 동안만 필요하므로 메모리에만 둔다.
+  // The PKCE verifier lives only for one authorization, so it stays in memory.
   saveCodeVerifier(codeVerifier) {
     this.verifier = codeVerifier;
   }
@@ -19431,30 +19450,36 @@ var WorkspaceAuthProvider = class _WorkspaceAuthProvider {
     if (scope === "verifier") return;
     await this.update((s) => {
       if (scope === "all" || scope === "client") delete s.clientInformation;
-      if (scope === "all") {
-        delete s.tokens;
-        delete s.tokensSavedAt;
-      }
+      if (scope === "all") delete s.tokens;
       if (scope === "all" || scope === "discovery") delete s.discoveryState;
     });
   }
   async deleteStored() {
     await keychain.delete(this.account);
   }
+  /** Moves the stored credentials to another keychain account (a new connection's final `workspace:<id>`). */
+  async moveTo(account) {
+    const raw = await keychain.get(this.account);
+    if (raw === void 0) throw new Error("\uC800\uC7A5\uB41C \uC778\uC99D\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.");
+    await keychain.set(account, raw);
+    await keychain.delete(this.account);
+    this.account = account;
+  }
   async reload() {
     const raw = await keychain.get(this.account);
     if (raw !== void 0) this.stored = JSON.parse(raw);
   }
   /**
-   * 메모리에 든 값을 통째로 쓰면 그사이 다른 프로세스가 저장한 새 토큰을 옛 토큰으로 덮어쓴다.
-   * 그래서 잠금을 잡고 키체인을 다시 읽은 뒤, 바꾸려는 항목만 고쳐서 쓴다.
-   * 다른 프로세스가 연결을 해제했거나 별칭을 바꿔 값이 사라졌으면, 지운 토큰을 되살리지 않도록 쓰지 않는다.
+   * Writing the in-memory copy wholesale would overwrite newer tokens another process saved meanwhile.
+   * So take the lock, re-read the keychain and change only the given fields.
+   * If the value vanished because another process disconnected the workspace, write nothing,
+   * so deleted tokens stay deleted.
    */
   async update(change) {
     await withFileLock(this.account, async () => {
       const raw = await keychain.get(this.account);
       if (raw !== void 0) this.stored = JSON.parse(raw);
-      else if (this.persisted) throw new Error("\uC774 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB294 \uC5F0\uACB0\uC774 \uD574\uC81C\uB418\uC5C8\uAC70\uB098 \uBCC4\uCE6D\uC774 \uBC14\uB00C\uC5C8\uC2B5\uB2C8\uB2E4. \uC0C8 \uB300\uD654\uC5D0\uC11C \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC138\uC694.");
+      else if (this.persisted) throw new Error("\uC774 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB294 \uB2E4\uB978 \uC138\uC158\uC5D0\uC11C \uC5F0\uACB0\uC774 \uD574\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC0C8 \uB300\uD654\uC5D0\uC11C \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC138\uC694.");
       change(this.stored);
       await keychain.set(this.account, JSON.stringify(this.stored));
       this.persisted = true;
@@ -19490,114 +19515,12 @@ async function revokeTokens(stored, fetchFn = fetch) {
   }
 }
 
-// src/upstream.ts
-import { mkdir as mkdir3, readFile as readFile2, rename as rename2, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join3 } from "node:path";
-var UpstreamPool = class {
-  constructor(open2 = openWorkspace) {
-    this.open = open2;
-  }
-  open;
-  sessions = /* @__PURE__ */ new Map();
-  session(alias) {
-    let pending = this.sessions.get(alias);
-    if (!pending) {
-      pending = this.open(alias);
-      const opened = pending;
-      opened.catch(() => {
-        if (this.sessions.get(alias) === opened) this.sessions.delete(alias);
-      });
-      this.sessions.set(alias, pending);
-    }
-    return pending;
-  }
-  /**
-   * 업스트림 MCP 세션이 만료되면 서버가 404를 돌려준다. 그 경우 요청이 처리되지 않았으므로
-   * 세션을 새로 열어 한 번 더 보낸다. 다른 오류는 이미 처리됐을 수 있어 다시 보내지 않는다.
-   */
-  async callTool(alias, name, args2) {
-    try {
-      return await (await this.session(alias)).callTool(name, args2);
-    } catch (error2) {
-      if (!(error2 instanceof StreamableHTTPError && error2.code === 404)) throw error2;
-      await this.reset(alias);
-      return (await this.session(alias)).callTool(name, args2);
-    }
-  }
-  async reset(alias) {
-    const pending = this.sessions.get(alias);
-    this.sessions.delete(alias);
-    await pending?.then((s) => s.close()).catch(() => {
-    });
-  }
-  async closeAll() {
-    await Promise.all([...this.sessions.keys()].map((alias) => this.reset(alias)));
-  }
-};
-var LIVE_TIMEOUT_MS = 15e3;
-async function loadCatalogs(workspaces, pool) {
-  const results = await Promise.all(
-    workspaces.map(async (w) => {
-      try {
-        const catalog = await withTimeout(fetchLive(w.alias, pool), LIVE_TIMEOUT_MS);
-        await writeCache(catalog);
-        return catalog;
-      } catch (error2) {
-        const cached2 = await readCache(w.alias);
-        return cached2 ?? { alias: w.alias, reason: error2.message };
-      }
-    })
-  );
-  return {
-    catalogs: results.filter((r) => "tools" in r),
-    failures: results.filter((r) => "reason" in r)
-  };
-}
-async function fetchLive(alias, pool) {
-  const session = await pool.session(alias);
-  return {
-    alias,
-    tools: await session.listTools(),
-    instructions: session.instructions,
-    source: "live",
-    fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-}
-var cachePath = (alias) => join3(configDir(), "cache", `catalog-${alias}.json`);
-async function writeCache(catalog) {
-  await mkdir3(join3(configDir(), "cache"), { recursive: true, mode: 448 });
-  const tmp = `${cachePath(catalog.alias)}.${process.pid}.tmp`;
-  await writeFile2(tmp, JSON.stringify(catalog), { mode: 384 });
-  await rename2(tmp, cachePath(catalog.alias));
-}
-async function readCache(alias) {
-  try {
-    const cached2 = JSON.parse(await readFile2(cachePath(alias), "utf8"));
-    return { ...cached2, source: "cache" };
-  } catch {
-    return void 0;
-  }
-}
-function withTimeout(promise, ms) {
-  let timer;
-  return Promise.race([
-    promise,
-    new Promise((_, reject) => {
-      timer = setTimeout(() => reject(new Error(`${ms / 1e3}\uCD08 \uC548\uC5D0 \uC751\uB2F5\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.`)), ms);
-    })
-  ]).finally(() => clearTimeout(timer));
-}
-
 // src/connect.ts
-var ALIAS_PATTERN = /^[a-z0-9][a-z0-9_-]{0,31}$/;
 var AUTH_TIMEOUT_MS = 10 * 60 * 1e3;
+var WORKSPACE_ID = /^[0-9a-f-]{32,36}$/i;
 async function connectWorkspace(options) {
-  const { alias, description } = options;
-  assertAlias(alias);
-  const existing = await loadWorkspaces();
-  if (existing.some((w) => w.alias === alias)) throw new Error(`\uC774\uBBF8 \uC4F0\uACE0 \uC788\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${alias}`);
   const callback = await startCallbackServer();
-  const provider = WorkspaceAuthProvider.forNewConnection(alias, callback.redirectUrl, (url2) => {
+  const provider = WorkspaceAuthProvider.forNewConnection(callback.redirectUrl, (url2) => {
     options.onAuthorizationUrl(url2);
     openBrowser(url2);
   });
@@ -19609,23 +19532,26 @@ async function connectWorkspace(options) {
     }
     session = await NotionSession.open(provider);
     const self = await session.getSelf();
-    const duplicate = existing.find((w) => w.notionWorkspaceId === self.workspaceId);
+    if (!WORKSPACE_ID.test(self.workspaceId)) throw new Error(`\uC608\uC0C1\uD558\uC9C0 \uBABB\uD55C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 ID\uC785\uB2C8\uB2E4: ${self.workspaceId}`);
+    const duplicate = (await loadWorkspaces()).find((w) => w.notionWorkspaceId === self.workspaceId);
     if (duplicate) {
       throw new Error(
-        `"${self.workspaceName}" \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB294 \uC774\uBBF8 "${duplicate.alias}"(\uC73C)\uB85C \uC5F0\uACB0\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. Notion \uC778\uC99D \uD654\uBA74\uC5D0\uC11C \uB2E4\uB978 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB790\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694.`
+        `"${duplicate.name}" \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB294 \uC774\uBBF8 \uC5F0\uACB0\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. Notion \uC778\uC99D \uD654\uBA74\uC5D0\uC11C \uB2E4\uB978 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB790\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694.`
       );
     }
     const tools = await session.listTools();
-    const entry = {
-      alias,
-      description,
-      notionWorkspaceId: self.workspaceId,
-      notionWorkspaceName: self.workspaceName,
-      status: "connected",
-      lastSuccessAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    const latest = await loadWorkspaces();
-    await saveWorkspaces([...latest.filter((w) => w.alias !== alias), entry]);
+    await provider.moveTo(credentialAccount(self.workspaceId));
+    let entry;
+    await updateWorkspaces((latest) => {
+      entry = {
+        name: uniqueName(self.workspaceName, self.workspaceId, latest),
+        notionWorkspaceId: self.workspaceId,
+        description: options.description,
+        status: "connected",
+        lastSuccessAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      return [...latest, entry];
+    });
     return { entry, tools };
   } catch (error2) {
     await provider.deleteStored();
@@ -19635,54 +19561,27 @@ async function connectWorkspace(options) {
     await session?.close();
   }
 }
-async function openWorkspace(alias) {
-  const provider = await WorkspaceAuthProvider.forExisting(alias);
-  if (!provider) throw new Error(`"${alias}"\uC758 \uC800\uC7A5\uB41C \uC778\uC99D\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC5F0\uACB0\uD558\uC138\uC694.`);
+async function findWorkspace(name) {
+  const entry = (await loadWorkspaces()).find((w) => w.name === name);
+  if (!entry) throw new Error(`\uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uC544\uB2D9\uB2C8\uB2E4: ${name}`);
+  return entry;
+}
+async function openWorkspace(name) {
+  const entry = await findWorkspace(name);
+  const provider = await WorkspaceAuthProvider.forExisting(entry.notionWorkspaceId);
+  if (!provider) throw new Error(`"${name}"\uC758 \uC800\uC7A5\uB41C \uC778\uC99D\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC5F0\uACB0\uD558\uC138\uC694.`);
   return NotionSession.open(provider);
 }
-async function disconnectWorkspace(alias) {
-  const workspaces = await loadWorkspaces();
-  const raw = await withFileLock(credentialAccount(alias), async () => {
-    const found = await keychain.get(credentialAccount(alias));
-    await keychain.delete(credentialAccount(alias));
+async function disconnectWorkspace(name) {
+  const { notionWorkspaceId: id } = await findWorkspace(name);
+  const raw = await withFileLock(credentialAccount(id), async () => {
+    const found = await keychain.get(credentialAccount(id));
+    await keychain.delete(credentialAccount(id));
     return found;
   });
-  await rm2(cachePath(alias), { force: true });
-  const remaining = workspaces.filter((w) => w.alias !== alias);
-  await saveWorkspaces(remaining);
-  const revoked = raw !== void 0 && await revokeTokens(JSON.parse(raw));
-  return { removed: remaining.length !== workspaces.length || raw !== void 0, revoked };
-}
-async function renameWorkspace(alias, changes) {
-  const workspaces = await loadWorkspaces();
-  const entry = workspaces.find((w) => w.alias === alias);
-  if (!entry) throw new Error(`\uC5F0\uACB0\uB41C \uC801 \uC5C6\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${alias}`);
-  const newAlias = changes.newAlias ?? alias;
-  const moving = newAlias !== alias;
-  if (moving) {
-    assertAlias(newAlias);
-    if (workspaces.some((w) => w.alias === newAlias)) throw new Error(`\uC774\uBBF8 \uC4F0\uACE0 \uC788\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${newAlias}`);
-  }
-  const updated = { ...entry, alias: newAlias, description: changes.description ?? entry.description };
-  const save = () => saveWorkspaces(workspaces.map((w) => w.alias === alias ? updated : w));
-  if (!moving) {
-    await save();
-    return updated;
-  }
-  await withFileLock(credentialAccount(alias), async () => {
-    const credentials = await keychain.get(credentialAccount(alias));
-    if (credentials === void 0) throw new Error(`"${alias}"\uC758 \uC800\uC7A5\uB41C \uC778\uC99D\uC774 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC5F0\uACB0\uD558\uC138\uC694.`);
-    await keychain.set(credentialAccount(newAlias), credentials);
-    await save();
-    await keychain.delete(credentialAccount(alias));
-  });
-  await rm2(cachePath(alias), { force: true });
-  return updated;
-}
-function assertAlias(alias) {
-  if (!ALIAS_PATTERN.test(alias)) {
-    throw new Error("\uBCC4\uCE6D\uC740 \uC601\uC5B4 \uC18C\uBB38\uC790\xB7\uC22B\uC790\uB85C \uC2DC\uC791\uD558\uACE0 \uC18C\uBB38\uC790, \uC22B\uC790, -, _\uB9CC \uC4F8 \uC218 \uC788\uC2B5\uB2C8\uB2E4(\uCD5C\uB300 32\uC790).");
-  }
+  await rm3(cachePath(id), { force: true });
+  await updateWorkspaces((workspaces) => workspaces.filter((w) => w.notionWorkspaceId !== id));
+  return { revoked: raw !== void 0 && await revokeTokens(JSON.parse(raw)) };
 }
 function openBrowser(url2) {
   const child = spawn2("open", [url2.href], { stdio: "ignore", detached: true });
@@ -20317,10 +20216,11 @@ ${tool.description ?? ""}` : tool.description,
     inputSchema: {
       ...tool.inputSchema,
       properties: {
+        // A plain string, not an enum: Claude keeps a conversation's tool schemas even after tools/list_changed,
+        // so an enum would go stale as soon as a workspace is connected. The server checks the name.
         [WORKSPACE_PARAM]: {
           type: "string",
-          enum: aliases,
-          description: "\uC774 \uD638\uCD9C\uC744 \uBCF4\uB0BC Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uBCC4\uCE6D"
+          description: `\uC774 \uD638\uCD9C\uC744 \uBCF4\uB0BC Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uC774\uB984. \uC774 \uC11C\uBC84\uB97C \uC2DC\uC791\uD560 \uB54C \uC5F0\uACB0\uB3FC \uC788\uB358 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4: ${aliases.join(", ")}. \uC774\uD6C4 \uC0C8\uB85C \uC5F0\uACB0\uD55C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB3C4 \uBC14\uB85C \uC4F8 \uC218 \uC788\uB2E4.`
         },
         ...tool.inputSchema.properties
       },
@@ -20349,8 +20249,7 @@ async function callProxiedTool(catalog, name, args2, call) {
   }
   const others = available.filter((alias) => alias !== workspace);
   if (!isNotFound(result) || others.length === 0) return result;
-  const readOnly = catalog.tools.find((t) => t.name === name)?.annotations?.readOnlyHint === true;
-  if (!readOnly) {
+  if (!FAN_OUT_ON_NOT_FOUND.has(name)) {
     return withNote(
       result,
       `[${workspace} \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC5D0\uC11C \uCC3E\uC9C0 \uBABB\uD588\uB2E4. \uB2E4\uB978 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4(${others.join(", ")})\uC758 ID\uC77C \uC218 \uC788\uB2E4. notion-fetch\uB85C \uADF8 ID\uAC00 \uC788\uB294 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uD655\uC778\uD55C \uB4A4, \uC0AC\uC6A9\uC790\uC5D0\uAC8C \uD655\uC778\uC744 \uBC1B\uACE0 \uADF8 workspace\uB85C \uB2E4\uC2DC \uD638\uCD9C\uD55C\uB2E4.]`
@@ -20364,6 +20263,7 @@ async function callProxiedTool(catalog, name, args2, call) {
     `[${workspace} \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC5D0\uB294 \uC5C6\uC5B4\uC11C ${others[found]} \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC5D0\uC11C \uCC3E\uC740 \uACB0\uACFC\uB2E4. \uC774 \uB300\uC0C1\uC744 \uB2E4\uB8E8\uB294 \uB2E4\uC74C \uD638\uCD9C\uC740 workspace=${others[found]}\uB85C \uBCF4\uB0B8\uB2E4.]`
   );
 }
+var FAN_OUT_ON_NOT_FOUND = /* @__PURE__ */ new Set(["notion-fetch"]);
 var isNotFound = (result) => result.isError === true && result.content.some((c) => c.type === "text" && c.text.includes("object_not_found"));
 var withNote = (result, note) => ({
   ...result,
@@ -20412,108 +20312,103 @@ function errorResult(text2) {
 }
 
 // src/management.ts
-var aliasParam = { type: "string", description: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uBCC4\uCE6D" };
+var workspaceParam = { type: "string", description: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC774\uB984(workspace_list\uC758 name)" };
 var managementTools = [
   {
     name: "workspace_list",
-    description: "\uC5F0\uACB0\uB41C Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uBCC4\uCE6D, \uC124\uBA85, \uC2E4\uC81C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC774\uB984\uACFC ID, \uC0C1\uD0DC, \uC5F0\uACB0\uC744 \uB9C8\uC9C0\uB9C9\uC73C\uB85C \uD655\uC778\uD55C \uC2DC\uAC01\uC744 \uBCF4\uC5EC\uC900\uB2E4.",
+    description: "\uC5F0\uACB0\uB41C Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uC774\uB984, ID, \uC124\uBA85, \uC0C1\uD0DC, \uC5F0\uACB0\uC744 \uB9C8\uC9C0\uB9C9\uC73C\uB85C \uD655\uC778\uD55C \uC2DC\uAC01\uC744 \uBCF4\uC5EC\uC900\uB2E4.",
     inputSchema: { type: "object", properties: {} },
     annotations: { title: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uBAA9\uB85D", readOnlyHint: true }
   },
   {
     name: "workspace_connect",
-    description: "\uC0C8 Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uC5F0\uACB0\uD55C\uB2E4. \uC0AC\uC6A9\uC790\uC758 \uBE0C\uB77C\uC6B0\uC800\uC5D0 Notion \uB85C\uADF8\uC778 \uD654\uBA74\uC774 \uC5F4\uB9AC\uACE0, \uC0AC\uC6A9\uC790\uAC00 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB77C \uC2B9\uC778\uD560 \uB54C\uAE4C\uC9C0(\uCD5C\uB300 10\uBD84) \uAE30\uB2E4\uB9B0\uB2E4. \uC2B9\uC778 \uD6C4 \uC2E4\uC81C\uB85C \uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC774\uB984\uC744 \uB3CC\uB824\uC8FC\uBBC0\uB85C \uC0AC\uC6A9\uC790\uAC00 \uC758\uB3C4\uD55C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC778\uC9C0 \uD655\uC778\uC2DC\uD0A8\uB2E4. \uC0C8 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 Notion \uB3C4\uAD6C\uB294 \uC0C8 \uB300\uD654\uBD80\uD130 \uBCF4\uC778\uB2E4.",
+    description: "\uC0C8 Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uC5F0\uACB0\uD55C\uB2E4. \uCCAB \uD638\uCD9C\uC740 \uC0AC\uC6A9\uC790\uC758 \uBE0C\uB77C\uC6B0\uC800\uC5D0 Notion \uB85C\uADF8\uC778 \uD654\uBA74\uC744 \uC5F4\uACE0 \uADF8 \uB85C\uADF8\uC778 \uC8FC\uC18C(authorizationUrl)\uB97C \uBC14\uB85C \uB3CC\uB824\uC900\uB2E4. \uBE0C\uB77C\uC6B0\uC800\uAC00 \uC548 \uC5F4\uB838\uC744 \uC218 \uC788\uC73C\uB2C8 \uC8FC\uC18C\uB97C \uC0AC\uC6A9\uC790\uC5D0\uAC8C \uBCF4\uC5EC\uC8FC\uACE0, \uC5F0\uACB0\uD560 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB77C \uC2B9\uC778\uD558\uB77C\uACE0 \uD55C\uB2E4(\uCD5C\uB300 10\uBD84). \uC0AC\uC6A9\uC790\uAC00 \uC2B9\uC778\uD588\uB2E4\uACE0 \uD558\uBA74 \uB2E4\uC2DC \uD638\uCD9C\uD574 \uACB0\uACFC\uB97C \uBC1B\uB294\uB2E4. \uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB294 Notion\uC5D0\uC11C\uC758 \uC774\uB984\uC73C\uB85C \uBD88\uB9AC\uACE0, \uC774 \uB300\uD654\uC5D0\uC11C \uBC14\uB85C workspace \uAC12\uC73C\uB85C \uC4F8 \uC218 \uC788\uB2E4.",
     inputSchema: {
       type: "object",
       properties: {
-        alias: {
-          type: "string",
-          description: "\uC0C8 \uBCC4\uCE6D. \uC601\uC5B4 \uC18C\uBB38\uC790\uB098 \uC22B\uC790\uB85C \uC2DC\uC791\uD558\uACE0 \uC601\uC5B4 \uC18C\uBB38\uC790, \uC22B\uC790, -, _\uB9CC \uC4F4\uB2E4(\uCD5C\uB300 32\uC790)."
-        },
         description: { type: "string", description: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC5D0 \uBB34\uC5C7\uC774 \uC788\uB294\uC9C0 \uC9E7\uC740 \uC124\uBA85. Claude\uAC00 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE0\uB97C \uB54C \uC4F4\uB2E4." }
-      },
-      required: ["alias"]
+      }
     },
     annotations: { title: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0", readOnlyHint: false, destructiveHint: false, openWorldHint: true }
   },
   {
     name: "workspace_disconnect",
     description: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0\uC744 \uD574\uC81C\uD55C\uB2E4. \uC774 \uCEF4\uD4E8\uD130\uC5D0 \uC800\uC7A5\uB41C \uD1A0\uD070\uACFC \uC124\uC815\uC744 \uC9C0\uC6B0\uACE0 Notion \uCABD \uD1A0\uD070\uB3C4 \uD574\uC81C\uD55C\uB2E4. \uB418\uB3CC\uB9B4 \uC218 \uC5C6\uC73C\uBBC0\uB85C \uC0AC\uC6A9\uC790\uC5D0\uAC8C \uD655\uC778\uC744 \uBC1B\uC740 \uB4A4 \uD638\uCD9C\uD55C\uB2E4.",
-    inputSchema: { type: "object", properties: { alias: aliasParam }, required: ["alias"] },
+    inputSchema: { type: "object", properties: { workspace: workspaceParam }, required: ["workspace"] },
     annotations: { title: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0 \uD574\uC81C", readOnlyHint: false, destructiveHint: true, idempotentHint: true }
   },
-  {
-    name: "workspace_rename",
-    description: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uBCC4\uCE6D\uC774\uB098 \uC124\uBA85\uC744 \uBC14\uAFBC\uB2E4. \uB2E4\uC2DC \uB85C\uADF8\uC778\uD558\uC9C0 \uC54A\uB294\uB2E4. \uBC14\uB010 \uBCC4\uCE6D\uC740 \uC0C8 \uB300\uD654\uBD80\uD130 workspace \uAC12\uC73C\uB85C \uC4F8 \uC218 \uC788\uB2E4.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        alias: { type: "string", description: "\uC9C0\uAE08 \uBCC4\uCE6D" },
-        new_alias: {
-          type: "string",
-          description: "\uC0C8 \uBCC4\uCE6D. \uC601\uC5B4 \uC18C\uBB38\uC790\uB098 \uC22B\uC790\uB85C \uC2DC\uC791\uD558\uACE0 \uC601\uC5B4 \uC18C\uBB38\uC790, \uC22B\uC790, -, _\uB9CC \uC4F4\uB2E4(\uCD5C\uB300 32\uC790). \uBC14\uAFB8\uC9C0 \uC54A\uC73C\uBA74 \uC0DD\uB7B5\uD55C\uB2E4."
-        },
-        description: { type: "string", description: "\uC0C8 \uC124\uBA85. \uBC14\uAFB8\uC9C0 \uC54A\uC73C\uBA74 \uC0DD\uB7B5\uD55C\uB2E4." }
-      },
-      required: ["alias"]
-    },
-    annotations: { title: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC774\uB984 \uBC14\uAFB8\uAE30", readOnlyHint: false, destructiveHint: false, idempotentHint: true }
-  },
   {
     name: "workspace_check",
     description: "\uC800\uC7A5\uB41C \uC778\uC99D\uC73C\uB85C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC5D0 \uB2E4\uC2DC \uBD99\uC5B4\uC11C \uC5F0\uACB0\uC774 \uC0B4\uC544 \uC788\uB294\uC9C0, \uCC98\uC74C \uC5F0\uACB0\uD55C \uADF8 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uB9DE\uB294\uC9C0 \uD655\uC778\uD558\uACE0 \uB3C4\uAD6C \uC218\uB97C \uC54C\uB824\uC900\uB2E4. \uACB0\uACFC\uB85C \uC0C1\uD0DC\uB97C \uAC31\uC2E0\uD55C\uB2E4.",
-    inputSchema: { type: "object", properties: { alias: aliasParam }, required: ["alias"] },
+    inputSchema: { type: "object", properties: { workspace: workspaceParam }, required: ["workspace"] },
     annotations: { title: "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0 \uD655\uC778", readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: true }
   }
 ];
+var pendingConnect;
+async function connectInBackground(description, onChanged, connect = connectWorkspace) {
+  if (pendingConnect?.outcome) {
+    const { outcome } = pendingConnect;
+    pendingConnect = void 0;
+    return outcome;
+  }
+  if (pendingConnect) {
+    return json({ status: "waiting_for_approval", authorizationUrl: pendingConnect.url, note: "\uC544\uC9C1 \uC2B9\uC778\uC744 \uAE30\uB2E4\uB9AC\uB294 \uC911\uC785\uB2C8\uB2E4." });
+  }
+  const state = {};
+  pendingConnect = state;
+  let urlReady = () => {
+  };
+  const gotUrl = new Promise((resolve) => urlReady = resolve);
+  const done = connect({
+    description,
+    onAuthorizationUrl: (url2) => {
+      state.url = url2.href;
+      urlReady();
+    }
+  }).then(
+    async ({ entry, tools }) => {
+      await onChanged().catch(() => {
+      });
+      state.outcome = json({ status: "connected", connected: entry, toolCount: tools.length });
+    },
+    (error2) => {
+      state.outcome = errorResult(error2.message);
+    }
+  );
+  await Promise.race([gotUrl, done]);
+  if (state.outcome) {
+    pendingConnect = void 0;
+    return state.outcome;
+  }
+  return json({
+    status: "waiting_for_approval",
+    authorizationUrl: state.url,
+    note: "\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C \uC774 \uC8FC\uC18C\uB85C Notion\uC5D0 \uB85C\uADF8\uC778\uD574 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB77C \uC2B9\uC778\uD55C \uB4A4, workspace_connect\uB97C \uB2E4\uC2DC \uD638\uCD9C\uD558\uC138\uC694."
+  });
+}
 var text = (value) => ({ content: [{ type: "text", text: value }] });
 var json = (value) => text(JSON.stringify(value, null, 2));
-async function callManagementTool(name, args2, onDisconnected) {
-  const alias = typeof args2.alias === "string" ? args2.alias : "";
+async function callManagementTool(name, args2, onChanged) {
+  const workspace = typeof args2.workspace === "string" ? args2.workspace : "";
   try {
     switch (name) {
       case "workspace_list":
         return json(await loadWorkspaces());
-      case "workspace_connect": {
-        if (!alias) return errorResult("alias\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
-        const { entry, tools } = await connectWorkspace({
-          alias,
-          description: typeof args2.description === "string" ? args2.description : "",
-          onAuthorizationUrl: () => {
-          }
-        });
-        return json({
-          connected: entry,
-          toolCount: tools.length,
-          note: "\uC0C8 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 Notion \uB3C4\uAD6C\uB294 \uC0C8 \uB300\uD654\uBD80\uD130 \uC4F8 \uC218 \uC788\uC2B5\uB2C8\uB2E4."
-        });
-      }
+      case "workspace_connect":
+        return await connectInBackground(typeof args2.description === "string" ? args2.description : "", onChanged);
       case "workspace_disconnect": {
-        if (!alias) return errorResult("alias\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
-        const { removed, revoked } = await disconnectWorkspace(alias);
-        if (!removed) return errorResult(`\uC5F0\uACB0\uB41C \uC801 \uC5C6\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${alias}`);
-        await onDisconnected(alias);
+        if (!workspace) return errorResult("workspace\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
+        const { revoked } = await disconnectWorkspace(workspace);
+        await onChanged(workspace);
         return json({
-          disconnected: alias,
+          disconnected: workspace,
           revokedOnNotion: revoked,
           note: revoked ? "\uC774 \uCEF4\uD4E8\uD130\uC758 \uD1A0\uD070\uACFC \uC124\uC815\uC744 \uC9C0\uC6B0\uACE0, Notion \uCABD \uD1A0\uD070\uB3C4 \uD574\uC81C\uD588\uC2B5\uB2C8\uB2E4." : "\uC774 \uCEF4\uD4E8\uD130\uC758 \uD1A0\uD070\uACFC \uC124\uC815\uC744 \uC9C0\uC6E0\uC2B5\uB2C8\uB2E4. Notion \uCABD \uD1A0\uD070 \uD574\uC81C\uB294 \uC2E4\uD328\uD588\uC73C\uB2C8, Notion \uC124\uC815\uC758 \uC5F0\uACB0(Connections) \uBA54\uB274\uC5D0\uC11C \uD574\uC81C\uD558\uC138\uC694."
         });
       }
-      case "workspace_rename": {
-        if (!alias) return errorResult("alias\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
-        const newAlias = typeof args2.new_alias === "string" ? args2.new_alias : void 0;
-        const description = typeof args2.description === "string" ? args2.description : void 0;
-        if (newAlias === void 0 && description === void 0) return errorResult("new_alias\uB098 description\uC774 \uD544\uC694\uD569\uB2C8\uB2E4.");
-        const entry = await renameWorkspace(alias, { newAlias, description });
-        if (entry.alias !== alias) await onDisconnected(alias);
-        return json({
-          renamed: entry,
-          note: entry.alias === alias ? void 0 : "\uC0C8 \uBCC4\uCE6D\uC740 \uC0C8 \uB300\uD654\uBD80\uD130 workspace \uAC12\uC73C\uB85C \uC4F8 \uC218 \uC788\uC2B5\uB2C8\uB2E4."
-        });
-      }
       case "workspace_check":
-        if (!alias) return errorResult("alias\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
-        return await checkWorkspace(alias);
+        if (!workspace) return errorResult("workspace\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4.");
+        return await checkWorkspace(workspace);
       default:
         return void 0;
     }
@@ -20521,81 +20416,177 @@ async function callManagementTool(name, args2, onDisconnected) {
     return errorResult(error2.message);
   }
 }
-async function checkWorkspace(alias) {
-  const entry = (await loadWorkspaces()).find((w) => w.alias === alias);
-  if (!entry) return errorResult(`\uC5F0\uACB0\uB41C \uC801 \uC5C6\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${alias}`);
+async function checkWorkspace(name) {
+  const entry = await findWorkspace(name);
   let status;
   let detail;
   try {
-    const session = await openWorkspace(alias);
+    const session = await openWorkspace(name);
     try {
       const self = await session.getSelf();
       const tools = await session.listTools();
       const sameWorkspace = self.workspaceId === entry.notionWorkspaceId;
       status = sameWorkspace ? "connected" : "error";
-      detail = sameWorkspace ? { workspace: self.workspaceName, toolCount: tools.length } : {
-        problem: `\uCC98\uC74C \uC5F0\uACB0\uD55C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4("${entry.notionWorkspaceName}")\uAC00 \uC544\uB2C8\uB77C "${self.workspaceName}"\uC5D0 \uBD99\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uC5F0\uACB0\uC744 \uD574\uC81C\uD558\uACE0 \uB2E4\uC2DC \uC5F0\uACB0\uD558\uC138\uC694.`
-      };
+      detail = sameWorkspace ? { notionName: self.workspaceName, toolCount: tools.length } : { problem: `\uC800\uC7A5\uB41C \uC778\uC99D\uC774 \uB2E4\uB978 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4("${self.workspaceName}")\uC5D0 \uBD99\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uC5F0\uACB0\uC744 \uD574\uC81C\uD558\uACE0 \uB2E4\uC2DC \uC5F0\uACB0\uD558\uC138\uC694.` };
     } finally {
       await session.close();
     }
   } catch (error2) {
     const message = error2.message;
-    status = /인증|auth|401|invalid_grant/i.test(message) ? "needs_reauth" : "error";
+    const signInDead = error2 instanceof InvalidGrantError || error2 instanceof UnauthorizedError || /저장된 인증/.test(message);
+    status = signInDead ? "needs_reauth" : "error";
     detail = { problem: message };
   }
-  await updateEntry(alias, (w) => ({
-    ...w,
-    status,
-    lastSuccessAt: status === "connected" ? (/* @__PURE__ */ new Date()).toISOString() : w.lastSuccessAt
-  }));
-  const result = json({ alias, status, ...detail });
+  await updateWorkspaces(
+    (workspaces) => workspaces.map(
+      (w) => w.notionWorkspaceId === entry.notionWorkspaceId ? { ...w, status, lastSuccessAt: status === "connected" ? (/* @__PURE__ */ new Date()).toISOString() : w.lastSuccessAt } : w
+    )
+  );
+  const result = json({ workspace: name, status, ...detail });
   return status === "connected" ? result : { ...result, isError: true };
 }
-async function updateEntry(alias, update) {
-  const workspaces = await loadWorkspaces();
-  await saveWorkspaces(workspaces.map((w) => w.alias === alias ? update(w) : w));
+
+// src/upstream.ts
+import { mkdir as mkdir3, readFile as readFile2, rename as rename2, writeFile as writeFile2 } from "node:fs/promises";
+import { join as join3 } from "node:path";
+var UpstreamPool = class {
+  constructor(open2 = openWorkspace) {
+    this.open = open2;
+  }
+  open;
+  sessions = /* @__PURE__ */ new Map();
+  session(alias) {
+    const existing = this.sessions.get(alias);
+    if (existing) return existing;
+    const opened = this.open(alias);
+    opened.catch(() => {
+      if (this.sessions.get(alias) === opened) this.sessions.delete(alias);
+    });
+    this.sessions.set(alias, opened);
+    return opened;
+  }
+  /**
+   * An expired upstream MCP session gets a 404 and the request was not processed, so reopen and send it once more.
+   * Other errors may come after the request was processed, so those are never resent.
+   */
+  async callTool(alias, name, args2) {
+    try {
+      return await (await this.session(alias)).callTool(name, args2);
+    } catch (error2) {
+      if (!(error2 instanceof StreamableHTTPError && error2.code === 404)) throw error2;
+      await this.reset(alias);
+      return (await this.session(alias)).callTool(name, args2);
+    }
+  }
+  async reset(alias) {
+    const pending = this.sessions.get(alias);
+    this.sessions.delete(alias);
+    await pending?.then((s) => s.close()).catch(() => {
+    });
+  }
+  async closeAll() {
+    await Promise.all([...this.sessions.keys()].map((alias) => this.reset(alias)));
+  }
+};
+var LIVE_TIMEOUT_MS = 15e3;
+async function loadCatalogs(workspaces, pool) {
+  const results = await Promise.all(
+    workspaces.map(async (w) => {
+      try {
+        const catalog = await withTimeout(fetchLive(w.name, pool), LIVE_TIMEOUT_MS);
+        await writeCache(catalog, w.notionWorkspaceId);
+        return catalog;
+      } catch (error2) {
+        const cached2 = await readCache(w.notionWorkspaceId);
+        return cached2 ? { ...cached2, alias: w.name } : { alias: w.name, reason: error2.message };
+      }
+    })
+  );
+  return {
+    catalogs: results.filter((r) => "tools" in r),
+    failures: results.filter((r) => "reason" in r)
+  };
+}
+async function fetchLive(alias, pool) {
+  const session = await pool.session(alias);
+  return {
+    alias,
+    tools: await session.listTools(),
+    instructions: session.instructions
+  };
+}
+async function writeCache(catalog, workspaceId) {
+  await mkdir3(join3(configDir(), "cache"), { recursive: true, mode: 448 });
+  const tmp = `${cachePath(workspaceId)}.${process.pid}.tmp`;
+  await writeFile2(tmp, JSON.stringify(catalog), { mode: 384 });
+  await rename2(tmp, cachePath(workspaceId));
+}
+async function readCache(workspaceId) {
+  try {
+    return JSON.parse(await readFile2(cachePath(workspaceId), "utf8"));
+  } catch {
+    return void 0;
+  }
+}
+function withTimeout(promise, ms) {
+  let timer;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error(`${ms / 1e3}\uCD08 \uC548\uC5D0 \uC751\uB2F5\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.`)), ms);
+    })
+  ]).finally(() => clearTimeout(timer));
 }
 
 // src/server.ts
 var log = (message) => console.error(`[${SERVER_NAME}] ${message}`);
 async function createServer2() {
-  const workspaces = await loadWorkspaces();
   const pool = new UpstreamPool();
+  const workspaces = await loadWorkspaces();
   const { catalogs, failures } = await loadCatalogs(workspaces, pool);
-  for (const f of failures) log(`${f.alias}: \uB3C4\uAD6C \uBAA9\uB85D\uC744 \uBC1B\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4 (${f.reason})`);
-  const catalog = mergeCatalogs(catalogs, log);
-  const searchAll = searchAllTool(catalog);
+  let current = toolsFor(catalogs, failures);
   const server = new Server(
     { name: SERVER_NAME, version: SERVER_VERSION },
-    { capabilities: { tools: {} }, instructions: buildInstructions(workspaces, catalogs, failures) }
+    { capabilities: { tools: { listChanged: true } }, instructions: buildInstructions(workspaces, catalogs, failures) }
   );
+  const refresh = async (staleAlias) => {
+    if (staleAlias) await pool.reset(staleAlias);
+    const latest = await loadCatalogs(await loadWorkspaces(), pool);
+    current = toolsFor(latest.catalogs, latest.failures);
+    await server.sendToolListChanged();
+  };
   server.setRequestHandler(ListToolsRequestSchema, async () => ({
-    tools: [...managementTools, ...searchAll ? [searchAll] : [], ...catalog.tools]
+    tools: [...managementTools, ...current.searchAll ? [current.searchAll] : [], ...current.catalog.tools]
   }));
   server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args2 } = request.params;
+    const { catalog, searchAll } = current;
     const call = (alias, tool, rest) => pool.callTool(alias, tool, rest);
     if (searchAll && name === SEARCH_ALL) return callSearchAll(catalog, args2, call);
-    const managed = await callManagementTool(name, args2 ?? {}, (alias) => pool.reset(alias));
+    const managed = await callManagementTool(name, args2 ?? {}, refresh);
     return managed ?? callProxiedTool(catalog, name, args2, call);
   });
   server.onclose = () => void pool.closeAll();
   return server;
 }
+function toolsFor(catalogs, failures) {
+  for (const f of failures) log(`${f.alias}: \uB3C4\uAD6C \uBAA9\uB85D\uC744 \uBC1B\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4 (${f.reason})`);
+  const catalog = mergeCatalogs(catalogs, log);
+  return { catalog, searchAll: searchAllTool(catalog) };
+}
 function buildInstructions(workspaces, catalogs, failures) {
   const failed = new Map(failures.map((f) => [f.alias, f.reason]));
   const lines = workspaces.length === 0 ? ["- (\uC5C6\uC74C) workspace_connect \uB3C4\uAD6C\uB85C \uBA3C\uC800 \uC5F0\uACB0\uD574\uC57C \uD55C\uB2E4."] : workspaces.map((w) => {
-    const label = `- ${w.alias}: Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 "${w.notionWorkspaceName}"${w.description ? ` (${w.description})` : ""}`;
-    return failed.has(w.alias) ? `${label} - \uC9C0\uAE08 \uC5F0\uACB0\uD560 \uC218 \uC5C6\uC74C: ${failed.get(w.alias)}` : label;
+    const label = `- "${w.name}"${w.description ? `: ${w.description}` : ""}`;
+    return failed.has(w.name) ? `${label} - \uC9C0\uAE08 \uC5F0\uACB0\uD560 \uC218 \uC5C6\uC74C: ${failed.get(w.name)}` : label;
   });
   const sections = [
     [
       "\uC774 \uC11C\uBC84(Multi-Workspace for Notion)\uB294 \uC5EC\uB7EC Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uB3D9\uC2DC\uC5D0 \uC5F0\uACB0\uD574 \uB454\uB2E4.",
-      `\uBAA8\uB4E0 Notion \uB3C4\uAD6C\uC5D0\uB294 ${WORKSPACE_PARAM} \uD30C\uB77C\uBBF8\uD130\uAC00 \uC788\uACE0, \uD638\uCD9C\uB9C8\uB2E4 \uB300\uC0C1 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uBCC4\uCE6D\uC744 \uB123\uC5B4\uC57C \uD55C\uB2E4.`,
+      `\uBAA8\uB4E0 Notion \uB3C4\uAD6C\uC5D0\uB294 ${WORKSPACE_PARAM} \uD30C\uB77C\uBBF8\uD130\uAC00 \uC788\uACE0, \uD638\uCD9C\uB9C8\uB2E4 \uB300\uC0C1 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uC774\uB984(\uC544\uB798 \uBAA9\uB85D\uC758 \uC774\uB984 \uADF8\uB300\uB85C)\uC744 \uB123\uC5B4\uC57C \uD55C\uB2E4.`,
       "\uC0AC\uC6A9\uC790\uAC00 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uB9D0\uD558\uC9C0 \uC54A\uC558\uACE0 \uB9E5\uB77D\uC73C\uB85C\uB3C4 \uC54C \uC218 \uC5C6\uC744 \uB54C, \uC4F0\uAE30\xB7\uC218\uC815\xB7\uC0AD\uC81C\uB294 \uC2E4\uD589\uD558\uAE30 \uC804\uC5D0 \uC5B4\uB290 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC778\uC9C0 \uC0AC\uC6A9\uC790\uC5D0\uAC8C \uBB3B\uB294\uB2E4.",
       `\uC5EC\uB7EC \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uD55C\uAEBC\uBC88\uC5D0 \uCC3E\uC744 \uB54C\uB294 ${SEARCH_ALL} \uB3C4\uAD6C\uB97C \uC4F4\uB2E4(\uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uB458 \uC774\uC0C1\uC77C \uB54C\uB9CC \uC788\uB2E4).`,
-      "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uAD00\uB9AC\uB294 workspace_list, workspace_connect, workspace_disconnect, workspace_rename, workspace_check \uB3C4\uAD6C\uB85C \uD55C\uB2E4.",
+      "\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uAD00\uB9AC\uB294 workspace_list, workspace_connect, workspace_disconnect, workspace_check \uB3C4\uAD6C\uB85C \uD55C\uB2E4.",
       "",
       "\uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4:",
       ...lines
@@ -20622,10 +20613,10 @@ var [command, ...args] = process.argv.slice(2);
 var USAGE = `\uC0AC\uC6A9\uBC95:
   multi-workspace-for-notion                       MCP \uC11C\uBC84(stdio)\uB85C \uC2E4\uD589
   multi-workspace-for-notion list                  \uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uBAA9\uB85D
-  multi-workspace-for-notion add <\uBCC4\uCE6D> [\uC124\uBA85...]   \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0(\uBE0C\uB77C\uC6B0\uC800 \uC778\uC99D)
-  multi-workspace-for-notion tools <\uBCC4\uCE6D>           \uC800\uC7A5\uB41C \uC778\uC99D\uC73C\uB85C \uBD99\uC5B4\uC11C \uD655\uC778\uD558\uACE0 \uB3C4\uAD6C \uBAA9\uB85D \uCD9C\uB825
-  multi-workspace-for-notion rename <\uBCC4\uCE6D> <\uC0C8 \uBCC4\uCE6D>  \uBCC4\uCE6D \uBC14\uAFB8\uAE30(\uB2E4\uC2DC \uB85C\uADF8\uC778\uD558\uC9C0 \uC54A\uC74C)
-  multi-workspace-for-notion remove <\uBCC4\uCE6D>          \uC5F0\uACB0 \uD574\uC81C\uC640 \uD1A0\uD070 \uC0AD\uC81C`;
+  multi-workspace-for-notion add [\uC124\uBA85...]          \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uC5F0\uACB0(\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C \uACE0\uB978 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uC758 \uC774\uB984\uC73C\uB85C \uC5F0\uACB0)
+  multi-workspace-for-notion tools <\uC774\uB984>           \uC800\uC7A5\uB41C \uC778\uC99D\uC73C\uB85C \uBD99\uC5B4\uC11C \uD655\uC778\uD558\uACE0 \uB3C4\uAD6C \uBAA9\uB85D \uCD9C\uB825
+  multi-workspace-for-notion remove <\uC774\uB984>          \uC5F0\uACB0 \uD574\uC81C\uC640 \uD1A0\uD070 \uC0AD\uC81C
+  (\uC774\uB984\uC5D0 \uACF5\uBC31\uC774 \uC788\uC73C\uBA74 \uB530\uC634\uD45C\uB85C \uAC10\uC2FC\uB2E4: remove "\uD5C8 \uC740\uC11C\uC758 Notion")`;
 try {
   switch (command) {
     case void 0: {
@@ -20639,7 +20630,7 @@ try {
         console.log("\uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.");
       }
       for (const w of workspaces) {
-        console.log(`${w.alias}	${w.notionWorkspaceName}	${w.status}	${w.description}`);
+        console.log(`${w.name}	${w.status}	${w.description}`);
       }
       break;
     }
@@ -20648,11 +20639,8 @@ try {
       break;
     }
     case "add": {
-      const [alias, ...descriptionWords] = args;
-      if (!alias) throw new UsageError();
       const { entry, tools } = await connectWorkspace({
-        alias,
-        description: descriptionWords.join(" "),
+        description: args.join(" "),
         onAuthorizationUrl: (url2) => console.log(
           `\uBE0C\uB77C\uC6B0\uC800\uC5D0\uC11C Notion \uC778\uC99D \uD654\uBA74\uC744 \uC5FD\uB2C8\uB2E4. \uC5F0\uACB0\uD560 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uB97C \uACE8\uB77C \uC2B9\uC778\uD558\uC138\uC694.
 \uBE0C\uB77C\uC6B0\uC800\uAC00 \uC5F4\uB9AC\uC9C0 \uC54A\uC73C\uBA74 \uC774 \uC8FC\uC18C\uB85C \uB4E4\uC5B4\uAC00\uC138\uC694:
@@ -20660,38 +20648,30 @@ ${url2.href}
 `
         )
       });
-      console.log(`\uC5F0\uACB0\uD588\uC2B5\uB2C8\uB2E4: ${entry.alias} \u2192 "${entry.notionWorkspaceName}" (${entry.notionWorkspaceId})`);
+      console.log(`\uC5F0\uACB0\uD588\uC2B5\uB2C8\uB2E4: "${entry.name}" (${entry.notionWorkspaceId})`);
       console.log(`\uACF5\uC2DD \uB3C4\uAD6C ${tools.length}\uAC1C\uB97C \uBC1B\uC558\uC2B5\uB2C8\uB2E4.`);
       break;
     }
     case "tools": {
-      const [alias] = args;
-      if (!alias) throw new UsageError();
-      const session = await openWorkspace(alias);
+      const [name] = args;
+      if (!name) throw new UsageError();
+      const session = await openWorkspace(name);
       try {
         const self = await session.getSelf();
         const tools = await session.listTools();
-        console.log(`${alias} \u2192 "${self.workspaceName}" (${self.workspaceId}), \uB3C4\uAD6C ${tools.length}\uAC1C`);
+        console.log(`"${name}" \u2192 Notion "${self.workspaceName}" (${self.workspaceId}), \uB3C4\uAD6C ${tools.length}\uAC1C`);
         for (const tool of tools) console.log(`  ${tool.name}`);
       } finally {
         await session.close();
       }
       break;
     }
-    case "rename": {
-      const [alias, newAlias] = args;
-      if (!alias || !newAlias) throw new UsageError();
-      await renameWorkspace(alias, { newAlias });
-      console.log(`\uBCC4\uCE6D\uC744 \uBC14\uAFE8\uC2B5\uB2C8\uB2E4: ${alias} \u2192 ${newAlias}`);
-      break;
-    }
     case "remove": {
-      const [alias] = args;
-      if (!alias) throw new UsageError();
-      const { removed, revoked } = await disconnectWorkspace(alias);
-      if (!removed) console.log(`\uC5F0\uACB0\uB41C \uC801 \uC5C6\uB294 \uBCC4\uCE6D\uC785\uB2C8\uB2E4: ${alias}`);
-      else if (revoked) console.log(`\uC5F0\uACB0\uC744 \uD574\uC81C\uD588\uC2B5\uB2C8\uB2E4: ${alias} (Notion \uCABD \uD1A0\uD070\uB3C4 \uD574\uC81C)`);
-      else console.log(`\uC5F0\uACB0\uC744 \uD574\uC81C\uD588\uC2B5\uB2C8\uB2E4: ${alias}
+      const [name] = args;
+      if (!name) throw new UsageError();
+      const { revoked } = await disconnectWorkspace(name);
+      if (revoked) console.log(`\uC5F0\uACB0\uC744 \uD574\uC81C\uD588\uC2B5\uB2C8\uB2E4: ${name} (Notion \uCABD \uD1A0\uD070\uB3C4 \uD574\uC81C)`);
+      else console.log(`\uC5F0\uACB0\uC744 \uD574\uC81C\uD588\uC2B5\uB2C8\uB2E4: ${name}
 Notion \uCABD \uD1A0\uD070 \uD574\uC81C\uB294 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. Notion \uC124\uC815\uC758 \uC5F0\uACB0(Connections) \uBA54\uB274\uC5D0\uC11C \uD574\uC81C\uD558\uC138\uC694.`);
       break;
     }
@@ -20710,8 +20690,8 @@ ${USAGE}` : USAGE);
   process.exitCode = 1;
 }
 function sessionStatus(workspaces) {
-  if (workspaces.length === 0) return "Notion: \uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. /multi-workspace:workspace-add <\uBCC4\uCE6D> \uC73C\uB85C \uC5F0\uACB0\uD558\uC138\uC694.";
-  const names = workspaces.map((w) => `${w.alias}(${w.notionWorkspaceName})`).join(", ");
-  const broken = workspaces.filter((w) => w.status !== "connected").map((w) => w.alias);
+  if (workspaces.length === 0) return "Notion: \uC5F0\uACB0\uB41C \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. /multi-workspace:workspace-add \uB85C \uC5F0\uACB0\uD558\uC138\uC694.";
+  const names = workspaces.map((w) => w.name).join(", ");
+  const broken = workspaces.filter((w) => w.status !== "connected").map((w) => w.name);
   return broken.length === 0 ? `Notion: ${names}` : `Notion: ${names} \xB7 \uD655\uC778 \uD544\uC694: ${broken.join(", ")} \u2192 /multi-workspace:workspace-check`;
 }