groundcrew-cli 0.15.16 → 0.16.0

package/dist/index.js

@@ -5,9 +5,42 @@ import fs from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
 import readline from "readline";
-import { execFile } from "child_process";
+import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
+function getGitContext() {
+  try {
+    const branch = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      encoding: "utf8",
+      timeout: 500,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    let dirty = "";
+    try {
+      const status2 = execFileSync("git", ["status", "--porcelain", "-uno"], {
+        encoding: "utf8",
+        timeout: 500,
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      if (status2) {
+        const hasStaged = status2.split("\n").some((l) => l[0] !== " " && l[0] !== "?");
+        const hasUnstaged = status2.split("\n").some((l) => l[1] === "M" || l[1] === "D");
+        if (hasStaged) dirty += "+";
+        if (hasUnstaged) dirty += "*";
+      }
+      const untracked = execFileSync("git", ["ls-files", "--others", "--exclude-standard"], {
+        encoding: "utf8",
+        timeout: 500,
+        stdio: ["pipe", "pipe", "pipe"]
+      }).trim();
+      if (untracked) dirty += "%";
+    } catch {
+    }
+    return { branch, dirty };
+  } catch {
+    return null;
+  }
+}
 var GROUNDCREW_DIR = ".groundcrew";
 var SESSIONS_DIR = path.join(GROUNDCREW_DIR, "sessions");
 var ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_DIR, "active-sessions.json");
@@ -429,7 +462,7 @@ var CHAT_COMMANDS = [
   { cmd: "/clear", desc: "Clear pending tasks" },
   { cmd: "/exit", desc: "Exit chat" }
 ];
-function readMultilineInput(sessionId) {
+function readMultilineInput(sessionId, projectName, gitCtx) {
   return new Promise((resolve) => {
     const lines = [""];
     let crow = 0;
@@ -443,8 +476,18 @@ function readMultilineInput(sessionId) {
       const buf = [];
       if (lastTermRow > 0) buf.push(`\x1B[${lastTermRow}A`);
       buf.push("\r\x1B[J");
+      const termW = process.stdout.columns || 80;
+      let info = ` ${sessionId} `;
+      const ctxParts = [];
+      if (projectName) ctxParts.push(projectName);
+      if (gitCtx) {
+        ctxParts.push(`git:(${gitCtx.branch}${gitCtx.dirty})`);
+      }
+      if (ctxParts.length) info += ` ${ctxParts.join(" ")} `;
+      const dashRight = "\u2500".repeat(Math.max(0, termW - 4 - info.length));
+      buf.push(dim("\u2500\u2500\u2500" + info + dashRight));
       for (let i = 0; i < lines.length; i++) {
-        if (i > 0) buf.push("\n");
+        buf.push("\n");
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
@@ -457,7 +500,7 @@ function readMultilineInput(sessionId) {
       buf.push("\r");
       const col = padWidth + ccol;
       if (col > 0) buf.push(`\x1B[${col}C`);
-      lastTermRow = crow;
+      lastTermRow = 1 + crow;
       process.stdout.write(buf.join(""));
     };
     const finish = (result) => {
@@ -595,6 +638,89 @@ function readMultilineInput(sessionId) {
           continue;
         }
         if (str[i] === "\x1B" && i + 1 < str.length && str[i + 1] === "[") {
+          const csiMatch = str.slice(i).match(/^\x1b\[(\d+);(\d+)u/);
+          if (csiMatch) {
+            const codepoint = parseInt(csiMatch[1], 10);
+            const modifier = parseInt(csiMatch[2], 10);
+            const isCtrl = modifier - 1 & 4;
+            const seqLen = csiMatch[0].length;
+            if (isCtrl) {
+              switch (codepoint) {
+                case 99:
+                  if (fullText() || lines.length > 1 || lines[0].length > 0) {
+                    const lastRow = lines.length - 1;
+                    const rowsDown = lastRow - crow;
+                    if (rowsDown > 0) process.stdout.write(`\x1B[${rowsDown}B`);
+                    process.stdout.write("\r\n");
+                    lines.length = 0;
+                    lines.push("");
+                    crow = 0;
+                    ccol = 0;
+                    lastTermRow = 0;
+                    render();
+                  } else {
+                    process.stdout.write("\r\n");
+                    finish(null);
+                    return;
+                  }
+                  i += seqLen;
+                  continue;
+                case 100:
+                  if (fullText()) {
+                    doDelete();
+                  } else {
+                    process.stdout.write("\n");
+                    finish(null);
+                    return;
+                  }
+                  i += seqLen;
+                  continue;
+                case 97:
+                  ccol = 0;
+                  render();
+                  i += seqLen;
+                  continue;
+                case 101:
+                  ccol = lines[crow].length;
+                  render();
+                  i += seqLen;
+                  continue;
+                case 117:
+                  lines[crow] = lines[crow].slice(ccol);
+                  ccol = 0;
+                  render();
+                  i += seqLen;
+                  continue;
+                case 107:
+                  lines[crow] = lines[crow].slice(0, ccol);
+                  render();
+                  i += seqLen;
+                  continue;
+                case 119:
+                  {
+                    const before = lines[crow].slice(0, ccol);
+                    const stripped = before.replace(/\s+$/, "");
+                    const sp = stripped.lastIndexOf(" ");
+                    const newBefore = sp >= 0 ? stripped.slice(0, sp + 1) : "";
+                    lines[crow] = newBefore + lines[crow].slice(ccol);
+                    ccol = newBefore.length;
+                    render();
+                  }
+                  i += seqLen;
+                  continue;
+                case 108:
+                  process.stdout.write("\x1B[2J\x1B[H");
+                  lastTermRow = 0;
+                  render();
+                  i += seqLen;
+                  continue;
+                default:
+                  break;
+              }
+            }
+            i += seqLen;
+            continue;
+          }
           let j = i + 2;
           while (j < str.length && str.charCodeAt(j) >= 48 && str.charCodeAt(j) <= 63) j++;
           if (j < str.length) j++;
@@ -606,11 +732,12 @@ function readMultilineInput(sessionId) {
           continue;
         }
         if (str[i] === "") {
-          if (fullText()) {
+          const hasText = fullText();
+          if (hasText || lines.length > 1 || lines[0].length > 0) {
             const lastRow = lines.length - 1;
             const rowsDown = lastRow - crow;
             if (rowsDown > 0) process.stdout.write(`\x1B[${rowsDown}B`);
-            process.stdout.write("\n");
+            process.stdout.write("\r\n");
             lines.length = 0;
             lines.push("");
             crow = 0;
@@ -618,7 +745,7 @@ function readMultilineInput(sessionId) {
             lastTermRow = 0;
             render();
           } else {
-            process.stdout.write("\n");
+            process.stdout.write("\r\n");
             finish(null);
             return;
           }
@@ -672,6 +799,13 @@ function readMultilineInput(sessionId) {
           i++;
           continue;
         }
+        if (str[i] === "\f") {
+          process.stdout.write("\x1B[2J\x1B[H");
+          lastTermRow = 0;
+          render();
+          i++;
+          continue;
+        }
         if (str[i] === "\n") {
           insertNewline();
           i++;
@@ -687,8 +821,10 @@ function readMultilineInput(sessionId) {
           continue;
         }
         if (str[i] === "	") {
-          if (lines.length === 1 && lines[0].startsWith("/")) {
-            const matches = CHAT_COMMANDS.filter((c) => c.cmd.startsWith(lines[0]));
+          const currentLine = lines[crow];
+          if (lines.length === 1 && currentLine.startsWith("/")) {
+            const partial = currentLine.split(" ")[0];
+            const matches = CHAT_COMMANDS.filter((c) => c.cmd.startsWith(partial));
             if (matches.length === 1) {
               lines[0] = matches[0].cmd + " ";
               ccol = lines[0].length;
@@ -697,7 +833,7 @@ function readMultilineInput(sessionId) {
               const lastRow = lines.length - 1;
               const rowsDown = lastRow - crow;
               if (rowsDown > 0) process.stdout.write(`\x1B[${rowsDown}B`);
-              process.stdout.write("\n");
+              process.stdout.write("\r\n");
               for (const m of matches) {
                 process.stdout.write(`  ${cyan(m.cmd.padEnd(14))} ${dim(m.desc)}
 `);
@@ -812,7 +948,8 @@ async function chat(explicitSession) {
     process.exit(0);
   };
   while (true) {
-    const text = await readMultilineInput(current.id);
+    const gitCtx = getGitContext();
+    const text = await readMultilineInput(current.id, projectName, gitCtx);
     if (text === null) exitChat();
     if (!text) continue;
     const trimmed = text.trim();

package/package.json

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

package/src/index.ts

@@ -2,11 +2,40 @@ import fs from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
 import readline from "readline";
-import { execFile } from "child_process";
+import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
 
 const execFileAsync = promisify(execFile);
 
+// Git context for separator line (cached, refreshed periodically)
+function getGitContext(): { branch: string; dirty: string } | null {
+  try {
+    const branch = execFileSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      encoding: "utf8", timeout: 500, stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    // Status indicators matching Copilot CLI: * unstaged, + staged, % untracked
+    let dirty = "";
+    try {
+      const status = execFileSync("git", ["status", "--porcelain", "-uno"], {
+        encoding: "utf8", timeout: 500, stdio: ["pipe", "pipe", "pipe"],
+      }).trim();
+      if (status) {
+        const hasStaged = status.split("\n").some(l => l[0] !== " " && l[0] !== "?");
+        const hasUnstaged = status.split("\n").some(l => l[1] === "M" || l[1] === "D");
+        if (hasStaged) dirty += "+";
+        if (hasUnstaged) dirty += "*";
+      }
+      const untracked = execFileSync("git", ["ls-files", "--others", "--exclude-standard"], {
+        encoding: "utf8", timeout: 500, stdio: ["pipe", "pipe", "pipe"],
+      }).trim();
+      if (untracked) dirty += "%";
+    } catch { /* ignore status errors */ }
+    return { branch, dirty };
+  } catch {
+    return null;
+  }
+}
+
 // Resolved at startup by resolveRoot() — git-aware project root discovery
 let GROUNDCREW_DIR = ".groundcrew";
 let SESSIONS_DIR = path.join(GROUNDCREW_DIR, "sessions");
@@ -578,7 +607,7 @@ const CHAT_COMMANDS: Array<{ cmd: string; desc: string }> = [
  * Tab: slash command completion
  * Paste: bracketed paste with multiline support
  */
-function readMultilineInput(sessionId: string): Promise<string | null> {
+function readMultilineInput(sessionId: string, projectName: string, gitCtx: { branch: string; dirty: string } | null): Promise<string | null> {
   return new Promise((resolve) => {
     const lines: string[] = [""];
     let crow = 0;  // cursor row in lines[]
@@ -587,7 +616,7 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
     // Visible width of prompt: "[sessionId] > "
     const padWidth = sessionId.length + 5; // [ + id + ] + space + > + space = len+5
 
-    // Track which terminal row the cursor was on after last render
+    // Track how many rows up from cursor to top of rendered area (including separator)
     let lastTermRow = 0;
     let pasteBuffer = "";
     let isPasting = false;
@@ -597,13 +626,25 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
     const render = () => {
       const buf: string[] = [];
 
-      // Move to start of input area
+      // Move to start of input area (includes separator line)
       if (lastTermRow > 0) buf.push(`\x1b[${lastTermRow}A`);
       buf.push("\r\x1b[J"); // col 0 + clear to end of screen
 
-      // Draw each line
+      // Separator line: ─── sessionId  projectName git:(branch*) ───
+      const termW = process.stdout.columns || 80;
+      let info = ` ${sessionId} `;
+      const ctxParts: string[] = [];
+      if (projectName) ctxParts.push(projectName);
+      if (gitCtx) {
+        ctxParts.push(`git:(${gitCtx.branch}${gitCtx.dirty})`);
+      }
+      if (ctxParts.length) info += ` ${ctxParts.join(" ")} `;
+      const dashRight = "─".repeat(Math.max(0, termW - 4 - info.length));
+      buf.push(dim("───" + info + dashRight));
+
+      // Draw each input line (below separator)
       for (let i = 0; i < lines.length; i++) {
-        if (i > 0) buf.push("\n");
+        buf.push("\n");
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
@@ -620,7 +661,9 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
       const col = padWidth + ccol;
       if (col > 0) buf.push(`\x1b[${col}C`);
 
-      lastTermRow = crow;
+      // lastTermRow = rows from cursor back to top of separator
+      // separator is 1 row, then crow rows of input below it
+      lastTermRow = 1 + crow;
       process.stdout.write(buf.join(""));
     };
 
@@ -740,8 +783,63 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
         // End (\x1b[F)
         if (str.startsWith("\x1b[F", i)) { ccol = lines[crow].length; render(); i += 3; continue; }
 
-        // Skip unknown CSI sequences
+        // CSI u (Kitty keyboard protocol) — decode \x1b[{codepoint};{modifier}u
+        // modifier bit 3 (value 4) = Ctrl, sent as bits+1 so modifier 5 = Ctrl
         if (str[i] === "\x1b" && i + 1 < str.length && str[i + 1] === "[") {
+          const csiMatch = str.slice(i).match(/^\x1b\[(\d+);(\d+)u/);
+          if (csiMatch) {
+            const codepoint = parseInt(csiMatch[1], 10);
+            const modifier = parseInt(csiMatch[2], 10);
+            const isCtrl = (modifier - 1) & 4;
+            const seqLen = csiMatch[0].length;
+
+            if (isCtrl) {
+              switch (codepoint) {
+                case 99: // Ctrl+C
+                  if (fullText() || lines.length > 1 || lines[0].length > 0) {
+                    const lastRow = lines.length - 1;
+                    const rowsDown = lastRow - crow;
+                    if (rowsDown > 0) process.stdout.write(`\x1b[${rowsDown}B`);
+                    process.stdout.write("\r\n");
+                    lines.length = 0; lines.push("");
+                    crow = 0; ccol = 0; lastTermRow = 0;
+                    render();
+                  } else {
+                    process.stdout.write("\r\n");
+                    finish(null); return;
+                  }
+                  i += seqLen; continue;
+                case 100: // Ctrl+D
+                  if (fullText()) { doDelete(); } else { process.stdout.write("\n"); finish(null); return; }
+                  i += seqLen; continue;
+                case 97:  // Ctrl+A — home
+                  ccol = 0; render(); i += seqLen; continue;
+                case 101: // Ctrl+E — end
+                  ccol = lines[crow].length; render(); i += seqLen; continue;
+                case 117: // Ctrl+U — clear before cursor
+                  lines[crow] = lines[crow].slice(ccol); ccol = 0; render(); i += seqLen; continue;
+                case 107: // Ctrl+K — clear after cursor
+                  lines[crow] = lines[crow].slice(0, ccol); render(); i += seqLen; continue;
+                case 119: // Ctrl+W — delete word before cursor
+                  { const before = lines[crow].slice(0, ccol);
+                    const stripped = before.replace(/\s+$/, "");
+                    const sp = stripped.lastIndexOf(" ");
+                    const newBefore = sp >= 0 ? stripped.slice(0, sp + 1) : "";
+                    lines[crow] = newBefore + lines[crow].slice(ccol);
+                    ccol = newBefore.length; render(); }
+                  i += seqLen; continue;
+                case 108: // Ctrl+L — clear screen
+                  process.stdout.write("\x1b[2J\x1b[H");
+                  lastTermRow = 0; render();
+                  i += seqLen; continue;
+                default: break;
+              }
+            }
+            // Unhandled CSI u — skip it
+            i += seqLen; continue;
+          }
+
+          // Skip unknown CSI sequences (non-u final byte)
           let j = i + 2;
           while (j < str.length && str.charCodeAt(j) >= 0x30 && str.charCodeAt(j) <= 0x3f) j++;
           if (j < str.length) j++; // skip final byte
@@ -752,17 +850,18 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
 
         // Ctrl+C — clear input or exit
         if (str[i] === "\x03") {
-          if (fullText()) {
-            // Move past current rendering, start fresh below
+          const hasText = fullText();
+          if (hasText || lines.length > 1 || lines[0].length > 0) {
+            // Move past current rendering to below last line, start fresh
             const lastRow = lines.length - 1;
             const rowsDown = lastRow - crow;
             if (rowsDown > 0) process.stdout.write(`\x1b[${rowsDown}B`);
-            process.stdout.write("\n");
+            process.stdout.write("\r\n");
             lines.length = 0; lines.push("");
             crow = 0; ccol = 0; lastTermRow = 0;
             render();
           } else {
-            process.stdout.write("\n");
+            process.stdout.write("\r\n");
             finish(null); return;
           }
           i++; continue;
@@ -795,6 +894,11 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
           lines[crow] = newBefore + lines[crow].slice(ccol);
           ccol = newBefore.length; render(); i++; continue;
         }
+        // Ctrl+L — clear screen (legacy byte)
+        if (str[i] === "\x0c") {
+          process.stdout.write("\x1b[2J\x1b[H");
+          lastTermRow = 0; render(); i++; continue;
+        }
 
         // Ctrl+J (LF, 0x0A) — newline (cross-terminal)
         if (str[i] === "\n") { insertNewline(); i++; continue; }
@@ -807,8 +911,10 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
 
         // Tab — slash command completion
         if (str[i] === "\t") {
-          if (lines.length === 1 && lines[0].startsWith("/")) {
-            const matches = CHAT_COMMANDS.filter(c => c.cmd.startsWith(lines[0]));
+          const currentLine = lines[crow];
+          if (lines.length === 1 && currentLine.startsWith("/")) {
+            const partial = currentLine.split(" ")[0]; // only match command part
+            const matches = CHAT_COMMANDS.filter(c => c.cmd.startsWith(partial));
             if (matches.length === 1) {
               lines[0] = matches[0].cmd + " ";
               ccol = lines[0].length; render();
@@ -817,7 +923,7 @@ function readMultilineInput(sessionId: string): Promise<string | null> {
               const lastRow = lines.length - 1;
               const rowsDown = lastRow - crow;
               if (rowsDown > 0) process.stdout.write(`\x1b[${rowsDown}B`);
-              process.stdout.write("\n");
+              process.stdout.write("\r\n");
               for (const m of matches) {
                 process.stdout.write(`  ${cyan(m.cmd.padEnd(14))} ${dim(m.desc)}\n`);
               }
@@ -952,7 +1058,9 @@ async function chat(explicitSession?: string): Promise<void> {
 
   // ── Main chat loop ─────────────────────────────────────────────────────────────────
   while (true) {
-    const text = await readMultilineInput(current.id);
+    // Refresh git context each turn (branch may change between prompts)
+    const gitCtx = getGitContext();
+    const text = await readMultilineInput(current.id, projectName, gitCtx);
 
     if (text === null) exitChat();
     if (!text) continue;