@costgate/momentum-mcp 0.1.34 → 0.1.35

package/README.md

@@ -9,7 +9,7 @@ MOMENTUM_TOKEN=mom_agent_xxx \
 ```
 
 整条命令不用自己拼 —— 在 Momentum 的「设置 › Agent」里签发令牌时会直接给出，
-默认用 `@latest`，发新版不用改配置；想固定某一版时把 latest 换成版本号（当前是 0.1.34）。
+默认用 `@latest`，发新版不用改配置；想固定某一版时把 latest 换成版本号（当前是 0.1.35）。
 
 | 环境变量 | 必填 | 说明 |
 |---|---|---|
@@ -18,4 +18,4 @@ MOMENTUM_TOKEN=mom_agent_xxx \
 | `MOMENTUM_CF_ACCESS_CLIENT_ID` | 否 | 部署在 Cloudflare Access 后面时才需要 |
 | `MOMENTUM_CF_ACCESS_CLIENT_SECRET` | 否 | 同上 |
 
-版本 0.1.34。客户端和服务端版本不一致时，启动日志（stderr）会明确警告。
+版本 0.1.35。客户端和服务端版本不一致时，启动日志（stderr）会明确警告。

package/momentum-mcp.mjs

@@ -15339,7 +15339,7 @@ var allowErrorProps = SuperJSON.allowErrorProps;
 
 // src/version.ts
 var UNKNOWN = "unknown";
-var MCP_VERSION = true ? "0.1.34" : versionFromRepo();
+var MCP_VERSION = true ? "0.1.35" : versionFromRepo();
 var CLIENT_HEADER = `momentum-mcp/${MCP_VERSION}`;
 function compareVersions(a, b) {
   const parse4 = (v) => {
@@ -23621,6 +23621,12 @@ function hostUsageReader(env = process.env, opts = {}) {
   const home = opts.home ?? homedir();
   return async (runId, since) => {
     try {
+      const records = opts.reported?.since(since) ?? [];
+      if (env.MOMENTUM_USAGE_FILE) {
+        records.push(...parseHostReportFile(await readOptional(env.MOMENTUM_USAGE_FILE), since, opts.log));
+      }
+      const reported = sumHostReported(records);
+      if (reported) return reported;
       if (env.CLAUDE_CODE_SESSION_ID) {
         const dir = env.CLAUDE_CONFIG_DIR ?? join(home, ".claude");
         return await claudeCodeUsage(dir, env.CLAUDE_CODE_SESSION_ID, runId, since);
@@ -23734,6 +23740,74 @@ function sumCodex(bodies, threadId, since) {
   total.modelRequests = items.length;
   return total;
 }
+var HOST_USAGE_META_KEY = "ai.costgate.momentum/usage";
+var HostReports = class {
+  constructor(log2) {
+    this.log = log2;
+  }
+  items = [];
+  /** 只吃 `_meta`。工具参数是模型写的，哪怕里面也叫 `_meta`，也不会走到这里 */
+  record(meta, at = /* @__PURE__ */ new Date()) {
+    if (!meta || typeof meta !== "object") return;
+    const value = meta[HOST_USAGE_META_KEY];
+    if (value === void 0) return;
+    for (const item of Array.isArray(value) ? value : [value]) {
+      const report = toHostReport(item);
+      if (report) this.items.push({ ...report, at: at.getTime() });
+      else this.log?.(`  \u5FFD\u7565\u4E00\u6761\u683C\u5F0F\u4E0D\u5BF9\u7684\u5BBF\u4E3B\u7528\u91CF\uFF1A${JSON.stringify(item).slice(0, 200)}`);
+    }
+  }
+  since(since) {
+    return this.items.filter((r) => r.at >= since.getTime());
+  }
+};
+function parseHostReportFile(body, since, log2) {
+  const out = [];
+  for (const line of body.split("\n")) {
+    if (!line.trim()) continue;
+    const entry = parseLine(line);
+    if (!entry || !inWindow(entry.timestamp, since)) continue;
+    const report = toHostReport(entry);
+    if (report) out.push(report);
+    else log2?.(`  \u5FFD\u7565\u4E00\u6761\u683C\u5F0F\u4E0D\u5BF9\u7684\u5BBF\u4E3B\u7528\u91CF\uFF1A${line.slice(0, 200)}`);
+  }
+  return out;
+}
+function sumHostReported(reports) {
+  const seen = /* @__PURE__ */ new Set();
+  const total = emptyUsage("host_reported");
+  for (const r of reports) {
+    if (r.requestId !== void 0) {
+      if (seen.has(r.requestId)) continue;
+      seen.add(r.requestId);
+    }
+    total.modelRequests += 1;
+    total.inputTokens += r.inputTokens;
+    total.cachedInputTokens += r.cachedInputTokens;
+    total.outputTokens += r.outputTokens;
+    total.reasoningTokens += r.reasoningTokens;
+  }
+  return total.modelRequests > 0 ? total : null;
+}
+function toHostReport(value) {
+  if (!value || typeof value !== "object") return null;
+  const v = value;
+  const count = (x, fallback) => x === void 0 && fallback !== void 0 ? fallback : Number.isSafeInteger(x) && x >= 0 ? x : null;
+  const inputTokens = count(v.inputTokens);
+  const outputTokens = count(v.outputTokens);
+  const cachedInputTokens = count(v.cachedInputTokens, 0);
+  const reasoningTokens = count(v.reasoningTokens, 0);
+  if (inputTokens === null || outputTokens === null || cachedInputTokens === null || reasoningTokens === null) return null;
+  if (cachedInputTokens > inputTokens || reasoningTokens > outputTokens) return null;
+  if (v.requestId !== void 0 && (typeof v.requestId !== "string" || v.requestId.length > 200)) return null;
+  return {
+    ...typeof v.requestId === "string" ? { requestId: v.requestId } : {},
+    inputTokens,
+    cachedInputTokens,
+    outputTokens,
+    reasoningTokens
+  };
+}
 var RunMeters = class {
   runs = /* @__PURE__ */ new Map();
   open(runId, since = /* @__PURE__ */ new Date()) {
@@ -23780,6 +23854,14 @@ function inWindow(timestamp, since) {
   const at = timestamp ? Date.parse(timestamp) : Number.NaN;
   return Number.isFinite(at) && at >= since.getTime();
 }
+async function readOptional(path) {
+  try {
+    return await readFile(path, "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") return "";
+    throw err;
+  }
+}
 async function isFile(path) {
   try {
     return (await stat(path)).isFile();
@@ -23884,7 +23966,8 @@ function createTools(client, profile = "full", options = {}) {
     { log: options.log }
   );
   const meters = new RunMeters();
-  const readUsage = options.readUsage ?? hostUsageReader(process.env, { log: options.log });
+  const reported = options.hostReports ?? new HostReports(options.log);
+  const readUsage = options.readUsage ?? hostUsageReader(process.env, { log: options.log, reported });
   async function measured(runId) {
     const meter = meters.get(runId);
     if (!meter) return {};
@@ -24863,7 +24946,8 @@ ${JSON.stringify(receipt)}`);
   const selected = profile === "work" ? tools.filter((tool) => WORK_TOOL_NAMES.has(tool.name)) : tools;
   return selected.map((tool) => ({
     ...tool,
-    handler: async (args) => {
+    handler: async (args, meta) => {
+      reported.record(meta);
       const argBytes = byteLength(JSON.stringify(args ?? {}));
       const charged = meters.beginCall(argBytes);
       let result;
@@ -24947,8 +25031,9 @@ function createMcpServer(client, profile = "work", options = {}) {
     server.registerTool(
       tool.name,
       { description: tool.description, inputSchema: tool.inputSchema },
-      // SDK 会先按 inputSchema 校验再调进来，这里的形状转换是安全的
-      (args) => tool.handler(args)
+      // SDK 会先按 inputSchema 校验再调进来，这里的形状转换是安全的。
+      // extra._meta 是请求 params._meta，宿主可以在里面上报用量（IMMO-215）
+      (args, extra) => tool.handler(args, extra._meta)
     );
   }
   return server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@costgate/momentum-mcp",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "Momentum MCP Server —— 把 Momentum 的任务、领取与交付接进任意 MCP 客户端",
   "type": "module",
   "bin": {