omnikey-cli 1.5.7 → 1.5.8

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",

package/telegram-client-dist/dist/agentClient.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentAbortError = void 0;
+exports.getSessionMessages = getSessionMessages;
 exports.listRecentSessions = listRecentSessions;
 exports.listTaskTemplates = listTaskTemplates;
 exports.setDefaultTaskTemplate = setDefaultTaskTemplate;
@@ -18,6 +19,27 @@ const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
 const config_1 = require("./config");
 const omnikeyAuth_1 = require("./omnikeyAuth");
+/**
+ * Fetch the typed message transcript for a session.
+ * Returns null when the session does not exist (404), throws on other errors.
+ */
+async function getSessionMessages(logger, sessionId) {
+    const token = await (0, omnikeyAuth_1.fetchJwtToken)(logger);
+    const url = `${(0, config_1.omnikeyBaseUrl)()}/api/agent/sessions/${encodeURIComponent(sessionId)}/messages`;
+    try {
+        const resp = await axios_1.default.get(url, {
+            timeout: 10000,
+            headers: { Authorization: `Bearer ${token}` },
+        });
+        return resp.data?.messages ?? [];
+    }
+    catch (err) {
+        if (axios_1.default.isAxiosError(err) && err.response?.status === 404) {
+            return null;
+        }
+        throw err;
+    }
+}
 async function listRecentSessions(logger, limit = 5) {
     const token = await (0, omnikeyAuth_1.fetchJwtToken)(logger);
     const url = `${(0, config_1.omnikeyBaseUrl)()}/api/agent/sessions`;

package/telegram-client-dist/dist/index.js

@@ -11,7 +11,6 @@ const crypto_1 = require("crypto");
 const winston_1 = __importDefault(require("winston"));
 const zod_1 = require("zod");
 const notifyTelegram_1 = require("./notifyTelegram");
-const db_1 = require("./db");
 exports.logger = winston_1.default.createLogger({
     level: process.env.LOG_LEVEL || "info",
     defaultMeta: { conId: (0, crypto_1.randomUUID)() },
@@ -24,12 +23,6 @@ exports.logger = winston_1.default.createLogger({
 });
 const app = (0, express_1.default)();
 const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 6666;
-try {
-    (0, db_1.initDb)(exports.logger);
-}
-catch (e) {
-    exports.logger.error("Failed to open omnikey SQLite database:", e);
-}
 const botToken = process.env.TELEGRAM_BOT_TOKEN ?? "";
 if (botToken) {
     try {
@@ -87,11 +80,9 @@ app.listen(port, () => {
 });
 process.on("SIGINT", () => {
     exports.logger.info("Received SIGINT. Exiting...");
-    (0, db_1.closeDb)(exports.logger);
     process.exit(0);
 });
 process.on("SIGTERM", () => {
     exports.logger.info("Received SIGTERM. Exiting...");
-    (0, db_1.closeDb)(exports.logger);
     process.exit(0);
 });

package/telegram-client-dist/dist/notifyTelegram.js

@@ -8,7 +8,6 @@ exports.notify = notify;
 exports.setupMessageListener = setupMessageListener;
 const node_telegram_bot_api_1 = __importDefault(require("node-telegram-bot-api"));
 const agentClient_1 = require("./agentClient");
-const db_1 = require("./db");
 let bot = null;
 function initTelegram(botToken) {
     if (!botToken)
@@ -428,12 +427,26 @@ async function handleTaskCommand(logger, chatId) {
     }
     // 2. Otherwise show final answer from the most recent completed session.
     try {
-        const session = (0, db_1.getMostRecentSession)();
+        const sessions = await (0, agentClient_1.listRecentSessions)(logger, 1);
+        const session = sessions[0];
         if (!session) {
             await notify(logger, "🗒️ No sessions found.", { chatId });
             return;
         }
-        const finalAnswer = (0, agentClient_1.extractFinalAnswerFromHistory)(session.historyJson);
+        const messages = await (0, agentClient_1.getSessionMessages)(logger, session.id);
+        let finalAnswer = null;
+        if (messages) {
+            for (let i = messages.length - 1; i >= 0; i--) {
+                const msg = messages[i];
+                if (msg.role !== "assistant")
+                    continue;
+                const block = msg.blocks?.find((b) => b.kind === "finalAnswer");
+                if (block) {
+                    finalAnswer = block.text;
+                    break;
+                }
+            }
+        }
         if (!finalAnswer) {
             await notify(logger, `🗒️ Most recent session \`${session.id}\` has no final answer yet.`, { chatId });
             return;
@@ -884,8 +897,8 @@ function setupMessageListener(logger, bot) {
                 return;
             }
             if (pending.sessionId) {
-                const exists = (0, db_1.getSessionById)(pending.sessionId);
-                if (!exists) {
+                const messages = await (0, agentClient_1.getSessionMessages)(logger, pending.sessionId);
+                if (messages === null) {
                     pendingPrompts.delete(chatId);
                     await notify(logger, "❌ Selected session no longer exists.", {
                         chatId,

package/telegram-client-dist/dist/db.js

@@ -1,78 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDb = initDb;
-exports.closeDb = closeDb;
-exports.getRecentSessions = getRecentSessions;
-exports.getSessionById = getSessionById;
-exports.getMostRecentSession = getMostRecentSession;
-const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
-const config_1 = require("./config");
-let dbInstance = null;
-function initDb(logger) {
-    if (dbInstance)
-        return dbInstance;
-    const { sqlitePath } = (0, config_1.loadOmnikeyConfig)();
-    dbInstance = new better_sqlite3_1.default(sqlitePath, {
-        readonly: true,
-        fileMustExist: true,
-    });
-    // WAL is set by the writer; we only read. Set busy timeout so concurrent
-    // writes from omnikey-ai never throw SQLITE_BUSY at us.
-    dbInstance.pragma("busy_timeout = 5000");
-    logger.info("Opened SQLite database (read-only)", { path: sqlitePath });
-    return dbInstance;
-}
-function closeDb(logger) {
-    if (!dbInstance)
-        return;
-    try {
-        dbInstance.close();
-        logger?.info("Closed SQLite database");
-    }
-    catch (err) {
-        logger?.warn("Error closing SQLite database", {
-            error: err.message,
-        });
-    }
-    finally {
-        dbInstance = null;
-    }
-}
-function getRecentSessions(limit) {
-    const db = dbInstance;
-    if (!db)
-        throw new Error("Database not initialised. Call initDb() first.");
-    const rows = db
-        .prepare(`SELECT id, title, turns, last_active_at AS lastActiveAt, group_name AS groupName
-       FROM agent_sessions
-       ORDER BY last_active_at DESC
-       LIMIT ?`)
-        .all(limit);
-    return rows;
-}
-function getSessionById(sessionId) {
-    const db = dbInstance;
-    if (!db)
-        throw new Error("Database not initialised. Call initDb() first.");
-    const row = db
-        .prepare(`SELECT id, title, turns, last_active_at AS lastActiveAt, group_name AS groupName, history_json AS historyJson
-       FROM agent_sessions
-       WHERE id = ?`)
-        .get(sessionId);
-    return row ?? null;
-}
-function getMostRecentSession() {
-    const db = dbInstance;
-    if (!db)
-        throw new Error("Database not initialised. Call initDb() first.");
-    const row = db
-        .prepare(`SELECT id, title, turns, last_active_at AS lastActiveAt, group_name AS groupName, history_json AS historyJson
-       FROM agent_sessions
-       ORDER BY last_active_at DESC
-       LIMIT 1`)
-        .get();
-    return row ?? null;
-}