groundcrew-cli 0.15.1 → 0.15.3

package/dist/index.js

@@ -415,49 +415,54 @@ function chatCompleter(line) {
   return [[], line];
 }
 function setupInlineSuggestions(rl) {
-  let ghostLines = 0;
+  let dropdownLines = 0;
+  let cursorCol = 0;
+  const getPromptLen = () => {
+    const p = rl._prompt || "";
+    return p.replace(/\x1b\[[0-9;]*m/g, "").length;
+  };
   const clearGhost = () => {
-    if (ghostLines > 0) {
-      for (let i = 0; i < ghostLines; i++) {
-        process.stdout.write("\x1B[B\x1B[2K");
+    const buf = [];
+    if (dropdownLines > 0) {
+      for (let i = 0; i < dropdownLines; i++) {
+        buf.push("\x1B[B\x1B[2K");
       }
-      process.stdout.write(`\x1B[${ghostLines}A`);
-      ghostLines = 0;
+      buf.push(`\x1B[${dropdownLines}A`);
+      dropdownLines = 0;
+    }
+    if (cursorCol > 0) {
+      buf.push(`\x1B[${cursorCol}G\x1B[K`);
     }
-    process.stdout.write("\x1B[u\x1B[K");
+    if (buf.length) process.stdout.write(buf.join(""));
   };
   const showGhost = () => {
     const line = rl.line;
-    if (!line || !line.startsWith("/") || line.includes(" ")) {
-      return;
-    }
+    if (!line || !line.startsWith("/") || line.includes(" ")) return;
     const matches = CHAT_COMMANDS.filter((c) => c.cmd.startsWith(line));
     if (matches.length === 0) return;
-    process.stdout.write("\x1B[s");
-    if (matches.length === 1) {
-      const best = matches[0];
-      const remainder = best.cmd.slice(line.length);
-      if (!remainder) return;
-      const ghost = `${remainder} \u2014 ${best.desc}`;
-      process.stdout.write("\x1B[K");
-      process.stdout.write(`\x1B[2m${ghost}\x1B[0m`);
-      process.stdout.write("\x1B[u");
-    } else {
-      const shown = matches.slice(0, 5);
-      process.stdout.write("\x1B[K");
-      const best = shown[0];
-      const remainder = best.cmd.slice(line.length);
-      if (remainder) {
-        process.stdout.write(`\x1B[2m${remainder} \u2014 ${best.desc}\x1B[0m`);
-      }
-      for (let i = 1; i < shown.length; i++) {
-        const m = shown[i];
-        process.stdout.write(`
-\x1B[2K  \x1B[2m${m.cmd.padEnd(12)} \u2014 ${m.desc}\x1B[0m`);
+    const shown = matches.slice(0, 5);
+    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`);
+    if (remainder) {
+      buf.push(`\x1B[2m${remainder}\x1B[0m`);
+    }
+    if (shown.length > 1 || shown.length === 1 && remainder) {
+      const count = shown.length;
+      for (let i = 0; i < count; i++) buf.push("\n");
+      buf.push(`\x1B[${count}A`);
+      for (let i = 0; i < count; i++) {
+        buf.push(`\x1B[B\r\x1B[2K`);
+        buf.push(`  \x1B[36m${shown[i].cmd.padEnd(14)}\x1B[0m\x1B[2m${shown[i].desc}\x1B[0m`);
       }
-      ghostLines = shown.length - 1;
-      process.stdout.write("\x1B[u");
+      dropdownLines = count;
+      buf.push(`\x1B[${count}A`);
     }
+    buf.push(`\x1B[${cursorCol}G`);
+    process.stdout.write(buf.join(""));
   };
   process.stdin.on("keypress", (_ch, key) => {
     if (!key) return;
@@ -528,6 +533,7 @@ async function chat(explicitSession) {
   const prompt = () => {
     const isContinuation = continuationBuffer.length > 0;
     const prefix = isContinuation ? `${dim(`[${current.id}]`)} ${dim("...")} ` : `${dim(`[${current.id}]`)} ${bold(">")} `;
+    rl.setPrompt(prefix);
     rl.question(prefix, async (line) => {
       if (line.endsWith("\\")) {
         continuationBuffer.push(line.slice(0, -1));

package/package.json

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

package/src/index.ts

@@ -540,71 +540,81 @@ function chatCompleter(line: string): [string[], string] {
 }
 
 /**
- * Show inline ghost suggestions as user types / commands.
- * Single match: inline ghost after cursor.
- * Multiple matches: multi-line dropdown below the prompt (max 5).
+ * 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).
  */
 function setupInlineSuggestions(rl: readline.Interface): void {
-  let ghostLines = 0; // how many extra lines we rendered below prompt
+  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;
+  };
 
   const clearGhost = () => {
-    if (ghostLines > 0) {
-      // Move down and clear each ghost line, then move back up
-      for (let i = 0; i < ghostLines; i++) {
-        process.stdout.write("\x1b[B\x1b[2K"); // down + clear line
+    const buf: string[] = [];
+    // Clear dropdown lines below prompt
+    if (dropdownLines > 0) {
+      for (let i = 0; i < dropdownLines; i++) {
+        buf.push("\x1b[B\x1b[2K"); // down + clear entire line
       }
-      // Move back up to prompt line
-      process.stdout.write(`\x1b[${ghostLines}A`);
-      ghostLines = 0;
+      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`);
     }
-    // Restore cursor and clear to end of line (for inline ghost)
-    process.stdout.write("\x1b[u\x1b[K");
+    if (buf.length) process.stdout.write(buf.join(""));
   };
 
   const showGhost = () => {
     const line = (rl as any).line as string;
-    if (!line || !line.startsWith("/") || line.includes(" ")) {
-      return;
-    }
+    if (!line || !line.startsWith("/") || line.includes(" ")) return;
 
     const matches = CHAT_COMMANDS.filter((c) => c.cmd.startsWith(line));
     if (matches.length === 0) return;
 
-    // Save cursor position
-    process.stdout.write("\x1b[s");
-
-    if (matches.length === 1) {
-      // Single match: inline ghost remainder + description
-      const best = matches[0];
-      const remainder = best.cmd.slice(line.length);
-      if (!remainder) return;
-      const ghost = `${remainder} \u2014 ${best.desc}`;
-      process.stdout.write("\x1b[K");
-      process.stdout.write(`\x1b[2m${ghost}\x1b[0m`);
-      process.stdout.write("\x1b[u");
-    } else {
-      // Multiple matches: show dropdown below prompt (max 5)
-      const shown = matches.slice(0, 5);
-      // Clear to end of line first
-      process.stdout.write("\x1b[K");
-      // Inline ghost for the best match remainder
-      const best = shown[0];
-      const remainder = best.cmd.slice(line.length);
-      if (remainder) {
-        process.stdout.write(`\x1b[2m${remainder} \u2014 ${best.desc}\x1b[0m`);
-      }
-      // Render dropdown lines below
-      for (let i = 1; i < shown.length; i++) {
-        const m = shown[i];
-        process.stdout.write(`\n\x1b[2K  \x1b[2m${m.cmd.padEnd(12)} \u2014 ${m.desc}\x1b[0m`);
+    const shown = matches.slice(0, 5);
+    const best = shown[0];
+    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`);
+    if (remainder) {
+      buf.push(`\x1b[2m${remainder}\x1b[0m`);
+    }
+
+    // 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;
+      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[36m${shown[i].cmd.padEnd(14)}\x1b[0m\x1b[2m${shown[i].desc}\x1b[0m`);
       }
-      ghostLines = shown.length - 1;
-      // Restore cursor to typing position
-      process.stdout.write("\x1b[u");
+      dropdownLines = count;
+
+      // Back to prompt line
+      buf.push(`\x1b[${count}A`);
     }
+
+    // Restore cursor to typing position on prompt line
+    buf.push(`\x1b[${cursorCol}G`);
+    process.stdout.write(buf.join(""));
   };
 
-  // Listen to keypresses
   process.stdin.on("keypress", (_ch: string, key: any) => {
     if (!key) return;
     clearGhost();
@@ -687,6 +697,7 @@ async function chat(explicitSession?: string): Promise<void> {
       ? `${dim(`[${current!.id}]`)} ${dim("...")} `
       : `${dim(`[${current!.id}]`)} ${bold(">")} `;
 
+    rl.setPrompt(prefix);
     rl.question(prefix, async (line) => {
       // Line continuation with backslash
       if (line.endsWith("\\")) {