hiwork-core 0.0.8 → 0.0.11

package/lib/index.js

@@ -3137,7 +3137,7 @@ function isUnloading(ctx) {
 }
 
 // src/version.ts
-var PKG_VERSION = false ? "dev" : "0.0.8";
+var PKG_VERSION = false ? "dev" : "0.0.11";
 
 // src/ai-router-client.ts
 var AUTH_AUTHORIZE_PATH = "/api/auth/authorize";
@@ -3150,6 +3150,8 @@ var ME_KEY_RECHARGES_PATH = "/api/me/key/recharges";
 var ME_COST_ESTIMATE_PATH = "/api/me/cost-estimate";
 var ME_DAILY_QUOTE_PATH = "/api/me/daily-quote";
 var ME_DAILY_QUOTE_RANDOM_PATH = "/api/me/daily-quote/random";
+var ME_MCP_ASSIGNMENTS_PATH = "/api/me/mcp-assignments";
+var ME_MCP_ASSERTIONS_PATH = "/api/me/mcp-assertions";
 var DEFAULT_CLIENT_ID = "hiwork-desktop";
 var DEFAULT_REDIRECT_URI = "hiwork://auth/callback";
 var GatewayError = class extends Error {
@@ -3308,6 +3310,45 @@ var AiRouterClient = class {
     if (!res.ok) throw new GatewayError("GATEWAY_UNREACHABLE", `\u7F51\u5173\u8FD4\u56DE\u9519\u8BEF\uFF08HTTP ${res.status}\uFF09`, res.status);
     return await parseMeJson(res);
   }
+  /**
+   * GET /api/me/mcp-assignments：管理员下发给当前账号的 MCP 清单。
+   *
+   * 不复用 {@link getMeJson}：那条路径把 403 映射成 `NO_KEY_ASSIGNED`（「尚未被分配
+   * 虚拟 KEY」），而本端点的鉴权只有会话——一个还没被分配 Key 的账号照样应该有
+   * 清单（分 MCP 与分 Key 是两件事）。沿用它的 403 文案会把「没有 Key」错报成原因。
+   */
+  async getMyMcpAssignments(sessionCookie) {
+    const res = await this.requestOrUnreachable(ME_MCP_ASSIGNMENTS_PATH, { method: "GET", sessionCookie });
+    if (res.status === 401) throw new GatewayError("SESSION_EXPIRED", "\u7F51\u5173\u4F1A\u8BDD\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55", 401);
+    if (!res.ok) throw new GatewayError("GATEWAY_UNREACHABLE", `\u7F51\u5173\u8FD4\u56DE\u9519\u8BEF\uFF08HTTP ${res.status}\uFF09`, res.status);
+    return await parseMeJson(res);
+  }
+  /**
+   * POST /api/me/mcp-assertions：为某条分配签一张 120 秒断言。
+   *
+   * 三种拒绝各有确定含义（服务端 handler 的 404/409/503），必须分开映射——否则
+   * 客户端只会看到一句「取断言失败」，既分不清「被撤销了」（该卸连接）还是
+   * 「服务停用了」（该重试）还是「部署没配私钥」（找管理员）。
+   */
+  async issueMyMcpAssertion(sessionCookie, assignmentId) {
+    const res = await this.requestOrUnreachable(ME_MCP_ASSERTIONS_PATH, {
+      method: "POST",
+      sessionCookie,
+      body: { assignmentId }
+    });
+    if (res.status === 401) throw new GatewayError("SESSION_EXPIRED", "\u7F51\u5173\u4F1A\u8BDD\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55", 401);
+    if (res.status === 400 || res.status === 404) {
+      throw new GatewayError("MCP_ASSIGNMENT_GONE", "\u8FD9\u6761\u5206\u914D\u5DF2\u5931\u6548\uFF0C\u7A0D\u540E\u540C\u6B65\u4F1A\u91CD\u65B0\u6838\u5BF9", res.status);
+    }
+    if (res.status === 409) {
+      throw new GatewayError("MCP_NOT_DELIVERABLE", "\u8BE5 MCP \u670D\u52A1\u5F53\u524D\u4E0D\u53EF\u4E0B\u53D1\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458", 409);
+    }
+    if (res.status === 503) {
+      throw new GatewayError("MCP_ASSERTION_DISABLED", "\u672C\u90E8\u7F72\u672A\u542F\u7528 MCP \u65AD\u8A00\u7B7E\u53D1\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458", 503);
+    }
+    if (!res.ok) throw new GatewayError("GATEWAY_UNREACHABLE", `\u7F51\u5173\u8FD4\u56DE\u9519\u8BEF\uFF08HTTP ${res.status}\uFF09`, res.status);
+    return await parseMeJson(res);
+  }
   /**
    * /api/me 自助端点的 GET 公共路径：网络异常 → GATEWAY_UNREACHABLE，
    * 401/403/400 映射为稳定 code，响应体非 JSON 时不把原文带进异常。
@@ -3766,6 +3807,7 @@ async function completeBrowserLogin(input, opts) {
 var DEFAULT_LOGIN_MODE = "both";
 var CLIENT_POLICY_PATH = "/api/client/policy";
 var CLIENT_POLICY_TIMEOUT_MS = 5e3;
+var DEFAULT_PASSWORD_LOGIN = true;
 function buildClientPolicyURL(opts) {
   const baseURL = typeof opts.baseURL === "string" ? opts.baseURL.trim().replace(/\/+$/, "") : "";
   if (baseURL === "") return void 0;
@@ -3783,6 +3825,11 @@ function parseLoginMode(payload) {
   const value = payload.loginMode;
   return value === "browser" || value === "form" || value === "both" ? value : void 0;
 }
+function parsePasswordLogin(payload) {
+  if (typeof payload !== "object" || payload === null) return DEFAULT_PASSWORD_LOGIN;
+  const value = payload.passwordLogin;
+  return typeof value === "boolean" ? value : DEFAULT_PASSWORD_LOGIN;
+}
 async function fetchClientPolicy(opts) {
   const url = buildClientPolicyURL(opts);
   if (url === void 0) return void 0;
@@ -3800,7 +3847,7 @@ async function fetchClientPolicy(opts) {
       return void 0;
     }
     const loginMode = parseLoginMode(payload);
-    return loginMode === void 0 ? void 0 : { loginMode };
+    return loginMode === void 0 ? void 0 : { loginMode, passwordLogin: parsePasswordLogin(payload) };
   } catch {
     return void 0;
   }
@@ -4401,6 +4448,232 @@ function registerUsageRpc(ctx, deps) {
   };
 }
 
+// src/managed-mcp.ts
+var MANAGED_MCP_RPC_CHANNEL = "/hiwork-managed-mcp";
+var MANAGED_MCP_RPC_ENDPOINTS = ["snapshot", "refresh", "assertion"];
+var MANAGED_MCP_REFRESH_INTERVAL_MS = 30 * 6e4;
+var ManagedMcpRequestError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "ManagedMcpRequestError";
+  }
+};
+var MANAGED_MCP_MESSAGE_FALLBACK = {
+  SESSION_EXPIRED: "\u767B\u5F55\u72B6\u6001\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55",
+  GATEWAY_UNREACHABLE: "\u7F51\u5173\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
+  MCP_ASSIGNMENT_GONE: "\u8FD9\u6761\u5206\u914D\u5DF2\u5931\u6548\uFF0C\u7A0D\u540E\u540C\u6B65\u4F1A\u91CD\u65B0\u6838\u5BF9",
+  MCP_NOT_DELIVERABLE: "\u8BE5 MCP \u670D\u52A1\u5F53\u524D\u4E0D\u53EF\u4E0B\u53D1\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458",
+  MCP_ASSERTION_DISABLED: "\u672C\u90E8\u7F72\u672A\u542F\u7528 MCP \u65AD\u8A00\u7B7E\u53D1\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458",
+  NO_KEY_ASSIGNED: "\u5F53\u524D\u8D26\u53F7\u5C1A\u672A\u88AB\u5206\u914D\u865A\u62DF KEY\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458"
+};
+var MANAGED_MCP_GENERIC_FAILURE_MESSAGE = "MCP \u6E05\u5355\u6682\u65F6\u65E0\u6CD5\u83B7\u53D6\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5";
+var MANAGED_MCP_SESSION_EXPIRED_MESSAGE = "\u767B\u5F55\u72B6\u6001\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55";
+function displayManagedMcpMessage(code, message) {
+  const text = typeof message === "string" ? message.trim() : "";
+  if (text === "") return MANAGED_MCP_MESSAGE_FALLBACK[code] ?? MANAGED_MCP_GENERIC_FAILURE_MESSAGE;
+  const leaksImplementationDetail = /https?:\/\//i.test(text) || /\bHTTP\s*\d{3}\b/i.test(text) || /\bbaseURL\b/i.test(text);
+  if (leaksImplementationDetail) return MANAGED_MCP_MESSAGE_FALLBACK[code] ?? MANAGED_MCP_GENERIC_FAILURE_MESSAGE;
+  return text;
+}
+var ASSIGNMENT_ID_PATTERN = /^[0-9a-fA-F-]{1,64}$/;
+function parseManagedMcpPayload(endpoint, raw) {
+  if (raw === void 0 || raw === null) {
+    if (endpoint === "assertion") throw new ManagedMcpRequestError("bad-request", "\u53D6\u65AD\u8A00\u8BF7\u6C42\u7F3A\u5C11 assignmentId\u3002");
+    return {};
+  }
+  if (typeof raw !== "object" || Array.isArray(raw)) {
+    throw new ManagedMcpRequestError("bad-request", "MCP \u6E05\u5355\u8BF7\u6C42\u53C2\u6570\u4E0D\u5408\u6CD5\u3002");
+  }
+  const record = raw;
+  const keys = Object.keys(record);
+  if (endpoint !== "assertion") {
+    if (keys.length > 0) throw new ManagedMcpRequestError("bad-request", `MCP \u6E05\u5355\u8BF7\u6C42\u5305\u542B\u672A\u77E5\u5B57\u6BB5 '${keys[0]}'\u3002`);
+    return {};
+  }
+  for (const key of keys) {
+    if (key !== "assignmentId") throw new ManagedMcpRequestError("bad-request", `\u53D6\u65AD\u8A00\u8BF7\u6C42\u5305\u542B\u672A\u77E5\u5B57\u6BB5 '${key}'\u3002`);
+  }
+  const rawId = record["assignmentId"];
+  if (typeof rawId !== "string" || !ASSIGNMENT_ID_PATTERN.test(rawId.trim())) {
+    throw new ManagedMcpRequestError("bad-request", "\u53D6\u65AD\u8A00\u8BF7\u6C42\u7684 assignmentId \u4E0D\u5408\u6CD5\u3002");
+  }
+  return { assignmentId: rawId.trim() };
+}
+function isManagedMcpRpcEndpoint(endpoint) {
+  return MANAGED_MCP_RPC_ENDPOINTS.includes(endpoint);
+}
+function textOrUndefined(value) {
+  return typeof value === "string" && value.trim() !== "" ? value : void 0;
+}
+function normalizeAssignment(raw, log) {
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return void 0;
+  const record = raw;
+  const assignmentId = textOrUndefined(record["assignmentId"]);
+  const serverName = textOrUndefined(record["serverName"]);
+  const url = textOrUndefined(record["url"]);
+  const transport = textOrUndefined(record["transport"]);
+  const authRaw = record["auth"];
+  const auth = typeof authRaw === "object" && authRaw !== null && !Array.isArray(authRaw) ? authRaw : void 0;
+  const kind = textOrUndefined(auth?.["kind"]);
+  const mintUrl = textOrUndefined(auth?.["mintUrl"]);
+  if (assignmentId === void 0 || serverName === void 0 || url === void 0 || transport === void 0 || kind === void 0 || mintUrl === void 0) {
+    log?.("hiwork-core: MCP \u6E05\u5355\u91CC\u6709\u4E00\u6761\u7ED3\u6784\u4E0D\u5B8C\u6574\u7684\u5206\u914D\uFF0C\u5DF2\u8DF3\u8FC7");
+    return void 0;
+  }
+  const revision = record["revision"];
+  return {
+    assignmentId,
+    revision: typeof revision === "number" && Number.isFinite(revision) ? revision : 0,
+    slug: textOrUndefined(record["slug"]) ?? serverName,
+    displayName: textOrUndefined(record["displayName"]) ?? serverName,
+    serverName,
+    transport,
+    url,
+    extraHeaders: stringMap(record["extraHeaders"]),
+    auth: { kind, mintUrl, revokeUrl: textOrUndefined(auth?.["revokeUrl"]) ?? "" },
+    updatedAt: textOrUndefined(record["updatedAt"]) ?? ""
+  };
+}
+function stringMap(raw) {
+  if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return {};
+  const out = {};
+  for (const [key, value] of Object.entries(raw)) {
+    if (typeof value === "string") out[key] = value;
+  }
+  return out;
+}
+function failureOf(error) {
+  if (error instanceof ManagedMcpRequestError) return { code: error.code, message: error.message, details: {} };
+  if (error instanceof GatewayError) {
+    return { code: error.code, message: displayManagedMcpMessage(error.code, error.message), details: {} };
+  }
+  return { code: "internal", message: MANAGED_MCP_GENERIC_FAILURE_MESSAGE, details: {} };
+}
+var ManagedMcpStore = class {
+  constructor(deps, now = () => Date.now()) {
+    this.deps = deps;
+    this.now = now;
+  }
+  cached;
+  lastError;
+  inFlight;
+  /**
+   * 当前缓存（同步读，不发请求）。从没成功过返回 undefined；
+   * 最近一次失败会以 `stale + lastError` 标注在上一次成功的结果上。
+   */
+  peek() {
+    if (this.cached === void 0) return void 0;
+    return this.lastError === void 0 ? this.cached : { ...this.cached, stale: true, lastError: this.lastError };
+  }
+  /**
+   * 去网关拉一次清单并更新缓存。失败时抛异常，且**缓存原样保留**。
+   *
+   * 并发调用合并成一次请求：后台预热与客户端手动同步撞在一起时不必打两遍网关。
+   */
+  async load() {
+    if (this.inFlight !== void 0) return await this.inFlight;
+    const task = this.fetchOnce();
+    this.inFlight = task;
+    try {
+      return await task;
+    } finally {
+      this.inFlight = void 0;
+    }
+  }
+  async fetchOnce() {
+    try {
+      const sessionCookie = await this.deps.resolveSession();
+      if (sessionCookie === void 0 || sessionCookie === "") {
+        throw new GatewayError("SESSION_EXPIRED", MANAGED_MCP_SESSION_EXPIRED_MESSAGE);
+      }
+      const gateway = this.deps.gateway();
+      if (gateway === void 0) {
+        throw new GatewayError("GATEWAY_UNREACHABLE", "\u7F51\u5173\u5730\u5740\u672A\u914D\u7F6E\uFF0C\u8BF7\u5148\u5728\u300C\u7F51\u5173\u6A21\u578B\u300D\u91CC\u5B8C\u6210\u767B\u5F55");
+      }
+      const view = await gateway.getMyMcpAssignments(sessionCookie);
+      const assignments = [];
+      for (const item of Array.isArray(view?.assignments) ? view.assignments : []) {
+        const normalized = normalizeAssignment(item, this.deps.log);
+        if (normalized !== void 0) assignments.push(normalized);
+      }
+      const snapshot = {
+        revision: typeof view?.revision === "number" && Number.isFinite(view.revision) ? view.revision : 0,
+        fetchedAt: new Date(this.now()).toISOString(),
+        assignments,
+        stale: false
+      };
+      this.cached = snapshot;
+      this.lastError = void 0;
+      return snapshot;
+    } catch (error) {
+      this.lastError = failureOf(error);
+      throw error;
+    }
+  }
+};
+function isAborted4(signal) {
+  return signal?.aborted === true;
+}
+async function handleManagedMcpEndpoint(endpoint, rawPayload, deps, store, signal) {
+  try {
+    if (isAborted4(signal)) return failure4("cancelled", "MCP \u6E05\u5355\u8BF7\u6C42\u5DF2\u53D6\u6D88\u3002");
+    if (!isManagedMcpRpcEndpoint(endpoint)) {
+      throw new ManagedMcpRequestError("bad-request", `\u672A\u77E5\u7684 MCP \u6E05\u5355\u7AEF\u70B9 '${endpoint}'`);
+    }
+    const payload = parseManagedMcpPayload(endpoint, rawPayload);
+    if (endpoint === "assertion") {
+      const assignmentId = payload.assignmentId;
+      if (assignmentId === void 0) throw new ManagedMcpRequestError("bad-request", "\u53D6\u65AD\u8A00\u8BF7\u6C42\u7F3A\u5C11 assignmentId\u3002");
+      return await handleAssertion(assignmentId, deps, signal);
+    }
+    const cached = store.peek();
+    if (endpoint === "snapshot" && cached !== void 0) return { ok: true, value: cached };
+    return { ok: true, value: await store.load() };
+  } catch (error) {
+    deps.log?.(`hiwork-core: MCP \u6E05\u5355 RPC '${endpoint}' \u5931\u8D25\uFF08${error instanceof Error ? error.name : typeof error}\uFF09`);
+    return { ok: false, error: failureOf(error) };
+  }
+}
+async function handleAssertion(assignmentId, deps, signal) {
+  const sessionCookie = await deps.resolveSession();
+  if (sessionCookie === void 0 || sessionCookie === "") {
+    return failure4("SESSION_EXPIRED", MANAGED_MCP_SESSION_EXPIRED_MESSAGE);
+  }
+  const gateway = deps.gateway();
+  if (gateway === void 0) {
+    return failure4("GATEWAY_UNREACHABLE", "\u7F51\u5173\u5730\u5740\u672A\u914D\u7F6E\uFF0C\u8BF7\u5148\u5728\u300C\u7F51\u5173\u6A21\u578B\u300D\u91CC\u5B8C\u6210\u767B\u5F55");
+  }
+  if (isAborted4(signal)) return failure4("cancelled", "MCP \u6E05\u5355\u8BF7\u6C42\u5DF2\u53D6\u6D88\u3002");
+  const ticket = await gateway.issueMyMcpAssertion(sessionCookie, assignmentId);
+  const assertion = textOrUndefined(ticket?.assertion);
+  const mintUrl = textOrUndefined(ticket?.mintUrl);
+  if (assertion === void 0 || mintUrl === void 0) {
+    deps.log?.("hiwork-core: \u53D6\u65AD\u8A00\u6536\u5230\u65E0\u6548\u54CD\u5E94\uFF08\u7F3A assertion / mintUrl\uFF09");
+    return failure4("internal", MANAGED_MCP_GENERIC_FAILURE_MESSAGE);
+  }
+  return {
+    ok: true,
+    value: {
+      assertion,
+      mintUrl,
+      revokeUrl: textOrUndefined(ticket?.revokeUrl) ?? "",
+      expiresAt: textOrUndefined(ticket?.expiresAt) ?? "",
+      serverName: textOrUndefined(ticket?.serverName) ?? ""
+    }
+  };
+}
+function failure4(code, message) {
+  return { ok: false, error: { code, message, details: {} } };
+}
+function registerManagedMcpRpc(ctx, deps, store) {
+  const handler = (endpoint, payload, signal) => handleManagedMcpEndpoint(endpoint, payload, deps, store, signal);
+  const remove = ctx.connection.rpc.handle(MANAGED_MCP_RPC_CHANNEL, handler, { authority: "loopback" });
+  return async () => {
+    await remove();
+  };
+}
+
 // src/index.ts
 var name = "hiwork-core";
 var inject = ["settings", "credentials", "workspaceRegistry", "connection"];
@@ -4422,6 +4695,7 @@ var Config = Schema.object({
   browserLogin: Schema.object({ authorizeUrl: Schema.string().required(), startedAt: Schema.string().required() }).default(void 0),
   // 三值枚举：非法值写入直接被 schema 拒绝（客户端还会再归一一次，双保险）。
   loginMode: Schema.union([Schema.const("browser"), Schema.const("form"), Schema.const("both")]),
+  passwordLogin: Schema.boolean(),
   budgets: Schema.array(Schema.object({
     model_name: Schema.string().required(),
     total_budget: Schema.number(),
@@ -4593,6 +4867,7 @@ function registerIpcMessageHandler(ports) {
 }
 async function projectLoginMode(opts) {
   let loginMode = DEFAULT_LOGIN_MODE;
+  let passwordLogin = DEFAULT_PASSWORD_LOGIN;
   try {
     const baseURL = opts.baseURL;
     if (baseURL !== void 0 && baseURL !== "") {
@@ -4605,13 +4880,16 @@ async function projectLoginMode(opts) {
         deviceId: device.deviceId,
         ...opts.timeoutMs === void 0 ? {} : { timeoutMs: opts.timeoutMs }
       });
-      if (policy !== void 0) loginMode = policy.loginMode;
+      if (policy !== void 0) {
+        loginMode = policy.loginMode;
+        passwordLogin = policy.passwordLogin;
+      }
     }
   } catch (error) {
     opts.log?.(`hiwork-core: \u5BA2\u6237\u7AEF\u7B56\u7565\u62C9\u53D6\u5931\u8D25\uFF0C\u767B\u5F55\u65B9\u5F0F\u56DE\u9000 both\uFF08${errorName(error)}\uFF09`);
   }
   try {
-    await opts.state.patch({ set: { loginMode } });
+    await opts.state.patch({ set: { loginMode, passwordLogin } });
   } catch (error) {
     opts.log?.(`hiwork-core: \u5BA2\u6237\u7AEF\u7B56\u7565\u5199\u5165\u5931\u8D25\uFF08${errorName(error)}\uFF09`);
   }
@@ -4751,6 +5029,34 @@ function apply(ctx, config) {
       ctx.logger.warn(message);
     }
   }), "hiwork-core: daily rpc");
+  const managedMcpDeps = {
+    resolveSession: async () => (await ports.credentials.resolve(SESSION_REF))?.value,
+    gateway: () => {
+      const baseURL = current().baseURL;
+      return baseURL === void 0 || baseURL === "" ? void 0 : gatewayFor(baseURL);
+    },
+    log: (message) => {
+      ctx.logger.warn(message);
+    }
+  };
+  const managedMcp = new ManagedMcpStore(managedMcpDeps);
+  ctx.effect(
+    () => registerManagedMcpRpc({ connection, logger: ctx.logger }, managedMcpDeps, managedMcp),
+    "hiwork-core: managed mcp rpc"
+  );
+  ctx.effect(() => {
+    const warm = () => {
+      void managedMcp.load().catch((error) => {
+        ctx.logger.warn(`hiwork-core: \u53D7\u7BA1 MCP \u6E05\u5355\u9884\u70ED\u5931\u8D25\uFF08${error instanceof Error ? error.name : typeof error}\uFF09`);
+      });
+    };
+    warm();
+    const timer = setInterval(warm, MANAGED_MCP_REFRESH_INTERVAL_MS);
+    timer.unref?.();
+    return () => {
+      clearInterval(timer);
+    };
+  }, "hiwork-core: managed mcp warmup");
   ctx.effect(() => registerAppVersionRpc({ connection, logger: ctx.logger }, {
     appVersion: () => pushedAppVersion(),
     log: (message) => {