groundcrew-cli 0.16.5 → 0.17.0

package/dist/index.js

@@ -4,6 +4,7 @@ import{createRequire}from'module';const require=createRequire(import.meta.url);
 import fs from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
+import os from "os";
 import readline from "readline";
 import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
@@ -73,35 +74,21 @@ close access fp`], { timeout: 3e3, stdio: ["pipe", "pipe", "pipe"] });
     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");
-var HISTORY_FILE = path.join(GROUNDCREW_DIR, "history.json");
+var GROUNDCREW_HOME = path.join(os.homedir(), ".groundcrew");
+var SESSIONS_DIR = path.join(GROUNDCREW_HOME, "sessions");
+var ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_HOME, "active-sessions.json");
+var HISTORY_FILE = path.join(GROUNDCREW_HOME, "history.json");
+var REPO_NAME = "";
 async function resolveRoot() {
   let root = null;
   try {
     const { stdout } = await execFileAsync("git", ["rev-parse", "--show-toplevel"]);
-    const gitRoot = stdout.trim();
-    if (gitRoot && existsSync(path.join(gitRoot, ".groundcrew"))) {
-      root = gitRoot;
-    }
+    root = stdout.trim() || null;
   } catch {
   }
-  if (!root) {
-    let dir = process.cwd();
-    while (dir !== path.dirname(dir)) {
-      if (existsSync(path.join(dir, ".groundcrew"))) {
-        root = dir;
-        break;
-      }
-      dir = path.dirname(dir);
-    }
-  }
   if (!root) root = process.cwd();
-  GROUNDCREW_DIR = path.join(root, ".groundcrew");
-  SESSIONS_DIR = path.join(GROUNDCREW_DIR, "sessions");
-  ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_DIR, "active-sessions.json");
-  HISTORY_FILE = path.join(GROUNDCREW_DIR, "history.json");
+  REPO_NAME = path.basename(root).replace(/[^a-zA-Z0-9_-]/g, "_") || "unknown";
+  await fs.mkdir(SESSIONS_DIR, { recursive: true });
 }
 async function readActiveSessions() {
   try {
@@ -110,6 +97,9 @@ async function readActiveSessions() {
     return {};
   }
 }
+function isRepoSession(sessionId) {
+  return sessionId.startsWith(REPO_NAME + "-");
+}
 async function resolveSessionDir(explicitSession) {
   if (explicitSession) {
     const dir = path.join(SESSIONS_DIR, explicitSession);
@@ -119,10 +109,10 @@ async function resolveSessionDir(explicitSession) {
     return dir;
   }
   const sessions2 = await readActiveSessions();
-  const ids = Object.keys(sessions2);
+  const ids = Object.keys(sessions2).filter(isRepoSession);
   if (ids.length === 0) {
     try {
-      const dirs = await fs.readdir(SESSIONS_DIR);
+      const dirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession);
       if (dirs.length === 1) return path.join(SESSIONS_DIR, dirs[0]);
       if (dirs.length > 1) {
         let latest2 = { dir: dirs[0], mtime: 0 };
@@ -139,7 +129,7 @@ async function resolveSessionDir(explicitSession) {
       }
     } catch {
     }
-    throw new Error("No active sessions. Start Copilot with groundcrew first.");
+    throw new Error(`No active sessions for repo "${REPO_NAME}". Start Copilot with groundcrew first.`);
   }
   if (ids.length === 1) {
     return path.join(SESSIONS_DIR, ids[0]);
@@ -185,10 +175,6 @@ var cyan = (t) => color(36, t);
 var dim = (t) => color(2, t);
 var bold = (t) => color(1, t);
 var red = (t) => color(31, t);
-async function init() {
-  await fs.mkdir(SESSIONS_DIR, { recursive: true });
-  console.log(green("Groundcrew initialized.") + ` ${dim(GROUNDCREW_DIR + "/ created")}`);
-}
 async function add(taskText, priority, sessionDir) {
   const queue = await readQueue(sessionDir);
   const task = {
@@ -308,23 +294,35 @@ async function sessions() {
     console.log(dim("No sessions found."));
     return;
   }
-  console.log(bold("Sessions:\n"));
+  const byRepo = /* @__PURE__ */ new Map();
   for (const dir of allDirs) {
-    const isActive = ids.includes(dir);
-    const sessionDir = path.join(SESSIONS_DIR, dir);
-    let info = "";
-    try {
-      const session = JSON.parse(await fs.readFile(path.join(sessionDir, "session.json"), "utf-8"));
-      const startTime = new Date(session.started).getTime();
-      const minutes = Math.round((Date.now() - startTime) / 6e4);
-      const statusColor = session.status === "active" ? green : session.status === "parked" ? yellow : dim;
-      info = `${statusColor(session.status)} | ${minutes}min | ${session.tasksCompleted || 0} tasks done`;
-    } catch {
-      info = dim("no session data");
+    const dashIdx = dir.lastIndexOf("-");
+    const repo = dashIdx > 0 ? dir.substring(0, dashIdx) : "unknown";
+    if (!byRepo.has(repo)) byRepo.set(repo, []);
+    byRepo.get(repo).push(dir);
+  }
+  console.log(bold("Sessions:\n"));
+  for (const [repo, dirs] of byRepo) {
+    const isCurrent = repo === REPO_NAME;
+    console.log(`  ${isCurrent ? green(repo) : dim(repo)}`);
+    for (const dir of dirs) {
+      const isActive = ids.includes(dir);
+      const sessionDir = path.join(SESSIONS_DIR, dir);
+      let info = "";
+      try {
+        const session = JSON.parse(await fs.readFile(path.join(sessionDir, "session.json"), "utf-8"));
+        const startTime = new Date(session.started).getTime();
+        const minutes = Math.round((Date.now() - startTime) / 6e4);
+        const statusColor = session.status === "active" ? green : session.status === "parked" ? yellow : dim;
+        info = `${statusColor(session.status)} | ${minutes}min | ${session.tasksCompleted || 0} tasks done`;
+      } catch {
+        info = dim("no session data");
+      }
+      const queue = await readQueue(sessionDir);
+      const marker = isActive ? green("*") : " ";
+      const shortId = dir.substring(repo.length + 1);
+      console.log(`    ${marker} ${cyan(shortId)}  ${info} | ${queue.tasks.length} queued`);
     }
-    const queue = await readQueue(sessionDir);
-    const marker = isActive ? green("*") : " ";
-    console.log(`  ${marker} ${cyan(dir)}  ${info} | ${queue.tasks.length} queued`);
   }
   if (ids.length > 0) {
     console.log(dim(`
@@ -381,14 +379,14 @@ async function destroyOne(sessionId) {
 }
 async function stopAll() {
   const active = await readActiveSessions();
-  const ids = Object.keys(active);
+  const ids = Object.keys(active).filter(isRepoSession);
   let allDirs = [];
   try {
-    allDirs = await fs.readdir(SESSIONS_DIR);
+    allDirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession);
   } catch {
   }
   if (ids.length === 0 && allDirs.length === 0) {
-    console.log(dim("No sessions to stop."));
+    console.log(dim(`No sessions to stop for repo "${REPO_NAME}".`));
     return;
   }
   for (const id of ids) {
@@ -404,36 +402,32 @@ async function stopAll() {
       console.log(`  ${green("cleaned")}  ${cyan(dir)} ${dim("(orphaned)")}`);
     }
   }
-  await fs.writeFile(ACTIVE_SESSIONS_FILE, "{}");
-  console.log(green("\nAll sessions stopped."));
+  const remaining = await readActiveSessions();
+  for (const id of ids) delete remaining[id];
+  await fs.writeFile(ACTIVE_SESSIONS_FILE, JSON.stringify(remaining, null, 2));
+  console.log(green(`
+All ${REPO_NAME} sessions stopped.`));
 }
 async function destroyAll() {
   await stopAll();
   try {
-    const dirs = await fs.readdir(SESSIONS_DIR);
+    const dirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession);
     for (const dir of dirs) {
       await fs.rm(path.join(SESSIONS_DIR, dir), { recursive: true, force: true });
     }
   } catch {
   }
   try {
-    await fs.unlink(HISTORY_FILE);
-  } catch {
-  }
-  try {
-    await fs.unlink(ACTIVE_SESSIONS_FILE);
-  } catch {
-  }
-  try {
-    await fs.unlink(path.join(GROUNDCREW_DIR, "tool-history.csv"));
+    await fs.unlink(path.join(GROUNDCREW_HOME, "tool-history.csv"));
   } catch {
   }
-  console.log(green("All session data and history deleted."));
+  console.log(green(`All ${REPO_NAME} session data deleted.`));
 }
 async function listSessionChoices() {
   const active = await readActiveSessions();
   const choices = [];
   for (const [id, entry] of Object.entries(active)) {
+    if (!isRepoSession(id)) continue;
     const dir = path.join(SESSIONS_DIR, id);
     let status2 = "active";
     let minutes = 0;
@@ -458,7 +452,7 @@ async function listSessionChoices() {
 async function pickSession(rl) {
   const choices = await listSessionChoices();
   if (choices.length === 0) {
-    console.log(red("No active sessions. Start Copilot with groundcrew first."));
+    console.log(red(`No active sessions for repo "${REPO_NAME}". Start Copilot with groundcrew first.`));
     return null;
   }
   if (choices.length === 1) {
@@ -500,6 +494,7 @@ function readMultilineInput(sessionId, projectName, gitCtx, sessionDir) {
     let crow = 0;
     let ccol = 0;
     const padWidth = sessionId.length + 5;
+    const linePad = (i) => i === 0 ? padWidth : 0;
     let lastTermRow = 0;
     let pasteBuffer = "";
     let isPasting = false;
@@ -523,7 +518,7 @@ function readMultilineInput(sessionId, projectName, gitCtx, sessionDir) {
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
-          buf.push(" ".repeat(padWidth) + lines[i]);
+          buf.push(lines[i]);
         }
       }
       let suggestionRows = 0;
@@ -540,17 +535,18 @@ function readMultilineInput(sessionId, projectName, gitCtx, sessionDir) {
       }
       const lastRow = lines.length - 1;
       const termRowsForLine = (i) => {
-        const lineLen = (i === 0 ? padWidth : padWidth) + lines[i].length;
+        const lineLen = linePad(i) + lines[i].length;
         return lineLen === 0 ? 1 : Math.max(1, Math.ceil(lineLen / termW));
       };
       let rowsBelowCursor = suggestionRows;
       for (let i = lastRow; i > crow; i--) rowsBelowCursor += termRowsForLine(i);
       const cursorLineTermRows = termRowsForLine(crow);
-      const cursorRowWithinLine = Math.floor((padWidth + ccol) / termW);
+      const cursorPad = linePad(crow);
+      const cursorRowWithinLine = Math.floor((cursorPad + ccol) / termW);
       rowsBelowCursor += cursorLineTermRows - 1 - cursorRowWithinLine;
       if (rowsBelowCursor > 0) buf.push(`\x1B[${rowsBelowCursor}A`);
       buf.push("\r");
-      const col = (padWidth + ccol) % termW;
+      const col = (cursorPad + ccol) % termW;
       if (col > 0) buf.push(`\x1B[${col}C`);
       let rowsAbove = 1;
       for (let i = 0; i < crow; i++) rowsAbove += termRowsForLine(i);
@@ -572,7 +568,7 @@ function readMultilineInput(sessionId, projectName, gitCtx, sessionDir) {
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
-          buf.push(" ".repeat(padWidth) + lines[i]);
+          buf.push(lines[i]);
         }
       }
       buf.push("\n");
@@ -1114,7 +1110,6 @@ ${bold("groundcrew")} \u2014 CLI companion for the Groundcrew Copilot plugin
 ${bold("Usage:")}
   groundcrew chat                              Interactive chat mode (recommended)
   groundcrew chat --session <id>               Chat with a specific session
-  groundcrew init                              Initialize .groundcrew/ in current dir
   groundcrew add <task>                        Add a task to the queue
   groundcrew add --priority <task>             Add an urgent task (processed first)
   groundcrew add --session <id> <task>         Add to a specific session
@@ -1125,9 +1120,9 @@ ${bold("Usage:")}
   groundcrew sessions                          List all sessions
   groundcrew history                           Show completed tasks
   groundcrew clear                             Clear all pending tasks
-  groundcrew stop                              Stop all active sessions
+  groundcrew stop                              Stop all sessions for current repo
   groundcrew stop --session <id>               Stop a specific session
-  groundcrew destroy                           Delete all sessions, history, and data
+  groundcrew destroy                           Delete all sessions for current repo
   groundcrew destroy --session <id>            Delete a specific session
 
 ${bold("Session targeting:")}
@@ -1159,9 +1154,6 @@ async function main() {
   const { value: explicitSession, remaining: args } = extractFlag(rawArgs, "--session");
   const command = args[0];
   switch (command) {
-    case "init":
-      await init();
-      return;
     case "chat":
       await chat(explicitSession);
       return;

package/package.json

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

package/src/index.ts

@@ -1,6 +1,7 @@
 import fs from "fs/promises";
 import { existsSync } from "fs";
 import path from "path";
+import os from "os";
 import readline from "readline";
 import { execFile, execFileSync } from "child_process";
 import { promisify } from "util";
@@ -68,17 +69,16 @@ close access fp`], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
   } 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");
-let ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_DIR, "active-sessions.json");
-let HISTORY_FILE = path.join(GROUNDCREW_DIR, "history.json");
+// ── Centralized storage at ~/.groundcrew ─────────────────────────────────────
+const GROUNDCREW_HOME = path.join(os.homedir(), ".groundcrew");
+const SESSIONS_DIR = path.join(GROUNDCREW_HOME, "sessions");
+const ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_HOME, "active-sessions.json");
+const HISTORY_FILE = path.join(GROUNDCREW_HOME, "history.json");
+
+let REPO_NAME = "";
 
 /**
- * Resolve the project root that contains .groundcrew/.
- * Uses git rev-parse --show-toplevel for worktree support, then walks up
- * from CWD as fallback. This ensures the CLI works from subdirectories
- * and git worktrees.
+ * Derive repo name from CWD (git-aware for worktree/subdirectory support).
  */
 async function resolveRoot(): Promise<void> {
   let root: string | null = null;
@@ -86,31 +86,16 @@ async function resolveRoot(): Promise<void> {
   // 1. Try git rev-parse --show-toplevel (worktree-aware)
   try {
     const { stdout } = await execFileAsync("git", ["rev-parse", "--show-toplevel"]);
-    const gitRoot = stdout.trim();
-    if (gitRoot && existsSync(path.join(gitRoot, ".groundcrew"))) {
-      root = gitRoot;
-    }
+    root = stdout.trim() || null;
   } catch { /* not a git repo or git not installed */ }
 
-  // 2. Walk up from CWD looking for .groundcrew/
-  if (!root) {
-    let dir = process.cwd();
-    while (dir !== path.dirname(dir)) {
-      if (existsSync(path.join(dir, ".groundcrew"))) {
-        root = dir;
-        break;
-      }
-      dir = path.dirname(dir);
-    }
-  }
-
-  // 3. Fallback to CWD (for `groundcrew init`)
+  // 2. Fallback to CWD
   if (!root) root = process.cwd();
 
-  GROUNDCREW_DIR = path.join(root, ".groundcrew");
-  SESSIONS_DIR = path.join(GROUNDCREW_DIR, "sessions");
-  ACTIVE_SESSIONS_FILE = path.join(GROUNDCREW_DIR, "active-sessions.json");
-  HISTORY_FILE = path.join(GROUNDCREW_DIR, "history.json");
+  REPO_NAME = path.basename(root).replace(/[^a-zA-Z0-9_-]/g, "_") || "unknown";
+
+  // Ensure centralized dirs exist
+  await fs.mkdir(SESSIONS_DIR, { recursive: true });
 }
 
 interface Task {
@@ -147,9 +132,17 @@ async function readActiveSessions(): Promise<Record<string, ActiveSessionEntry>>
   }
 }
 
+/**
+ * Filter session IDs that belong to the current repo.
+ * Session IDs are prefixed with repo name: "mekari_credit-a1b2c3d4"
+ */
+function isRepoSession(sessionId: string): boolean {
+  return sessionId.startsWith(REPO_NAME + "-");
+}
+
 /**
  * Resolve which session to target.
- * Priority: --session flag > single active session > error if ambiguous.
+ * Priority: --session flag > single active repo session > error if ambiguous.
  */
 async function resolveSessionDir(explicitSession?: string): Promise<string> {
   if (explicitSession) {
@@ -161,12 +154,13 @@ async function resolveSessionDir(explicitSession?: string): Promise<string> {
   }
 
   const sessions = await readActiveSessions();
-  const ids = Object.keys(sessions);
+  // Filter to sessions for THIS repo
+  const ids = Object.keys(sessions).filter(isRepoSession);
 
   if (ids.length === 0) {
-    // Fallback: check if any session dirs exist (server may have exited without cleanup)
+    // Fallback: check session dirs on disk for this repo
     try {
-      const dirs = await fs.readdir(SESSIONS_DIR);
+      const dirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession);
       if (dirs.length === 1) return path.join(SESSIONS_DIR, dirs[0]);
       if (dirs.length > 1) {
         // Pick most recently modified
@@ -182,7 +176,7 @@ async function resolveSessionDir(explicitSession?: string): Promise<string> {
         return path.join(SESSIONS_DIR, latest.dir);
       }
     } catch { /* no sessions dir */ }
-    throw new Error("No active sessions. Start Copilot with groundcrew first.");
+    throw new Error(`No active sessions for repo "${REPO_NAME}". Start Copilot with groundcrew first.`);
   }
 
   if (ids.length === 1) {
@@ -244,11 +238,6 @@ const red = (t: string) => color(31, t);
 
 // ── Commands ──────────────────────────────────────────────────────────────────
 
-async function init(): Promise<void> {
-  await fs.mkdir(SESSIONS_DIR, { recursive: true });
-  console.log(green("Groundcrew initialized.") + ` ${dim(GROUNDCREW_DIR + "/ created")}`);
-}
-
 async function add(taskText: string, priority: number, sessionDir: string): Promise<void> {
   const queue = await readQueue(sessionDir);
   const task: Task = {
@@ -397,27 +386,43 @@ async function sessions(): Promise<void> {
     return;
   }
 
+  // Group by repo prefix
+  const byRepo = new Map<string, string[]>();
+  for (const dir of allDirs) {
+    const dashIdx = dir.lastIndexOf("-");
+    const repo = dashIdx > 0 ? dir.substring(0, dashIdx) : "unknown";
+    if (!byRepo.has(repo)) byRepo.set(repo, []);
+    byRepo.get(repo)!.push(dir);
+  }
+
   console.log(bold("Sessions:\n"));
 
-  for (const dir of allDirs) {
-    const isActive = ids.includes(dir);
-    const sessionDir = path.join(SESSIONS_DIR, dir);
+  for (const [repo, dirs] of byRepo) {
+    const isCurrent = repo === REPO_NAME;
+    console.log(`  ${isCurrent ? green(repo) : dim(repo)}`);
 
-    let info = "";
-    try {
-      const session = JSON.parse(await fs.readFile(path.join(sessionDir, "session.json"), "utf-8"));
-      const startTime = new Date(session.started).getTime();
-      const minutes = Math.round((Date.now() - startTime) / 60000);
-      const statusColor = session.status === "active" ? green : session.status === "parked" ? yellow : dim;
-      info = `${statusColor(session.status)} | ${minutes}min | ${session.tasksCompleted || 0} tasks done`;
-    } catch {
-      info = dim("no session data");
-    }
+    for (const dir of dirs) {
+      const isActive = ids.includes(dir);
+      const sessionDir = path.join(SESSIONS_DIR, dir);
 
-    const queue = await readQueue(sessionDir);
-    const marker = isActive ? green("*") : " ";
+      let info = "";
+      try {
+        const session = JSON.parse(await fs.readFile(path.join(sessionDir, "session.json"), "utf-8"));
+        const startTime = new Date(session.started).getTime();
+        const minutes = Math.round((Date.now() - startTime) / 60000);
+        const statusColor = session.status === "active" ? green : session.status === "parked" ? yellow : dim;
+        info = `${statusColor(session.status)} | ${minutes}min | ${session.tasksCompleted || 0} tasks done`;
+      } catch {
+        info = dim("no session data");
+      }
+
+      const queue = await readQueue(sessionDir);
+      const marker = isActive ? green("*") : " ";
+      // Show only the hex suffix for cleaner display
+      const shortId = dir.substring(repo.length + 1);
 
-    console.log(`  ${marker} ${cyan(dir)}  ${info} | ${queue.tasks.length} queued`);
+      console.log(`    ${marker} ${cyan(shortId)}  ${info} | ${queue.tasks.length} queued`);
+    }
   }
 
   if (ids.length > 0) {
@@ -484,13 +489,14 @@ async function destroyOne(sessionId: string): Promise<void> {
 
 async function stopAll(): Promise<void> {
   const active = await readActiveSessions();
-  const ids = Object.keys(active);
+  // Scope to current repo
+  const ids = Object.keys(active).filter(isRepoSession);
 
   let allDirs: string[] = [];
-  try { allDirs = await fs.readdir(SESSIONS_DIR); } catch {}
+  try { allDirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession); } catch {}
 
   if (ids.length === 0 && allDirs.length === 0) {
-    console.log(dim("No sessions to stop."));
+    console.log(dim(`No sessions to stop for repo "${REPO_NAME}".`));
     return;
   }
 
@@ -511,33 +517,29 @@ async function stopAll(): Promise<void> {
     }
   }
 
-  // Clear active sessions file
-  await fs.writeFile(ACTIVE_SESSIONS_FILE, "{}");
-  console.log(green("\nAll sessions stopped."));
+  // Remove stopped sessions from active-sessions.json (keep other repos)
+  const remaining = await readActiveSessions();
+  for (const id of ids) delete remaining[id];
+  await fs.writeFile(ACTIVE_SESSIONS_FILE, JSON.stringify(remaining, null, 2));
+  console.log(green(`\nAll ${REPO_NAME} sessions stopped.`));
 }
 
 async function destroyAll(): Promise<void> {
-  // Stop everything first
+  // Stop this repo's sessions first
   await stopAll();
 
-  // Delete all session directories
+  // Delete this repo's session directories only
   try {
-    const dirs = await fs.readdir(SESSIONS_DIR);
+    const dirs = (await fs.readdir(SESSIONS_DIR)).filter(isRepoSession);
     for (const dir of dirs) {
       await fs.rm(path.join(SESSIONS_DIR, dir), { recursive: true, force: true });
     }
   } catch { /* no sessions dir */ }
 
-  // Delete history
-  try { await fs.unlink(HISTORY_FILE); } catch {}
-
-  // Delete active sessions file
-  try { await fs.unlink(ACTIVE_SESSIONS_FILE); } catch {}
-
   // Delete tool history
-  try { await fs.unlink(path.join(GROUNDCREW_DIR, "tool-history.csv")); } catch {}
+  try { await fs.unlink(path.join(GROUNDCREW_HOME, "tool-history.csv")); } catch {}
 
-  console.log(green("All session data and history deleted."));
+  console.log(green(`All ${REPO_NAME} session data deleted.`));
 }
 
 // ── Chat Mode ────────────────────────────────────────────────────────────────
@@ -557,6 +559,9 @@ async function listSessionChoices(): Promise<SessionChoice[]> {
   const choices: SessionChoice[] = [];
 
   for (const [id, entry] of Object.entries(active)) {
+    // Only show sessions for the current repo
+    if (!isRepoSession(id)) continue;
+
     const dir = path.join(SESSIONS_DIR, id);
     let status = "active";
     let minutes = 0;
@@ -585,7 +590,7 @@ async function pickSession(rl: readline.Interface): Promise<SessionChoice | null
   const choices = await listSessionChoices();
 
   if (choices.length === 0) {
-    console.log(red("No active sessions. Start Copilot with groundcrew first."));
+    console.log(red(`No active sessions for repo "${REPO_NAME}". Start Copilot with groundcrew first.`));
     return null;
   }
 
@@ -647,6 +652,7 @@ function readMultilineInput(sessionId: string, projectName: string, gitCtx: { br
 
     // Visible width of prompt: "[sessionId] > "
     const padWidth = sessionId.length + 5; // [ + id + ] + space + > + space = len+5
+    const linePad = (i: number) => i === 0 ? padWidth : 0;
 
     // Track how many rows up from cursor to top of rendered area (including separator)
     let lastTermRow = 0;
@@ -680,7 +686,7 @@ function readMultilineInput(sessionId: string, projectName: string, gitCtx: { br
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
-          buf.push(" ".repeat(padWidth) + lines[i]);
+          buf.push(lines[i]);
         }
       }
 
@@ -702,7 +708,7 @@ function readMultilineInput(sessionId: string, projectName: string, gitCtx: { br
 
       // Calculate actual terminal rows each line occupies (for wrapped lines)
       const termRowsForLine = (i: number): number => {
-        const lineLen = (i === 0 ? padWidth : padWidth) + lines[i].length;
+        const lineLen = linePad(i) + lines[i].length;
         return lineLen === 0 ? 1 : Math.max(1, Math.ceil(lineLen / termW));
       };
 
@@ -712,13 +718,14 @@ function readMultilineInput(sessionId: string, projectName: string, gitCtx: { br
       for (let i = lastRow; i > crow; i--) rowsBelowCursor += termRowsForLine(i);
       // Add any extra wrapped rows on the cursor line itself (below the cursor's row within wraps)
       const cursorLineTermRows = termRowsForLine(crow);
-      const cursorRowWithinLine = Math.floor((padWidth + ccol) / termW);
+      const cursorPad = linePad(crow);
+      const cursorRowWithinLine = Math.floor((cursorPad + ccol) / termW);
       rowsBelowCursor += (cursorLineTermRows - 1 - cursorRowWithinLine);
 
       if (rowsBelowCursor > 0) buf.push(`\x1b[${rowsBelowCursor}A`);
 
       buf.push("\r");
-      const col = (padWidth + ccol) % termW;
+      const col = (cursorPad + ccol) % termW;
       if (col > 0) buf.push(`\x1b[${col}C`);
 
       // lastTermRow = terminal rows above cursor (separator + wrapped input lines above crow + cursor's wrapped rows above)
@@ -747,7 +754,7 @@ function readMultilineInput(sessionId: string, projectName: string, gitCtx: { br
         if (i === 0) {
           buf.push(dim(`[${sessionId}]`) + " " + bold(">") + " " + lines[i]);
         } else {
-          buf.push(" ".repeat(padWidth) + lines[i]);
+          buf.push(lines[i]);
         }
       }
       buf.push("\n");
@@ -1239,7 +1246,6 @@ ${bold("groundcrew")} — CLI companion for the Groundcrew Copilot plugin
 ${bold("Usage:")}
   groundcrew chat                              Interactive chat mode (recommended)
   groundcrew chat --session <id>               Chat with a specific session
-  groundcrew init                              Initialize .groundcrew/ in current dir
   groundcrew add <task>                        Add a task to the queue
   groundcrew add --priority <task>             Add an urgent task (processed first)
   groundcrew add --session <id> <task>         Add to a specific session
@@ -1250,9 +1256,9 @@ ${bold("Usage:")}
   groundcrew sessions                          List all sessions
   groundcrew history                           Show completed tasks
   groundcrew clear                             Clear all pending tasks
-  groundcrew stop                              Stop all active sessions
+  groundcrew stop                              Stop all sessions for current repo
   groundcrew stop --session <id>               Stop a specific session
-  groundcrew destroy                           Delete all sessions, history, and data
+  groundcrew destroy                           Delete all sessions for current repo
   groundcrew destroy --session <id>            Delete a specific session
 
 ${bold("Session targeting:")}
@@ -1293,9 +1299,6 @@ async function main(): Promise<void> {
 
   // Commands that don't need a session (handle their own resolution)
   switch (command) {
-    case "init":
-      await init();
-      return;
     case "chat":
       await chat(explicitSession);
       return;