@vellumai/assistant 0.4.55 → 0.4.57

package/src/cli.ts

@@ -11,7 +11,6 @@ import {
 import { dirname, join } from "node:path";
 import * as readline from "node:readline";
 
-import { httpSend } from "./cli/http-client.js";
 import {
   type MainScreenLayout,
   renderMainScreen,
@@ -19,36 +18,36 @@ import {
   updateStatusText,
 } from "./cli/main-screen.jsx";
 import { loadRawConfig, saveRawConfig } from "./config/loader.js";
-import { shouldAutoStartDaemon } from "./daemon/connection-policy.js";
-import { isHttpHealthy } from "./daemon/daemon-control.js";
+import { setServiceField } from "./config/raw-config-utils.js";
+import { MODEL_TO_PROVIDER } from "./daemon/conversation-slash.js";
 import { getModelInfo } from "./daemon/handlers/config-model.js";
 import { renderHistoryContent } from "./daemon/handlers/shared.js";
-import { ensureDaemonRunning } from "./daemon/lifecycle.js";
 import type {
   ConfirmationRequest,
   ServerMessage,
 } from "./daemon/message-protocol.js";
-import { MODEL_TO_PROVIDER } from "./daemon/session-slash.js";
 import { getConversation, getMessages } from "./memory/conversation-crud.js";
 import {
   getConversationByKey,
+  getOrCreateConversation,
   setConversationKeyIfAbsent,
 } from "./memory/conversation-key-store.js";
 import { listConversations } from "./memory/conversation-queries.js";
+import {
+  type EventStreamWatcher,
+  watchEventStream,
+} from "./signals/event-stream.js";
 import {
   copyToClipboard,
   extractLastCodeBlock,
-  formatSessionForExport,
+  formatConversationForExport,
 } from "./util/clipboard.js";
 import { formatDiff, formatNewFileDiff } from "./util/diff.js";
-import { getHistoryPath, getWorkspaceDir } from "./util/platform.js";
+import { getHistoryPath, getSignalsDir } from "./util/platform.js";
 import { Spinner } from "./util/spinner.js";
 import { timeAgo } from "./util/time.js";
 import { truncate } from "./util/truncate.js";
 
-const RECONNECT_BASE_DELAY_MS = 1_000;
-const RECONNECT_MAX_DELAY_MS = 30_000;
-
 /** Stable conversation key used by the built-in CLI. */
 const CLI_CONVERSATION_KEY = "builtin-cli:default";
 
@@ -145,7 +144,7 @@ export function formatConfirmationCommandPreview(
 
 export async function startCli(): Promise<void> {
   let conversationKey = CLI_CONVERSATION_KEY;
-  let sessionId = "";
+  let conversationId = "";
   let pendingUserContent: string | null = null;
   let generating = false;
   let lastResponse = "";
@@ -161,9 +160,8 @@ export async function startCli(): Promise<void> {
   let pendingConfirmation = false;
   let pendingCopySession = false;
   let toolStreaming = false;
-  let reconnecting = false;
-  let reconnectDelay = RECONNECT_BASE_DELAY_MS;
-  let sseAbortController: AbortController | null = null;
+  let lastDisplayedError: string | null = null;
+  let eventSubscription: EventStreamWatcher | null = null;
   const spinner = new Spinner();
 
   process.stdout.write("\x1b[2J\x1b[H");
@@ -241,7 +239,7 @@ export async function startCli(): Promise<void> {
   /** Send a confirmation decision via signal file (read by the daemon). */
   function sendConfirmation(requestId: string, decision: string): void {
     try {
-      const signalsDir = join(getWorkspaceDir(), "signals");
+      const signalsDir = getSignalsDir();
       mkdirSync(signalsDir, { recursive: true });
       writeFileSync(
         join(signalsDir, "confirm"),
@@ -262,7 +260,7 @@ export async function startCli(): Promise<void> {
     options?: { allowHighRisk?: boolean },
   ): void {
     try {
-      const signalsDir = join(getWorkspaceDir(), "signals");
+      const signalsDir = getSignalsDir();
       mkdirSync(signalsDir, { recursive: true });
       const resultPath = join(signalsDir, "trust-rule.result");
       writeFileSync(
@@ -323,19 +321,66 @@ export async function startCli(): Promise<void> {
     }
   }
 
-  /** Send a user message via HTTP POST. */
+  /** Send a user message via signal file to the daemon. */
   async function sendUserMessage(content: string): Promise<boolean> {
     try {
-      const response = await httpSend("/v1/messages", {
-        method: "POST",
-        body: JSON.stringify({
+      const signalsDir = getSignalsDir();
+      mkdirSync(signalsDir, { recursive: true });
+      const requestId = randomUUID();
+      const signalFile = `user-message.${requestId}`;
+      const resultFile = `${signalFile}.result`;
+      const resultPath = join(signalsDir, resultFile);
+      writeFileSync(
+        join(signalsDir, signalFile),
+        JSON.stringify({
           conversationKey,
           content,
           sourceChannel: "vellum",
           interface: "cli",
+          requestId,
         }),
+      );
+
+      const accepted = await new Promise<boolean>((resolve) => {
+        let settled = false;
+        const settle = (value: boolean): void => {
+          if (settled) return;
+          settled = true;
+          watcher.close();
+          clearTimeout(timeoutId);
+          resolve(value);
+        };
+
+        const checkResult = (): void => {
+          try {
+            const raw = readFileSync(resultPath, "utf-8");
+            const result = JSON.parse(raw) as {
+              ok?: boolean;
+              accepted?: boolean;
+              requestId?: string;
+            };
+            if (result.requestId === requestId) {
+              settle(result.ok === true && result.accepted !== false);
+            }
+          } catch {
+            // Result file not yet readable; ignore.
+          }
+        };
+
+        const watcher = watch(signalsDir, (_event, filename) => {
+          if (filename === resultFile) {
+            checkResult();
+          }
+        });
+
+        const timeoutId = setTimeout(() => settle(false), 10_000);
+
+        if (existsSync(resultPath)) {
+          checkResult();
+        }
       });
-      return response.ok || response.status === 202;
+
+      return accepted;
     } catch {
       return false;
     }
@@ -378,8 +423,8 @@ export async function startCli(): Promise<void> {
     if (req.temporaryOptionsAvailable?.includes("allow_10m")) {
       process.stdout.write(`\u2502 [t] Allow 10m\n`);
     }
-    if (req.temporaryOptionsAvailable?.includes("allow_thread")) {
-      process.stdout.write(`\u2502 [T] Allow Thread\n`);
+    if (req.temporaryOptionsAvailable?.includes("allow_conversation")) {
+      process.stdout.write(`\u2502 [T] Allow Conversation\n`);
     }
     process.stdout.write(`\u2502 [d] Deny once\n`);
     if (req.allowlistOptions.length > 0 && req.scopeOptions.length > 0) {
@@ -445,9 +490,9 @@ export async function startCli(): Promise<void> {
 
       if (
         trimmed === "T" &&
-        req.temporaryOptionsAvailable?.includes("allow_thread")
+        req.temporaryOptionsAvailable?.includes("allow_conversation")
       ) {
-        sendConfirmation(req.requestId, "allow_thread");
+        sendConfirmation(req.requestId, "allow_conversation");
         return;
       }
 
@@ -546,31 +591,30 @@ export async function startCli(): Promise<void> {
     });
   }
 
-  function renderSessionPicker(
-    sessions: Array<{ id: string; title: string; updatedAt: number }>,
+  function renderConversationPicker(
+    conversations: Array<{ id: string; title: string; updatedAt: number }>,
   ): void {
-    process.stdout.write("\n  Recent sessions:\n");
-    for (let i = 0; i < sessions.length; i++) {
-      const s = sessions[i];
-      const ago = timeAgo(s.updatedAt);
-      const title = truncate(s.title, 50);
+    process.stdout.write("\n  Recent conversations:\n");
+    for (let i = 0; i < conversations.length; i++) {
+      const c = conversations[i];
+      const ago = timeAgo(c.updatedAt);
+      const title = truncate(c.title, 50);
       const padding = " ".repeat(Math.max(1, 55 - title.length));
       process.stdout.write(`  [${i + 1}] ${title}${padding}${ago}\n`);
     }
-    process.stdout.write("  [n] New session\n\n");
-    process.stdout.write("  Pick a session> ");
+    process.stdout.write("  [n] New conversation\n\n");
+    process.stdout.write("  Pick a conversation> ");
 
     rl.once("line", async (answer) => {
       const trimmed = answer.trim().toLowerCase();
       if (trimmed === "n") {
         // Create a new conversation by using a unique key
         conversationKey = `builtin-cli:${randomUUID()}`;
-        sessionId = "";
+        conversationId = "";
         pendingSessionPick = false;
-        // Reconnect SSE with new conversation key
-        await reconnectSse();
+        reconnectEvents();
         process.stdout.write(
-          `\n  New session started.\n  Type your message. Ctrl+D to detach.\n\n`,
+          `\n  New conversation started.\n  Type your message. Ctrl+D to detach.\n\n`,
         );
         prompt();
         return;
@@ -578,56 +622,56 @@ export async function startCli(): Promise<void> {
       const parsed = parseInt(trimmed, 10);
       if (Number.isNaN(parsed)) {
         process.stdout.write('  Invalid input — enter a number or "n".\n');
-        renderSessionPicker(sessions);
+        renderConversationPicker(conversations);
         return;
       }
       const idx = parsed - 1;
-      if (idx >= 0 && idx < sessions.length) {
-        const selected = sessions[idx];
-        if (selected.id === sessionId) {
-          // Already on this session
+      if (idx >= 0 && idx < conversations.length) {
+        const selected = conversations[idx];
+        if (selected.id === conversationId) {
+          // Already on this conversation
           pendingSessionPick = false;
           process.stdout.write(
-            `\n  Session: ${selected.title}\n  Type your message. Ctrl+D to detach.\n\n`,
+            `\n  Conversation: ${selected.title}\n  Type your message. Ctrl+D to detach.\n\n`,
           );
           prompt();
         } else {
           try {
             const conversation = getConversation(selected.id);
             if (!conversation) {
-              process.stdout.write("  Failed to switch session.\n");
-              renderSessionPicker(sessions);
+              process.stdout.write("  Failed to switch conversation.\n");
+              renderConversationPicker(conversations);
               return;
             }
             const newKey = `builtin-cli:${selected.id}`;
             setConversationKeyIfAbsent(newKey, selected.id);
-            sessionId = conversation.id;
+            conversationId = conversation.id;
             conversationKey = newKey;
             pendingSessionPick = false;
-            await reconnectSse();
+            reconnectEvents();
             process.stdout.write(
-              `\n  Session: ${conversation.title ?? "Untitled"}\n  Type your message. Ctrl+D to detach.\n\n`,
+              `\n  Conversation: ${conversation.title ?? "Untitled"}\n  Type your message. Ctrl+D to detach.\n\n`,
             );
             prompt();
           } catch {
-            process.stdout.write("  Failed to switch session.\n");
-            renderSessionPicker(sessions);
+            process.stdout.write("  Failed to switch conversation.\n");
+            renderConversationPicker(conversations);
           }
         }
       } else {
         process.stdout.write("  Invalid selection.\n");
-        renderSessionPicker(sessions);
+        renderConversationPicker(conversations);
       }
     });
   }
 
   function handleMessage(msg: ServerMessage): void {
     switch (msg.type) {
-      case "session_info":
+      case "conversation_info":
         pendingSessionPick = false;
-        sessionId = msg.sessionId;
+        conversationId = msg.conversationId;
         process.stdout.write(
-          `\n  Session: ${msg.title}\n  Type your message. Ctrl+D to detach.\n\n`,
+          `\n  Conversation: ${msg.title}\n  Type your message. Ctrl+D to detach.\n\n`,
         );
         if (pendingUserContent) {
           const content = pendingUserContent;
@@ -799,6 +843,14 @@ export async function startCli(): Promise<void> {
         renderConfirmationPrompt(msg);
         break;
 
+      case "conversation_error":
+        spinner.stop();
+        if (lastDisplayedError !== msg.userMessage) {
+          process.stdout.write(`\n[Error: ${msg.userMessage}]\n`);
+        }
+        lastDisplayedError = null;
+        break;
+
       case "error":
         spinner.stop();
         generating = false;
@@ -809,6 +861,7 @@ export async function startCli(): Promise<void> {
           rl.removeAllListeners("line");
           rl.on("line", handleLine);
         }
+        lastDisplayedError = msg.message;
         process.stdout.write(`\n[Error: ${msg.message}]\n`);
         prompt();
         break;
@@ -834,12 +887,14 @@ export async function startCli(): Promise<void> {
         break;
       }
 
-      case "session_list_response":
+      case "conversation_list_response":
         if (pendingSessionPick) {
-          renderSessionPicker(msg.sessions);
+          renderConversationPicker(msg.conversations);
         } else {
-          for (const session of msg.sessions) {
-            process.stdout.write(`  ${session.id}  ${session.title}\n`);
+          for (const conversation of msg.conversations) {
+            process.stdout.write(
+              `  ${conversation.id}  ${conversation.title}\n`,
+            );
           }
           prompt();
         }
@@ -857,10 +912,10 @@ export async function startCli(): Promise<void> {
             process.stdout.write("\n  No messages to copy.\n\n");
           } else {
             try {
-              const formatted = formatSessionForExport(msg.messages);
+              const formatted = formatConversationForExport(msg.messages);
               copyToClipboard(formatted);
               process.stdout.write(
-                `\n  Copied session (${msg.messages.length} messages) to clipboard.\n\n`,
+                `\n  Copied conversation (${msg.messages.length} messages) to clipboard.\n\n`,
               );
             } catch (err) {
               process.stdout.write(
@@ -873,7 +928,7 @@ export async function startCli(): Promise<void> {
         }
         process.stdout.write("\n");
         if (msg.messages.length === 0) {
-          process.stdout.write("  No messages in this session.\n");
+          process.stdout.write("  No messages in this conversation.\n");
         } else {
           for (const m of msg.messages) {
             const label = m.role === "user" ? "you" : "assistant";
@@ -920,152 +975,30 @@ export async function startCli(): Promise<void> {
     }
   }
 
-  /** Disconnect the current SSE stream. */
-  function disconnectSse(): void {
-    if (sseAbortController) {
-      sseAbortController.abort();
-      sseAbortController = null;
+  /** Stop watching the current conversation's event stream file. */
+  function disconnectEvents(): void {
+    if (eventSubscription) {
+      eventSubscription.dispose();
+      eventSubscription = null;
     }
   }
 
-  /** Reconnect the SSE stream (e.g., after switching conversations). */
-  async function reconnectSse(): Promise<void> {
-    disconnectSse();
-    await connectSse();
+  /** Restart the file-stream watcher (e.g., after switching conversations). */
+  function reconnectEvents(): void {
+    disconnectEvents();
+    connectEvents();
   }
 
-  /** Connect the SSE event stream for the current conversation. */
-  async function connectSse(): Promise<void> {
-    const controller = new AbortController();
-    sseAbortController = controller;
-
-    const url = `/v1/events?conversationKey=${encodeURIComponent(conversationKey)}`;
-
-    try {
-      const response = await httpSend(url, {
-        method: "GET",
-        headers: { Accept: "text/event-stream" },
-        signal: controller.signal,
-      });
+  /** Watch the file-based event stream for the current conversation. */
+  function connectEvents(): void {
+    const mapping = getOrCreateConversation(conversationKey);
 
-      if (!response.ok || !response.body) {
-        throw new Error(`SSE connection failed: ${response.status}`);
+    eventSubscription = watchEventStream(mapping.conversationId, (event) => {
+      if (!conversationId && event.conversationId) {
+        conversationId = event.conversationId;
       }
-
-      // Read the SSE stream
-      const reader = response.body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = "";
-
-      const readLoop = async () => {
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-
-            buffer += decoder.decode(value, { stream: true });
-
-            // Parse SSE frames from the buffer
-            const frames = buffer.split("\n\n");
-            // Keep the last (potentially incomplete) frame in the buffer
-            buffer = frames.pop() ?? "";
-
-            for (const frame of frames) {
-              if (!frame.trim()) continue;
-              // Skip heartbeat comments
-              if (frame.startsWith(":")) continue;
-
-              // Parse event type and data
-              let data = "";
-              for (const line of frame.split("\n")) {
-                if (line.startsWith("data: ")) {
-                  data += line.slice(6);
-                }
-              }
-
-              if (!data) continue;
-
-              try {
-                const event = JSON.parse(data) as {
-                  message: ServerMessage;
-                  sessionId?: string;
-                };
-                // Extract the sessionId from the event envelope if we don't have one
-                if (!sessionId && event.sessionId) {
-                  sessionId = event.sessionId;
-                }
-                handleMessage(event.message);
-              } catch {
-                // Skip malformed events
-              }
-            }
-          }
-        } catch {
-          if (controller.signal.aborted) return; // intentional disconnect
-          // Connection lost — trigger reconnect
-        } finally {
-          reader.releaseLock();
-        }
-
-        // If not intentionally disconnected, reconnect
-        if (!controller.signal.aborted && !reconnecting) {
-          reconnect();
-        }
-      };
-
-      // Start reading in the background (don't await — it runs for the lifetime of the connection)
-      readLoop();
-    } catch (err) {
-      if (controller.signal.aborted) return;
-      throw err;
-    }
-  }
-
-  async function reconnect(): Promise<void> {
-    if (reconnecting) return;
-    reconnecting = true;
-    disconnectSse();
-    spinner.stop();
-
-    // Reset generation state — any in-flight request is lost
-    generating = false;
-    toolStreaming = false;
-    pendingSessionPick = false;
-    pendingConfirmation = false;
-    pendingCopySession = false;
-    lastUsage = null;
-
-    // Remove stale rl.once('line') handlers from confirmation/selection prompts
-    // and re-register the main line handler
-    rl.removeAllListeners("line");
-    rl.on("line", handleLine);
-
-    // Retry with exponential backoff (1s → 2s → 4s → … → 30s cap) until connected
-    while (true) {
-      const delaySec = (reconnectDelay / 1000).toFixed(0);
-      process.stdout.write(
-        `\n  Reconnecting to assistant in ${delaySec}s...\n`,
-      );
-      await new Promise((r) => setTimeout(r, reconnectDelay));
-
-      // Increase backoff for next attempt before trying
-      reconnectDelay = Math.min(reconnectDelay * 2, RECONNECT_MAX_DELAY_MS);
-
-      try {
-        if (shouldAutoStartDaemon()) await ensureDaemonRunning();
-        // Verify the daemon is healthy before attempting SSE
-        const healthy = await isHttpHealthy();
-        if (!healthy) throw new Error("Health check failed");
-        await connectSse();
-        reconnectDelay = RECONNECT_BASE_DELAY_MS;
-        reconnecting = false;
-        updateDaemonText(mainScreenLayout, "connected");
-        updateStatusText(mainScreenLayout, "ready");
-        return;
-      } catch {
-        // Will retry with increased backoff
-      }
-    }
+      handleMessage(event.message);
+    });
   }
 
   function handleLine(line: string): void {
@@ -1073,7 +1006,6 @@ export async function startCli(): Promise<void> {
     if (!content) return;
     if (pendingSessionPick) return;
     if (pendingConfirmation) return;
-    if (reconnecting) return;
 
     // Persist to history file (ensure parent directory exists)
     try {
@@ -1098,19 +1030,19 @@ export async function startCli(): Promise<void> {
       return;
     }
 
-    if (content === "/sessions") {
+    if (content === "/sessions" || content === "/conversations") {
       pendingSessionPick = true;
       try {
         const rows = listConversations(20);
-        const sessions = rows.map((r) => ({
+        const conversations = rows.map((r) => ({
           id: r.id,
           title: r.title || "Untitled",
           updatedAt: r.updatedAt,
         }));
-        renderSessionPicker(sessions);
+        renderConversationPicker(conversations);
       } catch {
         pendingSessionPick = false;
-        process.stdout.write("[Failed to fetch sessions]\n");
+        process.stdout.write("[Failed to fetch conversations]\n");
         prompt();
       }
       return;
@@ -1132,7 +1064,7 @@ export async function startCli(): Promise<void> {
       return;
     }
 
-    if (content === "/copy-session") {
+    if (content === "/copy-session" || content === "/copy-conversation") {
       try {
         const mapping = getConversationByKey(conversationKey);
         if (!mapping) {
@@ -1157,10 +1089,10 @@ export async function startCli(): Promise<void> {
             };
           });
           try {
-            const formatted = formatSessionForExport(rendered);
+            const formatted = formatConversationForExport(rendered);
             copyToClipboard(formatted);
             process.stdout.write(
-              `\n  Copied session (${rawMessages.length} messages) to clipboard.\n\n`,
+              `\n  Copied conversation (${rawMessages.length} messages) to clipboard.\n\n`,
             );
           } catch (err) {
             process.stdout.write(
@@ -1178,13 +1110,12 @@ export async function startCli(): Promise<void> {
     if (content === "/new") {
       // Create a new conversation by using a unique key
       conversationKey = `builtin-cli:${randomUUID()}`;
-      sessionId = "";
-      reconnectSse().then(() => {
-        process.stdout.write(
-          `\n  New session started.\n  Type your message. Ctrl+D to detach.\n\n`,
-        );
-        prompt();
-      });
+      conversationId = "";
+      reconnectEvents();
+      process.stdout.write(
+        `\n  New conversation started.\n  Type your message. Ctrl+D to detach.\n\n`,
+      );
+      prompt();
       return;
     }
 
@@ -1207,11 +1138,14 @@ export async function startCli(): Promise<void> {
         try {
           const raw = loadRawConfig();
           const provider = MODEL_TO_PROVIDER[modelArg];
-          raw.model = modelArg;
-          if (provider) raw.provider = provider;
+          setServiceField(raw, "inference", "model", modelArg);
+          if (provider) setServiceField(raw, "inference", "provider", provider);
           saveRawConfig(raw);
+          const existingProvider = (
+            raw.services as Record<string, Record<string, unknown>>
+          )?.inference?.provider as string | undefined;
           process.stdout.write(
-            `\n  Model: ${modelArg} (${provider ?? raw.provider})\n\n`,
+            `\n  Model: ${modelArg} (${provider ?? existingProvider})\n\n`,
           );
         } catch {
           process.stdout.write("[Failed to set model]\n");
@@ -1239,11 +1173,11 @@ export async function startCli(): Promise<void> {
         const mapping = getConversationByKey(conversationKey);
         process.stdout.write("\n");
         if (!mapping) {
-          process.stdout.write("  No messages in this session.\n");
+          process.stdout.write("  No messages in this conversation.\n");
         } else {
           const rawMessages = getMessages(mapping.conversationId);
           if (rawMessages.length === 0) {
-            process.stdout.write("  No messages in this session.\n");
+            process.stdout.write("  No messages in this conversation.\n");
           } else {
             for (const msg of rawMessages) {
               let parsedContent: unknown;
@@ -1270,13 +1204,13 @@ export async function startCli(): Promise<void> {
     }
 
     if (content === "/undo") {
-      if (!sessionId) {
-        process.stdout.write("\n  No active session.\n\n");
+      if (!conversationId) {
+        process.stdout.write("\n  No active conversation.\n\n");
         prompt();
         return;
       }
       try {
-        const signalsDir = join(getWorkspaceDir(), "signals");
+        const signalsDir = getSignalsDir();
         mkdirSync(signalsDir, { recursive: true });
         const resultPath = join(signalsDir, "conversation-undo.result");
         try {
@@ -1287,7 +1221,7 @@ export async function startCli(): Promise<void> {
         const requestId = randomUUID();
         writeFileSync(
           join(signalsDir, "conversation-undo"),
-          JSON.stringify({ sessionId, requestId }),
+          JSON.stringify({ conversationId, requestId }),
         );
 
         let settled = false;
@@ -1361,8 +1295,10 @@ export async function startCli(): Promise<void> {
 
     if (content === "/help") {
       process.stdout.write("\n  Available commands:\n");
-      process.stdout.write("  /new              Start a new session\n");
-      process.stdout.write("  /sessions         Switch between sessions\n");
+      process.stdout.write("  /new              Start a new conversation\n");
+      process.stdout.write(
+        "  /conversations    Switch between conversations\n",
+      );
       process.stdout.write("  /clear            Clear the screen\n");
       process.stdout.write("  /model [name]     Show or change the model\n");
       process.stdout.write("  /history          Show conversation history\n");
@@ -1377,7 +1313,7 @@ export async function startCli(): Promise<void> {
         "  /copy-code        Copy last code block to clipboard\n",
       );
       process.stdout.write(
-        "  /copy-session     Copy entire session to clipboard\n",
+        "  /copy-conversation Copy entire conversation to clipboard\n",
       );
       process.stdout.write("  /help             Show this help\n");
       process.stdout.write("\n");
@@ -1401,7 +1337,7 @@ export async function startCli(): Promise<void> {
   rl.on("line", handleLine);
 
   rl.on("close", () => {
-    disconnectSse();
+    disconnectEvents();
     process.stdout.write("\x1b[r\x1b[2J\x1b[H");
     process.stdout.write("\x1b[2mDetached.\x1b[0m\n");
     process.exit(0);
@@ -1410,13 +1346,13 @@ export async function startCli(): Promise<void> {
   // Ctrl+C: cancel generation if in progress, otherwise detach
   process.on("SIGINT", () => {
     spinner.stop();
-    if (generating && sessionId) {
+    if (generating && conversationId) {
       try {
-        const signalsDir = join(getWorkspaceDir(), "signals");
+        const signalsDir = getSignalsDir();
         mkdirSync(signalsDir, { recursive: true });
         writeFileSync(
           join(signalsDir, "cancel"),
-          JSON.stringify({ sessionId }),
+          JSON.stringify({ conversationId }),
         );
       } catch {
         // Best-effort cancel
@@ -1432,11 +1368,9 @@ export async function startCli(): Promise<void> {
   });
 
   // Initial connection
-  await connectSse();
+  connectEvents();
   updateDaemonText(mainScreenLayout, "connected");
   updateStatusText(mainScreenLayout, "ready");
-
-  // Show initial prompt since HTTP doesn't have the session_info flow
   process.stdout.write(`\n  Type your message. Ctrl+D to detach.\n\n`);
   prompt();
 }