linkgravity 1.5.9 → 1.5.11

package/bin/cli.js

@@ -32,13 +32,17 @@ 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');
+
 function info(msg) {
     console.log(`\n${color.cyan}▶${color.reset} ${msg}`);
 }
 
 function runPm2(args, silent = true) {
     const stdioOpt = silent ? 'pipe' : 'inherit';
-    const result = spawnSync('npx', ['-y', 'pm2', ...args], {
+    const result = spawnSync(process.execPath, [PM2_BIN, ...args], {
         stdio: stdioOpt,
         cwd: path.join(__dirname, '..'),
         // pm2 gives Python a pipe not a TTY, so it block-buffers stdout and can sit on log lines indefinitely - force line buffering.
@@ -119,7 +123,7 @@ function colorizeLevel(line) {
 }
 
 function runPm2LogsStream(args, printLine) {
-    const cp = spawn('npx', ['-y', 'pm2', ...args], { cwd: path.join(__dirname, '..') });
+    const cp = spawn(process.execPath, [PM2_BIN, ...args], { cwd: path.join(__dirname, '..') });
 
     const isNoise = (line) =>
         line.trim().length === 0 ||
@@ -160,6 +164,8 @@ function runPm2LogsStream(args, printLine) {
         stdoutHandler.flush();
         stderrHandler.flush();
     });
+    // Ctrl-C reaches pm2 too (same process group), but an unhandled parent exit would leave it tailing.
+    process.on('exit', () => cp.kill());
 }
 
 function runPm2LogsClean(args, showStamps = false) {
@@ -175,10 +181,7 @@ function verifyStartup() {
             `${color.cyan}▶${color.reset} Verifying startup status (waiting for bot to come online)...`,
         );
 
-        // Spawned directly instead of through npx: npx wraps pm2 in "npm exec" + "sh -c", so cp.kill()
-        // reaps only the wrapper and leaves the real pm2 logs process orphaned onto init.
-        const pm2Bin = require.resolve('pm2/bin/pm2');
-        let cp = spawn(process.execPath, [pm2Bin, 'logs', LGY_PM2_NAME, '--raw', '--lines', '0'], {
+        let cp = spawn(process.execPath, [PM2_BIN, 'logs', LGY_PM2_NAME, '--raw', '--lines', '0'], {
             cwd: path.join(__dirname, '..'),
         });
 
@@ -282,7 +285,7 @@ function findAgyBin() {
 }
 
 function getPm2Proc() {
-    const jlist = spawnSync('npx', ['-y', 'pm2', 'jlist'], { stdio: 'pipe' });
+    const jlist = spawnSync(process.execPath, [PM2_BIN, 'jlist'], { stdio: 'pipe' });
     if (jlist.status !== 0) return null;
 
     // pm2 can print noise before the real JSON (version banners, ANSI escapes, daemon-spawn logs) that
@@ -376,11 +379,8 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     }
 
     if (!isEnvironmentReady()) {
-        console.log(
-            `\n${color.yellow}⚠${color.reset} Python environment isn't set up yet - ` +
-                `run ${color.cyan}lgy setup${color.reset} first (it installs everything on its first run).\n`,
-        );
-        process.exit(1);
+        info('Some dependencies are missing - installing them first...');
+        require('../npm-scripts/ensure-env').ensureEnvironment();
     }
 
     info('Starting LinkGravity daemon...');
@@ -602,6 +602,12 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     }
     success(`Installed v${latestVersion}.`);
 
+    // The new install ships without voice-service/node_modules, so restore anything the
+    // directory swap dropped. Loaded here rather than at the top of the file: by now npm has
+    // replaced this package on disk, and the copy required at startup is the pre-update one.
+    delete require.cache[require.resolve('../npm-scripts/ensure-env')];
+    require('../npm-scripts/ensure-env').ensureEnvironment();
+
     if (!procBeforeUpdate) {
         info("Daemon wasn't running - starting it fresh...");
         runPm2(['start', LGY_SCRIPT_PATH, '--interpreter', pythonExe, '--name', LGY_PM2_NAME]);

package/npm-scripts/ensure-env.js

@@ -8,31 +8,40 @@ const { pip: venvPip, python: venvPython, workspaceDir, repoRoot } = require('./
 const isWin = os.platform() === 'win32';
 const pyCmd = isWin ? 'python' : 'python3';
 
-function isEnvironmentReady() {
+const voiceServiceDir = path.join(repoRoot, 'voice-service');
+
+function isVenvReady() {
     return fs.existsSync(venvPython);
 }
 
+function isVoiceServiceReady() {
+    return fs.existsSync(path.join(voiceServiceDir, 'node_modules'));
+}
+
+function isEnvironmentReady() {
+    return isVenvReady() && isVoiceServiceReady();
+}
+
 function ensureEnvironment() {
-    if (isEnvironmentReady()) return;
-
-    console.log('⚙️  Setting up Python Virtual Environment...');
-    console.log(
-        `   (in ${path.join(workspaceDir, 'venv')} - not inside this install, so it survives`,
-    );
-    console.log('    package updates/reinstalls and works the same whether this is a global');
-    console.log('    `npm install -g linkgravity` or a local dev clone.)');
-
-    fs.mkdirSync(workspaceDir, { recursive: true });
-    execSync(`${pyCmd} -m venv "${path.join(workspaceDir, 'venv')}"`, { stdio: 'inherit' });
-
-    console.log('📦 Installing Python dependencies...');
-    execSync(`"${venvPip}" install -r requirements.txt`, { stdio: 'inherit', cwd: repoRoot });
-
-    console.log('🎙️  Installing Voice Service dependencies...');
-    execSync('npm install', {
-        stdio: 'inherit',
-        cwd: path.join(repoRoot, 'voice-service'),
-    });
+    if (!isVenvReady()) {
+        console.log('⚙️  Setting up Python Virtual Environment...');
+        console.log(
+            `   (in ${path.join(workspaceDir, 'venv')} - not inside this install, so it survives`,
+        );
+        console.log('    package updates/reinstalls and works the same whether this is a global');
+        console.log('    `npm install -g linkgravity` or a local dev clone.)');
+
+        fs.mkdirSync(workspaceDir, { recursive: true });
+        execSync(`${pyCmd} -m venv "${path.join(workspaceDir, 'venv')}"`, { stdio: 'inherit' });
+
+        console.log('📦 Installing Python dependencies...');
+        execSync(`"${venvPip}" install -r requirements.txt`, { stdio: 'inherit', cwd: repoRoot });
+    }
+
+    if (!isVoiceServiceReady()) {
+        console.log('🎙️  Installing Voice Service dependencies...');
+        execSync('npm install', { stdio: 'inherit', cwd: voiceServiceDir });
+    }
 
     console.log('✅ Environment ready.');
 }

package/package.json

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

package/src/core/agy_runner.py

@@ -13,6 +13,10 @@ _intentionally_stopped = set()
 
 _STDOUT_BUFFER_SIZE = 65536
 
+# Returned as ordinary output, not raised - callers that need to distinguish failure from a
+# real answer have to compare against this.
+TIMEOUT_MESSAGE = "🛑 AI Task timed out."
+
 
 @functools.lru_cache(maxsize=1)
 def _find_preload_lib() -> tuple[str, str] | None:
@@ -315,7 +319,7 @@ async def run_agy(
                     logger.warning("[AGY RETRY] Global timeout. Retrying...")
                     await asyncio.sleep(2.0)
                     continue
-                msg = "🛑 AI Task timed out."
+                msg = TIMEOUT_MESSAGE
                 if stream_queue is not None:
                     await stream_queue.put(("\n\n" + msg, True))
                 return msg
@@ -388,7 +392,7 @@ async def generate_thread_title(user_input: str, response: str) -> str:
         )
         title = await run_agy("--print", prompt, timeout=30)
         title = title.strip().strip('"').strip("'")
-        if not title or len(title) > 80:
+        if not title or len(title) > 80 or title == TIMEOUT_MESSAGE:
             return fallback
         return title
     except Exception as e:

package/src/handlers/thread_reply.py

@@ -73,13 +73,9 @@ async def handle_pending_session(
             await queue.put(("__END__", True))
             await stream_task
 
-            response_text = result_text
-            if adapter.should_auto_title(thread):
-                new_title = await generate_thread_title(content, response_text)
-                await adapter.rename_conversation(thread, new_title)
-                await update_agy_conversation_title(new_conv_id, new_title)
+            needs_title = adapter.should_auto_title(thread)
 
-            response_text = await render_thought_process(new_conv_id, ctx, response_text, thread)
+            response_text = await render_thought_process(new_conv_id, ctx, result_text, thread)
 
             session["conversation_id"] = new_conv_id
             session["created_at"] = datetime.now().isoformat()
@@ -87,6 +83,13 @@ async def handle_pending_session(
             session_manager.save_sessions()
 
             await send_agy_response(thread, response_text, session, ctx, start_time, new_conv_id)
+
+        # Outside the typing indicator: the answer is already on screen, and leaving "typing"
+        # up during the extra title call reads as if more output is still coming.
+        if needs_title:
+            new_title = await generate_thread_title(content, result_text)
+            await adapter.rename_conversation(thread, new_title)
+            await update_agy_conversation_title(new_conv_id, new_title)
     finally:
         cleanup_images(image_paths)