@devness/useai 0.5.29 → 0.5.30

package/dist/index.js

@@ -2681,7 +2681,7 @@ var VERSION;
 var init_version = __esm({
   "../shared/dist/constants/version.js"() {
     "use strict";
-    VERSION = "0.5.29";
+    VERSION = "0.5.30";
   }
 });
 
@@ -36341,11 +36341,17 @@ var init_session_state = __esm({
       conversationIndex;
       /** MCP transport session ID (set in daemon mode). Survives reset(). */
       mcpSessionId;
+      /** Self-reported model ID from useai_start (e.g. "claude-opus-4-6"). */
+      modelId;
+      /** Token estimates for the useai_start tool call. */
+      startCallTokensEst;
       constructor() {
         this.sessionId = generateSessionId();
         this.conversationId = generateSessionId();
         this.conversationIndex = 0;
         this.mcpSessionId = null;
+        this.modelId = null;
+        this.startCallTokensEst = null;
         this.sessionStartTime = Date.now();
         this.heartbeatCount = 0;
         this.sessionRecordCount = 0;
@@ -36370,6 +36376,8 @@ var init_session_state = __esm({
         this.sessionTitle = null;
         this.sessionPrivateTitle = null;
         this.sessionPromptWordCount = null;
+        this.modelId = null;
+        this.startCallTokensEst = null;
         this.detectProject();
       }
       detectProject() {
@@ -36393,6 +36401,9 @@ var init_session_state = __esm({
       setPromptWordCount(count) {
         this.sessionPromptWordCount = count;
       }
+      setModel(id) {
+        this.modelId = id;
+      }
       incrementHeartbeat() {
         this.heartbeatCount++;
       }
@@ -36447,25 +36458,6 @@ function writeMcpMapping(mcpSessionId, useaiSessionId) {
   map[mcpSessionId] = useaiSessionId;
   writeJson(mcpMapPath(), map);
 }
-function removeMcpMapping(mcpSessionId) {
-  if (!mcpSessionId) return;
-  const map = readMcpMap();
-  if (mcpSessionId in map) {
-    delete map[mcpSessionId];
-    writeJson(mcpMapPath(), map);
-  }
-}
-function removeMcpMappingByUseaiId(useaiSessionId) {
-  const map = readMcpMap();
-  let changed = false;
-  for (const [mcpId, sessionId] of Object.entries(map)) {
-    if (sessionId === useaiSessionId) {
-      delete map[mcpId];
-      changed = true;
-    }
-  }
-  if (changed) writeJson(mcpMapPath(), map);
-}
 var init_mcp_map = __esm({
   "src/mcp-map.ts"() {
     "use strict";
@@ -36510,15 +36502,17 @@ function registerTools(server2, session2, opts) {
       task_type: external_exports.enum(["coding", "debugging", "testing", "planning", "reviewing", "documenting", "learning", "other"]).optional().describe("What kind of task is the developer working on?"),
       title: external_exports.string().optional().describe(`Short public session title derived from the user's prompt. No project names, file paths, or identifying details. Example: "Fix authentication bug"`),
       private_title: external_exports.string().optional().describe('Detailed session title for private records. Can include project names and specifics. Example: "Fix JWT refresh in UseAI login flow"'),
-      project: external_exports.string().optional().describe('Project name for this session. Typically the root directory name of the codebase being worked on. Example: "goodpass", "useai"')
+      project: external_exports.string().optional().describe('Project name for this session. Typically the root directory name of the codebase being worked on. Example: "goodpass", "useai"'),
+      model: external_exports.string().optional().describe('The AI model ID running this session. Example: "claude-opus-4-6", "claude-sonnet-4-6"')
     },
-    async ({ task_type, title, private_title, project }) => {
+    async ({ task_type, title, private_title, project, model }) => {
       if (session2.sessionRecordCount > 0 && opts?.sealBeforeReset) {
         opts.sealBeforeReset();
       }
       session2.reset();
       resolveClient(server2, session2);
       if (project) session2.setProject(project);
+      if (model) session2.setModel(model);
       session2.setTaskType(task_type ?? "coding");
       session2.setTitle(title ?? null);
       session2.setPrivateTitle(private_title ?? null);
@@ -36532,13 +36526,20 @@ function registerTools(server2, session2, opts) {
       };
       if (title) chainData.title = title;
       if (private_title) chainData.private_title = private_title;
+      if (model) chainData.model = model;
       const record2 = session2.appendToChain("session_start", chainData);
       writeMcpMapping(session2.mcpSessionId, session2.sessionId);
+      const responseText = `useai session started \u2014 ${session2.sessionTaskType} on ${session2.clientName} \xB7 ${session2.sessionId.slice(0, 8)} \xB7 conv ${session2.conversationId.slice(0, 8)}#${session2.conversationIndex} \xB7 ${session2.signingAvailable ? "signed" : "unsigned"}`;
+      const paramsJson = JSON.stringify({ task_type, title, private_title, project, model });
+      session2.startCallTokensEst = {
+        output: Math.ceil(paramsJson.length / 4),
+        input: Math.ceil(responseText.length / 4)
+      };
       return {
         content: [
           {
             type: "text",
-            text: `useai session started \u2014 ${session2.sessionTaskType} on ${session2.clientName} \xB7 ${session2.sessionId.slice(0, 8)} \xB7 conv ${session2.conversationId.slice(0, 8)}#${session2.conversationIndex} \xB7 ${session2.signingAvailable ? "signed" : "unsigned"}`
+            text: responseText
           }
         ]
       };
@@ -36639,14 +36640,18 @@ function registerTools(server2, session2, opts) {
           writeJson(MILESTONES_FILE, allMilestones);
         }
       }
+      const endParamsJson = JSON.stringify({ task_type, languages, files_touched_count, milestones: milestonesInput, evaluation });
+      const endOutputTokensEst = Math.ceil(endParamsJson.length / 4);
       const endRecord = session2.appendToChain("session_end", {
         duration_seconds: duration3,
         task_type: finalTaskType,
         languages: languages ?? [],
         files_touched: files_touched_count ?? 0,
         heartbeat_count: session2.heartbeatCount,
-        ...evaluation ? { evaluation } : {}
+        ...evaluation ? { evaluation } : {},
+        ...session2.modelId ? { model: session2.modelId } : {}
       });
+      const startEst = session2.startCallTokensEst ?? { input: 0, output: 0 };
       const sealData = JSON.stringify({
         session_id: session2.sessionId,
         conversation_id: session2.conversationId,
@@ -36659,6 +36664,7 @@ function registerTools(server2, session2, opts) {
         title: session2.sessionTitle ?? void 0,
         private_title: session2.sessionPrivateTitle ?? void 0,
         prompt_word_count: session2.sessionPromptWordCount ?? void 0,
+        model: session2.modelId ?? void 0,
         evaluation: evaluation ?? void 0,
         started_at: new Date(session2.sessionStartTime).toISOString(),
         ended_at: now,
@@ -36683,6 +36689,17 @@ function registerTools(server2, session2, opts) {
         }
       } catch {
       }
+      const durationStr = formatDuration(duration3);
+      const langStr = languages && languages.length > 0 ? ` using ${languages.join(", ")}` : "";
+      const milestoneStr = milestoneCount > 0 ? ` \xB7 ${milestoneCount} milestone${milestoneCount > 1 ? "s" : ""} recorded` : "";
+      const evalStr = evaluation ? ` \xB7 eval: ${evaluation.task_outcome} (prompt: ${evaluation.prompt_quality}/5)` : "";
+      const responseText = `Session ended: ${durationStr} ${finalTaskType}${langStr}${milestoneStr}${evalStr}`;
+      const endInputTokensEst = Math.ceil(responseText.length / 4);
+      const toolOverhead = {
+        start: { input_tokens_est: startEst.input, output_tokens_est: startEst.output },
+        end: { input_tokens_est: endInputTokensEst, output_tokens_est: endOutputTokensEst },
+        total_tokens_est: startEst.input + startEst.output + endInputTokensEst + endOutputTokensEst
+      };
       const seal = {
         session_id: session2.sessionId,
         conversation_id: session2.conversationId,
@@ -36695,7 +36712,9 @@ function registerTools(server2, session2, opts) {
         title: session2.sessionTitle ?? void 0,
         private_title: session2.sessionPrivateTitle ?? void 0,
         prompt_word_count: session2.sessionPromptWordCount ?? void 0,
+        model: session2.modelId ?? void 0,
         evaluation: evaluation ?? void 0,
+        tool_overhead: toolOverhead,
         started_at: new Date(session2.sessionStartTime).toISOString(),
         ended_at: now,
         duration_seconds: duration3,
@@ -36708,16 +36727,11 @@ function registerTools(server2, session2, opts) {
       const sessions2 = getSessions().filter((s) => s.session_id !== seal.session_id);
       sessions2.push(seal);
       writeJson(SESSIONS_FILE, sessions2);
-      removeMcpMapping(session2.mcpSessionId);
-      const durationStr = formatDuration(duration3);
-      const langStr = languages && languages.length > 0 ? ` using ${languages.join(", ")}` : "";
-      const milestoneStr = milestoneCount > 0 ? ` \xB7 ${milestoneCount} milestone${milestoneCount > 1 ? "s" : ""} recorded` : "";
-      const evalStr = evaluation ? ` \xB7 eval: ${evaluation.task_outcome} (prompt: ${evaluation.prompt_quality}/5)` : "";
       return {
         content: [
           {
             type: "text",
-            text: `Session ended: ${durationStr} ${finalTaskType}${langStr}${milestoneStr}${evalStr}`
+            text: responseText
           }
         ]
       };
@@ -37167,7 +37181,6 @@ function sealOrphanFile(sessionId) {
       renameSync3(filePath, join10(SEALED_DIR, `${sessionId}.jsonl`));
     } catch {
     }
-    removeMcpMappingByUseaiId(sessionId);
     const convId = startData["conversation_id"] ?? void 0;
     const convIdx = startData["conversation_index"] ?? void 0;
     const seal = {
@@ -37418,6 +37431,17 @@ function parseBody(req) {
     req.on("error", reject);
   });
 }
+function detectClientFromHeaders(req) {
+  const ua = (req.headers["user-agent"] ?? "").toLowerCase();
+  if (ua.includes("claude-code") || ua.includes("claudecode")) return "claude-code";
+  if (ua.includes("cursor")) return "cursor";
+  if (ua.includes("windsurf") || ua.includes("codeium")) return "windsurf";
+  if (ua.includes("vscode") || ua.includes("visual studio code")) return "vscode";
+  if (ua.includes("codex")) return "codex";
+  if (ua.includes("gemini")) return "gemini-cli";
+  if (ua.includes("zed")) return "zed";
+  return "unknown";
+}
 function sendJsonRpcResult(res, rpcId, text) {
   res.writeHead(200, { "Content-Type": "application/json" });
   res.end(JSON.stringify({
@@ -37450,21 +37474,22 @@ function readChainMetadata(useaiSessionId) {
     return null;
   }
 }
-function recoverStartSession(staleMcpSessionId, args, rpcId, res) {
+function recoverStartSession(staleMcpSessionId, args, rpcId, res, req) {
   const map = readMcpMap();
   const prevSessionId = map[staleMcpSessionId];
-  if (!prevSessionId) return false;
-  const prevActivePath = join10(ACTIVE_DIR, `${prevSessionId}.jsonl`);
-  if (existsSync11(prevActivePath)) {
+  const prevActivePath = prevSessionId ? join10(ACTIVE_DIR, `${prevSessionId}.jsonl`) : null;
+  if (prevActivePath && existsSync11(prevActivePath)) {
     sealOrphanFile(prevSessionId);
   }
-  const meta = readChainMetadata(prevSessionId);
-  const client = meta?.client ?? "unknown";
+  const meta = prevSessionId ? readChainMetadata(prevSessionId) : null;
+  const chainClient = meta?.client;
+  const client = chainClient && chainClient !== "unknown" ? chainClient : detectClientFromHeaders(req);
   const newSessionId = randomUUID4();
   const taskType = args["task_type"] ?? "coding";
   const title = args["title"];
   const privateTitle = args["private_title"];
   const project = args["project"];
+  const model = args["model"];
   const convId = meta?.convId ?? randomUUID4();
   const chainData = {
     client,
@@ -37476,6 +37501,7 @@ function recoverStartSession(staleMcpSessionId, args, rpcId, res) {
   };
   if (title) chainData["title"] = title;
   if (privateTitle) chainData["private_title"] = privateTitle;
+  if (model) chainData["model"] = model;
   const record2 = buildChainRecord("session_start", newSessionId, chainData, "GENESIS", daemonSigningKey);
   const chainPath = join10(ACTIVE_DIR, `${newSessionId}.jsonl`);
   appendFileSync2(chainPath, JSON.stringify(record2) + "\n");
@@ -37544,6 +37570,7 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
   const sessionTitle = startData["title"] ?? void 0;
   const sessionPrivateTitle = startData["private_title"] ?? void 0;
   const sessionProject = startData["project"] ?? void 0;
+  const sessionModel = startData["model"] ?? void 0;
   const convId = startData["conversation_id"] ?? void 0;
   const convIdx = startData["conversation_index"] ?? void 0;
   const taskType = args["task_type"] ?? startData["task_type"] ?? "coding";
@@ -37593,6 +37620,7 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
       project: sessionProject,
       title: sessionTitle,
       private_title: sessionPrivateTitle,
+      model: sessionModel,
       evaluation: evaluation ?? void 0,
       started_at: startTime,
       ended_at: now,
@@ -37604,7 +37632,6 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
       seal_signature: ""
     };
     upsertSessionSeal(richSeal);
-    removeMcpMapping(staleMcpSessionId);
     const durationStr2 = formatDuration(duration3);
     sendJsonRpcResult(
       res,
@@ -37616,7 +37643,6 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
   }
   const lastRecord = JSON.parse(lines[lines.length - 1]);
   if (lastRecord.type === "session_end" || lastRecord.type === "session_seal") {
-    removeMcpMapping(staleMcpSessionId);
     sendJsonRpcResult(res, rpcId, "Session already ended.");
     return true;
   }
@@ -37675,7 +37701,8 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
     files_touched: filesTouched,
     heartbeat_count: heartbeatCount,
     recovered: true,
-    ...evaluation ? { evaluation } : {}
+    ...evaluation ? { evaluation } : {},
+    ...sessionModel ? { model: sessionModel } : {}
   }, chainTip, daemonSigningKey);
   appendFileSync2(activePath, JSON.stringify(endRecord) + "\n");
   recordCount++;
@@ -37690,6 +37717,7 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
     project: sessionProject,
     title: sessionTitle,
     private_title: sessionPrivateTitle,
+    model: sessionModel,
     evaluation: evaluation ?? void 0,
     started_at: startTime,
     ended_at: now,
@@ -37724,6 +37752,7 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
     project: sessionProject,
     title: sessionTitle,
     private_title: sessionPrivateTitle,
+    model: sessionModel,
     evaluation: evaluation ?? void 0,
     started_at: startTime,
     ended_at: now,
@@ -37734,7 +37763,6 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
     chain_end_hash: endRecord.hash,
     seal_signature: sealSignature
   });
-  removeMcpMapping(staleMcpSessionId);
   const durationStr = formatDuration(duration3);
   sendJsonRpcResult(
     res,
@@ -37744,7 +37772,7 @@ function recoverEndSession(staleMcpSessionId, args, rpcId, res) {
   console.log(`Recovered useai_end for stale session ${useaiSessionId.slice(0, 8)} (MCP ${staleMcpSessionId.slice(0, 8)})`);
   return true;
 }
-function tryRecoverStaleSession(staleMcpSessionId, body, res) {
+function tryRecoverStaleSession(staleMcpSessionId, body, res, req) {
   try {
     const rpc = body;
     if (rpc?.method !== "tools/call") return false;
@@ -37753,7 +37781,7 @@ function tryRecoverStaleSession(staleMcpSessionId, body, res) {
     const rpcId = rpc.id;
     switch (toolName) {
       case "useai_start":
-        return recoverStartSession(staleMcpSessionId, args, rpcId, res);
+        return recoverStartSession(staleMcpSessionId, args, rpcId, res, req);
       case "useai_heartbeat":
         return recoverHeartbeat(staleMcpSessionId, rpcId, res);
       case "useai_end":
@@ -37932,7 +37960,7 @@ async function startDaemon(port) {
           resetIdleTimer(sid);
           await sessions.get(sid).transport.handleRequest(req, res, body);
         } else if (sid && !sessions.has(sid)) {
-          if (!tryRecoverStaleSession(sid, body, res)) {
+          if (!tryRecoverStaleSession(sid, body, res, req)) {
             res.writeHead(404, { "Content-Type": "application/json" });
             res.end(JSON.stringify({
               jsonrpc: "2.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devness/useai",
-  "version": "0.5.29",
+  "version": "0.5.30",
   "description": "Track your AI-assisted development workflow. MCP server that records usage metrics across all your AI tools.",
   "keywords": [
     "mcp",