jinn-cli 0.5.3 → 0.7.0

package/dist/src/connectors/whatsapp/format.js

@@ -0,0 +1,22 @@
+const WA_MAX_LENGTH = 4000;
+export function formatResponse(text) {
+    if (text.length <= WA_MAX_LENGTH)
+        return [text];
+    const chunks = [];
+    let remaining = text;
+    while (remaining.length > 0) {
+        if (remaining.length <= WA_MAX_LENGTH) {
+            chunks.push(remaining);
+            break;
+        }
+        let cutAt = remaining.lastIndexOf("\n", WA_MAX_LENGTH);
+        if (cutAt <= 0)
+            cutAt = remaining.lastIndexOf(" ", WA_MAX_LENGTH);
+        if (cutAt <= 0)
+            cutAt = WA_MAX_LENGTH;
+        chunks.push(remaining.slice(0, cutAt));
+        remaining = remaining.slice(cutAt).trimStart();
+    }
+    return chunks;
+}
+//# sourceMappingURL=format.js.map

package/dist/src/connectors/whatsapp/format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../src/connectors/whatsapp/format.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,IAAI,IAAI,CAAC,MAAM,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAI,SAAS,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;YAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAAC,MAAM;QAAC,CAAC;QACzE,IAAI,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACvD,IAAI,KAAK,IAAI,CAAC;YAAE,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAClE,IAAI,KAAK,IAAI,CAAC;YAAE,KAAK,GAAG,aAAa,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACvC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IACjD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/src/connectors/whatsapp/index.d.ts

@@ -0,0 +1,42 @@
+import type { Connector, ConnectorCapabilities, ConnectorHealth, IncomingMessage, Target } from "../../shared/types.js";
+export interface WhatsAppConnectorConfig {
+    /** Where to store session credentials (default: JINN_HOME/.whatsapp-auth) */
+    authDir?: string;
+    /** Allowed phone numbers in JID format (e.g. "447700900000@s.whatsapp.net") — empty = allow all */
+    allowFrom?: string[];
+    ignoreOldMessagesOnBoot?: boolean;
+}
+export declare class WhatsAppConnector implements Connector {
+    name: string;
+    private sock;
+    private config;
+    private handler;
+    private bootTimeMs;
+    private allowedJids;
+    private connectionStatus;
+    private lastError;
+    private authDir;
+    private latestQr;
+    private reconnectAttempts;
+    private reconnectTimer;
+    private typingIntervals;
+    private readonly capabilities;
+    constructor(config: WhatsAppConnectorConfig);
+    onMessage(handler: (msg: IncomingMessage) => void): void;
+    start(): Promise<void>;
+    private scheduleReconnect;
+    private connect;
+    stop(): Promise<void>;
+    getCapabilities(): ConnectorCapabilities;
+    getQrCode(): string | null;
+    getHealth(): ConnectorHealth;
+    reconstructTarget(replyContext: Record<string, unknown> | null | undefined): Target;
+    sendMessage(target: Target, text: string): Promise<string | undefined>;
+    replyMessage(target: Target, text: string): Promise<string | undefined>;
+    editMessage(_target: Target, _text: string): Promise<void>;
+    addReaction(_target: Target, _emoji: string): Promise<void>;
+    removeReaction(_target: Target, _emoji: string): Promise<void>;
+    setTypingStatus(channelId: string, _threadTs: string | undefined, status: string): Promise<void>;
+    private handleMessage;
+}
+//# sourceMappingURL=index.d.ts.map

package/dist/src/connectors/whatsapp/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/connectors/whatsapp/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,MAAM,EACP,MAAM,uBAAuB,CAAC;AAO/B,MAAM,WAAW,uBAAuB;IACtC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mGAAmG;IACnG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAaD,qBAAa,iBAAkB,YAAW,SAAS;IACjD,IAAI,SAAc;IAClB,OAAO,CAAC,IAAI,CAAyB;IACrC,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,OAAO,CAAiD;IAChE,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,gBAAgB,CAA2E;IACnG,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,eAAe,CAAqD;IAE5E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAK3B;gBAEU,MAAM,EAAE,uBAAuB;IAO3C,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI;IAIlD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,OAAO,CAAC,iBAAiB;YASX,OAAO;IAqDf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,eAAe,IAAI,qBAAqB;IAIxC,SAAS,IAAI,MAAM,GAAG,IAAI;IAI1B,SAAS,IAAI,eAAe;IAa5B,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM;IAS7E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAItE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAavE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAmBxF,aAAa;CA0F5B"}

package/dist/src/connectors/whatsapp/index.js

@@ -0,0 +1,279 @@
+import makeWASocketImport, { Browsers, DisconnectReason, fetchLatestWaWebVersion, useMultiFileAuthState, downloadMediaMessage, } from "@whiskeysockets/baileys";
+// Handle ESM/CJS interop — Baileys may export as .default in some environments
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const makeWASocket = (makeWASocketImport.default ?? makeWASocketImport);
+import { logger } from "../../shared/logger.js";
+import { JINN_HOME } from "../../shared/paths.js";
+import { formatResponse } from "./format.js";
+import path from "node:path";
+import fs from "node:fs";
+// Minimal ILogger implementation that routes Baileys noise to silence
+const silentLogger = {
+    level: "silent",
+    child: () => silentLogger,
+    trace: () => { },
+    debug: () => { },
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+};
+export class WhatsAppConnector {
+    name = "whatsapp";
+    sock = null;
+    config;
+    handler = null;
+    bootTimeMs = Date.now();
+    allowedJids;
+    connectionStatus = "starting";
+    lastError = null;
+    authDir;
+    latestQr = null;
+    reconnectAttempts = 0;
+    reconnectTimer = null;
+    typingIntervals = new Map();
+    capabilities = {
+        threading: false,
+        messageEdits: false,
+        reactions: false,
+        attachments: true,
+    };
+    constructor(config) {
+        this.config = config;
+        this.authDir = config.authDir ?? path.join(JINN_HOME, ".whatsapp-auth");
+        this.allowedJids = new Set(config.allowFrom ?? []);
+        fs.mkdirSync(this.authDir, { recursive: true });
+    }
+    onMessage(handler) {
+        this.handler = handler;
+    }
+    async start() {
+        await this.connect();
+    }
+    scheduleReconnect() {
+        if (this.connectionStatus === "stopped")
+            return;
+        // Exponential backoff: 5s, 10s, 20s, 40s, 60s max
+        const delay = Math.min(5000 * Math.pow(2, this.reconnectAttempts), 60000);
+        this.reconnectAttempts++;
+        logger.info(`WhatsApp reconnecting in ${delay / 1000}s (attempt ${this.reconnectAttempts})`);
+        this.reconnectTimer = setTimeout(() => this.connect(), delay);
+    }
+    async connect() {
+        const { state, saveCreds } = await useMultiFileAuthState(this.authDir);
+        // Fetch latest WA Web version to avoid 405 rejections from outdated version
+        const { version } = await fetchLatestWaWebVersion().catch(() => ({ version: undefined }));
+        this.sock = makeWASocket({
+            auth: state,
+            printQRInTerminal: false,
+            logger: silentLogger,
+            browser: Browsers.macOS("Chrome"),
+            ...(version ? { version } : {}),
+        });
+        this.sock.ev.on("creds.update", saveCreds);
+        this.sock.ev.on("connection.update", ({ connection, lastDisconnect, qr }) => {
+            if (qr) {
+                this.latestQr = qr;
+                this.connectionStatus = "qr_pending";
+                logger.info("WhatsApp QR code generated — scan with your WhatsApp app to connect");
+            }
+            if (connection === "open") {
+                this.latestQr = null;
+                this.connectionStatus = "running";
+                this.lastError = null;
+                this.reconnectAttempts = 0;
+                logger.info("WhatsApp connector connected");
+            }
+            if (connection === "close") {
+                const statusCode = lastDisconnect?.error?.output?.statusCode;
+                const isLoggedOut = statusCode === DisconnectReason.loggedOut;
+                logger.info(`WhatsApp connection closed (${statusCode}), reconnecting: ${!isLoggedOut}`);
+                if (!isLoggedOut && this.connectionStatus !== "stopped") {
+                    this.scheduleReconnect();
+                }
+                else {
+                    this.connectionStatus = "stopped";
+                }
+            }
+        });
+        this.sock.ev.on("messages.upsert", async ({ messages, type }) => {
+            if (type !== "notify")
+                return;
+            for (const message of messages) {
+                try {
+                    await this.handleMessage(message);
+                }
+                catch (err) {
+                    logger.error(`WhatsApp message handler error: ${err instanceof Error ? err.message : err}`);
+                }
+            }
+        });
+    }
+    async stop() {
+        this.connectionStatus = "stopped";
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        await this.sock?.end(undefined);
+        logger.info("WhatsApp connector stopped");
+    }
+    getCapabilities() {
+        return this.capabilities;
+    }
+    getQrCode() {
+        return this.latestQr;
+    }
+    getHealth() {
+        let status = "stopped";
+        if (this.connectionStatus === "running")
+            status = "running";
+        else if (this.connectionStatus === "qr_pending")
+            status = "qr_pending";
+        return {
+            status,
+            detail: this.connectionStatus === "qr_pending"
+                ? "Scan QR code in settings to connect"
+                : (this.lastError ?? undefined),
+            capabilities: this.capabilities,
+        };
+    }
+    reconstructTarget(replyContext) {
+        const ctx = (replyContext ?? {});
+        return {
+            channel: (typeof ctx.channel === "string" ? ctx.channel : "") ?? "",
+            thread: undefined,
+            messageTs: typeof ctx.messageTs === "string" ? ctx.messageTs : undefined,
+        };
+    }
+    async sendMessage(target, text) {
+        return this.replyMessage(target, text);
+    }
+    async replyMessage(target, text) {
+        if (!this.sock || this.connectionStatus !== "running")
+            return;
+        try {
+            const chunks = formatResponse(text);
+            for (const chunk of chunks) {
+                await this.sock.sendMessage(target.channel, { text: chunk });
+            }
+        }
+        catch (err) {
+            logger.error(`WhatsApp replyMessage error: ${err instanceof Error ? err.message : err}`);
+        }
+        return undefined;
+    }
+    async editMessage(_target, _text) {
+        // WhatsApp doesn't support editing via Baileys reliably — no-op
+    }
+    async addReaction(_target, _emoji) {
+        // No-op: reactions are supported in WA but complex to map from Slack emoji names
+    }
+    async removeReaction(_target, _emoji) {
+        // No-op
+    }
+    async setTypingStatus(channelId, _threadTs, status) {
+        if (!this.sock || this.connectionStatus !== "running")
+            return;
+        const existing = this.typingIntervals.get(channelId);
+        if (existing) {
+            clearInterval(existing);
+            this.typingIntervals.delete(channelId);
+        }
+        if (status) {
+            // Show "typing..." and refresh every 20s (WhatsApp composing expires ~25s)
+            await this.sock.sendPresenceUpdate("composing", channelId).catch(() => { });
+            const interval = setInterval(() => {
+                this.sock?.sendPresenceUpdate("composing", channelId).catch(() => { });
+            }, 20_000);
+            this.typingIntervals.set(channelId, interval);
+        }
+        else {
+            await this.sock.sendPresenceUpdate("paused", channelId).catch(() => { });
+        }
+    }
+    async handleMessage(message) {
+        const jid = message.key.remoteJid;
+        const ownJid = this.sock?.user?.id ?? "";
+        const ownJidBare = ownJid.split(":")[0] + "@s.whatsapp.net";
+        // WhatsApp now uses LID (Linked ID) format — extract from sock.user.lid
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const ownLid = this.sock?.user?.lid ?? "";
+        const ownLidBare = ownLid ? ownLid.split(":")[0] + "@lid" : "";
+        if (!jid)
+            return;
+        if (jid.endsWith("@g.us"))
+            return;
+        if (jid.endsWith("@newsletter"))
+            return;
+        if (jid.endsWith("@broadcast"))
+            return;
+        // Allow "note to self" — matches own phone JID or own LID
+        const isSelfChat = message.key.fromMe && (jid === ownJidBare || jid === ownJid ||
+            jid === ownLidBare || jid === ownLid);
+        if (message.key.fromMe && !isSelfChat)
+            return;
+        const msgTimestampMs = Number(message.messageTimestamp ?? 0) * 1000;
+        if (this.config.ignoreOldMessagesOnBoot !== false &&
+            msgTimestampMs < this.bootTimeMs)
+            return;
+        // If no allowFrom configured, only self-chat is allowed.
+        // If allowFrom is set, also allow those specific JIDs.
+        if (!isSelfChat && (this.allowedJids.size === 0 || !this.allowedJids.has(jid)))
+            return;
+        if (!this.handler)
+            return;
+        const text = message.message?.conversation ||
+            message.message?.extendedTextMessage?.text ||
+            message.message?.imageMessage?.caption ||
+            message.message?.documentMessage?.caption ||
+            "";
+        if (!text.trim())
+            return;
+        logger.info(`WhatsApp message received from ${jid}`);
+        // Download media attachment if present
+        const attachments = [];
+        const hasMedia = message.message?.imageMessage || message.message?.documentMessage || message.message?.audioMessage;
+        if (hasMedia && this.sock) {
+            try {
+                const buffer = await downloadMediaMessage(message, "buffer", {}, {
+                    logger: silentLogger,
+                    reuploadRequest: this.sock.updateMediaMessage,
+                });
+                const ext = message.message?.imageMessage ? "jpg"
+                    : message.message?.audioMessage ? "ogg"
+                        : "bin";
+                const filename = `wa-attachment-${message.key.id}.${ext}`;
+                const tmpDir = path.join(JINN_HOME, "tmp");
+                const localPath = path.join(tmpDir, filename);
+                fs.mkdirSync(tmpDir, { recursive: true });
+                fs.writeFileSync(localPath, buffer);
+                const mimeType = ext === "jpg" ? "image/jpeg"
+                    : ext === "ogg" ? "audio/ogg"
+                        : "application/octet-stream";
+                attachments.push({ name: filename, localPath, mimeType, url: localPath });
+            }
+            catch {
+                // Non-fatal: continue without attachment
+            }
+        }
+        const sessionKey = `whatsapp:${jid}`;
+        const replyContext = { channel: jid, thread: null, messageTs: message.key.id ?? null };
+        const incomingMessage = {
+            connector: "whatsapp",
+            source: "whatsapp",
+            sessionKey,
+            channel: jid,
+            thread: undefined,
+            user: jid.replace("@s.whatsapp.net", ""),
+            userId: jid,
+            text,
+            attachments,
+            replyContext,
+            messageId: message.key.id ?? undefined,
+            transportMeta: { jid },
+            raw: message,
+        };
+        this.handler(incomingMessage);
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/src/connectors/whatsapp/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/connectors/whatsapp/index.ts"],"names":[],"mappings":"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"}

package/dist/src/engines/claude.d.ts

@@ -8,7 +8,12 @@ export declare class ClaudeEngine implements InterruptibleEngine {
     run(opts: EngineRunOpts): Promise<EngineResult>;
     private runOnce;
     private processStreamLine;
+    private formatClaudeError;
+    private buildEngineResultFromResultEvent;
+    private parseRateLimitInfo;
+    private parseClaudeJsonOutput;
     private extractResult;
+    private normalizeRateLimitInfo;
     private buildCleanEnv;
     private signalProcess;
 }

package/dist/src/engines/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../src/engines/claude.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AA6BxG,qBAAa,YAAa,YAAW,mBAAmB;IACtD,IAAI,EAAG,QAAQ,CAAU;IACzB,OAAO,CAAC,aAAa,CAAkC;IAEvD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,SAAgB,GAAG,IAAI;IAcrD,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAK7B,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;YAoCvC,OAAO;IAkMrB,OAAO,CAAC,iBAAiB;IA+DzB,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,aAAa;CAYtB"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../src/engines/claude.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAuB,mBAAmB,EAAE,aAAa,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AA6B7H,qBAAa,YAAa,YAAW,mBAAmB;IACtD,IAAI,EAAG,QAAQ,CAAU;IACzB,OAAO,CAAC,aAAa,CAAkC;IAEvD,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,SAAgB,GAAG,IAAI;IAcrD,OAAO,IAAI,IAAI;IAMf,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAK7B,GAAG,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;YAoCvC,OAAO;IAmPrB,OAAO,CAAC,iBAAiB;IAwFzB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,gCAAgC;IAkBxC,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,qBAAqB;IAqD7B,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,aAAa;CAYtB"}

package/dist/src/engines/claude.js

@@ -116,6 +116,7 @@ export class ClaudeEngine {
             let stderr = "";
             let settled = false;
             let lastResultMsg = null;
+            let rateLimitInfo;
             let lineCount = 0;
             let inTool = false;
             const STDERR_MAX = 10 * 1024; // 10KB rolling window for error reporting
@@ -137,6 +138,10 @@ export class ClaudeEngine {
                             lastResultMsg = parsed.msg;
                             continue;
                         }
+                        if (parsed.type === "__rate_limit") {
+                            rateLimitInfo = parsed.info;
+                            continue;
+                        }
                         if (parsed.type === "__tool_start") {
                             inTool = true;
                             onStream(parsed.delta);
@@ -188,29 +193,16 @@ export class ClaudeEngine {
                 }
                 if (code === 0) {
                     if (streaming && lastResultMsg) {
-                        resolve(this.extractResult(lastResultMsg, opts.resumeSessionId));
+                        const extracted = this.buildEngineResultFromResultEvent(lastResultMsg, String(lastResultMsg.result || ""), opts.resumeSessionId, rateLimitInfo);
+                        if (extracted.error)
+                            opts.onStream?.({ type: "error", content: extracted.error });
+                        resolve(extracted);
                         return;
                     }
                     try {
-                        const parsed = JSON.parse(stdout);
-                        // Claude --output-format json returns an array of events.
-                        // The last element with type "result" has the final output.
-                        let result;
-                        if (Array.isArray(parsed)) {
-                            const resultEvent = [...parsed].reverse().find((e) => e.type === "result");
-                            result = resultEvent || parsed[parsed.length - 1] || {};
-                        }
-                        else {
-                            result = parsed;
-                        }
-                        logger.info(`Claude result: session_id=${result.session_id || "none"}, result_length=${(result.result || "").length}, cost=$${result.total_cost_usd || 0}`);
-                        resolve({
-                            sessionId: result.session_id,
-                            result: result.result,
-                            cost: result.total_cost_usd,
-                            durationMs: result.duration_ms,
-                            numTurns: result.num_turns,
-                        });
+                        const parsedResult = this.parseClaudeJsonOutput(stdout, opts.resumeSessionId);
+                        logger.info(`Claude result: session_id=${parsedResult.sessionId || "none"}, result_length=${parsedResult.result.length}, cost=$${parsedResult.cost || 0}`);
+                        resolve(parsedResult);
                     }
                     catch (err) {
                         logger.error(`Failed to parse Claude output: ${err}\nstdout: ${stdout.slice(0, 500)}`);
@@ -222,10 +214,57 @@ export class ClaudeEngine {
                     }
                     return;
                 }
+                // Non-zero exit code — if we still got a structured "result" message, use it.
+                if (streaming && lastResultMsg) {
+                    resolve(this.extractResult(lastResultMsg, opts.resumeSessionId, rateLimitInfo));
+                    return;
+                }
+                if (!streaming && stdout.trim()) {
+                    try {
+                        const parsed = JSON.parse(stdout);
+                        if (Array.isArray(parsed)) {
+                            const resultEvent = [...parsed].reverse().find((e) => e.type === "result");
+                            const rlEvent = [...parsed].reverse().find((e) => e.type === "rate_limit_event");
+                            const rl = rlEvent ? this.normalizeRateLimitInfo(rlEvent.rate_limit_info) : rateLimitInfo;
+                            if (resultEvent) {
+                                resolve(this.extractResult(resultEvent, opts.resumeSessionId, rl));
+                                return;
+                            }
+                        }
+                        else if (parsed && typeof parsed === "object" && parsed.type === "result") {
+                            resolve(this.extractResult(parsed, opts.resumeSessionId, rateLimitInfo));
+                            return;
+                        }
+                    }
+                    catch {
+                        // ignore parse errors, fall through to generic stderr/code error
+                    }
+                }
                 // Non-zero exit code — log full stderr for debugging
                 if (stderr.trim()) {
                     logger.error(`Claude stderr (exit code ${code}):\n${stderr}`);
                 }
+                // Prefer structured output when available (stream-json)
+                if (streaming && lastResultMsg) {
+                    const extracted = this.buildEngineResultFromResultEvent(lastResultMsg, String(lastResultMsg.result || ""), opts.resumeSessionId, rateLimitInfo);
+                    if (extracted.error)
+                        opts.onStream?.({ type: "error", content: extracted.error });
+                    resolve(extracted);
+                    return;
+                }
+                // If stdout contains JSON output, try to parse it even on non-zero exit.
+                if (!streaming && stdout.trim()) {
+                    try {
+                        const parsedResult = this.parseClaudeJsonOutput(stdout, opts.resumeSessionId);
+                        if (parsedResult.error)
+                            opts.onStream?.({ type: "error", content: parsedResult.error });
+                        resolve(parsedResult);
+                        return;
+                    }
+                    catch {
+                        // Fall through to generic error below
+                    }
+                }
                 const errMsg = `Claude exited with code ${code}${stderr.trim() ? `: ${stderr.slice(0, 500)}` : " (no stderr output)"}`;
                 logger.error(errMsg);
                 // Emit error delta so WebSocket clients see the failure immediately
@@ -269,6 +308,29 @@ export class ClaudeEngine {
         if (msgType === "result") {
             return { type: "__result", msg };
         }
+        if (msgType === "rate_limit_event") {
+            const info = this.parseRateLimitInfo(msg.rate_limit_info);
+            if (!info)
+                return null;
+            return { type: "__rate_limit", info };
+        }
+        // Partial assistant messages contain the full accumulated text so far.
+        // Use these as snapshots to correct any dropped text_delta events.
+        if (msgType === "assistant") {
+            const message = msg.message;
+            if (message) {
+                const content = message.content;
+                if (Array.isArray(content)) {
+                    const textParts = content
+                        .filter((b) => b.type === "text" && typeof b.text === "string")
+                        .map((b) => b.text);
+                    if (textParts.length > 0) {
+                        return { type: "delta", delta: { type: "text_snapshot", content: textParts.join("") } };
+                    }
+                }
+            }
+            return null;
+        }
         if (msgType === "stream_event") {
             const event = msg.event;
             if (!event)
@@ -303,15 +365,123 @@ export class ClaudeEngine {
         }
         return null;
     }
-    extractResult(result, fallbackSessionId) {
+    formatClaudeError(message, rateLimit) {
+        const cleaned = message.trim() || "Claude error";
+        if (rateLimit?.status === "rejected") {
+            return `Claude usage limit reached: ${cleaned}`;
+        }
+        return cleaned;
+    }
+    buildEngineResultFromResultEvent(resultEvent, finalText, fallbackSessionId, rateLimit) {
+        const isError = resultEvent.is_error === true || rateLimit?.status === "rejected";
+        return {
+            sessionId: String(resultEvent.session_id || fallbackSessionId || ""),
+            result: isError ? "" : finalText,
+            error: isError ? this.formatClaudeError(finalText, rateLimit) : undefined,
+            cost: typeof resultEvent.total_cost_usd === "number" ? resultEvent.total_cost_usd : undefined,
+            durationMs: typeof resultEvent.duration_ms === "number" ? resultEvent.duration_ms : undefined,
+            numTurns: typeof resultEvent.num_turns === "number" ? resultEvent.num_turns : undefined,
+            ...(rateLimit ? { rateLimit } : {}),
+        };
+    }
+    parseRateLimitInfo(value) {
+        if (!value || typeof value !== "object")
+            return undefined;
+        const obj = value;
+        const info = {};
+        if (typeof obj.status === "string")
+            info.status = obj.status;
+        const resetsAt = obj.resetsAt;
+        if (typeof resetsAt === "number" && Number.isFinite(resetsAt))
+            info.resetsAt = resetsAt;
+        if (typeof resetsAt === "string" && resetsAt.trim()) {
+            const parsed = Number(resetsAt);
+            if (Number.isFinite(parsed))
+                info.resetsAt = parsed;
+        }
+        if (typeof obj.rateLimitType === "string")
+            info.rateLimitType = obj.rateLimitType;
+        if (typeof obj.overageStatus === "string")
+            info.overageStatus = obj.overageStatus;
+        if (typeof obj.overageDisabledReason === "string")
+            info.overageDisabledReason = obj.overageDisabledReason;
+        if (typeof obj.isUsingOverage === "boolean")
+            info.isUsingOverage = obj.isUsingOverage;
+        return Object.keys(info).length > 0 ? info : undefined;
+    }
+    parseClaudeJsonOutput(stdout, fallbackSessionId) {
+        const parsed = JSON.parse(stdout);
+        let rateLimitInfo;
+        let resultEvent = {};
+        if (Array.isArray(parsed)) {
+            const foundResult = [...parsed].reverse().find((e) => !!e && typeof e === "object" && e.type === "result");
+            resultEvent = foundResult || parsed[parsed.length - 1] || {};
+            const foundRate = [...parsed].reverse().find((e) => !!e && typeof e === "object" && e.type === "rate_limit_event");
+            if (foundRate) {
+                rateLimitInfo = this.parseRateLimitInfo(foundRate.rate_limit_info);
+            }
+        }
+        else if (parsed && typeof parsed === "object") {
+            resultEvent = parsed;
+        }
+        let finalText = resultEvent.result || "";
+        // If result text is empty, extract last assistant text from conversation
+        if (!finalText.trim() && Array.isArray(parsed)) {
+            for (let i = parsed.length - 1; i >= 0; i--) {
+                const evt = parsed[i];
+                if (evt.type === "assistant" && Array.isArray(evt.content)) {
+                    const textBlocks = evt.content
+                        .filter((b) => b.type === "text" && typeof b.text === "string")
+                        .map((b) => b.text);
+                    if (textBlocks.length > 0) {
+                        finalText = textBlocks.join("\n");
+                        break;
+                    }
+                }
+                // Also check for message format with role field
+                if (evt.role === "assistant" && Array.isArray(evt.content)) {
+                    const textBlocks = evt.content
+                        .filter((b) => b.type === "text" && typeof b.text === "string")
+                        .map((b) => b.text);
+                    if (textBlocks.length > 0) {
+                        finalText = textBlocks.join("\n");
+                        break;
+                    }
+                }
+            }
+        }
+        return this.buildEngineResultFromResultEvent(resultEvent, finalText, fallbackSessionId, rateLimitInfo);
+    }
+    extractResult(result, fallbackSessionId, rateLimitInfo) {
+        const isError = result.is_error === true;
+        const msg = String(result.result || "");
+        const error = isError
+            ? (rateLimitInfo?.status === "rejected" ? `Claude usage limit reached: ${msg || "Rate limited"}` : (msg || "Claude error"))
+            : undefined;
         return {
             sessionId: String(result.session_id || fallbackSessionId || ""),
-            result: String(result.result || ""),
+            result: isError ? "" : String(result.result || ""),
+            error,
+            rateLimit: rateLimitInfo,
             cost: typeof result.total_cost_usd === "number" ? result.total_cost_usd : undefined,
             durationMs: typeof result.duration_ms === "number" ? result.duration_ms : undefined,
             numTurns: typeof result.num_turns === "number" ? result.num_turns : undefined,
         };
     }
+    normalizeRateLimitInfo(raw) {
+        if (!raw || typeof raw !== "object" || Array.isArray(raw))
+            return undefined;
+        const o = raw;
+        const resetsAt = typeof o.resetsAt === "number" ? o.resetsAt : undefined;
+        return {
+            status: typeof o.status === "string" ? o.status : undefined,
+            resetsAt,
+            rateLimitType: typeof o.rateLimitType === "string" ? o.rateLimitType : undefined,
+            overageStatus: typeof o.overageStatus === "string" ? o.overageStatus : undefined,
+            overageDisabledReason: typeof o.overageDisabledReason === "string" ? o.overageDisabledReason : undefined,
+            isUsingOverage: typeof o.isUsingOverage === "boolean" ? o.isUsingOverage : undefined,
+        };
+    }
     buildCleanEnv() {
         const cleanEnv = {};
         for (const [k, v] of Object.entries(process.env)) {