linkgravity 1.2.0 → 1.2.1

package/bin/cli.js

@@ -14,6 +14,7 @@ const color = {
     green: '\x1b[32m',
     cyan: '\x1b[36m',
     yellow: '\x1b[33m',
+    red: '\x1b[31m',
     dim: '\x1b[2m',
 };
 
@@ -76,31 +77,71 @@ function runPm2(args, silent = true) {
 // Only strips the FIRST bracket group if present, so aiohttp's second
 // "[INFO ]" bracket (not a timestamp) is left alone.
 const TIMESTAMP_PREFIX = /^\[?\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}\]?\s*/;
+// loguru's colorize=True puts an ANSI code before the timestamp digits, breaking the '^' anchor above.
+// eslint-disable-next-line no-control-regex
+const ANSI_ESCAPE = /\x1b\[[0-9;]*m/g;
+
+const LEVEL_COLOR = {
+    DEBUG: color.dim,
+    INFO: color.cyan,
+    WARNING: color.yellow,
+    ERROR: color.red,
+    CRITICAL: color.red,
+};
+
+// Recolors the level word ourselves so Python (loguru) and Node (plain console.log) lines match.
+function colorizeLevel(line) {
+    return line.replace(/\b(DEBUG|INFO|WARNING|ERROR|CRITICAL)\b/, (match) => {
+        const c = LEVEL_COLOR[match];
+        return c ? `${c}${match}${color.reset}` : match;
+    });
+}
 
 function runPm2LogsClean(args, showStamps = false) {
     const cp = spawn('npx', ['-y', 'pm2', ...args], { cwd: path.join(__dirname, '..') });
 
-    const filterAndPrint = (data) => {
-        const lines = data.toString().split('\n');
-        for (const line of lines) {
-            if (line.trim().length === 0) continue;
-            if (
-                line.includes('In-memory PM2') ||
-                line.includes('pm2 update') ||
-                line.includes('[TAILING]') ||
-                line.includes('.pm2/logs/lgy') ||
-                line.includes('In memory PM2 version') ||
-                line.includes('Local PM2 version') ||
-                line.match(/^>+ /)
-            ) {
-                continue;
-            }
-            console.log(showStamps ? line : line.replace(TIMESTAMP_PREFIX, ''));
+    const printLine = (line) => {
+        if (line.trim().length === 0) return;
+        if (
+            line.includes('In-memory PM2') ||
+            line.includes('pm2 update') ||
+            line.includes('[TAILING]') ||
+            line.includes('.pm2/logs/lgy') ||
+            line.includes('In memory PM2 version') ||
+            line.includes('Local PM2 version') ||
+            line.match(/^>+ /)
+        ) {
+            return;
         }
+        const clean = line.replace(ANSI_ESCAPE, '');
+        const displayLine = colorizeLevel(showStamps ? clean : clean.replace(TIMESTAMP_PREFIX, ''));
+        console.log(displayLine);
     };
 
-    cp.stdout.on('data', filterAndPrint);
-    cp.stderr.on('data', filterAndPrint);
+    // A line can arrive split across two 'data' events, so buffer until '\n' is seen.
+    function makeChunkHandler() {
+        let buffer = '';
+        const handler = (data) => {
+            buffer += data.toString();
+            const lines = buffer.split('\n');
+            buffer = lines.pop(); // last element: '' if buffer ended in '\n', else the incomplete tail
+            for (const line of lines) printLine(line);
+        };
+        handler.flush = () => {
+            if (buffer) printLine(buffer);
+            buffer = '';
+        };
+        return handler;
+    }
+
+    const stdoutHandler = makeChunkHandler();
+    const stderrHandler = makeChunkHandler();
+    cp.stdout.on('data', stdoutHandler);
+    cp.stderr.on('data', stderrHandler);
+    cp.on('close', () => {
+        stdoutHandler.flush();
+        stderrHandler.flush();
+    });
 }
 
 function verifyStartup() {
@@ -168,7 +209,14 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     runPm2(['restart', 'lgy', '--update-env']);
     verifyStartup();
 } else if (cmd === 'logs') {
-    let args = process.argv.slice(3);
+    const SHORT_FLAGS = ['-f', '-n', '-t'];
+    let args = process.argv.slice(3).flatMap((arg) => {
+        // Only split bare combined short flags (e.g. "-fn" -> "-f", "-n"), not "--long" flags.
+        if (!/^-[a-z]{2,}$/.test(arg)) return [arg];
+        const chars = arg.slice(1).split('');
+        if (!chars.every((c) => SHORT_FLAGS.includes(`-${c}`))) return [arg];
+        return chars.map((c) => `-${c}`);
+    });
     let pm2Args = ['logs', 'lgy'];
     let isFollow = false;
     let showStamps = false;
@@ -265,8 +313,7 @@ if (cmd === 'version' || cmd === '-v' || cmd === '--version') {
     if (restartResult.status === 0) {
         verifyStartup();
     } else if ((restartResult.stderr || '').toString().includes('not found')) {
-        // Daemon wasn't running before the update - start it fresh instead
-        // of reporting a restart that never had anything to restart.
+        // Wasn't running before the update - start fresh instead of a false "restarted".
         info("Daemon wasn't running - starting it fresh...");
         runPm2(['start', botPath, '--interpreter', pythonExe, '--name', 'lgy']);
         verifyStartup();

package/bin/setup.js

@@ -278,9 +278,7 @@ async function runSetup() {
     } else {
         const stderr = (restartResult.stderr || '').toString();
         if (stderr.includes('not found')) {
-            // Nothing to restart yet (first-ever setup, or pm2's process list was
-            // reset e.g. after a reboot without `pm2 save`) - start it instead of
-            // reporting a false "restarted" success.
+            // Nothing to restart yet - start it instead of a false "restarted".
             const botPath = path.join(__dirname, '..', 'src', 'main.py');
             const startResult = spawnSync(
                 'npx',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkgravity",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Discord bot bridge for the Antigravity (agy) CLI, with voice interaction support",
   "scripts": {
     "postinstall": "node npm-scripts/postinstall.js",

package/src/cogs/general_cog.py

@@ -273,10 +273,7 @@ class GeneralCog(commands.Cog):
                 prev_tts.cancel()
                 session_manager.remove_tts_task(thread_id)
 
-            # A killed turn leaves the conversation in an unknown state -
-            # reusing conv_id risks silently hanging on the next message.
-            # conversation_id must be cleared too, not just status: the
-            # text path only treats a session as pending when both are unset.
+            # Must clear conversation_id too, not just status - pending requires both unset.
             session_manager.set_session(thread_id, {**session, "status": "pending", "conversation_id": None})
 
         from core.agy_runner import stop_active_process

package/src/cogs/voice_cog.py

@@ -44,8 +44,7 @@ class VoiceCog(commands.Cog):
         self.save_bot_settings = save_bot_settings
         self.logger = logger
         self._voice_state = {}
-        # guild_id -> in-flight handle_stt_input task, if any. A new
-        # utterance cancels the previous one so replies can't race out of order.
+        # guild_id -> in-flight handle_stt_input task; a new utterance cancels the previous one.
         self._active_turns = {}
         self.enrollment = EnrollmentManager(
             bot, self._voice_state, self._play_audio, self.bot_settings, self.save_bot_settings, self.logger
@@ -292,8 +291,7 @@ class VoiceCog(commands.Cog):
         updated = []
         wake_word_pending = False
         if wake_word is not None:
-            # Deferred: wake_words only gets set once 5 samples are
-            # recorded and confirmed (see EnrollmentManager), not here.
+            # Deferred - wake_words is set later once 5 samples are recorded (see EnrollmentManager).
             wake_word_pending = True
         if active_times is not None:
             self.bot_settings["active_timer"] = active_times
@@ -383,8 +381,7 @@ class VoiceCog(commands.Cog):
                 await self.stt_session.clear_partial_msg(str(guild_id))
                 return
 
-            # Node runs STT itself before calling this endpoint, so this is
-            # already-recognized text, not raw audio - keeps STT off every VAD hit.
+            # Node runs STT itself before this call, so 'text' is already-recognized, not raw audio.
             text = data.get("text")
 
             thread_id = self._voice_state.get(str(guild_id))
@@ -407,10 +404,7 @@ class VoiceCog(commands.Cog):
             import difflib
             import re
 
-            # Wake detection is Node's audio-based Rustpotter detector's job.
-            # No text-similarity fallback: an unenrolled user (or a failed
-            # .rpw build - see EnrollmentManager._build_rustpotter_reference)
-            # just can't wake the bot until that's fixed.
+            # Wake detection is Node's Rustpotter detector's job - no text-similarity fallback.
             is_waking_up = bool(data.get("wake_confirmed"))
             matched_wake_word = data.get("matched_wake_word")
             is_active = self.stt_session.is_active(str(guild_id))
@@ -444,8 +438,7 @@ class VoiceCog(commands.Cog):
                         if prefix_similarity >= 0.6:
                             text_to_ai = " ".join(words[wake_word_count:]).strip()
 
-            # No text resemblance at all + short wake word (less acoustic
-            # signal, more false-wakes) -> require a closer match to trust it.
+            # Short wake words have less acoustic signal (more false-wakes) -> need a closer match.
             wake_syllables = len(re.sub(r"[^\w가-힣]", "", matched_wake_word or ""))
             min_prefix_similarity = 0.55 if wake_syllables <= 2 else 0.35
             if is_waking_up and prefix_similarity is not None and prefix_similarity < min_prefix_similarity:
@@ -458,9 +451,7 @@ class VoiceCog(commands.Cog):
 
             self.logger.debug(f"STT recognized: {text} -> AI: {text_to_ai}")
 
-            # A previous in-flight turn for this guild is now stale - cancel
-            # it, kill its agy process (like /stop), and stop its playback,
-            # rather than letting two turns race to completion.
+            # A stale in-flight turn for this guild - cancel it, kill its agy process, stop playback.
             prev_task = self._active_turns.get(str(guild_id))
             if prev_task and not prev_task.done():
                 prev_task.cancel()

package/src/config.py

@@ -19,8 +19,7 @@ DEFAULT_LGY_CONFIG = {
     "voice_threshold": 3000,
     "tts_voice": "ko-KR-SunHiNeural",
     "tts_enabled": True,
-    # Sticky default for new /new sessions - set whenever /model succeeds,
-    # so a new thread doesn't fall back to agy's own settings.json model.
+    # Sticky default for /new sessions, set whenever /model succeeds.
     "default_model": "",
 }
 
@@ -94,10 +93,7 @@ def is_allowed_session_channel(channel) -> bool:
 
 TMP_FILE_DIR = WORKSPACE_DIR / "tmp-files"
 TMP_VOICE_DIR = WORKSPACE_DIR / "tmp-voice"
-# Per-user wake-word recordings + built .rpw reference (see
-# EnrollmentManager in cogs/voice/enrollment.py). No folder/.rpw yet means
-# "not enrolled" - falls back to transcribing everything and matching
-# bot_settings["wake_words"] as text.
+# Per-user wake-word recordings + built .rpw reference (see EnrollmentManager).
 WAKE_REF_DIR = WORKSPACE_DIR / "wake_refs"
 
 TMP_FILE_DIR.mkdir(parents=True, exist_ok=True)