cosmoremote 2.1.0 → 2.1.2

package/dist/session.js

@@ -37,6 +37,10 @@ class CLISession extends events_1.EventEmitter {
     sessionId;
     process = null;
     cliBinary;
+    // Public so bridge.ts can compute the on-disk Claude session path
+    // (~/.claude/projects/<encoded-cwd>/<sessionId>.jsonl) to verify whether a
+    // turn actually wrote conversation history before persisting the session
+    // id to session-contexts.json.
     workingDir;
     additionalDirs;
     model;
@@ -45,6 +49,7 @@ class CLISession extends events_1.EventEmitter {
     claudeSettingsPath = null;
     isClaude;
     isCodex;
+    isCursor;
     // Per-turn state — reset on every sendPrompt
     fullOutput = "";
     cleanOutput = "";
@@ -65,11 +70,13 @@ class CLISession extends events_1.EventEmitter {
     codexResponseDelivered = false;
     stdoutLineBuffer = "";
     stderrLineBuffer = "";
+    promptQueue = [];
     // Persistent-process state (Claude only)
     turnInFlight = false;
     idleTimer = null;
     codexThreadId = null;
     claudeSessionId = null;
+    cursorSessionId = null;
     // Optional persistent Codex adapter (experimental, opt-in via env var).
     codexPersistent = null;
     // True iff this session was constructed with a pre-existing claudeSessionId
@@ -86,8 +93,10 @@ class CLISession extends events_1.EventEmitter {
         this.claudeSettings = opts.claudeSettings ?? null;
         this.claudeSessionId = opts.initialClaudeSessionId ?? null;
         this.codexThreadId = opts.initialCodexThreadId ?? null;
+        this.cursorSessionId = opts.initialCursorSessionId ?? null;
         this.isClaude = this.cliBinary.includes("claude");
         this.isCodex = this.cliBinary.includes("codex");
+        this.isCursor = this.cliBinary.includes("cursor");
         // If we were given an existing Claude session id (continuation or imported
         // terminal conversation), spawn with `--resume` so Claude reloads history.
         this.claudeSessionResumable = this.isClaude && !!opts.initialClaudeSessionId;
@@ -105,9 +114,19 @@ class CLISession extends events_1.EventEmitter {
         }
         this.lastPromptContent = content;
         this.lastPromptAt = now;
+        if (this.turnInFlight) {
+            this.enqueuePrompt(content, attachments);
+            return;
+        }
+        this.dispatchPrompt(content, attachments);
+    }
+    dispatchPrompt(content, attachments) {
         if (this.isClaude) {
             this.sendPromptClaudePersistent(content, attachments);
         }
+        else if (this.isCursor) {
+            this.sendPromptCursorOneShot(content, attachments);
+        }
         else if (this.isCodex && CODEX_PERSISTENT_ENABLED) {
             this.sendPromptCodexPersistent(content, attachments);
         }
@@ -115,9 +134,29 @@ class CLISession extends events_1.EventEmitter {
             this.sendPromptOneShot(content, attachments);
         }
     }
+    enqueuePrompt(content, attachments) {
+        this.promptQueue.push({ content, attachments });
+        console.log(`  [session:${this.sessionId.substring(0, 8)}] queued prompt position=${this.promptQueue.length}`);
+        this.emit("status", `Prompt queued (${this.promptQueue.length})`);
+    }
+    emitDoneAndContinue(result) {
+        this.emit("done", result);
+        if (this.promptQueue.length === 0)
+            return;
+        const next = this.promptQueue.shift();
+        if (!next)
+            return;
+        setImmediate(() => {
+            if (this.turnInFlight) {
+                this.promptQueue.unshift(next);
+                return;
+            }
+            this.dispatchPrompt(next.content, next.attachments);
+        });
+    }
     sendPromptCodexPersistent(content, attachments) {
         if (this.turnInFlight) {
-            this.emit("error", "Previous Codex turn still running.");
+            this.enqueuePrompt(content, attachments);
             return;
         }
         if (attachments.length > 0) {
@@ -159,7 +198,7 @@ class CLISession extends events_1.EventEmitter {
                     this.codexThreadId = this.codexPersistent.threadId;
                 }
                 this.flushOutput();
-                this.emit("done", { code: result.code, fullOutput: this.cleanOutput });
+                this.emitDoneAndContinue({ code: result.code, fullOutput: this.cleanOutput });
                 this.scheduleIdleShutdown();
             });
         }
@@ -181,8 +220,7 @@ class CLISession extends events_1.EventEmitter {
     // ---------------------------------------------------------------------------
     sendPromptClaudePersistent(content, attachments) {
         if (this.turnInFlight) {
-            console.log(`  [session:${this.sessionId.substring(0, 8)}] turn already in flight, queue not implemented — dropping prompt`);
-            this.emit("error", "Previous turn still running. Please wait for it to finish before sending another prompt.");
+            this.enqueuePrompt(content, attachments);
             return;
         }
         this.resetTurnState();
@@ -280,7 +318,7 @@ class CLISession extends events_1.EventEmitter {
                 if (code !== 0 && !this.cleanOutput.trim() && finalOutput.trim()) {
                     this.emit("error", finalOutput);
                 }
-                this.emit("done", { code: code ?? -1, fullOutput: finalOutput });
+                this.emitDoneAndContinue({ code: code ?? -1, fullOutput: finalOutput });
             }
             this.cleanupAttachmentFiles();
         });
@@ -293,7 +331,7 @@ class CLISession extends events_1.EventEmitter {
             if (wasInFlight) {
                 const finalOutput = this.rememberCliFailure(err.message) || err.message;
                 this.emit("error", finalOutput);
-                this.emit("done", { code: -1, fullOutput: finalOutput });
+                this.emitDoneAndContinue({ code: -1, fullOutput: finalOutput });
             }
             this.cleanupAttachmentFiles();
         });
@@ -397,7 +435,7 @@ class CLISession extends events_1.EventEmitter {
             if (this.cleanOutput.length === 0 && typeof event.result === "string" && event.result) {
                 this.emit("output", event.result);
             }
-            this.emit("done", { code: 0, fullOutput: finalText });
+            this.emitDoneAndContinue({ code: 0, fullOutput: finalText });
             this.scheduleIdleShutdown();
             return;
         }
@@ -446,6 +484,164 @@ class CLISession extends events_1.EventEmitter {
         }
     }
     // ---------------------------------------------------------------------------
+    // Cursor Agent path: headless one-shot process per prompt, resumed by chat id.
+    // ---------------------------------------------------------------------------
+    sendPromptCursorOneShot(content, attachments) {
+        if (this.turnInFlight) {
+            this.enqueuePrompt(content, attachments);
+            return;
+        }
+        this.resetTurnState();
+        this.turnInFlight = true;
+        this.startedAt = Date.now();
+        this.lastActivityAt = this.startedAt;
+        this.cancelIdleTimer();
+        const attachmentPaths = this.prepareAttachmentFiles(attachments);
+        const promptWithAttachments = this.buildPromptWithAttachments(content, attachmentPaths, true);
+        const args = [
+            "-p",
+            "--output-format", "stream-json",
+            "--stream-partial-output",
+            "--force",
+            "--sandbox", "disabled",
+            "--trust",
+            "--workspace", this.workingDir,
+        ];
+        if (this.cursorSessionId)
+            args.push("--resume", this.cursorSessionId);
+        if (this.model)
+            args.push("--model", this.model);
+        args.push(promptWithAttachments);
+        console.log(`  [session:${this.sessionId.substring(0, 8)}] spawning Cursor binary=${this.cliBinary} cwd=${this.workingDir} cursorSessionId=${this.cursorSessionId ?? "new"}`);
+        this.process = (0, child_process_1.spawn)(this.cliBinary, args, {
+            cwd: this.workingDir,
+            env: { ...process.env, FORCE_COLOR: "0" },
+            detached: true,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        console.log(`  [session:${this.sessionId.substring(0, 8)}] Cursor args: ${args.map((a) => JSON.stringify(a)).join(" ")} pid=${this.process.pid ?? "unknown"}`);
+        this.startTurnWatchdog();
+        this.process.stdout?.on("data", (chunk) => {
+            const text = chunk.toString();
+            this.fullOutput += text;
+            this.lastActivityAt = Date.now();
+            this.stdoutLineBuffer += text;
+            const lines = this.drainBufferedLines("stdout");
+            for (const line of lines) {
+                this.handleCursorStreamLine(line);
+            }
+            if (lines.length === 0 && !text.trim().startsWith("{")) {
+                this.cleanOutput += text;
+                this.bufferOutput(text);
+            }
+        });
+        this.process.stderr?.on("data", (chunk) => {
+            const text = chunk.toString().trim();
+            if (!text)
+                return;
+            this.lastActivityAt = Date.now();
+            console.log(`  [session:${this.sessionId.substring(0, 8)}] cursor stderr: ${text.replace(/\s+/g, " ").slice(0, 220)}`);
+            const isNoise = /FORCE_COLOR|trust.*workspace|sandbox/i.test(text);
+            if (isNoise)
+                return;
+            this.rememberCliFailure(text);
+            this.stderrLineBuffer += `${text}\n`;
+        });
+        this.process.on("close", (code) => {
+            const elapsed = this.startedAt ? Date.now() - this.startedAt : -1;
+            console.log(`  [session:${this.sessionId.substring(0, 8)}] Cursor close code=${code} elapsedMs=${elapsed} cleanLen=${this.cleanOutput.length}`);
+            const wasInFlight = this.turnInFlight;
+            this.clearTurnWatchdog();
+            if (this.killTimeout)
+                clearTimeout(this.killTimeout);
+            this.killTimeout = null;
+            this.flushOutput();
+            if (wasInFlight) {
+                const finalOutput = this.finalOutputForClose(code);
+                if (code !== 0 && !this.cleanOutput.trim() && finalOutput.trim()) {
+                    this.emit("error", finalOutput);
+                }
+                this.turnInFlight = false;
+                this.emitDoneAndContinue({ code: code ?? -1, fullOutput: finalOutput });
+            }
+            this.cleanupAttachmentFiles();
+            this.process = null;
+            this.startedAt = null;
+            this.lastActivityAt = null;
+            this.pendingErrorText = null;
+            this.lastMeaningfulStderr = null;
+        });
+        this.process.on("error", (err) => {
+            const elapsed = this.startedAt ? Date.now() - this.startedAt : -1;
+            console.log(`  [session:${this.sessionId.substring(0, 8)}] Cursor error after ${elapsed}ms: ${err.message}`);
+            this.clearTurnWatchdog();
+            if (this.killTimeout)
+                clearTimeout(this.killTimeout);
+            this.killTimeout = null;
+            this.emit("error", err.message);
+            this.cleanupAttachmentFiles();
+            this.process = null;
+            this.startedAt = null;
+            this.lastActivityAt = null;
+            this.pendingErrorText = null;
+            this.lastMeaningfulStderr = null;
+            this.turnInFlight = false;
+            this.emitDoneAndContinue({ code: -1, fullOutput: err.message });
+        });
+    }
+    handleCursorStreamLine(line) {
+        let event;
+        try {
+            event = JSON.parse(line);
+        }
+        catch {
+            if (line.trim()) {
+                this.cleanOutput += line;
+                this.bufferOutput(line);
+            }
+            return;
+        }
+        const cursorSessionId = this.extractCursorSessionId(event);
+        if (cursorSessionId && this.cursorSessionId !== cursorSessionId) {
+            this.cursorSessionId = cursorSessionId;
+            console.log(`  [session:${this.sessionId.substring(0, 8)}] cursor session_id=${cursorSessionId}`);
+        }
+        const tool = this.extractCursorTool(event);
+        if (tool) {
+            const label = this.formatToolLabel(tool.name, tool.input);
+            this.emit("status", label);
+            this.maybeEmitToolEvent({ name: tool.name, input: tool.input });
+        }
+        const status = this.formatCursorStatus(event);
+        if (status) {
+            this.emit("status", status);
+        }
+        const error = this.extractCursorError(event);
+        if (error) {
+            const message = this.rememberCliFailure(error) || error;
+            if (!this.cleanOutput.trim())
+                this.cleanOutput = message;
+            this.emit("error", message);
+        }
+        const text = this.extractCursorText(event);
+        if (text) {
+            this.cleanOutput += text;
+            this.bufferOutput(text);
+        }
+        if (this.isCursorTurnEnd(event)) {
+            const finalText = this.extractCursorFinalText(event) || this.cleanOutput;
+            console.log(`  [session:${this.sessionId.substring(0, 8)}] Cursor turn complete len=${finalText.length}`);
+            this.clearTurnWatchdog();
+            this.turnInFlight = false;
+            this.cleanupAttachmentFiles();
+            this.flushOutput();
+            if (this.cleanOutput.length === 0 && finalText) {
+                this.emit("output", finalText);
+            }
+            this.emitDoneAndContinue({ code: 0, fullOutput: finalText });
+        }
+    }
+    // ---------------------------------------------------------------------------
     // One-shot path (Codex today; reused by anything non-persistent).
     // ---------------------------------------------------------------------------
     sendPromptOneShot(content, attachments) {
@@ -556,7 +752,7 @@ class CLISession extends events_1.EventEmitter {
             if (code !== 0 && !this.cleanOutput.trim() && finalOutput.trim()) {
                 this.emit("error", finalOutput);
             }
-            this.emit("done", { code: code ?? -1, fullOutput: finalOutput });
+            this.emitDoneAndContinue({ code: code ?? -1, fullOutput: finalOutput });
             this.cleanupAttachmentFiles();
             this.process = null;
             this.startedAt = null;
@@ -643,6 +839,7 @@ class CLISession extends events_1.EventEmitter {
     kill() {
         this.cancelIdleTimer();
         this.cleanupClaudeSettings();
+        this.promptQueue = [];
         if (this.codexPersistent) {
             void this.codexPersistent.interrupt().catch(() => { });
             this.codexPersistent.kill();
@@ -662,8 +859,7 @@ class CLISession extends events_1.EventEmitter {
                 this.killProcessGroup("SIGKILL");
                 setTimeout(() => {
                     if (this.process && !this.process.killed) {
-                        console.log(`  [session:${this.sessionId.substring(0, 8)}] SIGKILL didn't work either, orphaning pid=${this.process.pid}`);
-                        this.process = null;
+                        console.log(`  [session:${this.sessionId.substring(0, 8)}] SIGKILL did not confirm exit for pid=${this.process.pid}; keeping handle for later close/error and retry logs`);
                     }
                 }, 500);
             }
@@ -698,6 +894,9 @@ class CLISession extends events_1.EventEmitter {
     get hasTurnInFlight() {
         return this.turnInFlight;
     }
+    get hasQueuedPrompts() {
+        return this.promptQueue.length > 0;
+    }
     resetTurnState() {
         this.fullOutput = "";
         this.cleanOutput = "";
@@ -787,12 +986,17 @@ class CLISession extends events_1.EventEmitter {
         let label = "";
         switch (name.toLowerCase()) {
             case "read":
+            case "read_file":
+            case "list_dir":
             case "str_replace_editor":
             case "str_replace_based_edit_tool": {
                 const cmd = input?.command;
-                const path = input?.path;
+                const path = input?.path ?? input?.target_file;
                 const file = path ? path.split("/").pop() : undefined;
-                if (cmd === "view" || !cmd || name.toLowerCase() === "read") {
+                if (name.toLowerCase() === "list_dir") {
+                    label = file ? `📁 Listing ${file}` : "📁 Listing directory";
+                }
+                else if (cmd === "view" || !cmd || name.toLowerCase() === "read" || name.toLowerCase() === "read_file") {
                     label = file ? `📖 Reading ${file}` : "📖 Reading file";
                 }
                 else if (cmd === "create") {
@@ -804,15 +1008,18 @@ class CLISession extends events_1.EventEmitter {
                 break;
             }
             case "bash":
-            case "execute_bash": {
-                const cmd = input?.command;
+            case "execute_bash":
+            case "run_terminal_cmd": {
+                const cmd = input?.command ?? input?.cmd;
                 const preview = cmd ? cmd.replace(/\s+/g, " ").slice(0, 40) : "";
                 label = preview ? `⚙️ Running: ${preview}` : "⚙️ Running command";
                 break;
             }
-            case "edit": {
+            case "edit":
+            case "edit_file": {
                 const file = input?.path?.split("/").pop()
-                    ?? input?.file_path?.split("/").pop();
+                    ?? input?.file_path?.split("/").pop()
+                    ?? input?.target_file?.split("/").pop();
                 label = file ? `✏️ Editing ${file}` : "✏️ Editing file";
                 break;
             }
@@ -826,8 +1033,11 @@ class CLISession extends events_1.EventEmitter {
                 label = pattern ? `🔍 Finding: ${pattern}` : "🔍 Finding files";
                 break;
             }
-            case "grep": {
-                const pattern = input?.pattern?.slice(0, 30);
+            case "grep":
+            case "grep_search":
+            case "file_search":
+            case "codebase_search": {
+                const pattern = (input?.pattern ?? input?.query)?.slice(0, 30);
                 label = pattern ? `🔎 Searching: ${pattern}` : "🔎 Searching files";
                 break;
             }
@@ -958,6 +1168,140 @@ class CLISession extends events_1.EventEmitter {
                 return ".jpg";
         }
     }
+    extractCursorSessionId(event) {
+        const direct = event?.chatId ??
+            event?.chat_id ??
+            event?.sessionId ??
+            event?.session_id ??
+            event?.conversationId ??
+            event?.conversation_id;
+        if (typeof direct === "string" && direct.trim())
+            return direct.trim();
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        if ((type.includes("chat") || type.includes("session") || type.includes("conversation")) && typeof event?.id === "string") {
+            return event.id.trim() || null;
+        }
+        return null;
+    }
+    extractCursorTool(event) {
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        const item = event?.item;
+        const itemType = typeof item?.type === "string" ? item.type.toLowerCase() : "";
+        const name = event?.name ??
+            event?.toolName ??
+            event?.tool_name ??
+            event?.tool?.name ??
+            // cursor-agent shape: { type:"tool_call", tool_call:{ toolName, title, ... } }
+            event?.tool_call?.toolName ??
+            event?.tool_call?.name ??
+            item?.name ??
+            item?.toolName ??
+            item?.tool_name;
+        if (typeof name === "string" && name.trim() && (type.includes("tool") || itemType.includes("tool"))) {
+            const input = event?.input ?? event?.args ?? event?.arguments ??
+                event?.tool_call?.args ?? event?.tool_call?.input ??
+                item?.input ?? item?.args ?? item?.arguments;
+            return { name: name.trim(), input: typeof input === "object" && input ? input : undefined };
+        }
+        const blocks = Array.isArray(event?.message?.content) ? event.message.content : [];
+        for (const block of blocks) {
+            if (block?.type === "tool_use" && typeof block?.name === "string") {
+                return { name: block.name, input: typeof block.input === "object" && block.input ? block.input : undefined };
+            }
+        }
+        return null;
+    }
+    extractCursorText(event) {
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        const delta = event?.delta;
+        if (typeof event?.text === "string" && (type.includes("delta") || type === "text" || type.includes("partial"))) {
+            return event.text;
+        }
+        if (typeof event?.content === "string" && (type.includes("delta") || type === "text" || type.includes("partial"))) {
+            return event.content;
+        }
+        if (typeof delta === "string")
+            return delta;
+        if (typeof delta?.text === "string")
+            return delta.text;
+        if (typeof delta?.content === "string")
+            return delta.content;
+        if (event?.type === "stream_event" && event.event?.type === "content_block_delta") {
+            const streamDelta = event.event.delta;
+            if (streamDelta?.type === "text_delta" && typeof streamDelta.text === "string")
+                return streamDelta.text;
+        }
+        if (type === "assistant" || type === "message" || type === "assistant_message") {
+            // cursor-agent (with --stream-partial-output) emits one `assistant` frame per
+            // token chunk, each carrying an incremental DELTA at message.content[].text.
+            // Do NOT gate on cleanOutput being empty — that dropped every chunk after the
+            // first, so the phone saw first-chunk → silence → full answer. The turn-end
+            // `result` handler only re-emits full text when nothing was streamed, so
+            // streaming every delta here does not double-render.
+            const content = event?.message?.content ?? event?.content;
+            if (typeof content === "string")
+                return content;
+            if (Array.isArray(content)) {
+                return content
+                    .map((block) => typeof block?.text === "string" ? block.text : typeof block?.content === "string" ? block.content : "")
+                    .filter(Boolean)
+                    .join("");
+            }
+        }
+        return null;
+    }
+    extractCursorFinalText(event) {
+        const result = event?.result ?? event?.response ?? event?.message ?? event?.output;
+        if (typeof result === "string" && result.trim())
+            return result;
+        if (typeof event?.text === "string" && event.text.trim())
+            return event.text;
+        if (typeof result?.content === "string" && result.content.trim())
+            return result.content;
+        if (Array.isArray(result?.content)) {
+            const text = result.content
+                .map((block) => typeof block?.text === "string" ? block.text : typeof block?.content === "string" ? block.content : "")
+                .filter(Boolean)
+                .join("");
+            return text || null;
+        }
+        return null;
+    }
+    extractCursorError(event) {
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        if (!type.includes("error") && !event?.error)
+            return null;
+        return this.extractCliFailureFromValue(event?.error) ??
+            (typeof event?.message === "string" ? event.message : null) ??
+            (typeof event?.detail === "string" ? event.detail : null);
+    }
+    isCursorTurnEnd(event) {
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        const subtype = typeof event?.subtype === "string" ? event.subtype.toLowerCase() : "";
+        return (type === "result" ||
+            type === "done" ||
+            type === "complete" ||
+            type === "completed" ||
+            type === "turn.completed" ||
+            type === "response.completed" ||
+            type === "chat.completed" ||
+            type === "session.completed" ||
+            subtype === "success");
+    }
+    formatCursorStatus(event) {
+        const type = typeof event?.type === "string" ? event.type.toLowerCase() : "";
+        if (!type)
+            return null;
+        if (type.includes("thinking") || type.includes("reasoning"))
+            return "Thinking...";
+        if (type.includes("model") || type.includes("request"))
+            return "Calling model...";
+        if (type.includes("completed") || type === "done" || type === "result")
+            return "Turn complete";
+        if (type.includes("started") || type.includes("created"))
+            return "Starting conversation...";
+        return null;
+    }
     hasWorkspacePermissionError() {
         const haystack = [
             this.cleanOutput,