groundcrew-cli 0.15.3 → 0.15.5

package/dist/index.js

@@ -416,11 +416,7 @@ function chatCompleter(line) {
 }
 function setupInlineSuggestions(rl) {
   let dropdownLines = 0;
-  let cursorCol = 0;
-  const getPromptLen = () => {
-    const p = rl._prompt || "";
-    return p.replace(/\x1b\[[0-9;]*m/g, "").length;
-  };
+  let ghostLen = 0;
   const clearGhost = () => {
     const buf = [];
     if (dropdownLines > 0) {
@@ -430,9 +426,8 @@ function setupInlineSuggestions(rl) {
       buf.push(`\x1B[${dropdownLines}A`);
       dropdownLines = 0;
     }
-    if (cursorCol > 0) {
-      buf.push(`\x1B[${cursorCol}G\x1B[K`);
-    }
+    buf.push("\x1B[K");
+    ghostLen = 0;
     if (buf.length) process.stdout.write(buf.join(""));
   };
   const showGhost = () => {
@@ -444,11 +439,12 @@ function setupInlineSuggestions(rl) {
     const best = shown[0];
     const remainder = best.cmd.slice(line.length);
     if (!remainder && shown.length === 1) return;
-    cursorCol = getPromptLen() + line.length + 1;
     const buf = [];
-    buf.push(`\x1B[${cursorCol}G\x1B[K`);
+    buf.push("\x1B[K");
     if (remainder) {
       buf.push(`\x1B[2m${remainder}\x1B[0m`);
+      ghostLen = remainder.length;
+      buf.push(`\x1B[${remainder.length}D`);
     }
     if (shown.length > 1 || shown.length === 1 && remainder) {
       const count = shown.length;
@@ -460,12 +456,24 @@ function setupInlineSuggestions(rl) {
       }
       dropdownLines = count;
       buf.push(`\x1B[${count}A`);
+      buf.push(`\r`);
     }
-    buf.push(`\x1B[${cursorCol}G`);
     process.stdout.write(buf.join(""));
+    if (dropdownLines > 0) {
+      rl._refreshLine();
+      if (remainder) {
+        process.stdout.write(`\x1B[K\x1B[2m${remainder}\x1B[0m\x1B[${remainder.length}D`);
+      }
+    }
   };
   process.stdin.on("keypress", (_ch, key) => {
     if (!key) return;
+    if (key.name === "return" && key.shift) {
+      const line = rl.line;
+      rl.line = line + "\\";
+      rl.cursor = rl.line.length;
+      return;
+    }
     clearGhost();
     if (key.name !== "return" && key.name !== "tab") {
       setImmediate(showGhost);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "groundcrew-cli",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "CLI companion for Groundcrew — queue tasks, send feedback, monitor your Copilot agent from another terminal.",
   "type": "module",
   "bin": {

package/src/index.ts

@@ -543,16 +543,11 @@ function chatCompleter(line: string): [string[], string] {
  * Show inline ghost + multi-line dropdown as user types / commands.
  * Best match completion shown inline (dimmed) after cursor.
  * All matches (max 5) shown as dropdown lines below the prompt.
- * Uses explicit column + relative cursor movement (no save/restore).
+ * Uses only relative cursor movement — no absolute column needed.
  */
 function setupInlineSuggestions(rl: readline.Interface): void {
-  let dropdownLines = 0; // extra lines rendered below prompt
-  let cursorCol = 0;     // 1-based column where typed text ends
-
-  const getPromptLen = (): number => {
-    const p = (rl as any)._prompt as string || "";
-    return p.replace(/\x1b\[[0-9;]*m/g, "").length;
-  };
+  let dropdownLines = 0;  // extra lines rendered below prompt
+  let ghostLen = 0;        // length of inline ghost text on prompt line
 
   const clearGhost = () => {
     const buf: string[] = [];
@@ -564,10 +559,10 @@ function setupInlineSuggestions(rl: readline.Interface): void {
       buf.push(`\x1b[${dropdownLines}A`); // back up to prompt line
       dropdownLines = 0;
     }
-    // Clear inline ghost on prompt line
-    if (cursorCol > 0) {
-      buf.push(`\x1b[${cursorCol}G\x1b[K`);
-    }
+    // Clear inline ghost: readline already repositioned cursor at end of
+    // typed text after processing the keypress, so just clear to EOL
+    buf.push("\x1b[K");
+    ghostLen = 0;
     if (buf.length) process.stdout.write(buf.join(""));
   };
 
@@ -583,40 +578,63 @@ function setupInlineSuggestions(rl: readline.Interface): void {
     const remainder = best.cmd.slice(line.length);
     if (!remainder && shown.length === 1) return;
 
-    cursorCol = getPromptLen() + line.length + 1;
     const buf: string[] = [];
 
-    // Inline ghost: show remainder of best match (dimmed) on prompt line
-    buf.push(`\x1b[${cursorCol}G\x1b[K`);
+    // Inline ghost: cursor is already at end of typed text (readline did that)
+    // Just clear rest of line and write dimmed remainder
+    buf.push("\x1b[K");
     if (remainder) {
       buf.push(`\x1b[2m${remainder}\x1b[0m`);
+      ghostLen = remainder.length;
+      // Move cursor back to end of typed text
+      buf.push(`\x1b[${remainder.length}D`);
     }
 
     // Dropdown: show all matches below prompt
     if (shown.length > 1 || (shown.length === 1 && remainder)) {
-      // Make room by writing newlines (handles terminal bottom scroll)
       const count = shown.length;
+      // Make room by writing newlines (handles terminal bottom scroll)
       for (let i = 0; i < count; i++) buf.push("\n");
       buf.push(`\x1b[${count}A`); // back to prompt line
 
       // Write each dropdown line: cyan command + dim description
       for (let i = 0; i < count; i++) {
-        buf.push(`\x1b[B\r\x1b[2K`); // down + beginning of line + clear
+        buf.push(`\x1b[B\r\x1b[2K`); // down + col 1 + clear
         buf.push(`  \x1b[36m${shown[i].cmd.padEnd(14)}\x1b[0m\x1b[2m${shown[i].desc}\x1b[0m`);
       }
       dropdownLines = count;
 
-      // Back to prompt line
+      // Back to prompt line and restore horizontal position
+      // Move up to prompt line
       buf.push(`\x1b[${count}A`);
+      // Move to column 1, then rewrite prompt+line to position cursor correctly
+      buf.push(`\r`);
+      // Let readline handle cursor positioning
     }
 
-    // Restore cursor to typing position on prompt line
-    buf.push(`\x1b[${cursorCol}G`);
     process.stdout.write(buf.join(""));
+    // After dropdown, force readline to redraw prompt line to fix cursor position
+    if (dropdownLines > 0) {
+      (rl as any)._refreshLine();
+      // Re-draw inline ghost since _refreshLine cleared it
+      if (remainder) {
+        process.stdout.write(`\x1b[K\x1b[2m${remainder}\x1b[0m\x1b[${remainder.length}D`);
+      }
+    }
   };
 
   process.stdin.on("keypress", (_ch: string, key: any) => {
     if (!key) return;
+
+    // Shift+Enter: insert newline marker instead of submitting
+    if (key.name === "return" && key.shift) {
+      // Append backslash to trigger line continuation, then simulate Enter
+      const line = (rl as any).line as string;
+      (rl as any).line = line + "\\";
+      (rl as any).cursor = (rl as any).line.length;
+      return;
+    }
+
     clearGhost();
     if (key.name !== "return" && key.name !== "tab") {
       setImmediate(showGhost);