whale-code 6.4.0 → 6.5.0

package/dist/cli/shared/theme-manager.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Theme Manager — shiki syntax highlighting + theme switching
+ *
+ * Synchronous shiki highlighter using the JavaScript regex engine.
+ * Manages active theme state and persists preference to config store.
+ */
+import { type ThemePreset } from "./theme-presets.js";
+export type { ThemePreset } from "./theme-presets.js";
+/**
+ * Highlight code synchronously using shiki.
+ * Returns ANSI-colored string. Falls back to plain text for unknown languages.
+ */
+export declare function highlightCode(code: string, lang: string): string;
+export declare function setRebuildCallback(cb: () => void): void;
+/**
+ * Switch the active theme. Mutates `colors` in place so all importers see the change.
+ * Returns true if theme was found and applied.
+ */
+export declare function switchTheme(presetId: string): boolean;
+/** Get the current theme ID */
+export declare function getCurrentThemeId(): string;
+/** Get all available theme presets */
+export declare function getThemePresets(): ThemePreset[];
+/**
+ * Initialize theme from saved preference. Call once at startup.
+ */
+export declare function initTheme(): void;

package/dist/cli/shared/theme-manager.js

@@ -0,0 +1,178 @@
+/**
+ * Theme Manager — shiki syntax highlighting + theme switching
+ *
+ * Synchronous shiki highlighter using the JavaScript regex engine.
+ * Manages active theme state and persists preference to config store.
+ */
+import chalk from "chalk";
+import { createHighlighterCoreSync } from "shiki/core";
+import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
+// Bundled themes (tree-shaken imports)
+import catppuccinMocha from "shiki/themes/catppuccin-mocha.mjs";
+import tokyoNight from "shiki/themes/tokyo-night.mjs";
+import dracula from "shiki/themes/dracula.mjs";
+import nord from "shiki/themes/nord.mjs";
+import oneDarkPro from "shiki/themes/one-dark-pro.mjs";
+// Bundled languages (tree-shaken imports)
+import langTypescript from "shiki/langs/typescript.mjs";
+import langJavascript from "shiki/langs/javascript.mjs";
+import langTsx from "shiki/langs/tsx.mjs";
+import langJsx from "shiki/langs/jsx.mjs";
+import langPython from "shiki/langs/python.mjs";
+import langJson from "shiki/langs/json.mjs";
+import langBash from "shiki/langs/bash.mjs";
+import langCss from "shiki/langs/css.mjs";
+import langHtml from "shiki/langs/html.mjs";
+import langXml from "shiki/langs/xml.mjs";
+import langRust from "shiki/langs/rust.mjs";
+import langGo from "shiki/langs/go.mjs";
+import langSql from "shiki/langs/sql.mjs";
+import langYaml from "shiki/langs/yaml.mjs";
+import langToml from "shiki/langs/toml.mjs";
+import langMarkdown from "shiki/langs/markdown.mjs";
+import langSwift from "shiki/langs/swift.mjs";
+import langDiff from "shiki/langs/diff.mjs";
+import { colors } from "./Theme.js";
+import { THEME_PRESETS, DEFAULT_THEME_ID, getPresetById } from "./theme-presets.js";
+import { loadPreferences, savePreferences } from "../services/config-store.js";
+// ============================================================================
+// Shiki highlighter — created synchronously at module load
+// ============================================================================
+const allThemes = [catppuccinMocha, tokyoNight, dracula, nord, oneDarkPro];
+const allLangs = [
+    langTypescript, langJavascript, langTsx, langJsx,
+    langPython, langJson, langBash, langCss, langHtml, langXml,
+    langRust, langGo, langSql, langYaml, langToml,
+    langMarkdown, langSwift, langDiff,
+];
+const highlighter = createHighlighterCoreSync({
+    themes: [...allThemes],
+    langs: [...allLangs],
+    engine: createJavaScriptRegexEngine(),
+});
+// Set of known language IDs for fast lookup
+const KNOWN_LANGS = new Set(highlighter.getLoadedLanguages());
+// Map common aliases to shiki language IDs
+const LANG_ALIASES = {
+    ts: "typescript",
+    js: "javascript",
+    py: "python",
+    rb: "ruby",
+    sh: "bash",
+    shell: "bash",
+    zsh: "bash",
+    yml: "yaml",
+    md: "markdown",
+    rs: "rust",
+    htm: "html",
+    jsonc: "json",
+    terminal: "bash",
+};
+// ============================================================================
+// State
+// ============================================================================
+let currentThemeId = DEFAULT_THEME_ID;
+// ============================================================================
+// Syntax highlighting
+// ============================================================================
+/**
+ * Highlight code synchronously using shiki.
+ * Returns ANSI-colored string. Falls back to plain text for unknown languages.
+ */
+export function highlightCode(code, lang) {
+    // Resolve language alias
+    const resolvedLang = LANG_ALIASES[lang] || lang;
+    if (!resolvedLang || !KNOWN_LANGS.has(resolvedLang)) {
+        return code; // plain text fallback
+    }
+    const preset = getPresetById(currentThemeId);
+    const shikiTheme = preset?.shikiTheme || "catppuccin-mocha";
+    try {
+        const result = highlighter.codeToTokens(code, {
+            lang: resolvedLang,
+            theme: shikiTheme,
+        });
+        // Convert tokens to chalk ANSI
+        const lines = [];
+        for (const tokenLine of result.tokens) {
+            const parts = [];
+            for (const token of tokenLine) {
+                if (token.color) {
+                    let styled = chalk.hex(token.color)(token.content);
+                    // Apply font styles
+                    if (token.fontStyle) {
+                        if (token.fontStyle & 1)
+                            styled = chalk.italic(chalk.hex(token.color)(token.content));
+                        if (token.fontStyle & 2)
+                            styled = chalk.bold(chalk.hex(token.color)(token.content));
+                    }
+                    parts.push(styled);
+                }
+                else {
+                    parts.push(token.content);
+                }
+            }
+            lines.push(parts.join(""));
+        }
+        return lines.join("\n");
+    }
+    catch {
+        return code; // fallback on any error
+    }
+}
+// ============================================================================
+// Theme switching
+// ============================================================================
+/** Rebuild callback — set by markdown.ts to rebuild chalk instances */
+let rebuildCallback = null;
+export function setRebuildCallback(cb) {
+    rebuildCallback = cb;
+}
+/**
+ * Switch the active theme. Mutates `colors` in place so all importers see the change.
+ * Returns true if theme was found and applied.
+ */
+export function switchTheme(presetId) {
+    const preset = getPresetById(presetId);
+    if (!preset)
+        return false;
+    currentThemeId = preset.id;
+    // Mutate colors in place — all modules import the same object
+    Object.assign(colors, preset.chrome);
+    // Persist preference
+    try {
+        const prefs = loadPreferences();
+        prefs.theme = preset.id;
+        savePreferences(prefs);
+    }
+    catch { /* best effort */ }
+    // Rebuild markdown renderer chalk instances
+    if (rebuildCallback)
+        rebuildCallback();
+    return true;
+}
+/** Get the current theme ID */
+export function getCurrentThemeId() {
+    return currentThemeId;
+}
+/** Get all available theme presets */
+export function getThemePresets() {
+    return THEME_PRESETS;
+}
+/**
+ * Initialize theme from saved preference. Call once at startup.
+ */
+export function initTheme() {
+    try {
+        const prefs = loadPreferences();
+        if (prefs.theme) {
+            const preset = getPresetById(prefs.theme);
+            if (preset) {
+                currentThemeId = preset.id;
+                Object.assign(colors, preset.chrome);
+                // Rebuild will be called after markdown module loads
+            }
+        }
+    }
+    catch { /* use default */ }
+}

package/dist/cli/shared/theme-presets.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Theme Presets — bundled color themes for whale CLI
+ *
+ * Each preset defines:
+ *   - shikiTheme: the shiki theme ID for syntax highlighting
+ *   - chrome: full UI color overrides (all keys from DEFAULT_COLORS)
+ */
+export interface ThemePreset {
+    id: string;
+    label: string;
+    shikiTheme: string;
+    chrome: Record<string, string>;
+}
+export declare const DEFAULT_THEME_ID = "catppuccin-mocha";
+export declare const THEME_PRESETS: ThemePreset[];
+export declare function getPresetById(id: string): ThemePreset | undefined;

package/dist/cli/shared/theme-presets.js

@@ -0,0 +1,265 @@
+/**
+ * Theme Presets — bundled color themes for whale CLI
+ *
+ * Each preset defines:
+ *   - shikiTheme: the shiki theme ID for syntax highlighting
+ *   - chrome: full UI color overrides (all keys from DEFAULT_COLORS)
+ */
+export const DEFAULT_THEME_ID = "catppuccin-mocha";
+export const THEME_PRESETS = [
+    // ── Catppuccin Mocha — warm modern dark ──
+    {
+        id: "catppuccin-mocha",
+        label: "Catppuccin Mocha",
+        shikiTheme: "catppuccin-mocha",
+        chrome: {
+            brand: "#89B4FA",
+            brandDim: "#74C7EC",
+            success: "#A6E3A1",
+            error: "#F38BA8",
+            warning: "#FAB387",
+            info: "#94E2D5",
+            pink: "#F5C2E7",
+            purple: "#CBA6F7",
+            indigo: "#B4BEFE",
+            mint: "#94E2D5",
+            teal: "#89DCEB",
+            lavender: "#B4BEFE",
+            roseGold: "#F5C2E7",
+            text: "#CDD6F4",
+            secondary: "#A6ADC8",
+            tertiary: "#6C7086",
+            quaternary: "#45475A",
+            muted: "#A6ADC8",
+            dim: "#9399B2",
+            subtle: "#6C7086",
+            border: "#45475A",
+            user: "#CDD6F4",
+            assistant: "#CBA6F7",
+            tool: "#89B4FA",
+            localTool: "#CBA6F7",
+            serverTool: "#F5C2E7",
+            gain: "#A6E3A1",
+            loss: "#F38BA8",
+            panel: "#1E1E2E",
+            separator: "#45475A",
+            diffAddedBg: "#1E3A2F",
+            diffRemovedBg: "#3A1E2A",
+            diffWordAdded: "#2E5A45",
+            diffWordRemoved: "#5A2E3A",
+        },
+    },
+    // ── Tokyo Night — cool blue-toned ──
+    {
+        id: "tokyo-night",
+        label: "Tokyo Night",
+        shikiTheme: "tokyo-night",
+        chrome: {
+            brand: "#7AA2F7",
+            brandDim: "#3D59A1",
+            success: "#9ECE6A",
+            error: "#F7768E",
+            warning: "#E0AF68",
+            info: "#7DCFFF",
+            pink: "#F7768E",
+            purple: "#BB9AF7",
+            indigo: "#7AA2F7",
+            mint: "#73DACA",
+            teal: "#2AC3DE",
+            lavender: "#C0CAF5",
+            roseGold: "#FF9E64",
+            text: "#C0CAF5",
+            secondary: "#9AA5CE",
+            tertiary: "#565F89",
+            quaternary: "#3B4261",
+            muted: "#9AA5CE",
+            dim: "#787C99",
+            subtle: "#565F89",
+            border: "#3B4261",
+            user: "#C0CAF5",
+            assistant: "#BB9AF7",
+            tool: "#7AA2F7",
+            localTool: "#BB9AF7",
+            serverTool: "#F7768E",
+            gain: "#9ECE6A",
+            loss: "#F7768E",
+            panel: "#1A1B26",
+            separator: "#3B4261",
+            diffAddedBg: "#1A2E1F",
+            diffRemovedBg: "#2E1A22",
+            diffWordAdded: "#2A4A32",
+            diffWordRemoved: "#4A2A35",
+        },
+    },
+    // ── Dracula — bold purple-heavy ──
+    {
+        id: "dracula",
+        label: "Dracula",
+        shikiTheme: "dracula",
+        chrome: {
+            brand: "#BD93F9",
+            brandDim: "#6272A4",
+            success: "#50FA7B",
+            error: "#FF5555",
+            warning: "#FFB86C",
+            info: "#8BE9FD",
+            pink: "#FF79C6",
+            purple: "#BD93F9",
+            indigo: "#6272A4",
+            mint: "#8BE9FD",
+            teal: "#8BE9FD",
+            lavender: "#BD93F9",
+            roseGold: "#FF79C6",
+            text: "#F8F8F2",
+            secondary: "#BFBFBF",
+            tertiary: "#6272A4",
+            quaternary: "#44475A",
+            muted: "#BFBFBF",
+            dim: "#6272A4",
+            subtle: "#6272A4",
+            border: "#44475A",
+            user: "#F8F8F2",
+            assistant: "#BD93F9",
+            tool: "#8BE9FD",
+            localTool: "#BD93F9",
+            serverTool: "#FF79C6",
+            gain: "#50FA7B",
+            loss: "#FF5555",
+            panel: "#282A36",
+            separator: "#44475A",
+            diffAddedBg: "#1A3A1A",
+            diffRemovedBg: "#3A1A1A",
+            diffWordAdded: "#2E5A2E",
+            diffWordRemoved: "#5A2E2E",
+        },
+    },
+    // ── Nord — muted Scandinavian ──
+    {
+        id: "nord",
+        label: "Nord",
+        shikiTheme: "nord",
+        chrome: {
+            brand: "#81A1C1",
+            brandDim: "#5E81AC",
+            success: "#A3BE8C",
+            error: "#BF616A",
+            warning: "#EBCB8B",
+            info: "#88C0D0",
+            pink: "#B48EAD",
+            purple: "#B48EAD",
+            indigo: "#81A1C1",
+            mint: "#8FBCBB",
+            teal: "#88C0D0",
+            lavender: "#B48EAD",
+            roseGold: "#D08770",
+            text: "#ECEFF4",
+            secondary: "#D8DEE9",
+            tertiary: "#4C566A",
+            quaternary: "#3B4252",
+            muted: "#D8DEE9",
+            dim: "#616E88",
+            subtle: "#4C566A",
+            border: "#3B4252",
+            user: "#ECEFF4",
+            assistant: "#B48EAD",
+            tool: "#81A1C1",
+            localTool: "#B48EAD",
+            serverTool: "#D08770",
+            gain: "#A3BE8C",
+            loss: "#BF616A",
+            panel: "#2E3440",
+            separator: "#3B4252",
+            diffAddedBg: "#2A3A2A",
+            diffRemovedBg: "#3A2A2A",
+            diffWordAdded: "#3A4A3A",
+            diffWordRemoved: "#4A3A3A",
+        },
+    },
+    // ── One Dark Pro — VS Code classic ──
+    {
+        id: "one-dark-pro",
+        label: "One Dark Pro",
+        shikiTheme: "one-dark-pro",
+        chrome: {
+            brand: "#61AFEF",
+            brandDim: "#528BFF",
+            success: "#98C379",
+            error: "#E06C75",
+            warning: "#D19A66",
+            info: "#56B6C2",
+            pink: "#E06C75",
+            purple: "#C678DD",
+            indigo: "#61AFEF",
+            mint: "#56B6C2",
+            teal: "#56B6C2",
+            lavender: "#C678DD",
+            roseGold: "#E5C07B",
+            text: "#ABB2BF",
+            secondary: "#828997",
+            tertiary: "#5C6370",
+            quaternary: "#3E4452",
+            muted: "#828997",
+            dim: "#636D83",
+            subtle: "#5C6370",
+            border: "#3E4452",
+            user: "#ABB2BF",
+            assistant: "#C678DD",
+            tool: "#61AFEF",
+            localTool: "#C678DD",
+            serverTool: "#E06C75",
+            gain: "#98C379",
+            loss: "#E06C75",
+            panel: "#282C34",
+            separator: "#3E4452",
+            diffAddedBg: "#1E3A1E",
+            diffRemovedBg: "#3A1E1E",
+            diffWordAdded: "#2E5A2E",
+            diffWordRemoved: "#5A2E2E",
+        },
+    },
+    // ── Apple Dark — original whale CLI colors (preserved as-is) ──
+    {
+        id: "apple-dark",
+        label: "Apple Dark",
+        shikiTheme: "one-dark-pro", // closest VS Code match for syntax
+        chrome: {
+            brand: "#0A84FF",
+            brandDim: "#0071E3",
+            success: "#30D158",
+            error: "#FF453A",
+            warning: "#FF9F0A",
+            info: "#64D2FF",
+            pink: "#FF375F",
+            purple: "#BF5AF2",
+            indigo: "#5E5CE6",
+            mint: "#66D4CF",
+            teal: "#6AC4DC",
+            lavender: "#D4BBFF",
+            roseGold: "#FFB5C2",
+            text: "#F5F5F7",
+            secondary: "#A1A1A6",
+            tertiary: "#6E6E73",
+            quaternary: "#48484A",
+            muted: "#A1A1A6",
+            dim: "#86868B",
+            subtle: "#6E6E73",
+            border: "#38383A",
+            user: "#F5F5F7",
+            assistant: "#BF5AF2",
+            tool: "#0A84FF",
+            localTool: "#BF5AF2",
+            serverTool: "#FF375F",
+            gain: "#30D158",
+            loss: "#FF453A",
+            panel: "#1C1C1E",
+            separator: "#38383A",
+            diffAddedBg: "#005f00",
+            diffRemovedBg: "#5f0000",
+            diffWordAdded: "#008700",
+            diffWordRemoved: "#870000",
+        },
+    },
+];
+export function getPresetById(id) {
+    return THEME_PRESETS.find((p) => p.id === id);
+}

package/dist/index.js

@@ -334,7 +334,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         };
     }
     // ── Remote tool execution ──
-    const startTime = Date.now();
     const traceId = crypto.randomUUID();
     // Allow tool-level store_id override (e.g. multi-store users switching context)
     const effectiveStoreId = toolArgs.store_id || STORE_ID || undefined;
@@ -343,9 +342,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     }
     console.error(`[MCP] Executing: ${toolName} → Fly.io [${traceId.slice(0, 8)}] store=${effectiveStoreId?.slice(0, 8) || "none"}`);
     const result = await executeToolRemote(toolName, toolArgs, effectiveStoreId, traceId);
-    const durationMs = Date.now() - startTime;
-    // Fire-and-forget telemetry
-    logMcpToolCall(toolName, toolArgs.action, result.success, durationMs, traceId, result.error).catch(() => { });
     if (result.success) {
         return {
             content: [{
@@ -366,53 +362,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         };
     }
 });
-/**
- * Fire-and-forget MCP proxy telemetry — logs to audit_logs as a third service
- * ("mcp-proxy") alongside "whale-cli" and "agent-server", capturing the full
- * network round-trip latency from MCP client → Fly.io server → response.
- */
-async function logMcpToolCall(toolName, action, success, durationMs, traceId, error) {
-    if (!supabase)
-        return;
-    try {
-        const now = new Date();
-        const startTime = new Date(now.getTime() - durationMs);
-        const bytes = new Uint8Array(8);
-        crypto.getRandomValues(bytes);
-        const spanId = Array.from(bytes).map(b => b.toString(16).padStart(2, "0")).join("");
-        await supabase.from("audit_logs").insert({
-            action: `mcp.tool.${toolName}${action ? `.${action}` : ""}`,
-            severity: success ? "info" : "error",
-            store_id: STORE_ID || null,
-            user_id: USER_ID,
-            user_email: USER_EMAIL,
-            resource_type: "whale_code_mcp",
-            resource_id: toolName,
-            request_id: traceId,
-            conversation_id: SESSION_ID,
-            source: "whale_code_mcp",
-            details: {
-                session_id: SESSION_ID,
-                source: "whale_code_mcp",
-                tool_name: toolName,
-                action: action || null,
-            },
-            error_message: error || null,
-            duration_ms: durationMs,
-            trace_id: traceId,
-            span_id: spanId,
-            span_kind: "CLIENT",
-            service_name: "whale-code-mcp",
-            service_version: PKG_VERSION,
-            status_code: success ? "OK" : "ERROR",
-            start_time: startTime.toISOString(),
-            end_time: now.toISOString(),
-        });
-    }
-    catch {
-        // Telemetry must never break tool execution
-    }
-}
 // ============================================================================
 // LOCAL AGENT (auto-spawned — shares this process with MCP server)
 // ============================================================================

package/dist/node/adapters/imessage.d.ts

@@ -9,9 +9,19 @@ export declare class IMessageAdapter extends BaseAdapter {
     readonly name: string;
     private process;
     private config;
+    private restartAttempts;
+    private maxRestartAttempts;
+    private lastError;
+    private restartTimer;
     constructor(name: string, config?: IMessageConfig);
     start(): Promise<void>;
     stop(): Promise<void>;
+    /** Manual restart — resets attempt counter and restarts */
+    restart(): void;
+    /** Get the last stderr error message */
+    getLastError(): string | null;
+    /** Get current restart attempt count */
+    getRestartAttempts(): number;
     sendMessage(msg: OutboundMessage): Promise<boolean>;
     private handleLine;
 }

package/dist/node/adapters/imessage.js

@@ -1,10 +1,18 @@
 import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
 import { BaseAdapter } from "./base.js";
+// Resolve imsg binary — prefer /opt/homebrew/bin (macOS ARM) then fall back to PATH
+const IMSG_BIN = existsSync("/opt/homebrew/bin/imsg") ? "/opt/homebrew/bin/imsg" : "imsg";
 export class IMessageAdapter extends BaseAdapter {
     type = "imessage";
     name;
     process = null;
     config;
+    // Restart resilience
+    restartAttempts = 0;
+    maxRestartAttempts = 5;
+    lastError = null;
+    restartTimer = null;
     constructor(name, config = {}) {
         super();
         this.name = name;
@@ -16,7 +24,7 @@ export class IMessageAdapter extends BaseAdapter {
         this.running = true;
         // Spawn imsg watch as a child process
         const args = ["watch", "--json"];
-        this.process = spawn("imsg", args, { stdio: ["ignore", "pipe", "pipe"] });
+        this.process = spawn(IMSG_BIN, args, { stdio: ["ignore", "pipe", "pipe"] });
         let buffer = "";
         this.process.stdout?.on("data", (chunk) => {
             buffer += chunk.toString();
@@ -32,27 +40,56 @@ export class IMessageAdapter extends BaseAdapter {
             }
         });
         this.process.stderr?.on("data", (chunk) => {
-            console.error(`[imessage] stderr:`, chunk.toString().trim());
+            const msg = chunk.toString().trim();
+            this.lastError = msg;
+            console.error(`[imessage] stderr:`, msg);
         });
         this.process.on("exit", (code) => {
             console.log(`[imessage] Process exited with code ${code}`);
             const wasRunning = this.running;
             this.running = false;
-            // Auto-restart after 5s if unexpected exit while we were supposed to be running
+            // Auto-restart with exponential backoff if unexpected exit
             if (code !== 0 && wasRunning) {
-                console.log(`[imessage] Restarting in 5s...`);
-                setTimeout(() => this.start(), 5000);
+                if (this.restartAttempts >= this.maxRestartAttempts) {
+                    console.error(`[imessage] Max restart attempts (${this.maxRestartAttempts}) reached. Giving up. Last error: ${this.lastError || "unknown"}`);
+                    return;
+                }
+                this.restartAttempts++;
+                const delay = Math.min(5000 * Math.pow(2, this.restartAttempts - 1), 80_000);
+                console.log(`[imessage] Restarting in ${delay / 1000}s (attempt ${this.restartAttempts}/${this.maxRestartAttempts}, last error: ${this.lastError || "unknown"})...`);
+                this.restartTimer = setTimeout(() => {
+                    this.restartTimer = null;
+                    this.start();
+                }, delay);
             }
         });
         console.log(`[imessage] Watching for messages...`);
     }
     async stop() {
         this.running = false;
+        if (this.restartTimer) {
+            clearTimeout(this.restartTimer);
+            this.restartTimer = null;
+        }
         if (this.process) {
             this.process.kill("SIGTERM");
             this.process = null;
         }
     }
+    /** Manual restart — resets attempt counter and restarts */
+    restart() {
+        this.restartAttempts = 0;
+        this.lastError = null;
+        this.stop().then(() => this.start());
+    }
+    /** Get the last stderr error message */
+    getLastError() {
+        return this.lastError;
+    }
+    /** Get current restart attempt count */
+    getRestartAttempts() {
+        return this.restartAttempts;
+    }
     async sendMessage(msg) {
         try {
             const text = msg.content.substring(0, this.config.max_message_length || 4000);
@@ -61,7 +98,7 @@ export class IMessageAdapter extends BaseAdapter {
                 console.error("[imessage] No chat_id to send to");
                 return false;
             }
-            const proc = spawn("imsg", ["send", "--chat", String(chatId), text]);
+            const proc = spawn(IMSG_BIN, ["send", "--chat-id", String(chatId), "--text", text]);
             return new Promise((resolve) => {
                 proc.on("exit", (code) => {
                     if (code === 0) {
@@ -109,6 +146,8 @@ export class IMessageAdapter extends BaseAdapter {
                 attachments: data.attachments,
             },
         };
+        // Successful message receipt — reset restart counter
+        this.restartAttempts = 0;
         this.stats.messages_in++;
         this.stats.last_message_at = new Date().toISOString();
         if (this.onInboundMessage) {