devwing 0.1.21 → 0.1.23

package/dist/index.js

@@ -22,7 +22,6 @@ import util from 'util';
 import Table3 from 'cli-table3';
 import { fileURLToPath } from 'url';
 import semver from 'semver';
-import readline from 'readline';
 
 var SERVICE_NAME = "DevWing CLI";
 var API_KEY_ACCOUNT = "api-key";
@@ -2772,7 +2771,7 @@ function isDemoMode() {
 }
 var __sessionFile = fileURLToPath(import.meta.url);
 var __sessionDir = dirname(__sessionFile);
-var sleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
 function getVersion() {
   const paths = [
     join(__sessionDir, "../package.json"),
@@ -2787,10 +2786,10 @@ function getVersion() {
       continue;
     }
   }
-  return "0.1.21";
+  return "0.1.23";
 }
 var DEMO_USER2 = {
-  id: "usr_a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+  id: "usr_a1b2c3d4",
   email: "aliyu@devwing.ai",
   full_name: "Aliyu Mohammed",
   subscription_plan: "pro",
@@ -2801,22 +2800,19 @@ var DEMO_USER2 = {
   tokens_used_today: 47832,
   tokens_reset_at: "2026-04-10T00:00:00Z"
 };
-var DEMO_WORKSPACE2 = {
-  name: "Kano State Government",
-  plan: "enterprise"};
-var DEMO_PROJECT2 = {
-  name: "Tallon SaaS ERP"};
+var DEMO_WORKSPACE2 = { name: "Kano State Government"};
+var DEMO_PROJECT2 = { name: "Tallon SaaS ERP"};
 var DEMO_MODELS = [
-  { name: "devwing-general-1", display_name: "DevWing General", domain: "general", status: "active", min_plan: "free", context_window: 32768, tokens_per_sec: 85, version: "1.0" },
-  { name: "devwing-frontend-1", display_name: "DevWing Frontend", domain: "frontend", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 78, version: "1.0" },
-  { name: "devwing-backend-1", display_name: "DevWing Backend", domain: "backend", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 82, version: "1.0" },
-  { name: "devwing-security-1", display_name: "DevWing Security", domain: "security", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 74, version: "1.0" },
-  { name: "devwing-devops-1", display_name: "DevWing DevOps", domain: "devops", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 70, version: "0.9" },
-  { name: "devwing-mobile-1", display_name: "DevWing Mobile", domain: "general", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 72, version: "0.8" },
-  { name: "devwing-data-1", display_name: "DevWing Data", domain: "general", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 68, version: "0.7" }
+  { name: "devwing-general-1", display_name: "DevWing General", domain: "general", status: "active", min_plan: "free", context_window: 32768, tokens_per_sec: 85 },
+  { name: "devwing-frontend-1", display_name: "DevWing Frontend", domain: "frontend", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 78 },
+  { name: "devwing-backend-1", display_name: "DevWing Backend", domain: "backend", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 82 },
+  { name: "devwing-security-1", display_name: "DevWing Security", domain: "security", status: "active", min_plan: "pro", context_window: 32768, tokens_per_sec: 74 },
+  { name: "devwing-devops-1", display_name: "DevWing DevOps", domain: "devops", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 70 },
+  { name: "devwing-mobile-1", display_name: "DevWing Mobile", domain: "mobile", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 72 },
+  { name: "devwing-data-1", display_name: "DevWing Data", domain: "data", status: "beta", min_plan: "pro", context_window: 32768, tokens_per_sec: 68 }
 ];
 var DEMO_PLANS = [
-  { name: "Free", price: "$0", tokens_day: "50,000", models: "General only", projects: "1", seats: "1" },
+  { name: "Free", price: "$0/mo", tokens_day: "50,000", models: "General only", projects: "1", seats: "1" },
   { name: "Pro", price: "$19/mo", tokens_day: "500,000", models: "All models", projects: "10", seats: "1" },
   { name: "Team", price: "$99/mo", tokens_day: "2,000,000", models: "All + priority", projects: "Unlimited", seats: "5 included" },
   { name: "Enterprise", price: "Custom", tokens_day: "Unlimited", models: "Dedicated", projects: "Unlimited", seats: "Unlimited" }
@@ -2826,6 +2822,65 @@ var DEMO_USAGE = {
   week: { requests: 147, tokens_in: 198340, tokens_out: 102890, cost: 0.7213 },
   month: { requests: 612, tokens_in: 824100, tokens_out: 428750, cost: 3.0012 }
 };
+function readLine() {
+  return new Promise((resolve) => {
+    try {
+      if (typeof process.stdin.setRawMode === "function") {
+        process.stdin.setRawMode(false);
+      }
+    } catch {
+    }
+    process.stdin.resume();
+    process.stdin.setEncoding("utf8");
+    let buf = "";
+    const onData = (chunk) => {
+      for (const ch of chunk) {
+        if (ch === "\n" || ch === "\r") {
+          cleanup();
+          resolve(buf);
+          return;
+        } else if (ch === "") {
+          cleanup();
+          resolve("");
+          return;
+        } else if (ch === "\x7F" || ch === "\b") {
+          if (buf.length > 0) {
+            buf = buf.slice(0, -1);
+            process.stdout.write("\b \b");
+          }
+        } else if (ch >= " ") {
+          buf += ch;
+          process.stdout.write(ch);
+        }
+      }
+    };
+    const onEnd = () => {
+      cleanup();
+      resolve("");
+    };
+    const cleanup = () => {
+      process.stdin.removeListener("data", onData);
+      process.stdin.removeListener("end", onEnd);
+      process.stdin.pause();
+    };
+    process.stdin.on("data", onData);
+    process.stdin.once("end", onEnd);
+  });
+}
+function restoreStdin() {
+  try {
+    if (typeof process.stdin.setRawMode === "function") {
+      try {
+        process.stdin.setRawMode(false);
+      } catch {
+      }
+    }
+    process.stdin.removeAllListeners("keypress");
+    process.stdin.removeAllListeners("data");
+    if (process.stdin.isPaused()) process.stdin.resume();
+  } catch {
+  }
+}
 var InteractiveSession = class {
   isAuthenticated = false;
   userProfile = null;
@@ -2836,13 +2891,10 @@ var InteractiveSession = class {
   sessionId = null;
   isDemo;
   options;
-  rl;
   commands = /* @__PURE__ */ new Map();
-  sigintCount = 0;
-  sigintTimer = null;
   version;
-  isBusy = false;
-  // prevent readline events during command execution
+  running = true;
+  ctrlCCount = 0;
   constructor(options) {
     this.options = options;
     this.isDemo = isDemoMode();
@@ -2851,97 +2903,48 @@ var InteractiveSession = class {
     if (options.model) this.currentModel = options.model;
     this.registerCommands();
   }
-  // ============================================================
-  // START
-  // ============================================================
+  // ─── START ───────────────────────────────────────────────
   async start() {
     console.clear();
-    this.printStartupBanner();
-    await this.checkAuthStatus();
+    this.printBanner();
+    await this.checkAuth();
     this.printSystemInfo();
-    this.createReadline();
     console.log();
-    this.rl.prompt();
-  }
-  // ============================================================
-  // READLINE MANAGEMENT
-  // ============================================================
-  createReadline() {
-    this.isBusy = false;
-    this.rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-      prompt: this.buildPrompt(),
-      completer: (line) => this.completer(line)
-    });
-    this.rl.on("SIGINT", () => {
-      this.sigintCount++;
-      if (this.sigintCount >= 2) {
-        this.exitSession();
-        return;
+    while (this.running) {
+      this.printPrompt();
+      const input = await readLine();
+      process.stdout.write("\n");
+      if (input === "") {
+        this.ctrlCCount++;
+        if (this.ctrlCCount >= 2) {
+          this.exit();
+          return;
+        }
+        console.log(chalk7.dim("  Press Ctrl+C again to exit, or type /exit"));
+        setTimeout(() => {
+          this.ctrlCCount = 0;
+        }, 1500);
+        continue;
       }
-      console.log(chalk7.dim("\n  Press Ctrl+C again to exit, or type /exit"));
-      this.sigintTimer = setTimeout(() => {
-        this.sigintCount = 0;
-      }, 1500);
-      this.rl.prompt();
-    });
-    const currentRl = this.rl;
-    this.rl.on("line", async (input) => {
-      if (this.isBusy) return;
+      this.ctrlCCount = 0;
       const trimmed = input.trim();
-      if (!trimmed) {
-        this.rl.prompt();
-        return;
-      }
-      this.isBusy = true;
+      if (!trimmed) continue;
       try {
         if (trimmed.startsWith("/")) {
-          await this.handleSlashCommand(trimmed);
-          return;
+          await this.handleSlash(trimmed);
         } else {
-          await this.handleAIPrompt(trimmed);
-        }
-      } catch (error) {
-        logger.error(error.message || "An error occurred");
-      }
-      this.isBusy = false;
-      if (this.rl === currentRl) {
-        this.rl.setPrompt(this.buildPrompt());
-        this.rl.prompt();
-      }
-    });
-    this.rl.on("close", () => {
-      if (!this.isBusy) {
-        this.exitSession();
-      }
-    });
-  }
-  resetStdin() {
-    try {
-      if (typeof process.stdin.setRawMode === "function") {
-        try {
-          process.stdin.setRawMode(false);
-        } catch {
+          await this.handlePrompt(trimmed);
         }
+      } catch (err) {
+        logger.error(err.message || "An error occurred");
       }
-      process.stdin.removeAllListeners("keypress");
-      process.stdin.removeAllListeners("data");
-      if (process.stdin.isPaused()) {
-        process.stdin.resume();
-      }
-    } catch {
+      restoreStdin();
+      await sleep2(50);
     }
   }
-  recreateReadline() {
-    this.createReadline();
-    this.rl.prompt();
-  }
-  // ============================================================
-  // STARTUP UI
-  // ============================================================
-  printStartupBanner() {
-    const banner = gradient.pastel.multiline([
+  // ─── BANNER ──────────────────────────────────────────────
+  printBanner() {
+    const art = gradient.pastel.multiline([
       "",
       "  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2557    \u2588\u2588\u2557\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
       "  \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551    \u2588\u2588\u2551\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ",
@@ -2951,101 +2954,81 @@ var InteractiveSession = class {
       "  \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u255D   \u255A\u2550\u2550\u255D\u255A\u2550\u2550\u255D \u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D ",
       ""
     ].join("\n"));
-    console.log(banner);
-    console.log(chalk7.dim("  Your AI Wingman in the Terminal") + chalk7.dim(`                          v${this.version}`));
+    console.log(art);
+    console.log(
+      chalk7.dim("  Your AI Wingman in the Terminal") + "                    " + chalk7.dim(`v${this.version}`)
+    );
     console.log();
   }
+  // ─── SYSTEM INFO PANEL ───────────────────────────────────
   printSystemInfo() {
-    const line = chalk7.dim("\u2500".repeat(64));
-    console.log(line);
+    const W = 62;
+    const ln = (s = "") => {
+      const raw = s.replace(/\x1B\[[0-9;]*m/g, "");
+      const pad = W - 4 - raw.length;
+      return chalk7.dim("\u2502 ") + s + " ".repeat(Math.max(0, pad)) + chalk7.dim(" \u2502");
+    };
+    const div = chalk7.dim("\u251C" + "\u2500".repeat(W - 2) + "\u2524");
+    const top = chalk7.dim("\u256D" + "\u2500".repeat(W - 2) + "\u256E");
+    const bot = chalk7.dim("\u2570" + "\u2500".repeat(W - 2) + "\u256F");
+    const kv = (k, v) => ln(chalk7.bold(k.padEnd(12)) + v);
+    console.log(top);
     if (this.isAuthenticated && this.userProfile) {
       const name = this.userProfile.full_name || this.userProfile.email;
       const plan = (this.userProfile.subscription_plan || "free").toUpperCase();
-      const planColor = plan === "PRO" ? chalk7.cyan : plan === "ENTERPRISE" ? chalk7.magenta : plan === "TEAM" ? chalk7.yellow : chalk7.dim;
-      console.log(
-        `  ${chalk7.bold("Auth")}     ${chalk7.green("\u25CF")} ${name} ${planColor(`(${plan})`)}`
-      );
-    } else if (this.isAuthenticated) {
-      console.log(
-        `  ${chalk7.bold("Auth")}     ${chalk7.green("\u25CF")} Authenticated ${chalk7.dim("(offline)")}`
-      );
+      const badge = plan === "PRO" ? chalk7.bgCyan.black(` ${plan} `) : plan === "ENTERPRISE" ? chalk7.bgMagenta.white(` ${plan} `) : plan === "TEAM" ? chalk7.bgYellow.black(` ${plan} `) : chalk7.bgGray.white(` ${plan} `);
+      console.log(ln(chalk7.bold("Auth".padEnd(12)) + chalk7.green("\u25CF ") + chalk7.white(name) + "  " + badge));
     } else {
-      console.log(
-        `  ${chalk7.bold("Auth")}     ${chalk7.red("\u25CF")} Not logged in ${chalk7.dim("\u2014 type /login")}`
-      );
+      console.log(ln(chalk7.bold("Auth".padEnd(12)) + chalk7.red("\u25CF ") + chalk7.dim("Not logged in") + "  " + chalk7.cyan("/login")));
     }
-    const modeStr = chalk7.yellow(this.currentMode);
-    const modelStr = this.currentModel ? chalk7.cyan(this.currentModel) : chalk7.dim("auto");
-    console.log(`  ${chalk7.bold("Mode")}     ${modeStr}              ${chalk7.bold("Model")}   ${modelStr}`);
-    const cwd = process.cwd().replace(process.env.HOME || "", "~");
+    console.log(div);
+    console.log(kv("Mode", chalk7.yellow(this.currentMode) + "         " + chalk7.bold("Model".padEnd(8)) + (this.currentModel ? chalk7.cyan(this.currentModel) : chalk7.dim("auto"))));
+    console.log(div);
     if (this.isDemo) {
-      console.log(`  ${chalk7.bold("Project")}  ${chalk7.cyan(DEMO_PROJECT2.name)}     ${chalk7.bold("CWD")}     ${chalk7.dim(cwd)}`);
+      console.log(kv("Project", chalk7.cyan(DEMO_PROJECT2.name)));
     } else {
-      const projectId = configManager.getProjectId();
-      const projectStr = projectId ? chalk7.cyan(projectId) : chalk7.dim("none");
-      console.log(`  ${chalk7.bold("Project")}  ${projectStr}     ${chalk7.bold("CWD")}     ${chalk7.dim(cwd)}`);
+      const pid = configManager.getProjectId();
+      console.log(kv("Project", pid ? chalk7.cyan(pid) : chalk7.dim("none")));
     }
-    const shell = process.env.SHELL?.split("/").pop() || "unknown";
-    console.log(`  ${chalk7.bold("Shell")}    ${shell}                   ${chalk7.bold("OS")}      ${process.platform}`);
+    const cwd = process.cwd().replace(process.env.HOME || "", "~");
+    console.log(kv("Directory", chalk7.dim(cwd)));
     if (this.isDemo) {
-      console.log(`  ${chalk7.bold("Demo")}     ${chalk7.yellow("\u25CF")} ${chalk7.yellow("Demo mode active")} ${chalk7.dim("\u2014 no backend required")}`);
+      console.log(div);
+      console.log(ln(chalk7.yellow("\u25C6 ") + chalk7.yellow("Demo mode") + chalk7.dim(" \u2014 no backend required")));
     }
-    console.log(line);
+    console.log(bot);
     console.log();
-    console.log(chalk7.dim("  Type a message to chat with AI, or /help for commands."));
-  }
-  // ============================================================
-  // PROMPT
-  // ============================================================
-  buildPrompt() {
-    const parts = [];
-    parts.push(chalk7.bold.cyan("devwing"));
-    parts.push(chalk7.dim("[") + chalk7.yellow(this.currentMode) + chalk7.dim("]"));
+    console.log(chalk7.dim("  Type a message to chat, or ") + chalk7.cyan("/help") + chalk7.dim(" for commands."));
+  }
+  // ─── PROMPT LINE ─────────────────────────────────────────
+  printPrompt() {
+    const sep = chalk7.dim("\n  " + "\u2500".repeat(50));
+    const icon = chalk7.bold.cyan("\u2B21");
+    const name = chalk7.bold.white("devwing");
+    const mode = chalk7.dim("[") + chalk7.yellow(this.currentMode) + chalk7.dim("]");
+    let user = "";
     if (this.isAuthenticated && this.userProfile) {
-      const firstName = (this.userProfile.full_name || this.userProfile.email).split(" ")[0].split("@")[0].toLowerCase();
-      parts.push(chalk7.green(firstName));
-    }
-    if (this.isDemo) {
-      parts.push(chalk7.dim.yellow("demo"));
+      const first = (this.userProfile.full_name || this.userProfile.email).split(" ")[0].split("@")[0].toLowerCase();
+      user = " " + chalk7.dim("@") + chalk7.green(first);
     }
-    return "\n" + parts.join(" ") + chalk7.bold(" > ");
+    const demo = this.isDemo ? chalk7.dim.yellow(" demo") : "";
+    process.stdout.write(`${sep}
+  ${icon} ${name} ${mode}${user}${demo}
+  ${chalk7.bold.cyan("\u276F")} `);
   }
-  // ============================================================
-  // TAB COMPLETION
-  // ============================================================
-  completer(line) {
-    if (!line.startsWith("/")) return [[], line];
-    const allNames = [];
-    for (const cmd of this.commands.values()) {
-      allNames.push("/" + cmd.name);
-      for (const alias of cmd.aliases) {
-        allNames.push("/" + alias);
-      }
-    }
-    const hits = allNames.filter((n) => n.startsWith(line));
-    return [hits.length ? hits : allNames, line];
-  }
-  // ============================================================
-  // AUTH CHECK
-  // ============================================================
-  async checkAuthStatus() {
+  // ─── AUTH CHECK ──────────────────────────────────────────
+  async checkAuth() {
     try {
-      const apiKey = await configManager.getApiKey();
+      const key = await configManager.getApiKey();
       if (this.isDemo) {
-        if (apiKey) {
-          this.isAuthenticated = true;
-          this.userProfile = { ...DEMO_USER2 };
-        } else {
-          this.isAuthenticated = false;
-          this.userProfile = null;
-        }
+        this.isAuthenticated = !!key;
+        this.userProfile = key ? { ...DEMO_USER2 } : null;
         return;
       }
-      if (!apiKey) return;
+      if (!key) return;
       try {
-        const profile = await apiClient.getProfile();
+        this.userProfile = await apiClient.getProfile();
         this.isAuthenticated = true;
-        this.userProfile = profile;
       } catch {
         this.isAuthenticated = true;
         this.userProfile = null;
@@ -3055,10 +3038,8 @@ var InteractiveSession = class {
       this.userProfile = null;
     }
   }
-  // ============================================================
-  // SLASH COMMAND DISPATCH
-  // ============================================================
-  async handleSlashCommand(input) {
+  // ─── SLASH COMMAND DISPATCH ──────────────────────────────
+  async handleSlash(input) {
     const parts = input.split(/\s+/);
     const cmdName = parts[0].substring(1).toLowerCase();
     const args = parts.slice(1).join(" ").trim();
@@ -3070,60 +3051,43 @@ var InteractiveSession = class {
       }
     }
     if (!command) {
+      console.log();
       logger.warn(`Unknown command: /${cmdName}. Type /help for available commands.`);
       return;
     }
     if (command.requiresAuth && !this.isAuthenticated) {
-      logger.warn("You need to be logged in for this command. Type /login first.");
+      console.log();
+      logger.warn("You need to be logged in. Type /login first.");
       return;
     }
-    this.isBusy = true;
-    this.rl.close();
-    try {
-      await command.handler(args);
-    } catch (error) {
-      logger.error(error.message || "Command failed");
-    }
-    this.resetStdin();
-    await sleep2(80);
-    this.recreateReadline();
+    console.log();
+    await command.handler(args);
   }
-  // ============================================================
-  // AI PROMPT HANDLER
-  // ============================================================
-  async handleAIPrompt(input) {
+  // ─── AI PROMPT ───────────────────────────────────────────
+  async handlePrompt(input) {
     if (!this.isAuthenticated) {
       console.log();
-      logger.warn("You need to log in to chat with AI. Type /login to authenticate.");
+      logger.warn("You need to log in first. Type /login to authenticate.");
       return;
     }
     console.log();
     if (this.isDemo) {
-      this.isBusy = true;
-      this.rl.close();
-      try {
-        await demoPromptCommand(input, { ...this.options, mode: this.currentMode });
-        this.conversationHistory.push(
-          { role: "user", content: input, timestamp: /* @__PURE__ */ new Date() },
-          { role: "assistant", content: "[demo response]", timestamp: /* @__PURE__ */ new Date() }
-        );
-      } catch (error) {
-        logger.error(error.message || "Command failed");
-      }
-      this.resetStdin();
-      await sleep2(80);
-      this.recreateReadline();
+      await demoPromptCommand(input, { ...this.options, mode: this.currentMode });
+      this.conversationHistory.push(
+        { role: "user", content: input, timestamp: /* @__PURE__ */ new Date() },
+        { role: "assistant", content: "[demo response]", timestamp: /* @__PURE__ */ new Date() }
+      );
       return;
     }
     if (!this.sessionContext) {
       logger.startSpinner("Loading codebase context...");
       try {
-        const collector = new ContextCollector(process.cwd());
-        this.sessionContext = await collector.collect(input);
+        const col = new ContextCollector(process.cwd());
+        this.sessionContext = await col.collect(input);
         logger.succeedSpinner(`Context loaded \u2014 ${this.sessionContext.files.length} files`);
-      } catch (error) {
+      } catch (err) {
         logger.failSpinner("Failed to load context");
-        logger.error(error.message);
+        logger.error(err.message);
         return;
       }
     }
@@ -3131,8 +3095,8 @@ var InteractiveSession = class {
     logger.info(chalk7.dim("DevWing is thinking..."));
     console.log();
     try {
-      const request = {
-        prompt: this.buildPromptWithHistory(),
+      const req = {
+        prompt: this.buildHistory(),
         mode: this.currentMode,
         model: this.currentModel || void 0,
         project_id: this.options.project || configManager.getProjectId(),
@@ -3140,292 +3104,164 @@ var InteractiveSession = class {
         stream: true,
         max_tokens: 4096
       };
-      let assistantResponse = "";
+      let reply = "";
       streamingRenderer.reset();
       streamingRenderer.clearPendingTools();
-      for await (const message of apiClient.streamCompletion(request)) {
-        await streamingRenderer.processMessage(message);
-        if (message.type === "token" && message.content) {
-          assistantResponse += message.content;
-        }
-        if (message.session_id) {
-          this.sessionId = message.session_id;
-        }
+      for await (const msg of apiClient.streamCompletion(req)) {
+        await streamingRenderer.processMessage(msg);
+        if (msg.type === "token" && msg.content) reply += msg.content;
+        if (msg.session_id) this.sessionId = msg.session_id;
       }
-      if (assistantResponse) {
-        this.conversationHistory.push({ role: "assistant", content: assistantResponse, timestamp: /* @__PURE__ */ new Date() });
+      if (reply) {
+        this.conversationHistory.push({ role: "assistant", content: reply, timestamp: /* @__PURE__ */ new Date() });
       }
-      const pendingTools = streamingRenderer.getPendingToolCalls();
-      if (pendingTools.length > 0) {
+      const pending = streamingRenderer.getPendingToolCalls();
+      if (pending.length > 0) {
         logger.newline();
-        logger.info("Executing tools...");
-        const toolResults = await streamingRenderer.executePendingTools();
+        const results = await streamingRenderer.executePendingTools();
         if (this.sessionId) {
-          for await (const message of apiClient.continueCompletion(this.sessionId, toolResults)) {
-            await streamingRenderer.processMessage(message);
+          for await (const msg of apiClient.continueCompletion(this.sessionId, results)) {
+            await streamingRenderer.processMessage(msg);
           }
         }
       }
       console.log();
-    } catch (error) {
-      logger.error(error.message || "AI request failed");
+    } catch (err) {
+      logger.error(err.message || "AI request failed");
     }
   }
-  buildPromptWithHistory() {
-    const history = this.conversationHistory;
-    if (history.length <= 1) {
-      return history[history.length - 1]?.content || "";
-    }
-    const recent = history.slice(-10);
-    const context = recent.slice(0, -1).map((m) => `${m.role === "user" ? "User" : "Assistant"}: ${m.content}`).join("\n\n");
+  buildHistory() {
+    const h = this.conversationHistory;
+    if (h.length <= 1) return h[h.length - 1]?.content || "";
+    const recent = h.slice(-10);
+    const ctx = recent.slice(0, -1).map((m) => `${m.role === "user" ? "User" : "Assistant"}: ${m.content}`).join("\n\n");
     return `Previous conversation:
-${context}
+${ctx}
 
 Current question:
 ${recent[recent.length - 1].content}`;
   }
-  // ============================================================
-  // EXIT
-  // ============================================================
-  exitSession() {
-    if (this.sigintTimer) clearTimeout(this.sigintTimer);
-    this.resetStdin();
+  // ─── EXIT ────────────────────────────────────────────────
+  exit() {
+    restoreStdin();
     console.log();
-    console.log(chalk7.dim("  Goodbye! Happy coding."));
+    console.log(chalk7.dim("  Goodbye! Happy shipping."));
     console.log();
     process.exit(0);
   }
-  // ============================================================
-  // COMMAND REGISTRATION
-  // ============================================================
+  // ─── COMMAND REGISTRATION ────────────────────────────────
   registerCommands() {
-    this.addCommand({
-      name: "help",
-      aliases: ["h", "?"],
-      description: "Show all available commands",
-      category: "session",
-      requiresAuth: false,
-      handler: async () => this.cmdHelp()
-    });
-    this.addCommand({
-      name: "exit",
-      aliases: ["quit", "q"],
-      description: "Exit DevWing",
-      category: "session",
-      requiresAuth: false,
-      handler: async () => this.exitSession()
-    });
-    this.addCommand({
-      name: "clear",
-      aliases: ["cls"],
-      description: "Clear screen and conversation",
-      category: "session",
-      requiresAuth: false,
-      handler: async () => this.cmdClear()
-    });
-    this.addCommand({
-      name: "login",
-      aliases: ["signin"],
-      description: "Authenticate with DevWing",
-      category: "session",
-      requiresAuth: false,
-      handler: async () => this.cmdLogin()
-    });
-    this.addCommand({
-      name: "logout",
-      aliases: ["signout"],
-      description: "Clear credentials and log out",
-      category: "session",
-      requiresAuth: true,
-      handler: async () => this.cmdLogout()
-    });
-    this.addCommand({
-      name: "status",
-      aliases: ["whoami"],
-      description: "Show auth status and profile",
-      category: "session",
-      requiresAuth: false,
-      handler: async () => this.cmdStatus()
-    });
-    this.addCommand({
-      name: "scan",
-      aliases: [],
-      description: "Run security vulnerability scan",
-      category: "tools",
-      requiresAuth: true,
-      handler: async () => this.cmdScan()
-    });
-    this.addCommand({
-      name: "review",
-      aliases: [],
-      description: "Perform code review on recent changes",
-      category: "tools",
-      requiresAuth: true,
-      handler: async () => this.cmdReview()
-    });
-    this.addCommand({
-      name: "explain",
-      aliases: [],
-      description: "Explain code, file, or concept",
-      category: "tools",
-      requiresAuth: true,
-      handler: async (args) => this.cmdExplain(args)
-    });
-    this.addCommand({
-      name: "memory",
-      aliases: ["mem"],
-      description: "Manage project memory (save/show/clear)",
-      category: "tools",
-      requiresAuth: true,
-      handler: async (args) => this.cmdMemory(args)
-    });
-    this.addCommand({
-      name: "mode",
-      aliases: [],
-      description: "Show or set AI mode",
-      category: "config",
-      requiresAuth: false,
-      handler: async (args) => this.cmdMode(args)
-    });
-    this.addCommand({
-      name: "model",
-      aliases: [],
-      description: "Show or set AI model",
-      category: "config",
-      requiresAuth: false,
-      handler: async (args) => this.cmdModel(args)
-    });
-    this.addCommand({
-      name: "models",
-      aliases: [],
-      description: "List all available AI models",
-      category: "config",
-      requiresAuth: false,
-      handler: async () => this.cmdModels()
-    });
-    this.addCommand({
-      name: "usage",
-      aliases: ["stats"],
-      description: "Show token usage statistics",
-      category: "config",
-      requiresAuth: true,
-      handler: async () => this.cmdUsage()
-    });
-    this.addCommand({
-      name: "plans",
-      aliases: ["pricing"],
-      description: "Show available plans and pricing",
-      category: "config",
-      requiresAuth: false,
-      handler: async () => this.cmdPlans()
-    });
-    this.addCommand({
-      name: "context",
-      aliases: ["ctx"],
-      description: "Show loaded codebase context",
-      category: "config",
-      requiresAuth: false,
-      handler: async () => this.cmdContext()
-    });
-    this.addCommand({
-      name: "history",
-      aliases: [],
-      description: "Show conversation history",
-      category: "config",
-      requiresAuth: false,
-      handler: async () => this.cmdHistory()
-    });
-    this.addCommand({
-      name: "config",
-      aliases: ["settings"],
-      description: "Show or set CLI configuration",
-      category: "config",
-      requiresAuth: false,
-      handler: async (args) => this.cmdConfig(args)
-    });
-  }
-  addCommand(cmd) {
-    this.commands.set(cmd.name, cmd);
-  }
-  // ============================================================
-  // COMMAND IMPLEMENTATIONS
-  // ============================================================
+    const add = (c) => this.commands.set(c.name, c);
+    add({ name: "help", aliases: ["h", "?"], description: "Show all available commands", category: "session", requiresAuth: false, handler: async () => this.cmdHelp() });
+    add({ name: "exit", aliases: ["quit", "q"], description: "Exit DevWing", category: "session", requiresAuth: false, handler: async () => this.exit() });
+    add({ name: "clear", aliases: ["cls"], description: "Clear screen and reset conversation", category: "session", requiresAuth: false, handler: async () => this.cmdClear() });
+    add({ name: "login", aliases: ["signin"], description: "Authenticate with DevWing", category: "session", requiresAuth: false, handler: async () => this.cmdLogin() });
+    add({ name: "logout", aliases: ["signout"], description: "Clear credentials and log out", category: "session", requiresAuth: true, handler: async () => this.cmdLogout() });
+    add({ name: "status", aliases: ["whoami"], description: "Show auth status and profile", category: "session", requiresAuth: false, handler: async () => this.cmdStatus() });
+    add({ name: "scan", aliases: [], description: "Run security vulnerability scan", category: "tools", requiresAuth: true, handler: async () => this.cmdScan() });
+    add({ name: "review", aliases: [], description: "Perform code review on recent changes", category: "tools", requiresAuth: true, handler: async () => this.cmdReview() });
+    add({ name: "explain", aliases: [], description: "Explain code, file, or concept", category: "tools", requiresAuth: true, handler: async (a) => this.cmdExplain(a) });
+    add({ name: "memory", aliases: ["mem"], description: "Project memory  save / show / clear", category: "tools", requiresAuth: true, handler: async (a) => this.cmdMemory(a) });
+    add({ name: "mode", aliases: [], description: "Show or set AI mode", category: "config", requiresAuth: false, handler: async (a) => this.cmdMode(a) });
+    add({ name: "model", aliases: [], description: "Show or set AI model", category: "config", requiresAuth: false, handler: async (a) => this.cmdModel(a) });
+    add({ name: "models", aliases: [], description: "List all available AI models", category: "config", requiresAuth: false, handler: async () => this.cmdModels() });
+    add({ name: "usage", aliases: ["stats"], description: "Show token usage statistics", category: "config", requiresAuth: true, handler: async () => this.cmdUsage() });
+    add({ name: "plans", aliases: ["pricing"], description: "Show available plans and pricing", category: "config", requiresAuth: false, handler: async () => this.cmdPlans() });
+    add({ name: "context", aliases: ["ctx"], description: "Show loaded codebase context", category: "config", requiresAuth: false, handler: async () => this.cmdContext() });
+    add({ name: "history", aliases: [], description: "Show conversation history", category: "config", requiresAuth: false, handler: async () => this.cmdHistory() });
+    add({ name: "config", aliases: ["settings"], description: "Show or set CLI configuration", category: "config", requiresAuth: false, handler: async (a) => this.cmdConfig(a) });
+  }
+  // ─── COMMAND IMPLEMENTATIONS ─────────────────────────────
   async cmdHelp() {
-    console.log();
-    const categories = [
+    const W = 62;
+    const top = chalk7.dim("\u256D" + "\u2500".repeat(W - 2) + "\u256E");
+    const bot = chalk7.dim("\u2570" + "\u2500".repeat(W - 2) + "\u256F");
+    const div = chalk7.dim("\u251C" + "\u2500".repeat(W - 2) + "\u2524");
+    const ln = (s = "") => {
+      const raw = s.replace(/\x1B\[[0-9;]*m/g, "");
+      const pad = W - 4 - raw.length;
+      return chalk7.dim("\u2502 ") + s + " ".repeat(Math.max(0, pad)) + chalk7.dim(" \u2502");
+    };
+    console.log(top);
+    console.log(ln(chalk7.bold.white("Commands")));
+    const cats = [
       { key: "session", label: "Session", color: chalk7.bold.green },
       { key: "tools", label: "AI Tools", color: chalk7.bold.magenta },
       { key: "config", label: "Configuration", color: chalk7.bold.yellow }
     ];
-    const lines = [];
-    for (const cat of categories) {
-      lines.push(cat.color(`  ${cat.label}`));
+    for (const cat of cats) {
+      console.log(div);
+      console.log(ln("  " + cat.color(cat.label)));
       for (const cmd of this.commands.values()) {
         if (cmd.category !== cat.key) continue;
-        const aliasStr = cmd.aliases.length > 0 ? chalk7.dim(` (${cmd.aliases.map((a) => "/" + a).join(", ")})`) : "";
-        lines.push(`    ${chalk7.cyan("/" + cmd.name.padEnd(12))} ${cmd.description}${aliasStr}`);
+        const cmdStr = chalk7.cyan(("/" + cmd.name).padEnd(13));
+        const descStr = chalk7.dim(cmd.description);
+        const alias = cmd.aliases.length ? chalk7.dim("  \xB7 " + cmd.aliases.map((a) => "/" + a).join(", ")) : "";
+        console.log(ln("    " + cmdStr + " " + descStr + alias));
       }
-      lines.push("");
     }
-    lines.push(chalk7.dim("  Just type a message to chat with DevWing AI."));
-    logger.box(lines.join("\n"), { title: "Commands", color: "cyan" });
+    console.log(div);
+    console.log(ln(chalk7.dim("  Type any message to chat with DevWing AI")));
+    console.log(bot);
   }
   async cmdClear() {
     this.conversationHistory = [];
     this.sessionContext = null;
     this.sessionId = null;
     console.clear();
-    this.printStartupBanner();
+    this.printBanner();
     this.printSystemInfo();
+    console.log();
   }
   async cmdLogin() {
-    console.log();
     if (this.isDemo) {
       await demoLoginCommand({ fromSession: true });
     } else {
       await loginCommand();
     }
-    await this.checkAuthStatus();
-    this.rl.setPrompt(this.buildPrompt());
+    restoreStdin();
+    await sleep2(80);
+    await this.checkAuth();
   }
   async cmdLogout() {
-    console.log();
     if (this.isDemo) {
       await demoLogoutCommand();
     } else {
       await logoutCommand();
     }
-    await this.checkAuthStatus();
-    this.rl.setPrompt(this.buildPrompt());
+    restoreStdin();
+    await sleep2(80);
+    await this.checkAuth();
   }
   async cmdStatus() {
-    console.log();
     if (!this.isAuthenticated) {
       logger.info("Not logged in. Type /login to authenticate.");
       return;
     }
     if (this.isDemo) {
-      const table = new Table3({
-        chars: { "mid": "", "left-mid": "", "mid-mid": "", "right-mid": "" }
-      });
-      table.push(
-        [chalk7.bold("Email"), DEMO_USER2.email],
-        [chalk7.bold("Name"), DEMO_USER2.full_name],
-        [chalk7.bold("Plan"), chalk7.cyan(DEMO_USER2.subscription_plan.toUpperCase())],
-        [chalk7.bold("Verified"), chalk7.green("Yes")],
-        [chalk7.bold("2FA"), chalk7.dim("Disabled")],
-        [chalk7.bold("Workspace"), `${DEMO_WORKSPACE2.name} (${DEMO_WORKSPACE2.plan})`],
-        [chalk7.bold("Project"), DEMO_PROJECT2.name],
-        [chalk7.bold("Tokens Today"), `${DEMO_USER2.tokens_used_today?.toLocaleString()} / 500,000`],
-        [chalk7.bold("Member Since"), new Date(DEMO_USER2.created_at).toLocaleDateString()]
-      );
-      console.log(table.toString());
+      const W = 54;
+      const top = chalk7.dim("\u256D" + "\u2500".repeat(W - 2) + "\u256E");
+      const bot = chalk7.dim("\u2570" + "\u2500".repeat(W - 2) + "\u256F");
+      const kv = (k, v) => {
+        const rawV = v.replace(/\x1B\[[0-9;]*m/g, "");
+        const pad = W - 4 - k.length - rawV.length;
+        return chalk7.dim("\u2502 ") + chalk7.bold(k) + " ".repeat(Math.max(0, pad)) + v + chalk7.dim(" \u2502");
+      };
+      console.log(top);
+      console.log(kv("Email", DEMO_USER2.email));
+      console.log(kv("Name", DEMO_USER2.full_name));
+      console.log(kv("Plan", chalk7.bgCyan.black(" PRO ")));
+      console.log(kv("Verified", chalk7.green("\u2713 Yes")));
+      console.log(kv("2FA", chalk7.dim("Disabled")));
+      console.log(kv("Workspace", DEMO_WORKSPACE2.name + chalk7.dim(" (enterprise)")));
+      console.log(kv("Project", DEMO_PROJECT2.name));
+      console.log(kv("Tokens today", `${(DEMO_USER2.tokens_used_today).toLocaleString()} / 500,000`));
+      console.log(bot);
     } else {
       await statusCommand();
     }
   }
   async cmdScan() {
-    console.log();
     if (this.isDemo) {
       await demoPromptCommand("scan auth service for OWASP vulnerabilities", { ...this.options, mode: "security" });
     } else {
@@ -3433,7 +3269,6 @@ ${recent[recent.length - 1].content}`;
     }
   }
   async cmdReview() {
-    console.log();
     if (this.isDemo) {
       await demoReviewCommand();
     } else {
@@ -3442,11 +3277,9 @@ ${recent[recent.length - 1].content}`;
   }
   async cmdExplain(args) {
     if (!args) {
-      logger.error("Usage: /explain <file, function, or concept>");
-      logger.info("Example: /explain src/auth/middleware.ts");
+      logger.error("Usage: /explain <file or concept>");
       return;
     }
-    console.log();
     if (this.isDemo) {
       await demoExplainCommand(args);
     } else {
@@ -3457,275 +3290,240 @@ ${recent[recent.length - 1].content}`;
     const parts = args.split(/\s+/);
     const sub = parts[0]?.toLowerCase();
     if (!sub || !["save", "show", "clear"].includes(sub)) {
-      console.log();
       console.log(`  ${chalk7.cyan("/memory show")}          \u2014 Show all project memories`);
       console.log(`  ${chalk7.cyan("/memory save <text>")}   \u2014 Save a memory`);
       console.log(`  ${chalk7.cyan("/memory clear")}         \u2014 Clear all memories`);
       return;
     }
-    console.log();
     const content = parts.slice(1).join(" ").trim();
     if (this.isDemo) {
       await demoMemoryCommand(sub, content || void 0);
+      restoreStdin();
+      await sleep2(80);
     } else {
       await memoryCommand(sub, content || void 0, this.options);
     }
   }
   async cmdMode(args) {
-    const validModes = ["general", "frontend", "backend", "security", "devops"];
+    const valid = ["general", "frontend", "backend", "security", "devops"];
     if (!args) {
-      console.log();
-      console.log(`  Current mode: ${chalk7.yellow.bold(this.currentMode)}`);
-      console.log();
-      console.log("  Available modes:");
-      for (const mode2 of validModes) {
-        const indicator = mode2 === this.currentMode ? chalk7.green(" \u25CF") : chalk7.dim(" \u25CB");
-        const desc = mode2 === "general" ? "All-purpose coding assistant" : mode2 === "frontend" ? "React, Vue, CSS, TypeScript, accessibility" : mode2 === "backend" ? "APIs, databases, microservices, system design" : mode2 === "security" ? "OWASP, CVE, penetration testing, compliance" : "Docker, Kubernetes, CI/CD, infrastructure";
-        console.log(`  ${indicator} ${chalk7.cyan(mode2.padEnd(12))} ${chalk7.dim(desc)}`);
+      const descs = {
+        general: "All-purpose coding assistant",
+        frontend: "React, Vue, CSS, TypeScript",
+        backend: "APIs, databases, microservices",
+        security: "OWASP, CVE, penetration testing",
+        devops: "Docker, Kubernetes, CI/CD"
+      };
+      for (const m of valid) {
+        const active = m === this.currentMode;
+        const dot = active ? chalk7.green("\u25CF") : chalk7.dim("\u25CB");
+        const label = active ? chalk7.yellow.bold(m.padEnd(10)) : chalk7.white(m.padEnd(10));
+        console.log(`  ${dot} ${label} ${chalk7.dim(descs[m])}`);
       }
       console.log();
-      console.log(chalk7.dim(`  Usage: /mode <name>`));
+      console.log(chalk7.dim("  Usage: /mode <name>"));
       return;
     }
     const mode = args.toLowerCase();
-    if (!validModes.includes(mode)) {
-      logger.error(`Invalid mode "${args}". Valid: ${validModes.join(", ")}`);
+    if (!valid.includes(mode)) {
+      logger.error(`Invalid mode "${args}". Valid: ${valid.join(", ")}`);
       return;
     }
     this.currentMode = mode;
     this.options.mode = mode;
-    logger.success(`Mode set to ${chalk7.yellow.bold(mode)}`);
+    console.log(`  ${chalk7.green("\u2713")} Mode \u2192 ${chalk7.yellow.bold(mode)}`);
   }
   async cmdModel(args) {
     if (!args) {
-      console.log();
-      const current = this.currentModel || "auto (selected by mode)";
-      console.log(`  Current model: ${chalk7.cyan.bold(current)}`);
-      console.log(chalk7.dim(`  Usage: /model <name>  |  /model auto  |  /models to list all`));
+      const cur = this.currentModel || "auto";
+      console.log(`  Current model: ${chalk7.cyan.bold(cur)}`);
+      console.log(chalk7.dim("  /model <name>  \xB7  /model auto  \xB7  /models to list all"));
       return;
     }
     if (args === "auto") {
       this.currentModel = null;
       this.options.model = void 0;
-      logger.success("Model set to auto (selected by mode)");
+      logger.success("Model \u2192 auto");
       return;
     }
     this.currentModel = args;
     this.options.model = args;
-    logger.success(`Model set to ${chalk7.cyan.bold(args)}`);
+    console.log(`  ${chalk7.green("\u2713")} Model \u2192 ${chalk7.cyan.bold(args)}`);
   }
   async cmdModels() {
-    console.log();
     if (this.isDemo) {
       const table = new Table3({
-        head: [
-          chalk7.bold("Model"),
-          chalk7.bold("Domain"),
-          chalk7.bold("Status"),
-          chalk7.bold("Min Plan"),
-          chalk7.bold("Context"),
-          chalk7.bold("Speed")
-        ],
-        colWidths: [24, 12, 10, 10, 10, 12]
+        head: [chalk7.bold("Model"), chalk7.bold("Domain"), chalk7.bold("Status"), chalk7.bold("Plan"), chalk7.bold("Context"), chalk7.bold("Speed")],
+        style: { border: ["dim"] }
       });
       for (const m of DEMO_MODELS) {
-        const statusColor = m.status === "active" ? chalk7.green : chalk7.yellow;
-        const planColor = m.min_plan === "free" ? chalk7.green : chalk7.cyan;
-        table.push([
-          chalk7.bold(m.display_name),
-          chalk7.yellow(m.domain),
-          statusColor(m.status),
-          planColor(m.min_plan),
-          `${(m.context_window / 1024).toFixed(0)}k`,
-          `${m.tokens_per_sec} tok/s`
-        ]);
+        const cur = m.name === (this.currentModel || "");
+        const nm = cur ? chalk7.cyan.bold(m.display_name + " \u25CF") : m.display_name;
+        const status = m.status === "active" ? chalk7.green("active") : chalk7.yellow("beta");
+        const plan = m.min_plan === "free" ? chalk7.green("free") : chalk7.cyan("pro");
+        table.push([nm, chalk7.yellow(m.domain), status, plan, `${(m.context_window / 1024).toFixed(0)}k`, `${m.tokens_per_sec} t/s`]);
       }
       console.log(table.toString());
-      console.log();
-      console.log(chalk7.dim(`  Set a model: /model devwing-backend-1  |  /model auto`));
+      console.log(chalk7.dim("  /model <name> to select  \xB7  /model auto for automatic"));
     } else {
       try {
         const models = await apiClient.getModels();
-        if (models.length === 0) {
+        if (!models.length) {
           logger.info("No models available");
           return;
         }
-        const table = new Table3({
-          head: [chalk7.bold("Name"), chalk7.bold("Domain"), chalk7.bold("Status"), chalk7.bold("Min Plan")]
-        });
-        for (const m of models) {
-          table.push([m.display_name || m.name, m.domain, m.status, m.min_plan]);
-        }
+        const table = new Table3({ head: [chalk7.bold("Name"), chalk7.bold("Domain"), chalk7.bold("Status"), chalk7.bold("Plan")] });
+        for (const m of models) table.push([m.display_name || m.name, m.domain, m.status, m.min_plan]);
         console.log(table.toString());
-      } catch (error) {
-        logger.error("Failed to fetch models: " + error.message);
+      } catch (e) {
+        logger.error("Failed to fetch models: " + e.message);
       }
     }
   }
   async cmdUsage() {
-    console.log();
     if (this.isDemo) {
-      console.log(chalk7.bold("  Token Usage"));
-      console.log();
-      const table = new Table3({
-        head: [chalk7.bold("Period"), chalk7.bold("Requests"), chalk7.bold("Tokens In"), chalk7.bold("Tokens Out"), chalk7.bold("Cost")]
+      const t = new Table3({
+        head: [chalk7.bold("Period"), chalk7.bold("Requests"), chalk7.bold("Tokens In"), chalk7.bold("Tokens Out"), chalk7.bold("Cost")],
+        style: { border: ["dim"] }
       });
-      table.push(
-        ["Today", DEMO_USAGE.today.requests.toString(), DEMO_USAGE.today.tokens_in.toLocaleString(), DEMO_USAGE.today.tokens_out.toLocaleString(), `$${DEMO_USAGE.today.cost.toFixed(4)}`],
-        ["This Week", DEMO_USAGE.week.requests.toString(), DEMO_USAGE.week.tokens_in.toLocaleString(), DEMO_USAGE.week.tokens_out.toLocaleString(), `$${DEMO_USAGE.week.cost.toFixed(4)}`],
-        ["This Month", DEMO_USAGE.month.requests.toString(), DEMO_USAGE.month.tokens_in.toLocaleString(), DEMO_USAGE.month.tokens_out.toLocaleString(), `$${DEMO_USAGE.month.cost.toFixed(4)}`]
+      t.push(
+        ["Today", String(DEMO_USAGE.today.requests), DEMO_USAGE.today.tokens_in.toLocaleString(), DEMO_USAGE.today.tokens_out.toLocaleString(), `$${DEMO_USAGE.today.cost.toFixed(4)}`],
+        ["This Week", String(DEMO_USAGE.week.requests), DEMO_USAGE.week.tokens_in.toLocaleString(), DEMO_USAGE.week.tokens_out.toLocaleString(), `$${DEMO_USAGE.week.cost.toFixed(4)}`],
+        ["This Month", String(DEMO_USAGE.month.requests), DEMO_USAGE.month.tokens_in.toLocaleString(), DEMO_USAGE.month.tokens_out.toLocaleString(), `$${DEMO_USAGE.month.cost.toFixed(4)}`]
       );
-      console.log(table.toString());
-      console.log();
+      console.log(t.toString());
       const used = DEMO_USER2.tokens_used_today;
       const limit = 5e5;
       const pct = Math.round(used / limit * 100);
-      const barWidth = 30;
-      const filled = Math.round(pct / 100 * barWidth);
-      const bar = chalk7.cyan("\u2588".repeat(filled)) + chalk7.dim("\u2591".repeat(barWidth - filled));
-      console.log(`  Daily Quota: ${bar} ${pct}% (${used.toLocaleString()} / ${limit.toLocaleString()})`);
+      const barW = 30;
+      const fill = Math.round(pct / 100 * barW);
+      const bar = chalk7.cyan("\u2588".repeat(fill)) + chalk7.dim("\u2591".repeat(barW - fill));
       console.log();
-      console.log(chalk7.bold("  Usage by Model"));
+      console.log(`  Daily Quota  ${bar}  ${chalk7.bold(pct + "%")}  ${chalk7.dim(`${used.toLocaleString()} / ${limit.toLocaleString()}`)}`);
       console.log();
-      const modelTable = new Table3({
-        head: [chalk7.bold("Model"), chalk7.bold("Requests"), chalk7.bold("Tokens"), chalk7.bold("Cost")]
+      const mt = new Table3({
+        head: [chalk7.bold("Model"), chalk7.bold("Requests"), chalk7.bold("Tokens"), chalk7.bold("Cost")],
+        style: { border: ["dim"] }
       });
-      modelTable.push(
+      mt.push(
         ["devwing-backend-1", "312", "421,000", "$1.4721"],
         ["devwing-security-1", "145", "198,500", "$0.6948"],
         ["devwing-general-1", "98", "132,200", "$0.4627"],
         ["devwing-frontend-1", "42", "56,800", "$0.1988"],
         ["devwing-devops-1", "15", "15,600", "$0.1728"]
       );
-      console.log(modelTable.toString());
+      console.log(mt.toString());
     } else {
       try {
-        const usage = await apiClient.getUsage();
-        console.log(`  Total Requests: ${usage.total_requests}`);
-        console.log(`  Tokens In: ${usage.total_tokens_in.toLocaleString()}`);
-        console.log(`  Tokens Out: ${usage.total_tokens_out.toLocaleString()}`);
-        console.log(`  Cost: $${usage.total_cost_usd.toFixed(4)}`);
-      } catch (error) {
-        logger.error("Failed to fetch usage: " + error.message);
+        const u = await apiClient.getUsage();
+        console.log(`  Requests: ${u.total_requests}`);
+        console.log(`  Tokens: ${u.total_tokens_in.toLocaleString()} in, ${u.total_tokens_out.toLocaleString()} out`);
+        console.log(`  Cost: $${u.total_cost_usd.toFixed(4)}`);
+      } catch (e) {
+        logger.error("Failed to fetch usage: " + e.message);
       }
     }
   }
   async cmdPlans() {
-    console.log();
     const table = new Table3({
-      head: [
-        chalk7.bold("Plan"),
-        chalk7.bold("Price"),
-        chalk7.bold("Tokens/Day"),
-        chalk7.bold("Models"),
-        chalk7.bold("Projects"),
-        chalk7.bold("Seats")
-      ],
-      colWidths: [14, 12, 14, 16, 12, 14]
+      head: [chalk7.bold("Plan"), chalk7.bold("Price"), chalk7.bold("Tokens/Day"), chalk7.bold("Models"), chalk7.bold("Projects"), chalk7.bold("Seats")],
+      style: { border: ["dim"] }
     });
-    for (const plan of DEMO_PLANS) {
-      const isCurrentPlan = this.isAuthenticated && this.userProfile?.subscription_plan?.toLowerCase() === plan.name.toLowerCase();
-      const nameStr = isCurrentPlan ? chalk7.cyan.bold(plan.name + " \u25CF") : plan.name;
-      table.push([nameStr, plan.price, plan.tokens_day, plan.models, plan.projects, plan.seats]);
+    const cur = this.userProfile?.subscription_plan?.toLowerCase() || "";
+    for (const p of DEMO_PLANS) {
+      const isCur = this.isAuthenticated && cur === p.name.toLowerCase();
+      const nm = isCur ? chalk7.cyan.bold(p.name) + chalk7.dim(" \u2190") : p.name;
+      table.push([nm, p.price, p.tokens_day, p.models, p.projects, p.seats]);
     }
     console.log(table.toString());
     console.log();
     if (this.isAuthenticated) {
-      const currentPlan = this.userProfile?.subscription_plan || "free";
-      console.log(chalk7.dim(`  Your plan: ${currentPlan.toUpperCase()}. Upgrade at https://devwing.ai/dashboard/billing`));
+      console.log(chalk7.dim(`  Your plan: ${cur.toUpperCase()}  \xB7  Upgrade at devwing.ai/dashboard/billing`));
     } else {
-      console.log(chalk7.dim("  Sign up at https://devwing.ai to get started."));
+      console.log(chalk7.dim("  Sign up at devwing.ai"));
     }
   }
   async cmdContext() {
-    console.log();
     if (this.isDemo) {
-      const table = new Table3({
-        chars: { "mid": "", "left-mid": "", "mid-mid": "", "right-mid": "" }
-      });
-      table.push(
-        [chalk7.bold("Working Dir"), chalk7.cyan(process.cwd().replace(process.env.HOME || "", "~"))],
-        [chalk7.bold("Git Branch"), "main"],
-        [chalk7.bold("Files Loaded"), "34"],
-        [chalk7.bold("Framework"), "FastAPI + TypeScript"],
-        [chalk7.bold("Shell"), process.env.SHELL?.split("/").pop() || "unknown"],
-        [chalk7.bold("OS"), process.platform]
-      );
-      console.log(table.toString());
-      console.log();
-      console.log(chalk7.bold("  Top files in context:"));
-      const files = [
-        "src/auth/auth_controller.ts",
-        "src/middleware/jwt.middleware.ts",
-        "src/services/user_service.ts",
-        "src/auth/repositories/user.repository.ts",
-        "package.json",
-        "tsconfig.json",
-        "docker-compose.yml"
-      ];
-      for (const f of files) {
-        console.log(`    ${chalk7.dim("\u2022")} ${chalk7.cyan(f)}`);
-      }
-      console.log(chalk7.dim("    ... and 27 more"));
+      const W = 56;
+      const top = chalk7.dim("\u256D" + "\u2500".repeat(W - 2) + "\u256E");
+      const bot = chalk7.dim("\u2570" + "\u2500".repeat(W - 2) + "\u256F");
+      const div = chalk7.dim("\u251C" + "\u2500".repeat(W - 2) + "\u2524");
+      const kv = (k, v) => {
+        const rv = v.replace(/\x1B\[[0-9;]*m/g, "");
+        const pad = W - 4 - k.length - rv.length;
+        return chalk7.dim("\u2502 ") + chalk7.bold(k) + " ".repeat(Math.max(0, pad)) + v + chalk7.dim(" \u2502");
+      };
+      const fl = (f) => {
+        const pad = W - 6 - f.length;
+        return chalk7.dim("\u2502   \xB7 ") + chalk7.cyan(f) + " ".repeat(Math.max(0, pad)) + chalk7.dim("\u2502");
+      };
+      const ln = (s) => {
+        const raw = s.replace(/\x1B\[[0-9;]*m/g, "");
+        const pad = W - 4 - raw.length;
+        return chalk7.dim("\u2502 ") + s + " ".repeat(Math.max(0, pad)) + chalk7.dim(" \u2502");
+      };
+      console.log(top);
+      console.log(kv("Directory", chalk7.dim(process.cwd().replace(process.env.HOME || "", "~"))));
+      console.log(kv("Git Branch", "main"));
+      console.log(kv("Files", "34 files loaded"));
+      console.log(kv("Framework", "FastAPI + TypeScript"));
+      console.log(div);
+      console.log(ln(chalk7.bold("Top files")));
+      for (const f of ["src/auth/auth_controller.ts", "src/middleware/jwt.middleware.ts", "src/services/user_service.ts", "package.json", "docker-compose.yml"]) {
+        console.log(fl(f));
+      }
+      console.log(ln(chalk7.dim("... and 29 more")));
+      console.log(bot);
     } else if (this.sessionContext) {
-      console.log(`  Working Dir: ${chalk7.cyan(this.sessionContext.cwd)}`);
-      console.log(`  Shell: ${this.sessionContext.shell} | OS: ${this.sessionContext.os}`);
-      console.log(`  Files: ${this.sessionContext.files.length}`);
-      if (this.sessionContext.git_branch) {
-        console.log(`  Git Branch: ${this.sessionContext.git_branch}`);
-      }
-      console.log();
-      console.log(chalk7.bold("  Files in context:"));
+      console.log(`  Dir: ${this.sessionContext.cwd}  \xB7  Files: ${this.sessionContext.files.length}`);
       for (const f of this.sessionContext.files.slice(0, 10)) {
-        console.log(`    ${chalk7.dim("\u2022")} ${chalk7.cyan(f.path)}`);
-      }
-      if (this.sessionContext.files.length > 10) {
-        console.log(chalk7.dim(`    ... and ${this.sessionContext.files.length - 10} more`));
+        console.log(`  ${chalk7.dim("\xB7")} ${chalk7.cyan(f.path)}`);
       }
     } else {
       logger.info("No context loaded yet. Send a message to load context.");
     }
   }
   async cmdHistory() {
-    console.log();
-    if (this.conversationHistory.length === 0) {
+    if (!this.conversationHistory.length) {
       logger.info("No conversation history yet.");
       return;
     }
-    for (const msg of this.conversationHistory.slice(-20)) {
-      const label = msg.role === "user" ? chalk7.green.bold("You") : chalk7.cyan.bold("DevWing");
-      const time = chalk7.dim(msg.timestamp.toLocaleTimeString());
-      const preview = msg.content.length > 120 ? msg.content.substring(0, 120) + "..." : msg.content;
-      console.log(`  ${time} ${label}: ${preview}`);
+    for (const m of this.conversationHistory.slice(-20)) {
+      const label = m.role === "user" ? chalk7.green.bold("You      ") : chalk7.cyan.bold("DevWing  ");
+      const time = chalk7.dim(m.timestamp.toLocaleTimeString());
+      const preview = m.content.length > 100 ? m.content.slice(0, 100) + "\u2026" : m.content;
+      console.log(`  ${time}  ${label} ${preview}`);
     }
   }
   async cmdConfig(args) {
     if (!args) {
-      console.log();
-      const config = configManager.getAll();
-      const table = new Table3({
-        chars: { "mid": "", "left-mid": "", "mid-mid": "", "right-mid": "" }
-      });
-      table.push(
-        [chalk7.bold("API URL"), config.apiUrl || chalk7.dim("default")],
-        [chalk7.bold("Workspace"), config.workspaceId || chalk7.dim("none")],
-        [chalk7.bold("Project"), config.projectId || chalk7.dim("none")],
-        [chalk7.bold("Model"), config.model || chalk7.dim("auto")],
-        [chalk7.bold("Mode"), config.mode || chalk7.dim("general")],
-        [chalk7.bold("Config Path"), configManager.getPath()]
-      );
-      console.log(table.toString());
-      console.log();
-      console.log(chalk7.dim("  Usage: /config set <key> <value>  |  /config get <key>"));
+      const cfg = configManager.getAll();
+      const W = 54;
+      const top = chalk7.dim("\u256D" + "\u2500".repeat(W - 2) + "\u256E");
+      const bot = chalk7.dim("\u2570" + "\u2500".repeat(W - 2) + "\u256F");
+      const kv = (k, v) => {
+        const rv = v.replace(/\x1B\[[0-9;]*m/g, "");
+        const pad = W - 4 - k.length - rv.length;
+        return chalk7.dim("\u2502 ") + chalk7.bold(k) + " ".repeat(Math.max(0, pad)) + v + chalk7.dim(" \u2502");
+      };
+      console.log(top);
+      console.log(kv("API URL", chalk7.dim(cfg.apiUrl || "default")));
+      console.log(kv("Workspace", chalk7.dim(cfg.workspaceId || "none")));
+      console.log(kv("Project", chalk7.dim(cfg.projectId || "none")));
+      console.log(kv("Model", chalk7.dim(cfg.model || "auto")));
+      console.log(kv("Mode", chalk7.dim(cfg.mode || "general")));
+      console.log(kv("Config", chalk7.dim(configManager.getPath())));
+      console.log(bot);
+      console.log(chalk7.dim("  /config set <key> <value>  \xB7  /config get <key>"));
       return;
     }
     const parts = args.split(/\s+/);
-    const sub = parts[0];
-    if (sub === "list") {
+    if (parts[0] === "list") {
       await configCommand("list");
-    } else if (sub === "get" && parts[1]) {
+    } else if (parts[0] === "get" && parts[1]) {
       await configCommand("get", parts[1]);
-    } else if (sub === "set" && parts[1] && parts[2]) {
+    } else if (parts[0] === "set" && parts[1] && parts[2]) {
       await configCommand("set", parts[1], parts[2]);
       if (parts[1] === "mode") this.currentMode = parts[2];
       if (parts[1] === "model") this.currentModel = parts[2];