linkgravity 1.7.1 → 1.7.3

package/bin/cli.js

@@ -32,9 +32,12 @@ function success(msg) {
     console.log(`${color.green}✔${color.reset} ${msg}`);
 }
 
-// Resolved rather than run through npx: pm2 is a direct dependency, and npx wraps it in
-// "npm exec" + "sh -c", which leaves the real process orphaned when we try to kill it.
-const PM2_BIN = require.resolve('pm2/bin/pm2');
+const { PM2_BIN, PM2_CWD, pm2Env } = require('./pm2');
+
+// `npm` is npm.cmd on Windows, and node refuses to spawn a .cmd without a shell.
+function runNpm(args, options = {}) {
+    return spawnSync('npm', args, { shell: isWin, ...options });
+}
 
 function info(msg) {
     console.log(`\n${color.cyan}▶${color.reset} ${msg}`);
@@ -60,18 +63,8 @@ function runPm2(args, silent = true) {
     const stdioOpt = silent ? 'pipe' : 'inherit';
     const result = spawnSync(process.execPath, [PM2_BIN, ...args], {
         stdio: stdioOpt,
-        cwd: path.join(__dirname, '..'),
-        env: {
-            ...process.env,
-            // pm2 gives Python a pipe not a TTY, so it block-buffers stdout and can sit on log lines indefinitely - force line buffering.
-            PYTHONUNBUFFERED: '1',
-            // pm2 merges --update-env rather than replacing, so a LOG_LEVEL from an earlier run
-            // survives unless a value is passed every time.
-            LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
-            // Version managers (fnm, nvm) put node on PATH from a shell hook the daemon never runs,
-            // so the bot's own `node` lookup for voice-service would fail without this.
-            PATH: `${path.dirname(process.execPath)}${path.delimiter}${process.env.PATH || ''}`,
-        },
+        cwd: PM2_CWD,
+        env: pm2Env(),
     });
 
     if (result.error) {
@@ -148,7 +141,7 @@ function colorizeLevel(line) {
 }
 
 function runPm2LogsStream(args, printLine) {
-    const cp = spawn(process.execPath, [PM2_BIN, ...args], { cwd: path.join(__dirname, '..') });
+    const cp = spawn(process.execPath, [PM2_BIN, ...args], { cwd: PM2_CWD });
 
     const isNoise = (line) =>
         line.trim().length === 0 ||
@@ -207,7 +200,7 @@ function verifyStartup() {
         );
 
         let cp = spawn(process.execPath, [PM2_BIN, 'logs', LGY_PM2_NAME, '--raw', '--lines', '0'], {
-            cwd: path.join(__dirname, '..'),
+            cwd: PM2_CWD,
         });
 
         let settled = false;
@@ -359,10 +352,7 @@ function isAutostartEnabled() {
 }
 
 function checkLatestVersionFast(currentVersion) {
-    const view = spawnSync('npm', ['view', 'linkgravity', 'version'], {
-        stdio: 'pipe',
-        timeout: 3000,
-    });
+    const view = runNpm(['view', 'linkgravity', 'version'], { stdio: 'pipe', timeout: 3000 });
     if (view.error || view.status !== 0) return null;
     const latest = view.stdout.toString().trim();
     if (!latest) return null;
@@ -609,7 +599,7 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     const currentVersion = pkg.version;
 
     info('Checking npm for the latest version...');
-    const viewResult = spawnSync('npm', ['view', 'linkgravity', 'version'], { stdio: 'pipe' });
+    const viewResult = runNpm(['view', 'linkgravity', 'version'], { stdio: 'pipe' });
     if (viewResult.error || viewResult.status !== 0) {
         console.error(
             (viewResult.stderr || '').toString().trim() ||
@@ -629,9 +619,7 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     const wasOnline = !!procBeforeUpdate && procBeforeUpdate.pm2_env.status === 'online';
 
     info(`Updating: v${currentVersion} -> v${latestVersion}...`);
-    const installResult = spawnSync('npm', ['install', '-g', 'linkgravity@latest'], {
-        stdio: 'inherit',
-    });
+    const installResult = runNpm(['install', '-g', 'linkgravity@latest'], { stdio: 'inherit' });
     if (installResult.status !== 0) {
         console.error('npm install failed - update aborted, still on the old version.');
         process.exit(1);

package/bin/pm2.js

@@ -0,0 +1,22 @@
+const path = require('path');
+
+// Not `npx pm2`: its `npm exec` + `sh -c` wrapping survives cp.kill() as a zombie, and LPM
+// Firewall reads it as a runtime package install.
+const PM2_BIN = require.resolve('pm2/bin/pm2');
+const PM2_CWD = path.join(__dirname, '..');
+
+function pm2Env() {
+    return {
+        ...process.env,
+        // pm2 gives Python a pipe not a TTY, so it block-buffers stdout and can sit on log lines indefinitely - force line buffering.
+        PYTHONUNBUFFERED: '1',
+        // pm2 merges --update-env rather than replacing, so a LOG_LEVEL from an earlier run
+        // survives unless a value is passed every time.
+        LOG_LEVEL: process.env.LOG_LEVEL || 'INFO',
+        // Version managers (fnm, nvm) put node on PATH from a shell hook the daemon never runs,
+        // so the bot's own `node` lookup for voice-service would fail without this.
+        PATH: `${path.dirname(process.execPath)}${path.delimiter}${process.env.PATH || ''}`,
+    };
+}
+
+module.exports = { PM2_BIN, PM2_CWD, pm2Env };

package/bin/setup.js

@@ -1,6 +1,7 @@
 const p = require('@clack/prompts');
 const { spawnSync } = require('child_process');
 const { python: pythonExe } = require('../npm-scripts/venv-paths');
+const { PM2_BIN, PM2_CWD, pm2Env } = require('./pm2');
 const {
     getSettings,
     updateSettings,
@@ -178,11 +179,19 @@ async function collectUserIds(existingIds, platformLabel, required = false) {
     return ids;
 }
 
+function runPm2(args) {
+    return spawnSync(process.execPath, [PM2_BIN, ...args], {
+        stdio: 'pipe',
+        cwd: PM2_CWD,
+        env: pm2Env(),
+    });
+}
+
 function stopDaemon(pm2Name, label) {
     console.log(`${color.cyan}▶${color.reset} Stopping ${label} daemon...`);
-    spawnSync('npx', ['-y', 'pm2', 'delete', pm2Name], { stdio: 'pipe' });
+    runPm2(['delete', pm2Name]);
 
-    const jlist = spawnSync('npx', ['-y', 'pm2', 'jlist'], { stdio: 'pipe' });
+    const jlist = runPm2(['jlist']);
     let stillRunning = false;
     if (jlist.status === 0) {
         try {
@@ -194,17 +203,14 @@ function stopDaemon(pm2Name, label) {
         p.outro(`${label} daemon stopped.`);
     } else {
         p.outro(
-            `${color.yellow}⚠${color.reset} ${label} daemon is still running - run \`npx pm2 delete ${pm2Name}\` manually and check \`npx pm2 list\`.`,
+            `${color.yellow}⚠${color.reset} ${label} daemon is still running - run \`lgy stop\` manually and check \`lgy status\`.`,
         );
     }
 }
 
 function startOrRestartDaemon(pm2Name, scriptPath, label) {
     console.log(`${color.cyan}▶${color.reset} Restarting ${label} daemon to apply changes...`);
-    const restartResult = spawnSync('npx', ['-y', 'pm2', 'restart', pm2Name, '--update-env'], {
-        stdio: 'pipe',
-        env: { ...process.env, PYTHONUNBUFFERED: '1' },
-    });
+    const restartResult = runPm2(['restart', pm2Name, '--update-env']);
 
     if (restartResult.status === 0) {
         p.outro(`${label} daemon restarted.`);
@@ -214,11 +220,14 @@ function startOrRestartDaemon(pm2Name, scriptPath, label) {
     const stderr = (restartResult.stderr || '').toString();
     if (stderr.includes('not found')) {
         // Nothing to restart yet - start it instead of a false "restarted".
-        const startResult = spawnSync(
-            'npx',
-            ['-y', 'pm2', 'start', scriptPath, '--interpreter', pythonExe, '--name', pm2Name],
-            { stdio: 'pipe', env: { ...process.env, PYTHONUNBUFFERED: '1' } },
-        );
+        const startResult = runPm2([
+            'start',
+            scriptPath,
+            '--interpreter',
+            pythonExe,
+            '--name',
+            pm2Name,
+        ]);
         if (startResult.status === 0) {
             p.outro(`${label} daemon wasn't running yet - started it fresh instead.`);
         } else {

package/hooks/hook.js

@@ -12,7 +12,9 @@ const APPROVE_PORT = 18080;
 const TIMEOUT_MS = 3600 * 1000;
 
 function emit(payload) {
-    process.stdout.write(JSON.stringify(payload));
+    // Exits explicitly: the keep-alive socket and its hour-long timer stay open after the
+    // response arrives, and agy SIGABRTs the process instead of waiting for them to expire.
+    process.stdout.write(JSON.stringify(payload), () => process.exit(0));
 }
 
 function loadApproveToken() {

package/hooks/stop_hook.js

@@ -19,7 +19,7 @@ function log(line) {
 }
 
 function emit(payload) {
-    process.stdout.write(JSON.stringify(payload));
+    process.stdout.write(JSON.stringify(payload), () => process.exit(0));
 }
 
 async function readStdin() {

package/npm-scripts/register-hook.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { repoRoot, workspaceDir } = require('./venv-paths');
+const { repoRoot, workspaceDir, isWin } = require('./venv-paths');
 
 const hooksJsonPath = path.join(os.homedir(), '.gemini', 'config', 'hooks.json');
 
@@ -59,12 +59,13 @@ function loadHooksConfig() {
         return { hooks: {} };
     }
     try {
-        return JSON.parse(fs.readFileSync(hooksJsonPath, 'utf8'));
+        // Windows tools write a BOM, which JSON.parse rejects.
+        return JSON.parse(fs.readFileSync(hooksJsonPath, 'utf8').replace(/^\uFEFF/, ''));
     } catch (err) {
         const backupPath = `${hooksJsonPath}.corrupted-${Date.now()}`;
         fs.copyFileSync(hooksJsonPath, backupPath);
         console.warn(
-            `⚠️  ${hooksJsonPath} was invalid JSON - backed up to ${backupPath} and starting fresh.`,
+            `⚠️  ${hooksJsonPath} was invalid JSON - copied to ${backupPath}. Any hooks it held, including other tools', are about to be replaced.`,
         );
         return { hooks: {} };
     }
@@ -168,7 +169,8 @@ function registerHook({ allowFirstTimeCreate = true, quiet = false } = {}) {
 
     for (const reg of HOOK_REGISTRATIONS) {
         const scriptPath = path.join(installedHooksDir, reg.fileName);
-        const command = `${NODE_CMD} "${scriptPath}"`;
+        // Windows agy takes everything after the first token as one argument; POSIX agy uses a shell.
+        const command = isWin ? `${NODE_CMD} ${scriptPath}` : `${NODE_CMD} "${scriptPath}"`;
         const hookEntry = findHookEntry(config, reg.eventType, reg.name, reg.wrapInMatcher);
         const isNew = !hookEntry.command;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkgravity",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "Discord/Telegram bot bridge for the Antigravity (agy) CLI, with voice interaction support",
   "scripts": {
     "start": "node npm-scripts/run-dev.js",