revspec 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revspec",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "bin": {
     "revspec": "./bin/revspec.ts"

package/src/cli/reply.ts

@@ -42,12 +42,15 @@ export function runReply(
     process.exit(1);
   }
 
+  // Clean up shell escaping artifacts (e.g., \! from bash history expansion)
+  const cleanText = text.replace(/\\!/g, "!");
+
   // Append reply event
   appendEvent(jsonlPath, {
     type: "reply",
     threadId,
     author: "owner",
-    text,
+    text: cleanText,
     ts: Date.now(),
   });
 }

package/src/cli/watch.ts

@@ -193,6 +193,12 @@ function processNewEvents(
     return { approved: true, output: "", newOffset };
   }
 
+  // Check for session-end — TUI exited, break the loop
+  const hasSessionEnd = events.some((e) => e.type === "session-end");
+  if (hasSessionEnd) {
+    return { approved: false, output: "Session ended. Reviewer exited revspec.\n", newOffset };
+  }
+
   // Only return actionable events — comments and replies that need an LLM response.
   // Resolves, unresolves, and deletes are informational — no reply needed.
   const actionableEvents = events.filter(

package/src/protocol/live-events.ts

@@ -8,7 +8,8 @@ export type LiveEventType =
   | "unresolve"
   | "approve"
   | "delete"
-  | "round";
+  | "round"
+  | "session-end";
 
 export interface LiveEvent {
   type: LiveEventType;

package/src/tui/app.ts

@@ -200,6 +200,8 @@ export async function runTui(
 
   function mergeAndExit(resolve: () => void): void {
     doMerge();
+    // Signal to watch process that session has ended
+    appendEvent(jsonlPath, { type: "session-end", author: "reviewer", ts: Date.now() });
     liveWatcher.stop();
     renderer.destroy();
     resolve();
@@ -249,11 +251,13 @@ export async function runTui(
         setTimeout(() => { refreshPager(); }, 2000);
         return "stay";
       }
+      appendEvent(jsonlPath, { type: "session-end", author: "reviewer", ts: Date.now() });
       liveWatcher.stop();
       return "exit";
     }
     if (cmd === "q!") {
       // Exit without merging
+      appendEvent(jsonlPath, { type: "session-end", author: "reviewer", ts: Date.now() });
       liveWatcher.stop();
       return "exit";
     }
@@ -263,7 +267,7 @@ export async function runTui(
   // --- Overlay launchers ---
 
   function showCommentInput(): void {
-    const existingThread = state.threadAtLine(state.cursorLine);
+    let existingThread = state.threadAtLine(state.cursorLine);
 
     const overlay = createCommentInput({
       renderer,
@@ -278,13 +282,19 @@ export async function runTui(
           refreshPager();
           // Don't dismiss — overlay stays open, message appended by comment-input
         } else {
-          // New comment — close overlay
+          // New comment — create thread, stay open
           state.addComment(state.cursorLine, text);
           const newThread = state.threadAtLine(state.cursorLine);
           if (newThread) {
             appendEvent(jsonlPath, { type: "comment", threadId: newThread.id, line: state.cursorLine, author: "reviewer", text, ts: Date.now() });
+            // Update overlay to reference the new thread
+            if (activeOverlay) {
+              activeOverlay.threadId = newThread.id;
+              activeOverlay.container.title = ` Thread #${newThread.id} (line ${state.cursorLine}) `;
+            }
+            existingThread = newThread;
           }
-          dismissOverlay();
+          refreshPager();
         }
       },
       onResolve: () => {

package/src/tui/comment-input.ts

@@ -28,89 +28,12 @@ export interface CommentInputOverlay {
 
 export function createCommentInput(opts: CommentInputOptions): CommentInputOverlay {
   const { renderer, line, existingThread, onSubmit, onResolve, onCancel } = opts;
-  const hasThread = existingThread && existingThread.messages.length > 0;
-
-  if (!hasThread) {
-    return createNewComment(renderer, line, onSubmit, onCancel);
-  }
-  return createThreadView(renderer, line, existingThread!, onSubmit, onResolve, onCancel);
-}
-
-// --- New comment: insert-only buffer, Tab submits and closes ---
-function createNewComment(
-  renderer: CliRenderer,
-  line: number,
-  onSubmit: (text: string) => void,
-  onCancel: () => void,
-): CommentInputOverlay {
-  const container = new BoxRenderable(renderer, {
-    position: "absolute",
-    top: "30%",
-    left: "10%",
-    width: "80%",
-    height: 10,
-    zIndex: 100,
-    backgroundColor: theme.base,
-    border: true,
-    borderStyle: "single",
-    borderColor: theme.borderComment,
-    title: ` New comment on line ${line} `,
-    flexDirection: "column",
-    padding: 1,
-  });
-
-  const textarea = new TextareaRenderable(renderer, {
-    width: "100%",
-    flexGrow: 1,
-    backgroundColor: theme.surface0,
-    textColor: theme.text,
-    focusedBackgroundColor: theme.surface0,
-    focusedTextColor: theme.text,
-    wrapMode: "word",
-    placeholder: "Type your comment...",
-    placeholderColor: theme.overlay,
-    initialValue: "",
-  });
-
-  const hint = new TextRenderable(renderer, {
-    content: " [Tab] submit  [Esc] cancel",
-    width: "100%",
-    height: 1,
-    fg: theme.hintFg,
-    bg: theme.hintBg,
-    wrapMode: "none",
-    truncate: true,
-  });
-
-  container.add(textarea);
-  container.add(hint);
-  setTimeout(() => { textarea.focus(); renderer.requestRender(); }, 0);
-
-  let submitted = false;
-  const keyHandler = (key: KeyEvent) => {
-    if (key.name === "escape") {
-      key.preventDefault(); key.stopPropagation(); onCancel(); return;
-    }
-    if (key.name === "tab") {
-      key.preventDefault(); key.stopPropagation();
-      if (submitted) return;
-      submitted = true;
-      const text = textarea.plainText.trim();
-      if (text.length > 0) onSubmit(text); else onCancel();
-      return;
-    }
-  };
-  renderer.keyInput.on("keypress", keyHandler);
-
-  return {
-    container,
-    cleanup() { renderer.keyInput.off("keypress", keyHandler); textarea.destroy(); },
-    addMessage() {},
-    threadId: null,
-  };
+  // Always use thread view — even for new comments (empty history, just the input)
+  const thread = existingThread ?? { id: "", line, status: "open" as const, messages: [] };
+  return createThreadView(renderer, line, thread, onSubmit, onResolve, onCancel);
 }
 
-// --- Thread view: two modes (normal/insert), unified buffer ---
+// --- Unified thread view: works for both new comments and existing threads ---
 function createThreadView(
   renderer: CliRenderer,
   line: number,
@@ -130,7 +53,7 @@ function createThreadView(
     border: true,
     borderStyle: "single",
     borderColor: theme.borderComment,
-    title: ` Thread #${thread.id} (line ${line}) `,
+    title: thread.id ? ` Thread #${thread.id} (line ${line}) ` : ` New comment on line ${line} `,
     flexDirection: "column",
     padding: 1,
   });