@thinkingai/ae-cli 6.1.12 → 6.1.13

package/dist/{te-community-SQXKE5OO.js → te-community-HNKVTERD.js}

@@ -1,20 +1,215 @@
-import {
-  callMcpTool,
-  parseMcpResult,
-  registerMcpMappings,
-  resolveMcpUrl
-} from "./chunk-DT6Y3TD7.js";
-import "./chunk-NBPKWKRA.js";
 import {
   registerCapabilityGatewayRoute
 } from "./chunk-PTE56QPL.js";
-import "./chunk-Z3OXWCIA.js";
-import "./chunk-YV52FB5G.js";
-import "./chunk-GJJA4CQZ.js";
 import {
-  CliValidationError
+  clearCliToken,
+  getCliToken
+} from "./chunk-S5NTSDBS.js";
+import "./chunk-ZQKDZXDO.js";
+import {
+  getActiveHost,
+  safeJsonParse
+} from "./chunk-3FY3RJ26.js";
+import {
+  CliValidationError,
+  PermissionError
 } from "./chunk-AXDXJTPC.js";
-import "./chunk-JHENBQ5B.js";
+import {
+  logger
+} from "./chunk-JHENBQ5B.js";
+
+// src/core/mcp.ts
+async function permissionMessage(resp) {
+  const text = await resp.text().catch(() => "");
+  try {
+    const d = safeJsonParse(text);
+    const msg = d && (d.error?.message || (typeof d.error === "string" ? d.error : void 0) || d.message);
+    if (msg && typeof msg === "string") return msg;
+  } catch {
+  }
+  return "Permission denied for this resource (HTTP 403)";
+}
+function isInvalidCliTokenMessage(message) {
+  return /\b(cli[-_\s]?token|token)\b.*\binvalid\b/i.test(message) || /\binvalid\b.*\b(cli[-_\s]?token|token)\b/i.test(message);
+}
+var MCP_PROTOCOL_VERSION = "2025-11-25";
+var JSONRPC_VERSION = "2.0";
+var serviceMappingMap = /* @__PURE__ */ new Map();
+function registerMcpMappings(mappings) {
+  for (const [serviceName, mapping] of Object.entries(mappings)) {
+    serviceMappingMap.set(serviceName, mapping);
+  }
+}
+function getMcpMapping(serviceName) {
+  const mapping = serviceMappingMap.get(serviceName);
+  if (!mapping) {
+    throw new Error(`MCP mapping not found for service: '${serviceName}'. Please register it using registerMcpMapping() first.`);
+  }
+  return mapping;
+}
+function buildMcpUrl(host, serviceName) {
+  const mapping = getMcpMapping(serviceName);
+  const base = host.replace(/\/+$/, "");
+  return `${base}/mcp/${mapping.componentName}/http/${mapping.mappingPath}`;
+}
+function resolveMcpUrl(mcpUrlOverride, host, serviceName) {
+  if (mcpUrlOverride) {
+    return mcpUrlOverride;
+  }
+  return buildMcpUrl(host, serviceName);
+}
+var requestIdCounter = 1;
+function genRequestId() {
+  return requestIdCounter++;
+}
+function buildAuthHeaders(cliToken) {
+  return {
+    "cli-token": cliToken
+  };
+}
+async function mcpRequest(url, method, params = {}, hostOverride) {
+  const hostUrl = hostOverride || getActiveHost();
+  const token = await getCliToken(hostUrl);
+  const requestId = genRequestId();
+  const paramsWithMeta = {
+    ...params,
+    _meta: { progressToken: requestId }
+  };
+  const body = {
+    jsonrpc: JSONRPC_VERSION,
+    id: requestId,
+    method,
+    params: paramsWithMeta
+  };
+  const headers = {
+    "Content-Type": "application/json",
+    "Accept": "application/json, text/event-stream",
+    "mcp-protocol-version": MCP_PROTOCOL_VERSION,
+    ...buildAuthHeaders(token)
+  };
+  const resp = await fetch(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body)
+  });
+  if (!resp.ok) {
+    let permissionMsg;
+    if (resp.status === 403) {
+      permissionMsg = await permissionMessage(resp);
+      if (!isInvalidCliTokenMessage(permissionMsg)) {
+        throw new PermissionError(permissionMsg);
+      }
+    }
+    if (resp.status === 401 || resp.status === 403 && permissionMsg) {
+      logger.warn(`MCP request failed (${resp.status === 403 ? permissionMsg : "HTTP 401"}) for ${hostUrl}, refreshing CLI token`);
+      clearCliToken(hostUrl);
+      const newToken = await getCliToken(hostUrl);
+      logger.info(`CLI token refreshed for ${hostUrl}`);
+      process.stderr.write(`[ae-cli] CLI token refreshed for ${hostUrl}
+`);
+      Object.assign(headers, buildAuthHeaders(newToken));
+      const retryResp = await fetch(url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body)
+      });
+      if (retryResp.status === 403) {
+        throw new PermissionError(await permissionMessage(retryResp));
+      }
+      if (!retryResp.ok) {
+        throw new Error(`MCP HTTP error: ${retryResp.status} ${retryResp.statusText}`);
+      }
+      const retryData = safeJsonParse(await retryResp.text());
+      if (retryData.error) {
+        throw new Error(`MCP error: ${retryData.error.message || JSON.stringify(retryData.error)}`);
+      }
+      return retryData.result;
+    }
+    throw new Error(`MCP HTTP error: ${resp.status} ${resp.statusText}`);
+  }
+  const data = safeJsonParse(await resp.text());
+  if (data.error) {
+    throw new Error(`MCP error: ${data.error.message || JSON.stringify(data.error)}`);
+  }
+  return data.result;
+}
+async function callMcpTool(url, toolName, args = {}, hostOverride) {
+  const params = {
+    name: toolName,
+    arguments: args
+  };
+  logger.info(`MCP tool call: ${toolName}`);
+  const result = await mcpRequest(url, "tools/call", params, hostOverride);
+  if (result.isError) {
+    logger.warn(`MCP tool call failed: ${toolName}`);
+  }
+  return {
+    content: result.content.map((item) => {
+      if (item.type === "text") {
+        return { type: "text", text: item.text };
+      } else if (item.type === "image") {
+        return { type: "image", data: item.data, mimeType: item.mimeType };
+      } else {
+        return { type: "resource", ...item };
+      }
+    }),
+    isError: result.isError
+  };
+}
+function parseMcpResult(result) {
+  if (result.isError) {
+    const firstText = result.content.find((item) => item.type === "text")?.text || "";
+    let errorMessage = firstText.trim() || "MCP tool call failed";
+    try {
+      const parsed = safeJsonParse(firstText);
+      errorMessage = mcpResultErrorMessage(parsed) || errorMessage;
+    } catch {
+    }
+    throwMcpError(errorMessage);
+  }
+  if (result.content.length > 0 && result.content[0].type === "text") {
+    const text = result.content[0].text || "";
+    let parsed;
+    try {
+      parsed = safeJsonParse(text);
+    } catch {
+      return text;
+    }
+    const errMsg = mcpResultErrorMessage(parsed);
+    if (errMsg !== null) {
+      throwMcpError(errMsg);
+    }
+    return parsed;
+  }
+  return result;
+}
+function mcpResultErrorMessage(parsed) {
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  if (parsed.success === true || parsed.ok === true) return null;
+  const explicitlyFailed = parsed.success === false || parsed.ok === false;
+  const e = parsed.error;
+  if (typeof e === "string" && e.trim()) return e;
+  if (e && typeof e === "object") {
+    const msg = typeof e.message === "string" && e.message || void 0;
+    const code = typeof e.code === "string" && e.code || void 0;
+    if (msg && code) return `${code}: ${msg}`;
+    if (msg || code) return msg || code;
+  }
+  if (explicitlyFailed) {
+    const msg = typeof parsed.message === "string" && parsed.message.trim() ? parsed.message.trim() : void 0;
+    const codeValue = parsed.errorCode ?? parsed.error_code ?? parsed.code;
+    const code = typeof codeValue === "string" && codeValue.trim() ? codeValue.trim() : void 0;
+    if (msg && code) return `${code}: ${msg}`;
+    return msg || code || "MCP tool call failed";
+  }
+  return null;
+}
+function throwMcpError(message) {
+  if (/no_auth|auth_error|permission|forbidden|unauthor|\u65e0\u6743/i.test(message)) {
+    throw new PermissionError(message);
+  }
+  throw new Error(message);
+}
 
 // src/commands/te-community/get_channel_info.ts
 var getChannelInfo = {

package/dist/{te-community-TYSNU3NQ.js → te-community-IWE5B7W6.js}

@@ -1,20 +1,216 @@
-import {
-  callMcpTool,
-  parseMcpResult,
-  registerMcpMappings,
-  resolveMcpUrl
-} from "./chunk-MVDZ7DBQ.js";
-import "./chunk-NBPKWKRA.js";
 import {
   registerCapabilityGatewayRoute
 } from "./chunk-PTE56QPL.js";
-import "./chunk-Z3OXWCIA.js";
-import "./chunk-YV52FB5G.js";
-import "./chunk-GJJA4CQZ.js";
 import {
-  CliValidationError
+  clearCliToken,
+  getCliToken
+} from "./chunk-S5NTSDBS.js";
+import "./chunk-ZQKDZXDO.js";
+import {
+  getActiveHost,
+  safeJsonParse
+} from "./chunk-3FY3RJ26.js";
+import {
+  CliValidationError,
+  PermissionError
 } from "./chunk-AXDXJTPC.js";
-import "./chunk-JHENBQ5B.js";
+import {
+  logger
+} from "./chunk-JHENBQ5B.js";
+
+// src/core/mcp.ts
+async function permissionMessage(resp) {
+  const text = await resp.text().catch(() => "");
+  try {
+    const d = safeJsonParse(text);
+    const msg = d && (d.error?.message || (typeof d.error === "string" ? d.error : void 0) || d.message);
+    if (msg && typeof msg === "string") return msg;
+  } catch {
+  }
+  return "Permission denied for this resource (HTTP 403)";
+}
+function isInvalidCliTokenMessage(message) {
+  return /\b(cli[-_\s]?token|token)\b.*\binvalid\b/i.test(message) || /\binvalid\b.*\b(cli[-_\s]?token|token)\b/i.test(message);
+}
+var MCP_PROTOCOL_VERSION = "2025-11-25";
+var JSONRPC_VERSION = "2.0";
+var serviceMappingMap = /* @__PURE__ */ new Map();
+function registerMcpMappings(mappings) {
+  for (const [serviceName, mapping] of Object.entries(mappings)) {
+    serviceMappingMap.set(serviceName, mapping);
+  }
+}
+function getMcpMapping(serviceName) {
+  const mapping = serviceMappingMap.get(serviceName);
+  if (!mapping) {
+    throw new Error(`MCP mapping not found for service: '${serviceName}'. Please register it using registerMcpMapping() first.`);
+  }
+  return mapping;
+}
+function buildMcpUrl(host, serviceName) {
+  const mapping = getMcpMapping(serviceName);
+  const base = host.replace(/\/+$/, "");
+  return `${base}/mcp/${mapping.componentName}/http/${mapping.mappingPath}`;
+}
+function resolveMcpUrl(mcpUrlOverride, host, serviceName) {
+  if (mcpUrlOverride) {
+    return mcpUrlOverride;
+  }
+  return buildMcpUrl(host, serviceName);
+}
+var requestIdCounter = 1;
+function genRequestId() {
+  return requestIdCounter++;
+}
+function buildAuthHeaders(cliToken) {
+  return {
+    "cli-token": cliToken
+  };
+}
+async function mcpRequest(url, method, params = {}, hostOverride) {
+  const hostUrl = hostOverride || getActiveHost();
+  const token = await getCliToken(hostUrl);
+  const requestId = genRequestId();
+  const paramsWithMeta = {
+    ...params,
+    _meta: { progressToken: requestId }
+  };
+  const body = {
+    jsonrpc: JSONRPC_VERSION,
+    id: requestId,
+    method,
+    params: paramsWithMeta
+  };
+  const headers = {
+    "Content-Type": "application/json",
+    "Accept": "application/json, text/event-stream",
+    "mcp-protocol-version": MCP_PROTOCOL_VERSION,
+    "X-Source": "ae-cli",
+    ...buildAuthHeaders(token)
+  };
+  const resp = await fetch(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body)
+  });
+  if (!resp.ok) {
+    let permissionMsg;
+    if (resp.status === 403) {
+      permissionMsg = await permissionMessage(resp);
+      if (!isInvalidCliTokenMessage(permissionMsg)) {
+        throw new PermissionError(permissionMsg);
+      }
+    }
+    if (resp.status === 401 || resp.status === 403 && permissionMsg) {
+      logger.warn(`MCP request failed (${resp.status === 403 ? permissionMsg : "HTTP 401"}) for ${hostUrl}, refreshing CLI token`);
+      clearCliToken(hostUrl);
+      const newToken = await getCliToken(hostUrl);
+      logger.info(`CLI token refreshed for ${hostUrl}`);
+      process.stderr.write(`[ae-cli] CLI token refreshed for ${hostUrl}
+`);
+      Object.assign(headers, buildAuthHeaders(newToken));
+      const retryResp = await fetch(url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(body)
+      });
+      if (retryResp.status === 403) {
+        throw new PermissionError(await permissionMessage(retryResp));
+      }
+      if (!retryResp.ok) {
+        throw new Error(`MCP HTTP error: ${retryResp.status} ${retryResp.statusText}`);
+      }
+      const retryData = safeJsonParse(await retryResp.text());
+      if (retryData.error) {
+        throw new Error(`MCP error: ${retryData.error.message || JSON.stringify(retryData.error)}`);
+      }
+      return retryData.result;
+    }
+    throw new Error(`MCP HTTP error: ${resp.status} ${resp.statusText}`);
+  }
+  const data = safeJsonParse(await resp.text());
+  if (data.error) {
+    throw new Error(`MCP error: ${data.error.message || JSON.stringify(data.error)}`);
+  }
+  return data.result;
+}
+async function callMcpTool(url, toolName, args = {}, hostOverride) {
+  const params = {
+    name: toolName,
+    arguments: args
+  };
+  logger.info(`MCP tool call: ${toolName}`);
+  const result = await mcpRequest(url, "tools/call", params, hostOverride);
+  if (result.isError) {
+    logger.warn(`MCP tool call failed: ${toolName}`);
+  }
+  return {
+    content: result.content.map((item) => {
+      if (item.type === "text") {
+        return { type: "text", text: item.text };
+      } else if (item.type === "image") {
+        return { type: "image", data: item.data, mimeType: item.mimeType };
+      } else {
+        return { type: "resource", ...item };
+      }
+    }),
+    isError: result.isError
+  };
+}
+function parseMcpResult(result) {
+  if (result.isError) {
+    const firstText = result.content.find((item) => item.type === "text")?.text || "";
+    let errorMessage = firstText.trim() || "MCP tool call failed";
+    try {
+      const parsed = safeJsonParse(firstText);
+      errorMessage = mcpResultErrorMessage(parsed) || errorMessage;
+    } catch {
+    }
+    throwMcpError(errorMessage);
+  }
+  if (result.content.length > 0 && result.content[0].type === "text") {
+    const text = result.content[0].text || "";
+    let parsed;
+    try {
+      parsed = safeJsonParse(text);
+    } catch {
+      return text;
+    }
+    const errMsg = mcpResultErrorMessage(parsed);
+    if (errMsg !== null) {
+      throwMcpError(errMsg);
+    }
+    return parsed;
+  }
+  return result;
+}
+function mcpResultErrorMessage(parsed) {
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+  if (parsed.success === true || parsed.ok === true) return null;
+  const explicitlyFailed = parsed.success === false || parsed.ok === false;
+  const e = parsed.error;
+  if (typeof e === "string" && e.trim()) return e;
+  if (e && typeof e === "object") {
+    const msg = typeof e.message === "string" && e.message || void 0;
+    const code = typeof e.code === "string" && e.code || void 0;
+    if (msg && code) return `${code}: ${msg}`;
+    if (msg || code) return msg || code;
+  }
+  if (explicitlyFailed) {
+    const msg = typeof parsed.message === "string" && parsed.message.trim() ? parsed.message.trim() : void 0;
+    const codeValue = parsed.errorCode ?? parsed.error_code ?? parsed.code;
+    const code = typeof codeValue === "string" && codeValue.trim() ? codeValue.trim() : void 0;
+    if (msg && code) return `${code}: ${msg}`;
+    return msg || code || "MCP tool call failed";
+  }
+  return null;
+}
+function throwMcpError(message) {
+  if (/no_auth|auth_error|permission|forbidden|unauthor|\u65e0\u6743/i.test(message)) {
+    throw new PermissionError(message);
+  }
+  throw new Error(message);
+}
 
 // src/commands/te-community/get_channel_info.ts
 var getChannelInfo = {