omnikey-cli 1.6.1 → 1.6.2

package/backend-dist/aiProviderRoutes.js

@@ -12,6 +12,7 @@ const os_1 = __importDefault(require("os"));
 const authMiddleware_1 = require("./authMiddleware");
 const config_1 = require("./config");
 const logger_1 = require("./logger");
+const scheduledJobExecutor_1 = require("./scheduledJobExecutor");
 const providerEnum = zod_1.default.enum(['openai', 'anthropic', 'gemini', 'nemotron']);
 const putSchema = zod_1.default.object({
     apiKey: zod_1.default.string().min(1).max(4096),
@@ -99,14 +100,48 @@ function readActiveProvider(cfg) {
     return config_1.config.aiProvider;
 }
 /**
- * Triggers a graceful daemon restart. The process is supervised by launchd
- * (macOS) / NSSM (Windows) with auto-restart enabled, so exiting will cause
- * the supervisor to relaunch the API with the freshly written config.json.
+ * Triggers a daemon restart by handing off to the shared `runScript` helper
+ * (the same one used by the scheduled-job executor). The script invokes the
+ * `omnikey restart-daemon --port <port>` CLI, which tears down the
+ * launchd / NSSM persistence agent and brings a fresh daemon back up on the
+ * same port — picking up the rewritten config.json values from env on the
+ * way up.
+ *
+ * Important: `omnikey restart-daemon` calls `killDaemon()` first, which kills
+ * *this* Node process. To survive that, we wrap the call in `nohup ... &`
+ * with stdio redirected to a log file and `disown` so the actual
+ * `omnikey restart-daemon` invocation escapes the shell's process tree
+ * before this process is terminated. `runScript` is fire-and-forget: we do
+ * not await it because we expect to be killed before it returns.
  */
 function scheduleDaemonRestart(reason) {
     setTimeout(() => {
-        logger_1.logger.info(`Exiting process to trigger supervised restart: ${reason}`);
-        process.exit(0);
+        const port = config_1.config.port;
+        const logFile = path_1.default.join(process.env.HOME || os_1.default.homedir(), '.omnikey', 'restart-daemon.log');
+        const script = [
+            '#!/usr/bin/env bash',
+            'set -u',
+            `mkdir -p "$(dirname "${logFile}")"`,
+            `echo "[$(date -Iseconds)] restart-daemon triggered: ${reason}" >> "${logFile}"`,
+            // Detach the actual restart so it survives this daemon's imminent death.
+            `nohup omnikey restart-daemon --port ${port} >> "${logFile}" 2>&1 &`,
+            'disown || true',
+            'exit 0',
+        ].join('\n');
+        logger_1.logger.info(`Running \`omnikey restart-daemon --port ${port}\` via runScript (${reason})`);
+        // Fire-and-forget: we expect `omnikey restart-daemon` to kill this process
+        // long before runScript's exec promise resolves.
+        void (0, scheduledJobExecutor_1.runScript)(script)
+            .then((result) => {
+            if (result.isError) {
+                logger_1.logger.error('runScript reported a non-zero exit for restart-daemon.', {
+                    output: result.output,
+                });
+            }
+        })
+            .catch((err) => {
+            logger_1.logger.error('Unexpected runScript failure while restarting daemon.', { error: err });
+        });
     }, 500);
 }
 function aiProviderRouter() {

package/backend-dist/index.js

@@ -84,8 +84,8 @@ app.get('/macos/appcast', (req, res) => {
     const appcastUrl = `${baseUrl}/macos/appcast`;
     // These should match the values embedded into the macOS app
     // Info.plist in macOS/build_release_dmg.sh.
-    const bundleVersion = '37';
-    const shortVersion = '1.0.36';
+    const bundleVersion = '39';
+    const shortVersion = '1.0.38';
     const xml = `<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"
      xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"

package/backend-dist/scheduledJobExecutor.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeNextRunAt = computeNextRunAt;
 exports.startScheduledJobExecutor = startScheduledJobExecutor;
+exports.runScript = runScript;
 exports.executeJob = executeJob;
 const child_process_1 = require("child_process");
 const promises_1 = require("fs/promises");

package/package.json

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