omnikey-cli 1.5.8 → 1.6.1

package/src/telegramClient.ts

@@ -24,7 +24,7 @@ function resolveBundleRoot(): string {
 }
 
 function resolveBundledEntry(): string {
-  return path.join(resolveBundleRoot(), 'dist', 'index.js');
+  return path.join(resolveBundleRoot(), 'index.js');
 }
 
 function persistConfig(values: Record<string, string>): void {

package/src/telegramDaemon.ts

@@ -11,12 +11,12 @@ const PLIST_NAME = `${LABEL}.plist`;
 const WINDOWS_SERVICE_NAME = 'OmnikeyTelegram';
 
 // At runtime __dirname is cli/dist/. The bundled telegram app is copied into
-// cli/telegram-client-dist/ by the build:telegram-client script, so one level
-// up from dist/ lands at the package root, then into the bundle directory.
+// cli/telegram-client-dist/ by the build:telegram-client script (flat layout,
+// matching backend-dist/), so one level up from dist/ lands at the package
 // This matches resolveBundleRoot() in telegramClient.ts and works correctly
 // both in the monorepo and after `npm install -g omnikey-cli`.
 const TELEGRAM_BOT_ROOT = path.resolve(__dirname, '..', 'telegram-client-dist');
-const ENTRY_POINT = path.join(TELEGRAM_BOT_ROOT, 'dist', 'index.js');
+const ENTRY_POINT = path.join(TELEGRAM_BOT_ROOT, 'index.js');
 
 const HOME = getHomeDir();
 
@@ -300,11 +300,9 @@ async function startWindows(): Promise<void> {
     execFileSync(nssmPath, ['set', WINDOWS_SERVICE_NAME, 'Start', 'SERVICE_AUTO_START'], {
       stdio: 'pipe',
     });
-    execFileSync(
-      nssmPath,
-      ['set', WINDOWS_SERVICE_NAME, 'DisplayName', 'Omnikey Telegram'],
-      { stdio: 'pipe' },
-    );
+    execFileSync(nssmPath, ['set', WINDOWS_SERVICE_NAME, 'DisplayName', 'Omnikey Telegram'], {
+      stdio: 'pipe',
+    });
     execFileSync(
       nssmPath,
       ['set', WINDOWS_SERVICE_NAME, 'Description', 'Omnikey Telegram Daemon'],

package/telegram-client-dist/{dist/agentClient.js → agentClient.js}

@@ -70,7 +70,7 @@ async function setDefaultTaskTemplate(logger, templateId) {
         timeout: 10000,
         headers: { Authorization: `Bearer ${token}` },
     });
-    logger.info("Set default task template", { templateId });
+    logger.info('Set default task template', { templateId });
 }
 async function listProjectGroups(logger) {
     const token = await (0, omnikeyAuth_1.fetchJwtToken)(logger);
@@ -82,67 +82,63 @@ async function listProjectGroups(logger) {
     return resp.data?.groups ?? [];
 }
 class AgentAbortError extends Error {
-    constructor(message = "Agent run aborted") {
+    constructor(message = 'Agent run aborted') {
         super(message);
-        this.name = "AgentAbortError";
+        this.name = 'AgentAbortError';
     }
 }
 exports.AgentAbortError = AgentAbortError;
 function extractTagged(content, tag) {
-    const re = new RegExp(`<${tag}[^>]*>([\\s\\S]*?)<\\/${tag}>`, "i");
+    const re = new RegExp(`<${tag}[^>]*>([\\s\\S]*?)<\\/${tag}>`, 'i');
     const m = content.match(re);
     return m?.[1]?.trim() || null;
 }
 function stripTagged(content, tag) {
-    return content.replace(new RegExp(`<${tag}[^>]*>[\\s\\S]*?<\\/${tag}>`, "gi"), "");
+    return content.replace(new RegExp(`<${tag}[^>]*>[\\s\\S]*?<\\/${tag}>`, 'gi'), '');
 }
 function cleanReasoning(content) {
     return content
-        .replace(/<\/?shell_function_calls>/gi, "")
-        .replace(/<final_answer>([\s\S]*?)<\/final_answer>/gi, "$1")
+        .replace(/<\/?shell_function_calls>/gi, '')
+        .replace(/<final_answer>([\s\S]*?)<\/final_answer>/gi, '$1')
         .trim();
 }
 const SHELL_TIMEOUT_MS = 5 * 60 * 1000;
 const SHELL_OUTPUT_MAX = 64 * 1024;
 // Mirrors WINDOWS_SHELL_CANDIDATES in src/agent/mcpRuntime.ts
 const WINDOWS_SHELL_CANDIDATES = [
-    "C:\\Program Files\\PowerShell\\7\\pwsh.exe",
-    "C:\\Program Files\\PowerShell\\6\\pwsh.exe",
-    "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-    "C:\\Windows\\System32\\cmd.exe",
-    "C:\\Windows\\cmd.exe",
+    'C:\\Program Files\\PowerShell\\7\\pwsh.exe',
+    'C:\\Program Files\\PowerShell\\6\\pwsh.exe',
+    'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe',
+    'C:\\Windows\\System32\\cmd.exe',
+    'C:\\Windows\\cmd.exe',
 ];
 // Resolve the Windows shell: COMSPEC → SystemRoot\System32\cmd.exe → candidate list.
 // Mirrors resolveLoginShell() in src/agent/mcpRuntime.ts, with SystemRoot used to
 // locate cmd.exe from the Win32 system root rather than a hardcoded drive letter.
 function resolveWindowsShell() {
-    const comspec = process.env.COMSPEC ?? "";
+    const comspec = process.env.COMSPEC ?? '';
     if (comspec && (0, fs_1.existsSync)(comspec))
         return comspec;
-    const systemRoot = process.env.SystemRoot ?? "C:\\Windows";
-    const cmdFromRoot = path_1.default.join(systemRoot, "System32", "cmd.exe");
+    const systemRoot = process.env.SystemRoot ?? 'C:\\Windows';
+    const cmdFromRoot = path_1.default.join(systemRoot, 'System32', 'cmd.exe');
     if ((0, fs_1.existsSync)(cmdFromRoot))
         return cmdFromRoot;
     for (const candidate of WINDOWS_SHELL_CANDIDATES) {
         if ((0, fs_1.existsSync)(candidate))
             return candidate;
     }
-    return "cmd.exe";
+    return 'cmd.exe';
 }
 // Build shell args for the resolved shell — mirrors wrapWithLoginShell() in
 // src/agent/mcpRuntime.ts.  PowerShell/pwsh use -NoProfile -Command; cmd uses /c.
 function buildWindowsShellArgs(shell, script) {
     const name = path_1.default.basename(shell).toLowerCase();
-    if (name === "pwsh.exe" || name === "powershell.exe") {
-        return ["-NoProfile", "-Command", script];
+    if (name === 'pwsh.exe' || name === 'powershell.exe') {
+        return ['-NoProfile', '-Command', script];
     }
-    return ["/c", script];
+    return ['/c', script];
 }
-const PLATFORM = process.platform === "win32"
-    ? "windows"
-    : process.platform === "darwin"
-        ? "macos"
-        : "linux";
+const PLATFORM = process.platform === 'win32' ? 'windows' : process.platform === 'darwin' ? 'macos' : 'linux';
 /**
  * Execute a shell script locally and capture combined stdout+stderr.
  * On macOS/Linux: invoke the login shell with `-l -c <script>` (mirrors the
@@ -156,15 +152,15 @@ function runShellScript(script, logger) {
     return new Promise((resolve) => {
         let shell;
         let shellArgs;
-        if (process.platform !== "darwin" && process.platform === "win32") {
+        if (process.platform !== 'darwin' && process.platform === 'win32') {
             shell = resolveWindowsShell();
             shellArgs = buildWindowsShellArgs(shell, script);
         }
         else {
-            shell = process.env.SHELL || "/bin/zsh";
-            shellArgs = ["-l", "-c", script];
+            shell = process.env.SHELL || '/bin/zsh';
+            shellArgs = ['-l', '-c', script];
         }
-        logger.info("Executing shell script from agent", {
+        logger.info('Executing shell script from agent', {
             shell,
             platform: PLATFORM,
             length: script.length,
@@ -173,7 +169,7 @@ function runShellScript(script, logger) {
             cwd: process.env.HOME ?? process.env.USERPROFILE ?? process.cwd(),
             env: process.env,
         });
-        let buf = "";
+        let buf = '';
         let truncated = false;
         const append = (chunk) => {
             if (truncated)
@@ -183,7 +179,7 @@ function runShellScript(script, logger) {
                 truncated = true;
                 return;
             }
-            const text = chunk.toString("utf8");
+            const text = chunk.toString('utf8');
             if (text.length <= room) {
                 buf += text;
             }
@@ -192,33 +188,31 @@ function runShellScript(script, logger) {
                 truncated = true;
             }
         };
-        child.stdout.on("data", append);
-        child.stderr.on("data", append);
+        child.stdout.on('data', append);
+        child.stderr.on('data', append);
         const timeout = setTimeout(() => {
-            logger.warn("Shell script timed out; sending SIGTERM", {
+            logger.warn('Shell script timed out; sending SIGTERM', {
                 timeoutMs: SHELL_TIMEOUT_MS,
             });
             try {
-                child.kill("SIGTERM");
+                child.kill('SIGTERM');
             }
             catch {
                 /* noop */
             }
         }, SHELL_TIMEOUT_MS);
-        child.on("error", (err) => {
+        child.on('error', (err) => {
             clearTimeout(timeout);
             resolve({
                 output: `${buf}\n[shell spawn error: ${err.message}]`,
                 status: -1,
             });
         });
-        child.on("close", (code, signal) => {
+        child.on('close', (code, signal) => {
             clearTimeout(timeout);
-            const status = typeof code === "number" ? code : signal ? 1 : 0;
-            const finalOutput = truncated
-                ? `${buf}\n... [truncated to ${SHELL_OUTPUT_MAX} bytes]`
-                : buf;
-            logger.info("Shell script finished", {
+            const status = typeof code === 'number' ? code : signal ? 1 : 0;
+            const finalOutput = truncated ? `${buf}\n... [truncated to ${SHELL_OUTPUT_MAX} bytes]` : buf;
+            logger.info('Shell script finished', {
                 status,
                 signal,
                 outputLength: finalOutput.length,
@@ -239,7 +233,7 @@ function runShellScript(script, logger) {
 async function runAgentTurn(logger, opts) {
     const token = await (0, omnikeyAuth_1.fetchJwtToken)(logger);
     const sessionId = opts.sessionId || (0, crypto_1.randomUUID)();
-    const url = (0, config_1.omnikeyWsUrl)("/ws/omni-agent");
+    const url = (0, config_1.omnikeyWsUrl)('/ws/omni-agent');
     return new Promise((resolve, reject) => {
         if (opts.signal?.aborted) {
             reject(new AgentAbortError());
@@ -254,7 +248,7 @@ async function runAgentTurn(logger, opts) {
                 return;
             settled = true;
             if (opts.signal && onAbort) {
-                opts.signal.removeEventListener("abort", onAbort);
+                opts.signal.removeEventListener('abort', onAbort);
             }
             try {
                 ws.close();
@@ -269,12 +263,12 @@ async function runAgentTurn(logger, opts) {
         };
         const onAbort = opts.signal
             ? () => {
-                logger.info("Agent run aborted by caller", { sessionId });
+                logger.info('Agent run aborted by caller', { sessionId });
                 finish(new AgentAbortError());
             }
             : null;
         if (opts.signal && onAbort) {
-            opts.signal.addEventListener("abort", onAbort, { once: true });
+            opts.signal.addEventListener('abort', onAbort, { once: true });
         }
         const send = (msg) => {
             ws.send(JSON.stringify(msg), (err) => {
@@ -282,11 +276,11 @@ async function runAgentTurn(logger, opts) {
                     finish(err);
             });
         };
-        ws.on("open", () => {
-            logger.info("Agent WebSocket open", { sessionId });
+        ws.on('open', () => {
+            logger.info('Agent WebSocket open', { sessionId });
             send({
                 session_id: sessionId,
-                sender: "client",
+                sender: 'client',
                 content: opts.prompt,
                 is_terminal_output: false,
                 is_error: false,
@@ -294,56 +288,56 @@ async function runAgentTurn(logger, opts) {
                 group_name: opts.groupName,
             });
         });
-        ws.on("message", async (data) => {
+        ws.on('message', async (data) => {
             let msg;
             try {
                 msg = JSON.parse(data.toString());
             }
             catch (e) {
-                logger.warn("Failed to parse agent ws message", {
+                logger.warn('Failed to parse agent ws message', {
                     error: e.message,
                 });
                 return;
             }
-            const content = msg.content || "";
+            const content = msg.content || '';
             if (msg.is_error) {
-                finish(new Error(content || "Agent reported an error"));
+                finish(new Error(content || 'Agent reported an error'));
                 return;
             }
             if (msg.is_web_call) {
-                await opts.onBlock({ kind: "webCall", text: content });
+                await opts.onBlock({ kind: 'webCall', text: content });
                 return;
             }
             if (msg.is_image_rendering) {
-                await opts.onBlock({ kind: "imageRendering", text: content });
+                await opts.onBlock({ kind: 'imageRendering', text: content });
                 return;
             }
             if (msg.is_mcp_call) {
-                await opts.onBlock({ kind: "mcpCall", text: content });
+                await opts.onBlock({ kind: 'mcpCall', text: content });
                 return;
             }
-            const finalAnswer = extractTagged(content, "final_answer");
+            const finalAnswer = extractTagged(content, 'final_answer');
             if (finalAnswer) {
-                await opts.onBlock({ kind: "finalAnswer", text: finalAnswer });
+                await opts.onBlock({ kind: 'finalAnswer', text: finalAnswer });
                 finish(null, { sessionId, finalAnswer });
                 return;
             }
-            const shellScript = extractTagged(content, "shell_script");
+            const shellScript = extractTagged(content, 'shell_script');
             if (shellScript) {
-                const reasoning = cleanReasoning(stripTagged(content, "shell_script"));
+                const reasoning = cleanReasoning(stripTagged(content, 'shell_script'));
                 if (reasoning)
-                    await opts.onBlock({ kind: "reasoning", text: reasoning });
-                await opts.onBlock({ kind: "shellCommand", text: shellScript });
+                    await opts.onBlock({ kind: 'reasoning', text: reasoning });
+                await opts.onBlock({ kind: 'shellCommand', text: shellScript });
                 try {
                     const { output, status } = await runShellScript(shellScript, logger);
-                    const statusLabel = status === 0 ? "success" : `error (exit code: ${status})`;
+                    const statusLabel = status === 0 ? 'success' : `error (exit code: ${status})`;
                     await opts.onBlock({
-                        kind: "terminalOutput",
+                        kind: 'terminalOutput',
                         text: `[terminal ${statusLabel}]\n${output}`,
                     });
                     send({
                         session_id: sessionId,
-                        sender: "client",
+                        sender: 'client',
                         content: output,
                         is_terminal_output: true,
                         is_error: status !== 0,
@@ -352,14 +346,14 @@ async function runAgentTurn(logger, opts) {
                 }
                 catch (err) {
                     const message = err.message;
-                    logger.error("Shell execution failed", { error: message });
+                    logger.error('Shell execution failed', { error: message });
                     await opts.onBlock({
-                        kind: "terminalOutput",
+                        kind: 'terminalOutput',
                         text: `[terminal error]\n${message}`,
                     });
                     send({
                         session_id: sessionId,
-                        sender: "client",
+                        sender: 'client',
                         content: `Failed to execute shell script: ${message}`,
                         is_terminal_output: true,
                         is_error: true,
@@ -370,16 +364,16 @@ async function runAgentTurn(logger, opts) {
             }
             const reasoning = cleanReasoning(content);
             if (reasoning) {
-                await opts.onBlock({ kind: "reasoning", text: reasoning });
+                await opts.onBlock({ kind: 'reasoning', text: reasoning });
             }
         });
-        ws.on("error", (err) => {
-            logger.error("Agent WebSocket error", { error: err.message });
+        ws.on('error', (err) => {
+            logger.error('Agent WebSocket error', { error: err.message });
             finish(err);
         });
-        ws.on("close", () => {
+        ws.on('close', () => {
             if (!settled)
-                finish(new Error("Agent WebSocket closed before final answer"));
+                finish(new Error('Agent WebSocket closed before final answer'));
         });
     });
 }
@@ -391,10 +385,10 @@ function extractFinalAnswerFromHistory(historyJson) {
         const history = JSON.parse(historyJson);
         for (let i = history.length - 1; i >= 0; i--) {
             const entry = history[i];
-            if (entry.role !== "assistant")
+            if (entry.role !== 'assistant')
                 continue;
-            const content = typeof entry.content === "string" ? entry.content : "";
-            const fa = extractTagged(content, "final_answer");
+            const content = typeof entry.content === 'string' ? entry.content : '';
+            const fa = extractTagged(content, 'final_answer');
             if (fa)
                 return fa;
         }

package/telegram-client-dist/{dist/config.js → config.js}

@@ -9,23 +9,21 @@ exports.omnikeyWsUrl = omnikeyWsUrl;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
-const DEFAULT_HOST = "127.0.0.1";
+const DEFAULT_HOST = '127.0.0.1';
 const DEFAULT_PORT = 7071;
-const DEFAULT_SQLITE = path_1.default.join(os_1.default.homedir(), ".omnikey", "omnikey-selfhosted.sqlite");
-const CONFIG_PATH = path_1.default.join(os_1.default.homedir(), ".omnikey", "config.json");
+const DEFAULT_SQLITE = path_1.default.join(os_1.default.homedir(), '.omnikey', 'omnikey-selfhosted.sqlite');
+const CONFIG_PATH = path_1.default.join(os_1.default.homedir(), '.omnikey', 'config.json');
 let cached = null;
 function resolveSqlitePath(raw) {
-    if (typeof raw === "string" && raw.trim()) {
-        return path_1.default.isAbsolute(raw)
-            ? raw
-            : path_1.default.join(os_1.default.homedir(), ".omnikey", raw);
+    if (typeof raw === 'string' && raw.trim()) {
+        return path_1.default.isAbsolute(raw) ? raw : path_1.default.join(os_1.default.homedir(), '.omnikey', raw);
     }
     return DEFAULT_SQLITE;
 }
 function resolvePort(raw) {
-    if (typeof raw === "number" && Number.isFinite(raw))
+    if (typeof raw === 'number' && Number.isFinite(raw))
         return raw;
-    if (typeof raw === "string" && raw.trim()) {
+    if (typeof raw === 'string' && raw.trim()) {
         const n = Number(raw);
         if (Number.isFinite(n))
             return n;
@@ -38,7 +36,7 @@ function loadOmnikeyConfig() {
     let parsed = {};
     try {
         if (fs_1.default.existsSync(CONFIG_PATH)) {
-            const raw = fs_1.default.readFileSync(CONFIG_PATH, "utf-8");
+            const raw = fs_1.default.readFileSync(CONFIG_PATH, 'utf-8');
             parsed = JSON.parse(raw);
         }
     }
@@ -50,7 +48,7 @@ function loadOmnikeyConfig() {
     cached = {
         sqlitePath: resolveSqlitePath(parsed.SQLITE_PATH),
         omnikeyPort: resolvePort(parsed.OMNIKEY_PORT),
-        omnikeyHost: typeof parsed.OMNIKEY_HOST === "string" && parsed.OMNIKEY_HOST.trim()
+        omnikeyHost: typeof parsed.OMNIKEY_HOST === 'string' && parsed.OMNIKEY_HOST.trim()
             ? parsed.OMNIKEY_HOST
             : DEFAULT_HOST,
     };
@@ -62,6 +60,6 @@ function omnikeyBaseUrl() {
 }
 function omnikeyWsUrl(path) {
     const { omnikeyHost, omnikeyPort } = loadOmnikeyConfig();
-    const suffix = path.startsWith("/") ? path : `/${path}`;
+    const suffix = path.startsWith('/') ? path : `/${path}`;
     return `ws://${omnikeyHost}:${omnikeyPort}${suffix}`;
 }

package/telegram-client-dist/{dist/index.js → index.js}

@@ -12,10 +12,10 @@ const winston_1 = __importDefault(require("winston"));
 const zod_1 = require("zod");
 const notifyTelegram_1 = require("./notifyTelegram");
 exports.logger = winston_1.default.createLogger({
-    level: process.env.LOG_LEVEL || "info",
+    level: process.env.LOG_LEVEL || 'info',
     defaultMeta: { conId: (0, crypto_1.randomUUID)() },
     format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.timestamp(), winston_1.default.format.printf(({ timestamp, level, message, ...meta }) => {
-        const metaString = Object.keys(meta).length ? JSON.stringify(meta) : "";
+        const metaString = Object.keys(meta).length ? JSON.stringify(meta) : '';
         const date = new Date(timestamp).toLocaleString();
         return `[${date}] ${level}: ${message} ${metaString}`;
     })),
@@ -23,37 +23,37 @@ exports.logger = winston_1.default.createLogger({
 });
 const app = (0, express_1.default)();
 const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 6666;
-const botToken = process.env.TELEGRAM_BOT_TOKEN ?? "";
+const botToken = process.env.TELEGRAM_BOT_TOKEN ?? '';
 if (botToken) {
     try {
         const bot = (0, notifyTelegram_1.initTelegram)(botToken);
-        exports.logger.info("Telegram bot initialized", {
+        exports.logger.info('Telegram bot initialized', {
             botTokenSet: !!botToken,
             bot: !!bot,
         });
         (0, notifyTelegram_1.setupMessageListener)(exports.logger, bot);
     }
     catch (e) {
-        exports.logger.error("Failed to init telegram:", e);
+        exports.logger.error('Failed to init telegram:', e);
     }
 }
 app.use(express_1.default.json());
 const sendBodySchema = zod_1.z.object({
-    message: zod_1.z.string().min(1, "message must not be empty"),
-    parseMode: zod_1.z.enum(["Markdown", "MarkdownV2", "HTML"]).optional(),
+    message: zod_1.z.string().min(1, 'message must not be empty'),
+    parseMode: zod_1.z.enum(['Markdown', 'MarkdownV2', 'HTML']).optional(),
 });
-app.get("/", (req, res) => {
-    res.send("Telegram bot service (TypeScript)");
+app.get('/', (req, res) => {
+    res.send('Telegram bot service (TypeScript)');
 });
-app.post("/telegram/send", async (req, res) => {
-    exports.logger.defaultMeta = { conId: "sending notification" };
+app.post('/telegram/send', async (req, res) => {
+    exports.logger.defaultMeta = { conId: 'sending notification' };
     const parsed = sendBodySchema.safeParse(req.body);
     if (!parsed.success) {
-        exports.logger.warn("Invalid /telegram/send body", {
+        exports.logger.warn('Invalid /telegram/send body', {
             issues: parsed.error.issues,
         });
         return res.status(400).json({
-            message: "Invalid request body",
+            message: 'Invalid request body',
             issues: parsed.error.issues,
         });
     }
@@ -61,16 +61,16 @@ app.post("/telegram/send", async (req, res) => {
     try {
         await (0, notifyTelegram_1.notify)(exports.logger, message, { parseMode });
         return res.json({
-            message: "Message sent",
-            parseMode: parseMode ?? "Markdown",
+            message: 'Message sent',
+            parseMode: parseMode ?? 'Markdown',
         });
     }
     catch (e) {
-        exports.logger.error("Failed to send message:", e);
-        const description = e?.response?.body
-            ?.description ?? e.message;
+        exports.logger.error('Failed to send message:', e);
+        const description = e?.response?.body?.description ??
+            e.message;
         return res.status(502).json({
-            message: "Failed to deliver message to Telegram",
+            message: 'Failed to deliver message to Telegram',
             error: description,
         });
     }
@@ -78,11 +78,11 @@ app.post("/telegram/send", async (req, res) => {
 app.listen(port, () => {
     exports.logger.info(`Server listening on http://localhost:${port}`);
 });
-process.on("SIGINT", () => {
-    exports.logger.info("Received SIGINT. Exiting...");
+process.on('SIGINT', () => {
+    exports.logger.info('Received SIGINT. Exiting...');
     process.exit(0);
 });
-process.on("SIGTERM", () => {
-    exports.logger.info("Received SIGTERM. Exiting...");
+process.on('SIGTERM', () => {
+    exports.logger.info('Received SIGTERM. Exiting...');
     process.exit(0);
 });