sakuraai 0.0.1 → 0.0.3

package/dist/index.js

@@ -1,12 +1,6 @@
 #!/usr/bin/env node
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -425,15 +419,28 @@ function messages(sessionId) {
   const file = findFile(sessionId);
   return file ? readMessages(file) : [];
 }
-function send(sessionId, message) {
+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 cwd = sessionCwd(sessionId);
     const child = spawn(bin, ["--resume", sessionId, "-p", message], {
+      cwd: cwd && fs3.existsSync(cwd) ? cwd : void 0,
       stdio: ["ignore", "pipe", "pipe"]
     });
     let out = "";
     let err = "";
-    child.stdout.on("data", (d) => out += d.toString());
+    child.stdout.on("data", (d) => {
+      out += d.toString();
+      onData?.(d.toString());
+    });
     child.stderr.on("data", (d) => err += d.toString());
     child.on(
       "error",
@@ -560,7 +567,7 @@ function messages2(sessionId) {
   const file = findFile2(sessionId);
   return file ? readMessages2(file) : [];
 }
-function send2(sessionId, message) {
+function send2(sessionId, message, onData) {
   return new Promise((resolve) => {
     const child = spawn2(codexBin(), ["exec", "resume", sessionId, message], {
       stdio: ["ignore", "pipe", "pipe"],
@@ -568,7 +575,10 @@ function send2(sessionId, message) {
     });
     let out = "";
     let err = "";
-    child.stdout.on("data", (d) => out += d.toString());
+    child.stdout.on("data", (d) => {
+      out += d.toString();
+      onData?.(d.toString());
+    });
     child.stderr.on("data", (d) => err += d.toString());
     child.on("error", (e) => resolve({ ok: false, output: "", error: e.message }));
     child.on(
@@ -701,7 +711,7 @@ async function messages3(sessionId) {
     db.close();
   }
 }
-function send3(sessionId, message) {
+function send3(sessionId, message, onData) {
   return new Promise((resolve) => {
     const child = spawn3(opencodeBin(), ["run", "-s", sessionId, message], {
       stdio: ["ignore", "pipe", "pipe"],
@@ -709,7 +719,10 @@ function send3(sessionId, message) {
     });
     let out = "";
     let err = "";
-    child.stdout.on("data", (d) => out += d.toString());
+    child.stdout.on("data", (d) => {
+      out += d.toString();
+      onData?.(d.toString());
+    });
     child.stderr.on("data", (d) => err += d.toString());
     child.on("error", (e) => resolve({ ok: false, output: "", error: e.message }));
     child.on(
@@ -776,11 +789,11 @@ async function history(sessionId, opts = {}, agent) {
   if (opts.reverse) msgs = [...msgs].reverse();
   return msgs;
 }
-async function chat(sessionId, prompt, agent) {
+async function chat(sessionId, prompt, agent, onData) {
   const a = agent ?? await detectAgent(sessionId);
-  if (a === "claude") return send(sessionId, prompt);
-  if (a === "codex") return send2(sessionId, prompt);
-  if (a === "opencode") return send3(sessionId, prompt);
+  if (a === "claude") return send(sessionId, prompt, onData);
+  if (a === "codex") return send2(sessionId, prompt, onData);
+  if (a === "opencode") return send3(sessionId, prompt, onData);
   return {
     ok: false,
     output: "",
@@ -1134,10 +1147,107 @@ var init_tailscale = __esm({
   }
 });
 
+// src/daemon/hub.ts
+function sessionKey(agent, sessionId) {
+  return `${agent}:${sessionId}`;
+}
+var Hub, hub;
+var init_hub = __esm({
+  "src/daemon/hub.ts"() {
+    "use strict";
+    Hub = class {
+      clients = /* @__PURE__ */ new Map();
+      subscribe(key, ws) {
+        let set = this.clients.get(key);
+        if (!set) {
+          set = /* @__PURE__ */ new Set();
+          this.clients.set(key, set);
+        }
+        set.add(ws);
+      }
+      remove(ws) {
+        for (const set of this.clients.values()) set.delete(ws);
+      }
+      broadcast(key, event) {
+        const set = this.clients.get(key);
+        if (!set || set.size === 0) return;
+        const payload = JSON.stringify(event);
+        for (const ws of set) {
+          try {
+            ws.send(payload);
+          } catch {
+          }
+        }
+      }
+    };
+    hub = new Hub();
+  }
+});
+
+// src/daemon/stream.ts
+async function runTurn(sessionId, agent, prompt) {
+  const key = sessionKey(agent, sessionId);
+  const emit = (e) => hub.broadcast(key, e);
+  let lastEmitted = "\0";
+  const emitLive = (text) => {
+    if (text === lastEmitted) return;
+    lastEmitted = text;
+    emit({
+      type: "message",
+      sessionId,
+      agent,
+      data: {
+        id: LIVE_ID,
+        role: "assistant",
+        content: text,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        streaming: true
+      }
+    });
+  };
+  emitLive("");
+  const baseIds = /* @__PURE__ */ new Set();
+  try {
+    for (const m of await messages4(sessionId, agent)) baseIds.add(m.id);
+  } catch {
+  }
+  let stdoutAcc = "";
+  const onData = (chunk) => {
+    stdoutAcc += stripAnsi(chunk);
+    const t = stdoutAcc.trim();
+    if (t.length >= lastEmitted.replace("\0", "").length) emitLive(t);
+  };
+  const timer = setInterval(async () => {
+    try {
+      const msgs = await messages4(sessionId, agent);
+      const fresh = msgs.filter((m) => m.role === "assistant" && !baseIds.has(m.id)).map((m) => m.content).join("\n\n").trim();
+      if (fresh && fresh.length >= lastEmitted.length) emitLive(fresh);
+    } catch {
+    }
+  }, POLL_MS);
+  const result = await chat(sessionId, prompt, agent, onData);
+  clearInterval(timer);
+  emit({ type: "done", sessionId, agent, ok: result.ok, error: result.error });
+  return { ok: result.ok, error: result.error };
+}
+var ANSI, stripAnsi, LIVE_ID, POLL_MS;
+var init_stream = __esm({
+  "src/daemon/stream.ts"() {
+    "use strict";
+    init_sessions();
+    init_hub();
+    ANSI = /\[[0-9;]*[a-zA-Z]/g;
+    stripAnsi = (s) => s.replace(ANSI, "");
+    LIVE_ID = "__live__";
+    POLL_MS = 300;
+  }
+});
+
 // src/daemon/server.ts
 import http from "http";
 import fs8 from "fs";
 import { URL } from "url";
+import { WebSocketServer } from "ws";
 function add(method, path6, handler) {
   const keys = [];
   const pattern = new RegExp(
@@ -1190,7 +1300,7 @@ function send4(res, status2, payload) {
   res.end(body);
 }
 function createServer(port2) {
-  return http.createServer(async (req, res) => {
+  const server = http.createServer(async (req, res) => {
     const method = req.method ?? "GET";
     const url = new URL(req.url ?? "/", `http://localhost:${port2}`);
     if (method === "OPTIONS") return send4(res, 204, {});
@@ -1219,6 +1329,31 @@ function createServer(port2) {
       send4(res, 500, fail("nonzero", e.message));
     }
   });
+  const wss = new WebSocketServer({ server, path: "/ws" });
+  wss.on("connection", (ws, req) => {
+    const u = new URL(req.url ?? "/", `http://localhost:${port2}`);
+    const token = u.searchParams.get("token");
+    const expected = getToken();
+    if (!expected || token !== expected) {
+      ws.close(1008, "Unauthorized");
+      return;
+    }
+    ws.on("message", (raw) => {
+      try {
+        const msg = JSON.parse(raw.toString());
+        if (msg?.type === "subscribe" && msg.sessionId && msg.agent) {
+          hub.subscribe(sessionKey(msg.agent, msg.sessionId), ws);
+          ws.send(JSON.stringify({ type: "subscribed", sessionId: msg.sessionId, agent: msg.agent }));
+        } else if (msg?.type === "ping") {
+          ws.send(JSON.stringify({ type: "pong" }));
+        }
+      } catch {
+      }
+    });
+    ws.on("close", () => hub.remove(ws));
+    ws.on("error", () => hub.remove(ws));
+  });
+  return server;
 }
 function setVersion(v) {
   VERSION2 = v;
@@ -1234,6 +1369,8 @@ var init_server = __esm({
     init_registry();
     init_tailscale();
     init_registry();
+    init_hub();
+    init_stream();
     routes = [];
     add("GET", "/sessions", async () => {
       const list2 = await list();
@@ -1245,9 +1382,10 @@ var init_server = __esm({
       return { messages: messages5 };
     });
     add("POST", "/sessions/:id/send", async ({ params, body }) => {
-      const agent = body?.agent || void 0;
-      const r = await chat(params.id, String(body?.message ?? ""), agent);
-      return { ok: r.ok, output: r.output, error: r.error };
+      const agent = body?.agent || await detectAgent(params.id);
+      if (!agent) return { ok: false, error: "unknown agent for session" };
+      const r = await runTurn(params.id, agent, String(body?.message ?? ""));
+      return { ok: r.ok, error: r.error };
     });
     add(
       "GET",
@@ -1327,8 +1465,10 @@ var init_server = __esm({
       return ok(await history(params.id, { all, limit, reverse }));
     });
     add("POST", "/sakura/sessions/:id/chat", async ({ params, body }) => {
-      const r = await chat(params.id, String(body?.prompt ?? ""), body?.agent);
-      return r.ok ? ok({ output: r.output }) : fail("nonzero", r.error ?? "chat failed");
+      const agent = body?.agent || await detectAgent(params.id);
+      if (!agent) return fail("nonzero", "unknown agent for session");
+      const r = await runTurn(params.id, agent, String(body?.prompt ?? ""));
+      return r.ok ? ok({ ok: true }) : fail("nonzero", r.error ?? "chat failed");
     });
     add(
       "POST",
@@ -1526,6 +1666,7 @@ var init_manager = __esm({
 });
 
 // src/pairing.ts
+import os5 from "os";
 import qrcode from "qrcode-terminal";
 async function buildPairing() {
   const token = requireToken();
@@ -1542,15 +1683,11 @@ function renderQr(deepLink) {
   });
 }
 function localIp() {
-  try {
-    const os5 = __require("os");
-    const nets = os5.networkInterfaces();
-    for (const name of Object.keys(nets)) {
-      for (const net of nets[name] ?? []) {
-        if (net.family === "IPv4" && !net.internal) return net.address;
-      }
+  const nets = os5.networkInterfaces();
+  for (const name of Object.keys(nets)) {
+    for (const net of nets[name] ?? []) {
+      if (net.family === "IPv4" && !net.internal) return net.address;
     }
-  } catch {
   }
   return "127.0.0.1";
 }
@@ -1609,7 +1746,7 @@ var init_pair = __esm({
 import { Command } from "commander";
 
 // src/version.ts
-var VERSION = "0.0.1";
+var VERSION = "0.0.3";
 
 // src/index.ts
 init_config();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sakuraai",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "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",
@@ -42,7 +42,8 @@
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",
     "ora": "^8.1.0",
-    "qrcode-terminal": "^0.12.0"
+    "qrcode-terminal": "^0.12.0",
+    "ws": "^8.21.0"
   },
   "optionalDependencies": {
     "better-sqlite3": "^11.3.0"
@@ -51,6 +52,7 @@
     "@types/better-sqlite3": "^7.6.11",
     "@types/node": "^22.7.0",
     "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.18.1",
     "rimraf": "^6.0.1",
     "tsup": "^8.3.0",
     "tsx": "^4.19.0",