omnikey-cli 1.6.2 → 1.6.3

package/backend-dist/aiProviderRoutes.js

@@ -9,10 +9,10 @@ const zod_1 = __importDefault(require("zod"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
+const child_process_1 = require("child_process");
 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),
@@ -100,48 +100,31 @@ function readActiveProvider(cfg) {
     return config_1.config.aiProvider;
 }
 /**
- * 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.
+ * Triggers a daemon restart by spawning a detached `omnikey restart-daemon`
+ * process. Using spawn with detached:true + unref() instead of a shell script
+ * avoids PATH lookup failures when the daemon runs under launchd/NSSM (which
+ * provide a minimal environment). We resolve the CLI path relative to
+ * __dirname so it works regardless of PATH.
  *
- * 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.
+ * The API server lives in cli/backend-dist/ and the omnikey CLI lives in
+ * cli/dist/, so path.resolve(__dirname, '../dist/index.js') is always valid.
  */
 function scheduleDaemonRestart(reason) {
     setTimeout(() => {
         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 });
-        });
+        const omnikeyCli = path_1.default.resolve(__dirname, '../dist/index.js');
+        logger_1.logger.info(`Spawning detached \`omnikey restart-daemon --port ${port}\` (${reason})`);
+        try {
+            fs_1.default.mkdirSync(path_1.default.dirname(logFile), { recursive: true });
+            const out = fs_1.default.openSync(logFile, 'a');
+            const child = (0, child_process_1.spawn)(process.execPath, [omnikeyCli, 'restart-daemon', '--port', String(port)], { detached: true, stdio: ['ignore', out, out] });
+            child.unref();
+            fs_1.default.closeSync(out);
+        }
+        catch (err) {
+            logger_1.logger.error('Failed to spawn restart-daemon process.', { error: err });
+        }
     }, 500);
 }
 function aiProviderRouter() {

package/package.json

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