niahere 0.2.57 → 0.2.59

package/src/chat/engine.ts

@@ -8,7 +8,15 @@ import { randomUUID } from "crypto";
 import { buildSystemPrompt, getSessionContext } from "./identity";
 import { getAgentDefinitions } from "../core/agents";
 import { Session, Message, ActiveEngine } from "../db/models";
-import type { Attachment, SendResult, StreamCallback, ActivityCallback, SendCallbacks, ChatEngine, EngineOptions } from "../types";
+import type {
+  Attachment,
+  SendResult,
+  StreamCallback,
+  ActivityCallback,
+  SendCallbacks,
+  ChatEngine,
+  EngineOptions,
+} from "../types";
 import { truncate, formatToolUse } from "../utils/format-activity";
 import { consolidateSession } from "../core/consolidator";
 import { summarizeSession } from "../core/summarizer";
@@ -25,10 +33,19 @@ interface SDKUserMessage {
 }
 
 /** Convert provider-agnostic attachments to Anthropic content blocks. */
-export function buildContentBlocks(text: string, attachments?: Attachment[]): MessageParam["content"] {
+export function buildContentBlocks(
+  text: string,
+  attachments?: Attachment[],
+): MessageParam["content"] {
   if (!attachments?.length) return text;
 
-  const blocks: Array<{ type: "text"; text: string } | { type: "image"; source: { type: "base64"; media_type: string; data: string } }> = [];
+  const blocks: Array<
+    | { type: "text"; text: string }
+    | {
+        type: "image";
+        source: { type: "base64"; media_type: string; data: string };
+      }
+  > = [];
 
   for (const att of attachments) {
     if (att.type === "image") {
@@ -94,6 +111,7 @@ class MessageStream {
 
 interface PendingResult {
   userMessage: string;
+  userSaved: boolean;
   onStream: StreamCallback | null;
   onActivity: ActivityCallback | null;
   accumulatedText: string;
@@ -103,15 +121,22 @@ interface PendingResult {
   reject: (error: Error) => void;
 }
 
-
 function sessionFileExists(sessionId: string, cwd: string): boolean {
   // SDK stores sessions at ~/.claude/projects/<encoded-cwd>/<session-id>.jsonl
   const encoded = cwd.replace(/\//g, "-");
-  const sessionFile = join(homedir(), ".claude", "projects", encoded, `${sessionId}.jsonl`);
+  const sessionFile = join(
+    homedir(),
+    ".claude",
+    "projects",
+    encoded,
+    `${sessionId}.jsonl`,
+  );
   return existsSync(sessionFile);
 }
 
-export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine> {
+export async function createChatEngine(
+  opts: EngineOptions,
+): Promise<ChatEngine> {
   const { room, channel, resume, mcpServers } = opts;
   let systemPrompt = buildSystemPrompt("chat", channel);
 
@@ -156,7 +181,10 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
     idleTimer = setTimeout(async () => {
       if (pending) {
         // Don't tear down while a request is in flight
-        log.warn({ room }, "idle timer fired while request pending, skipping teardown");
+        log.warn(
+          { room },
+          "idle timer fired while request pending, skipping teardown",
+        );
         return;
       }
       // Memory consolidation + session summary before "sleep"
@@ -165,7 +193,10 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
           log.error({ err, room }, "consolidation failed during idle teardown");
         });
         summarizeSession(sessionId, room).catch((err) => {
-          log.error({ err, room }, "session summary failed during idle teardown");
+          log.error(
+            { err, room },
+            "session summary failed during idle teardown",
+          );
         });
       }
       teardown();
@@ -185,7 +216,10 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
     longRunningTimer = setTimeout(() => {
       if (pending) {
         longRunningWarned = true;
-        log.warn({ room, elapsed: LONG_RUNNING_WARN / 1000 }, "engine request running for 30+ minutes");
+        log.warn(
+          { room, elapsed: LONG_RUNNING_WARN / 1000 },
+          "engine request running for 30+ minutes",
+        );
       }
     }, LONG_RUNNING_WARN);
   }
@@ -250,7 +284,7 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
               await Session.create(sessionId, room);
             }
 
-            if (pending) {
+            if (pending && !pending.userSaved) {
               await Message.save({
                 sessionId,
                 room,
@@ -258,6 +292,7 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
                 content: pending.userMessage,
                 isFromAgent: false,
               });
+              pending.userSaved = true;
               messageCount++;
             }
           }
@@ -279,7 +314,10 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
                 if (lines.length > 1) {
                   // Show the last complete line (not the partial one being typed)
                   const completeLine = lines[lines.length - 2]?.trim();
-                  if (completeLine && completeLine !== pending.lastThinkingLine) {
+                  if (
+                    completeLine &&
+                    completeLine !== pending.lastThinkingLine
+                  ) {
                     pending.lastThinkingLine = completeLine;
                     pending.onActivity?.(truncate(completeLine, 70));
                   }
@@ -344,6 +382,7 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
                 duration_ms: msg.duration_ms,
                 duration_api_ms: msg.duration_api_ms,
                 stop_reason: msg.stop_reason,
+                terminal_reason: msg.terminal_reason,
                 session_id: msg.session_id,
                 subtype: msg.subtype,
                 usage: msg.usage,
@@ -364,15 +403,26 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
                 try {
                   messageId = await Message.save(saveParams);
                 } catch {
-                  messageId = await Message.save({ ...saveParams, metadata: undefined });
+                  messageId = await Message.save({
+                    ...saveParams,
+                    metadata: undefined,
+                  });
                 }
                 await Session.touch(sessionId);
-                Session.accumulateMetadata(sessionId, { ...metadata, channel }).catch(() => {});
+                Session.accumulateMetadata(sessionId, {
+                  ...metadata,
+                  channel,
+                }).catch(() => {});
               }
 
               await ActiveEngine.unregister(room);
               clearLongRunningTimer();
-              pending.resolve({ result: resultText, costUsd, turns, messageId });
+              pending.resolve({
+                result: resultText,
+                costUsd,
+                turns,
+                messageId,
+              });
               pending = null;
               resetIdleTimer();
             } else {
@@ -390,9 +440,16 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
         // Stream ended without a result — subprocess exited or was killed
         if (pending) {
           const partial = pending.accumulatedText;
-          log.error({ room, partialChars: partial.length }, "query stream ended without result, rejecting pending request");
+          log.error(
+            { room, partialChars: partial.length },
+            "query stream ended without result, rejecting pending request",
+          );
           await ActiveEngine.unregister(room).catch(() => {});
-          pending.reject(new Error(`stream ended without result (${partial.length} chars accumulated)`));
+          pending.reject(
+            new Error(
+              `stream ended without result (${partial.length} chars accumulated)`,
+            ),
+          );
           pending = null;
         }
       } catch (err) {
@@ -419,7 +476,11 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
       return room;
     },
 
-    async send(userMessage: string, callbacks?: SendCallbacks, attachments?: Attachment[]) {
+    async send(
+      userMessage: string,
+      callbacks?: SendCallbacks,
+      attachments?: Attachment[],
+    ) {
       // Clear idle timer — engine is not idle while processing a request
       clearIdleTimer();
       startLongRunningTimer();
@@ -430,9 +491,26 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
         startQuery();
       }
 
+      // Save user message to DB if session already exists (resumed session).
+      // For new sessions, the init handler saves it once sessionId is known.
+      let userSaved = false;
+      if (sessionId) {
+        await Message.save({
+          sessionId,
+          room,
+          sender: "user",
+          content: userMessage,
+          isFromAgent: false,
+        });
+        await Session.touch(sessionId);
+        userSaved = true;
+        messageCount++;
+      }
+
       return new Promise<SendResult>((resolve, reject) => {
         pending = {
           userMessage,
+          userSaved,
           onStream: callbacks?.onStream || null,
           onActivity: callbacks?.onActivity || null,
           accumulatedText: "",

package/src/cli/index.ts

@@ -1,6 +1,12 @@
 #!/usr/bin/env bun
 import { existsSync, mkdirSync } from "fs";
-import { isRunning, readPid, runDaemon, startDaemon, stopDaemon } from "../core/daemon";
+import {
+  isRunning,
+  readPid,
+  runDaemon,
+  startDaemon,
+  stopDaemon,
+} from "../core/daemon";
 import { getConfig } from "../utils/config";
 import { localTime } from "../utils/time";
 import { startRepl } from "../chat/repl";
@@ -29,7 +35,12 @@ try {
 const command = process.argv[2];
 
 // Ensure ~/.niahere/ exists for commands that need it
-if (command && !["init", "help", "version", "-v", "--version", "-h", "--help"].includes(command)) {
+if (
+  command &&
+  !["init", "help", "version", "-v", "--version", "-h", "--help"].includes(
+    command,
+  )
+) {
   mkdirSync(getNiaHome(), { recursive: true });
 }
 
@@ -45,7 +56,8 @@ async function awaitStartup(timeout = 60_000): Promise<void> {
   const expecting = new Set<string>();
   if (config.channels.enabled) {
     if (config.channels.telegram.bot_token) expecting.add("telegram");
-    if (config.channels.slack.bot_token && config.channels.slack.app_token) expecting.add("slack");
+    if (config.channels.slack.bot_token && config.channels.slack.app_token)
+      expecting.add("slack");
   }
   expecting.add("scheduler");
 
@@ -54,13 +66,19 @@ async function awaitStartup(timeout = 60_000): Promise<void> {
   const { readFileSync } = await import("fs");
   const ready = new Set<string>();
   let logOffset = 0;
-  try { logOffset = readFileSync(daemonLog, "utf8").length; } catch {}
+  try {
+    logOffset = readFileSync(daemonLog, "utf8").length;
+  } catch {}
 
   const startTime = Date.now();
   while (ready.size < expecting.size && Date.now() - startTime < timeout) {
     await new Promise((r) => setTimeout(r, 500));
     let content = "";
-    try { content = readFileSync(daemonLog, "utf8").slice(logOffset); } catch { continue; }
+    try {
+      content = readFileSync(daemonLog, "utf8").slice(logOffset);
+    } catch {
+      continue;
+    }
 
     for (const name of expecting) {
       if (ready.has(name)) continue;
@@ -125,7 +143,8 @@ switch (command) {
   }
 
   case "restart": {
-    const { isServiceInstalled, restartService } = await import("../commands/service");
+    const { isServiceInstalled, restartService } =
+      await import("../commands/service");
     if (isServiceInstalled()) {
       // Service-aware: unload (stops KeepAlive respawn), kill, then reload
       await restartService();
@@ -134,7 +153,9 @@ switch (command) {
       startDaemon();
     }
     const restartPid = readPid();
-    console.log(`nia restarting${restartPid ? ` (pid: ${restartPid})` : ""}...`);
+    console.log(
+      `nia restarting${restartPid ? ` (pid: ${restartPid})` : ""}...`,
+    );
     await awaitStartup();
     console.log("nia restarted");
     break;
@@ -145,7 +166,12 @@ switch (command) {
     if (prompt) {
       const { createChatEngine } = await import("../chat/engine");
       const { getMcpServers } = await import("../mcp");
-      const { DIM, RESET: RST, CLEAR_LINE, SPINNER: FRAMES } = await import("../utils/cli");
+      const {
+        DIM,
+        RESET: RST,
+        CLEAR_LINE,
+        SPINNER: FRAMES,
+      } = await import("../utils/cli");
       let frame = 0;
       let statusText = "thinking";
       let spinTimer: ReturnType<typeof setInterval> | null = null;
@@ -153,31 +179,47 @@ switch (command) {
       let streaming = false;
 
       const renderSpinner = () => {
-        process.stderr.write(`${CLEAR_LINE}${DIM}  ${FRAMES[frame]} ${statusText}${RST}`);
+        process.stderr.write(
+          `${CLEAR_LINE}${DIM}  ${FRAMES[frame]} ${statusText}${RST}`,
+        );
         frame = (frame + 1) % FRAMES.length;
       };
 
       await withDb(async () => {
-        const engine = await createChatEngine({ room: "cli-run", channel: "terminal", resume: false, mcpServers: getMcpServers() });
+        const engine = await createChatEngine({
+          room: "cli-run",
+          channel: "terminal",
+          resume: false,
+          mcpServers: getMcpServers(),
+        });
         spinTimer = setInterval(renderSpinner, 80);
         renderSpinner();
 
         const { result, costUsd, turns } = await engine.send(prompt, {
           onStream(textSoFar) {
             if (!streaming) {
-              if (spinTimer) { clearInterval(spinTimer); spinTimer = null; }
+              if (spinTimer) {
+                clearInterval(spinTimer);
+                spinTimer = null;
+              }
               process.stderr.write("\x1b[2K\r");
               streaming = true;
             }
             const chunk = textSoFar.slice(streamedLen);
-            if (chunk) { process.stdout.write(chunk); streamedLen = textSoFar.length; }
+            if (chunk) {
+              process.stdout.write(chunk);
+              streamedLen = textSoFar.length;
+            }
           },
           onActivity(text) {
             if (!streaming) statusText = text;
           },
         });
 
-        if (spinTimer) { clearInterval(spinTimer); spinTimer = null; }
+        if (spinTimer) {
+          clearInterval(spinTimer);
+          spinTimer = null;
+        }
 
         if (!streaming && result.trim()) {
           process.stderr.write("\x1b[2K\r");
@@ -190,13 +232,15 @@ switch (command) {
         }
 
         const costStr = costUsd > 0 ? `$${costUsd.toFixed(4)}` : "";
-        const turnsStr = turns > 0 ? `${turns} turn${turns !== 1 ? "s" : ""}` : "";
+        const turnsStr =
+          turns > 0 ? `${turns} turn${turns !== 1 ? "s" : ""}` : "";
         const meta = [costStr, turnsStr].filter(Boolean).join(" · ");
         if (meta) process.stderr.write(`\n${DIM}${meta}${RST}`);
         process.stdout.write("\n");
 
         engine.close();
       });
+      process.exit(0);
     } else {
       await runDaemon();
     }
@@ -235,8 +279,13 @@ switch (command) {
             const time = localTime(new Date(m.createdAt));
             const prefix = m.sender === "user" ? "you" : m.sender;
             const roomTag = room ? "" : `[${m.room}] `;
-            const snippet = m.content.length > 120 ? m.content.slice(0, 120) + "..." : m.content;
-            console.log(`  ${roomTag}${time}  ${prefix} > ${snippet.replace(/\n/g, " ")}`);
+            const snippet =
+              m.content.length > 120
+                ? m.content.slice(0, 120) + "..."
+                : m.content;
+            console.log(
+              `  ${roomTag}${time}  ${prefix} > ${snippet.replace(/\n/g, " ")}`,
+            );
           }
         }
       });
@@ -253,16 +302,25 @@ switch (command) {
     const follow = logArgs.includes("-f") || logArgs.includes("--follow");
     // --channel <name> filters logs by channel/component via grep
     const chIdx = logArgs.indexOf("--channel");
-    const channelFilter = chIdx !== -1 && logArgs[chIdx + 1] ? logArgs[chIdx + 1] : null;
+    const channelFilter =
+      chIdx !== -1 && logArgs[chIdx + 1] ? logArgs[chIdx + 1] : null;
 
     if (channelFilter) {
       // Pipe through grep to filter by channel name in structured logs
-      const tailArgs = follow ? ["tail", "-f", daemonLog] : ["tail", "-200", daemonLog];
-      const tail = Bun.spawn(tailArgs, { stdio: ["ignore", "pipe", "inherit"] });
-      const grep = Bun.spawn(["grep", "-i", channelFilter], { stdio: [tail.stdout, "inherit", "inherit"] });
+      const tailArgs = follow
+        ? ["tail", "-f", daemonLog]
+        : ["tail", "-200", daemonLog];
+      const tail = Bun.spawn(tailArgs, {
+        stdio: ["ignore", "pipe", "inherit"],
+      });
+      const grep = Bun.spawn(["grep", "-i", channelFilter], {
+        stdio: [tail.stdout, "inherit", "inherit"],
+      });
       await grep.exited;
     } else {
-      const args = follow ? ["tail", "-f", daemonLog] : ["tail", "-50", daemonLog];
+      const args = follow
+        ? ["tail", "-f", daemonLog]
+        : ["tail", "-50", daemonLog];
       const proc = Bun.spawn(args, { stdio: ["ignore", "inherit", "inherit"] });
       await proc.exited;
     }
@@ -276,13 +334,15 @@ switch (command) {
 
   case "chat": {
     const chatArgs = process.argv.slice(3);
-    const mode = (chatArgs.includes("--continue") || chatArgs.includes("-c"))
-      ? "continue" as const
-      : (chatArgs.includes("--resume") || chatArgs.includes("-r"))
-        ? "pick" as const
-        : "new" as const;
+    const mode =
+      chatArgs.includes("--continue") || chatArgs.includes("-c")
+        ? ("continue" as const)
+        : chatArgs.includes("--resume") || chatArgs.includes("-r")
+          ? ("pick" as const)
+          : ("new" as const);
     const chIdx = chatArgs.indexOf("--channel");
-    const simChannel = chIdx !== -1 && chatArgs[chIdx + 1] ? chatArgs[chIdx + 1] : undefined;
+    const simChannel =
+      chIdx !== -1 && chatArgs[chIdx + 1] ? chatArgs[chIdx + 1] : undefined;
     await startRepl(mode, simChannel);
     break;
   }
@@ -300,7 +360,9 @@ switch (command) {
       skills = skills.filter((s) => s.source === filter);
     }
     if (skills.length === 0) {
-      console.log(filter ? `No skills found in "${filter}".` : "No skills found.");
+      console.log(
+        filter ? `No skills found in "${filter}".` : "No skills found.",
+      );
     } else {
       for (const s of skills) {
         const tag = filter ? "" : `  [${s.source}]`;
@@ -354,8 +416,12 @@ switch (command) {
       const parts = configKey.split(".");
       let val: unknown = raw;
       for (const p of parts) {
-        if (val && typeof val === "object") val = (val as Record<string, unknown>)[p];
-        else { val = undefined; break; }
+        if (val && typeof val === "object")
+          val = (val as Record<string, unknown>)[p];
+        else {
+          val = undefined;
+          break;
+        }
       }
       if (val === undefined) {
         console.log(`${configKey}: (not set)`);
@@ -389,7 +455,9 @@ switch (command) {
         process.kill(pid, "SIGHUP");
         console.log(`channels ${enabled ? "enabled" : "disabled"}`);
       } else {
-        console.log(`channels ${enabled ? "enabled" : "disabled"} — start nia to apply`);
+        console.log(
+          `channels ${enabled ? "enabled" : "disabled"} — start nia to apply`,
+        );
       }
     } else {
       console.log(`channels: ${getConfig().channels.enabled ? "on" : "off"}`);
@@ -404,8 +472,11 @@ switch (command) {
   }
 
   case "test": {
-    const verbose = process.argv.includes("-v") || process.argv.includes("--verbose");
-    const extraArgs = process.argv.slice(3).filter((a) => a !== "-v" && a !== "--verbose");
+    const verbose =
+      process.argv.includes("-v") || process.argv.includes("--verbose");
+    const extraArgs = process.argv
+      .slice(3)
+      .filter((a) => a !== "-v" && a !== "--verbose");
     const proc = Bun.spawn(["bun", "test", ...extraArgs], {
       stdio: ["ignore", "pipe", "pipe"],
       cwd: import.meta.dir + "/../..",
@@ -423,7 +494,12 @@ switch (command) {
       process.stdout.write(output);
     } else {
       for (const line of output.split("\n")) {
-        if (/^\s*\d+ pass/.test(line) || /^\s*\d+ fail/.test(line) || /^Ran \d+ tests/.test(line) || /expect\(\) calls/.test(line)) {
+        if (
+          /^\s*\d+ pass/.test(line) ||
+          /^\s*\d+ fail/.test(line) ||
+          /^Ran \d+ tests/.test(line) ||
+          /expect\(\) calls/.test(line)
+        ) {
           console.log(line);
         } else if (/^✗|FAIL|error:/i.test(line.trim())) {
           console.log(line);
@@ -460,13 +536,18 @@ switch (command) {
       console.log(`⚠ backup skipped: ${errMsg(err)}`);
     }
     console.log("Updating...");
-    const install = Bun.spawn(["npm", "i", "-g", "niahere@latest"], { stdio: ["ignore", "inherit", "inherit"] });
+    const install = Bun.spawn(["npm", "i", "-g", "niahere@latest"], {
+      stdio: ["ignore", "inherit", "inherit"],
+    });
     const installExit = await install.exited;
     if (installExit !== 0) {
       fail("Update failed.");
     }
     // Get new version
-    const check = Bun.spawn(["npm", "view", "niahere", "version"], { stdout: "pipe", stderr: "pipe" });
+    const check = Bun.spawn(["npm", "view", "niahere", "version"], {
+      stdout: "pipe",
+      stderr: "pipe",
+    });
     const newVersion = (await new Response(check.stdout).text()).trim();
     await check.exited;
     if (newVersion === currentVersion) {
@@ -475,7 +556,8 @@ switch (command) {
       console.log(`Updated: v${currentVersion} → v${newVersion}`);
       if (isRunning()) {
         console.log("Restarting daemon...");
-        const { isServiceInstalled, restartService } = await import("../commands/service");
+        const { isServiceInstalled, restartService } =
+          await import("../commands/service");
         if (isServiceInstalled()) {
           await restartService();
         } else {
@@ -540,7 +622,11 @@ System:
 
     console.log(HELP);
     // Unknown command → exit 1, help/no command → exit 0
-    const isHelp = !command || command === "help" || command === "--help" || command === "-h";
+    const isHelp =
+      !command ||
+      command === "help" ||
+      command === "--help" ||
+      command === "-h";
     if (!isHelp) console.error(`\nUnknown command: ${command}`);
     process.exit(isHelp ? 0 : 1);
   }