codeam-cli 1.4.8 → 1.4.9

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.8",
+  version: "1.4.9",
   description: "Remote control Claude Code from your mobile device",
   main: "dist/index.js",
   bin: {
@@ -1121,9 +1121,10 @@ function filterChrome(lines) {
   return result;
 }
 var OutputService = class _OutputService {
-  constructor(sessionId, pluginId) {
+  constructor(sessionId, pluginId, onSessionIdDetected) {
     this.sessionId = sessionId;
     this.pluginId = pluginId;
+    this.onSessionIdDetected = onSessionIdDetected;
   }
   sessionId;
   pluginId;
@@ -1133,6 +1134,7 @@ var OutputService = class _OutputService {
   startTime = 0;
   active = false;
   lastPushTime = 0;
+  onSessionIdDetected;
   static POLL_MS = 1e3;
   static IDLE_MS = 3e3;
   /** Shorter idle threshold for selector detection (UI is ready immediately). */
@@ -1170,7 +1172,26 @@ var OutputService = class _OutputService {
     if (!this.active) return;
     this.rawBuffer += raw;
     const printable = raw.replace(/\x1B\[[^@-~]*[@-~]/g, "").replace(/[\x00-\x1F\x7F]/g, "");
-    if (printable.trim()) this.lastPushTime = Date.now();
+    if (printable.trim()) {
+      this.lastPushTime = Date.now();
+      this.tryExtractSessionId(printable);
+    }
+  }
+  /** Extract Claude conversation ID from output text (e.g., from /cost command or session resume) */
+  tryExtractSessionId(text) {
+    const patterns = [
+      /Resuming session[:\s]+([a-f0-9-]{36})/i,
+      /Session[:\s]+([a-f0-9-]{36})/i,
+      /Conversation[:\s]+([a-f0-9-]{36})/i,
+      /Session\s+ID[:\s]+([a-f0-9-]{36})/i
+    ];
+    for (const pattern of patterns) {
+      const match = text.match(pattern);
+      if (match && this.onSessionIdDetected) {
+        this.onSessionIdDetected(match[1]);
+        return;
+      }
+    }
   }
   dispose() {
     this.stopPoll();
@@ -1366,9 +1387,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.
@@ -1379,10 +1420,13 @@ var HistoryService = class {
    */
   getCurrentUsage() {
     const dir = this.projectDir;
+    console.log(`[HistoryService] Looking for sessions in: ${dir}`);
+    console.log(`[HistoryService] Current conversation ID: ${this.currentConversationId ?? "not set"}`);
     let entries;
     try {
       entries = fs4.readdirSync(dir, { withFileTypes: true });
-    } catch {
+    } catch (err) {
+      console.log(`[HistoryService] Failed to read directory: ${err}`);
       return null;
     }
     const files = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
@@ -1392,29 +1436,66 @@ var HistoryService = class {
         return { name: e.name, mtime: 0 };
       }
     }).sort((a, b) => b.mtime - a.mtime);
-    if (files.length === 0) return null;
+    if (files.length === 0) {
+      console.log(`[HistoryService] No .jsonl files found in directory`);
+      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;
+        console.log(`[HistoryService] Using tracked conversation file: ${targetFile}`);
+      } else {
+        console.log(`[HistoryService] Tracked conversation file not found, using most recent: ${targetFile}`);
+      }
+    } else {
+      console.log(`[HistoryService] No tracked conversation, using most recent: ${targetFile}`);
+    }
     let raw;
     try {
-      raw = fs4.readFileSync(path4.join(dir, files[0].name), "utf8");
-    } catch {
+      raw = fs4.readFileSync(path4.join(dir, targetFile), "utf8");
+    } catch (err) {
+      console.log(`[HistoryService] Failed to read file: ${err}`);
       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);
+    console.log(`[HistoryService] File has ${lines.length} lines`);
+    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"];
+          const usage = msg?.["usage"];
+          if (usage && (usage["input_tokens"] !== void 0 || usage["prompt_tokens"] !== void 0)) {
+            lastUsage = usage;
+            console.log(`[HistoryService] Found usage data: ${JSON.stringify(lastUsage)}`);
+          }
           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;
+    console.log(`[HistoryService] Processed ${assistantMessageCount} assistant messages, hasAnyMessages: ${hasAnyMessages}, lastUsage: ${lastUsage ? "found" : "not found"}, lastModel: ${lastModel}`);
+    if (!lastUsage) {
+      if (hasAnyMessages) {
+        console.log(`[HistoryService] File has messages but no usage data (Claude Code may not have recorded usage yet)`);
+        return { used: 0, total: 2e5, percent: 0, model: lastModel, outputTokens: 0, cacheReadTokens: 0 };
+      }
+      console.log(`[HistoryService] No messages or usage data found in session file`);
+      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 };
@@ -1503,9 +1584,15 @@ async function start() {
   const pluginId = session.pluginId ?? ensurePluginId();
   showInfo(`${session.userName}  \xB7  ${import_picocolors2.default.cyan(session.plan)}`);
   showInfo("Launching Claude Code...\n");
+  const cwd = process.cwd();
+  console.log(`[CLI] Starting with cwd: ${cwd}`);
+  console.log(`[CLI] Session: ${session.id}, Plugin: ${pluginId}`);
   const ws = new WebSocketService(session.id, pluginId);
-  const outputSvc = new OutputService(session.id, pluginId);
-  const historySvc = new HistoryService(pluginId, process.cwd());
+  const historySvc = new HistoryService(pluginId, cwd);
+  const outputSvc = new OutputService(session.id, pluginId, (conversationId) => {
+    console.log(`[CLI] Detected Claude conversation ID: ${conversationId}`);
+    historySvc.setCurrentConversationId(conversationId);
+  });
   function sendPrompt(prompt) {
     outputSvc.newTurn();
     claude.sendCommand(prompt);
@@ -1554,8 +1641,11 @@ async function start() {
         claude.interrupt();
         break;
       case "get_context": {
+        console.log(`[CLI] Received get_context command, fetching usage...`);
         const usage = historySvc.getCurrentUsage();
-        await relay.sendResult(cmd.id, "completed", usage ?? { error: "No usage data found" });
+        const result = usage ?? { used: 0, total: 2e5, percent: 0, model: null, outputTokens: 0, cacheReadTokens: 0, error: "No usage data found" };
+        console.log(`[CLI] Sending context result: ${JSON.stringify(result)}`);
+        await relay.sendResult(cmd.id, "completed", result);
         break;
       }
       case "resume_session": {

package/package.json

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