sakuraai 0.0.2 → 0.0.4

package/dist/index.js

@@ -379,16 +379,16 @@ function findFile(sessionId) {
 }
 function readMessages(file) {
   const msgs = [];
-  let startSecs = null;
+  let lastUserSecs = null;
   for (const entry of jsonlEntries(file)) {
     if (entry?.isSidechain === true) continue;
     const tsStr = entry?.timestamp ?? "";
     const tsSecs = parseIsoUnix(tsStr);
-    if (startSecs == null) startSecs = tsSecs;
     if (entry?.type === "user") {
       if (entry?.userType !== "external") continue;
       const text = extractTextFromContent(entry?.message?.content);
       if (text) {
+        lastUserSecs = tsSecs;
         msgs.push({
           id: entry?.uuid ?? "",
           role: "user",
@@ -400,15 +400,16 @@ function readMessages(file) {
     } else if (entry?.type === "assistant") {
       const { text, hasTools } = extractAssistantText(entry?.message?.content);
       if (!text) continue;
-      const inputTokens = entry?.message?.usage?.input_tokens;
-      const elapsed = startSecs != null && tsSecs != null ? Math.max(0, tsSecs - startSecs) : void 0;
+      const u = entry?.message?.usage;
+      const total = (u?.input_tokens ?? 0) + (u?.cache_read_input_tokens ?? 0) + (u?.cache_creation_input_tokens ?? 0);
+      const elapsed = lastUserSecs != null && tsSecs != null ? Math.max(0, tsSecs - lastUserSecs) : void 0;
       msgs.push({
         id: entry?.uuid ?? "",
         role: "assistant",
         content: text,
         timestamp: tsStr,
         hasToolUse: hasTools,
-        inputTokens: typeof inputTokens === "number" ? inputTokens : void 0,
+        inputTokens: total > 0 ? total : void 0,
         elapsedSecs: elapsed
       });
     }
@@ -419,33 +420,74 @@ function messages(sessionId) {
   const file = findFile(sessionId);
   return file ? readMessages(file) : [];
 }
+function sessionCwd(sessionId) {
+  const file = findFile(sessionId);
+  if (!file) return void 0;
+  for (const entry of jsonlEntries(file)) {
+    if (typeof entry?.cwd === "string" && entry.cwd) return entry.cwd;
+  }
+  return void 0;
+}
 function send(sessionId, message, onData) {
   return new Promise((resolve) => {
     const bin = process.env.CLAUDE_BIN || "claude";
-    const child = spawn(bin, ["--resume", sessionId, "-p", message], {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let out = "";
+    const cwd = sessionCwd(sessionId);
+    const child = spawn(
+      bin,
+      [
+        "--resume",
+        sessionId,
+        "-p",
+        message,
+        "--output-format",
+        "stream-json",
+        "--include-partial-messages",
+        "--verbose"
+      ],
+      {
+        cwd: cwd && fs3.existsSync(cwd) ? cwd : void 0,
+        stdio: ["ignore", "pipe", "pipe"]
+      }
+    );
+    let buf = "";
+    let finalText = "";
     let err = "";
     child.stdout.on("data", (d) => {
-      out += d.toString();
-      onData?.(d.toString());
+      buf += d.toString();
+      let nl;
+      while ((nl = buf.indexOf("\n")) >= 0) {
+        const line = buf.slice(0, nl);
+        buf = buf.slice(nl + 1);
+        if (!line.trim()) continue;
+        try {
+          const delta = textDelta(JSON.parse(line));
+          if (delta) {
+            finalText += delta;
+            onData?.(delta);
+          }
+        } catch {
+        }
+      }
     });
     child.stderr.on("data", (d) => err += d.toString());
-    child.on(
-      "error",
-      (e) => resolve({ ok: false, output: "", error: e.message })
-    );
+    child.on("error", (e) => resolve({ ok: false, output: "", error: e.message }));
     child.on(
       "close",
       (code) => resolve({
         ok: code === 0,
-        output: out.trim(),
+        output: finalText.trim(),
         error: code === 0 ? void 0 : err.trim() || `exited ${code}`
       })
     );
   });
 }
+function textDelta(ev) {
+  const obj = ev?.type === "stream_event" ? ev.event : ev;
+  if (obj?.type === "content_block_delta" && obj?.delta?.type === "text_delta") {
+    return obj.delta.text ?? null;
+  }
+  return null;
+}
 var PROJECTS_DIR;
 var init_claude = __esm({
   "src/runtime/claude.ts"() {
@@ -530,6 +572,7 @@ function readMessages2(file) {
     return [];
   }
   const msgs = [];
+  let lastUserSecs = null;
   for (const line of content.split("\n")) {
     if (!line.trim()) continue;
     let entry;
@@ -549,7 +592,16 @@ function readMessages2(file) {
     const text = part?.text ?? "";
     if (!text) continue;
     const ts = entry?.timestamp ?? "";
-    msgs.push({ id: ts, role, content: text, timestamp: ts, hasToolUse: false });
+    const tsSecs = parseIsoUnix(ts);
+    if (role === "user") lastUserSecs = tsSecs;
+    msgs.push({
+      id: ts,
+      role,
+      content: text,
+      timestamp: ts,
+      hasToolUse: false,
+      elapsedSecs: role === "assistant" && lastUserSecs != null && tsSecs != null ? Math.max(0, tsSecs - lastUserSecs) : void 0
+    });
   }
   return msgs;
 }
@@ -673,8 +725,8 @@ async function messages3(sessionId) {
       } catch {
       }
     }
-    const startMs = msgRows[0]?.time_created ?? 0;
     const out = [];
+    let lastUserMs = null;
     for (const m of msgRows) {
       let v;
       try {
@@ -687,13 +739,15 @@ async function messages3(sessionId) {
       const text = (partsMap.get(m.id) ?? []).join("");
       if (!text) continue;
       const mtime = Math.floor(m.time_created / 1e3);
+      if (role === "user") lastUserMs = m.time_created;
       out.push({
         id: m.id,
         role,
         content: text,
         timestamp: chronoIso(mtime),
         hasToolUse: false,
-        elapsedSecs: role === "assistant" ? Math.floor((m.time_created - startMs) / 1e3) : void 0
+        // Per-turn duration: assistant time − the user msg that started it.
+        elapsedSecs: role === "assistant" && lastUserMs != null ? Math.max(0, Math.floor((m.time_created - lastUserMs) / 1e3)) : void 0
       });
     }
     return out;
@@ -1736,7 +1790,7 @@ var init_pair = __esm({
 import { Command } from "commander";
 
 // src/version.ts
-var VERSION = "0.0.2";
+var VERSION = "0.0.4";
 
 // src/index.ts
 init_config();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sakuraai",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Sakura Agent CLI + local runtime for managing AI coding sessions (Claude Code, Codex, OpenCode) and reaching them privately from the Sakura mobile app over Tailscale",
   "type": "module",
   "main": "dist/index.js",