codeam-cli 1.4.10 → 1.4.12

package/dist/index.js

@@ -115,7 +115,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "1.4.10",
+  version: "1.4.12",
   description: "Remote control Claude Code from your mobile device",
   main: "dist/index.js",
   bin: {
@@ -492,12 +492,15 @@ var CommandRelayService = class {
       const commands = data?.data;
       if (!Array.isArray(commands)) return;
       for (const obj of commands) {
-        this.onCommand({
-          id: obj.id,
-          sessionId: obj.sessionId,
-          type: obj.type,
-          payload: obj.payload ?? {}
-        });
+        try {
+          await this.onCommand({
+            id: obj.id,
+            sessionId: obj.sessionId,
+            type: obj.type,
+            payload: obj.payload ?? {}
+          });
+        } catch {
+        }
       }
     } catch {
     }
@@ -1387,9 +1390,29 @@ var HistoryService = class {
   }
   pluginId;
   cwd;
+  currentConversationId = null;
   get projectDir() {
     return path4.join(os4.homedir(), ".claude", "projects", encodeCwd(this.cwd));
   }
+  /** Set the current Claude conversation ID (extracted from /cost command or session start) */
+  setCurrentConversationId(id) {
+    this.currentConversationId = id;
+  }
+  /** Extract conversation ID from Claude output (e.g., from session resume messages) */
+  tryExtractConversationIdFromOutput(output) {
+    const patterns = [
+      /Resuming session[:\s]+([a-f0-9-]{36})/i,
+      /session[:\s]+([a-f0-9-]{36})/i,
+      /conversation[:\s]+([a-f0-9-]{36})/i
+    ];
+    for (const pattern of patterns) {
+      const match = output.match(pattern);
+      if (match) {
+        this.currentConversationId = match[1];
+        return;
+      }
+    }
+  }
   /**
    * Read the most recently modified JSONL session file and extract the
    * context window usage from the last assistant message's usage field.
@@ -1414,28 +1437,52 @@ var HistoryService = class {
       }
     }).sort((a, b) => b.mtime - a.mtime);
     if (files.length === 0) return null;
+    let targetFile = files[0].name;
+    if (this.currentConversationId) {
+      const conversationFile = `${this.currentConversationId}.jsonl`;
+      const exists = files.some((f) => f.name === conversationFile);
+      if (exists) {
+        targetFile = conversationFile;
+      }
+    }
     let raw;
     try {
-      raw = fs4.readFileSync(path4.join(dir, files[0].name), "utf8");
+      raw = fs4.readFileSync(path4.join(dir, targetFile), "utf8");
     } catch {
       return null;
     }
     let lastUsage = null;
     let lastModel = null;
-    for (const line of raw.split("\n").filter(Boolean)) {
+    let assistantMessageCount = 0;
+    let hasAnyMessages = false;
+    const lines = raw.split("\n").filter(Boolean);
+    for (const line of lines) {
       try {
         const record = JSON.parse(line);
+        if (record["type"] === "user" || record["type"] === "assistant") {
+          hasAnyMessages = true;
+        }
         if (record["type"] === "assistant") {
+          assistantMessageCount++;
           const msg = record["message"];
-          if (msg?.["usage"]) lastUsage = msg["usage"];
+          if (msg?.["model"] === "<synthetic>") continue;
+          const usage = msg?.["usage"];
+          if (usage && (usage["input_tokens"] !== void 0 || usage["prompt_tokens"] !== void 0)) {
+            lastUsage = usage;
+          }
           if (msg?.["model"]) lastModel = msg["model"];
         }
       } catch {
       }
     }
-    if (!lastUsage) return null;
-    const inputTokens = (lastUsage["input_tokens"] ?? 0) + (lastUsage["cache_read_input_tokens"] ?? 0) + (lastUsage["cache_creation_input_tokens"] ?? 0);
-    const outputTokens = lastUsage["output_tokens"] ?? 0;
+    if (!lastUsage) {
+      if (hasAnyMessages) {
+        return { used: 0, total: 2e5, percent: 0, model: lastModel, outputTokens: 0, cacheReadTokens: 0 };
+      }
+      return null;
+    }
+    const inputTokens = (lastUsage["input_tokens"] ?? lastUsage["prompt_tokens"] ?? 0) + (lastUsage["cache_read_input_tokens"] ?? 0) + (lastUsage["cache_creation_input_tokens"] ?? 0);
+    const outputTokens = lastUsage["output_tokens"] ?? lastUsage["completion_tokens"] ?? 0;
     const total = 2e5;
     const percent = Math.min(100, Math.round(inputTokens / total * 100));
     return { used: inputTokens, total, percent, model: lastModel, outputTokens, cacheReadTokens: lastUsage["cache_read_input_tokens"] ?? 0 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "description": "Remote control Claude Code from your mobile device",
   "main": "dist/index.js",
   "bin": {