ys-code-agent 2.0.1 → 3.0.0

package/dist/cli/index.cjs

@@ -14023,16 +14023,13 @@ var init_CommandPopup = __esm({
       }
       getCategorizedCommands() {
         const cats = [];
-        const seen = /* @__PURE__ */ new Set();
-        for (const cmd of this.filteredCommands) {
-          if (seen.has(cmd.command)) continue;
-          seen.add(cmd.command);
-        }
+        const added = /* @__PURE__ */ new Set();
         const order = ["system", "files", "git", "agents", "code", "memory", "settings"];
         for (const cat of order) {
-          const cmds = this.filteredCommands.filter((c) => c.category === cat && !seen.has(c.command));
+          const cmds = this.filteredCommands.filter((c) => c.category === cat && !added.has(c.command));
           if (cmds.length > 0) {
             cats.push({ category: cat, commands: cmds });
+            cmds.forEach((c) => added.add(c.command));
           }
         }
         return cats;
@@ -14072,13 +14069,62 @@ init_config();
 init_logger();
 
 // src/providers/base.ts
-var BaseProvider = class {
+var BaseProvider = class _BaseProvider {
   config;
   modelConfig;
   constructor(config, modelConfig) {
     this.config = config;
     this.modelConfig = modelConfig;
   }
+  static convertToOpenAITools(tools) {
+    return tools.map((schema) => {
+      const properties = {};
+      for (const [key, param] of Object.entries(schema.parameters)) {
+        const prop = {
+          type: param.type,
+          description: param.description
+        };
+        if (param.enum) prop.enum = param.enum;
+        if (param.minimum !== void 0) prop.minimum = param.minimum;
+        if (param.maximum !== void 0) prop.maximum = param.maximum;
+        properties[key] = prop;
+      }
+      return {
+        type: "function",
+        function: {
+          name: schema.name,
+          description: schema.description,
+          parameters: {
+            type: "object",
+            properties,
+            required: schema.required
+          }
+        }
+      };
+    });
+  }
+  static convertToAnthropicTools(tools) {
+    return tools.map((schema) => {
+      const properties = {};
+      for (const [key, param] of Object.entries(schema.parameters)) {
+        const prop = {
+          type: param.type,
+          description: param.description
+        };
+        if (param.enum) prop.enum = param.enum;
+        properties[key] = prop;
+      }
+      return {
+        name: schema.name,
+        description: schema.description,
+        input_schema: {
+          type: "object",
+          properties,
+          required: schema.required
+        }
+      };
+    });
+  }
   getApiKey() {
     return this.config.apiKey || process.env[`${this.config.type.toUpperCase()}_API_KEY`] || "";
   }
@@ -14106,7 +14152,7 @@ var BaseProvider = class {
       body.stop = this.modelConfig.stop;
     }
     if (tools && tools.length > 0) {
-      body.tools = tools;
+      body.tools = _BaseProvider.convertToOpenAITools(tools);
       body.tool_choice = "auto";
     }
     return body;
@@ -14315,28 +14361,6 @@ var AnthropicProvider = class extends BaseProvider {
       "anthropic-version": "2023-06-01"
     };
   }
-  buildRequestBody(messages, tools) {
-    const systemMessages = messages.filter((m) => m.role === "system");
-    const chatMessages = messages.filter((m) => m.role !== "system");
-    const body = {
-      model: this.modelConfig.model,
-      messages: chatMessages.map((m) => ({
-        role: m.role === "assistant" ? "assistant" : "user",
-        content: m.content
-      })),
-      max_tokens: this.modelConfig.maxTokens,
-      temperature: this.modelConfig.temperature,
-      top_p: this.modelConfig.topP,
-      stream: false
-    };
-    if (systemMessages.length > 0) {
-      body.system = systemMessages.map((m) => ({ type: "text", text: m.content }));
-    }
-    if (tools && tools.length > 0) {
-      body.tools = tools;
-    }
-    return body;
-  }
   convertMessages(messages) {
     const systemMessages = [];
     const chatMessages = [];
@@ -14367,7 +14391,7 @@ var AnthropicProvider = class extends BaseProvider {
       body.system = systemMessages;
     }
     if (tools && tools.length > 0) {
-      body.tools = tools;
+      body.tools = BaseProvider.convertToAnthropicTools(tools);
     }
     const response = await this.fetchWithRetry(url, {
       method: "POST",
@@ -14417,7 +14441,7 @@ var AnthropicProvider = class extends BaseProvider {
       body.system = systemMessages;
     }
     if (tools && tools.length > 0) {
-      body.tools = tools;
+      body.tools = BaseProvider.convertToAnthropicTools(tools);
     }
     const response = await this.fetchWithRetry(url, {
       method: "POST",
@@ -15126,27 +15150,35 @@ init_session();
 init_project();
 init_utils();
 var logger13 = getLogger("agent");
-var SYSTEM_PROMPT = `You are YS Code Agent, an advanced AI coding assistant that helps users write, debug, and understand code.
+var SYSTEM_PROMPT = `You are YS Code Agent \u2014 a production-grade terminal AI coding assistant.
+You have DIRECT access to the filesystem and terminal through tool calls.
 
-You have access to a set of tools that let you read, write, and edit files, search code, execute commands, and more.
+## CRITICAL RULE \u2014 USE TOOLS, DON'T JUST TALK
+When the user asks you to make, create, write, or build something \u2014 USE the write_file tool to actually create the file on disk.
+When the user asks to read, show, or check something \u2014 USE the read_file tool.
+When the user asks to run, execute, or test something \u2014 USE the run_command tool.
+When the user asks to search or find something \u2014 USE the search_files tool.
+NEVER just show code in chat without writing it to disk when the user asks to create something.
 
-When working on tasks:
-1. First understand the request thoroughly
-2. Make a plan before executing
-3. Read relevant files to understand existing code
-4. Write or edit code as needed
-5. Run tests or commands to verify
-6. Fix any issues that arise
-7. Report results clearly
+## Available Tools
+- write_file: Write content to a file (creates/overwrites)
+- read_file: Read file contents from disk  
+- edit_file: Edit specific parts of a file
+- delete_file: Delete a file
+- run_command: Execute a shell command
+- search_files: Search for text in files
+- glob: Find files matching a pattern
+- list_directory: List directory contents
+- git: Execute git commands
+- web_fetch: Fetch content from a URL
+- memory: Read/write project memory
 
-Always follow these rules:
-- Write clean, maintainable code following existing patterns
-- Make minimal changes to achieve the goal
-- Verify changes work correctly
-- Be concise in explanations
-- Use the tools available to you effectively
-- Ask for clarification when needed
-- Never execute dangerous commands without confirmation`;
+## Response Format
+- Use clear section headers for complex responses
+- Show file paths when referencing code
+- Keep responses concise but complete
+- After writing files, confirm with a summary of what was created
+- Use markdown formatting in your responses`;
 var Agent = class {
   state;
   provider = null;
@@ -15643,7 +15675,6 @@ init_logger();
 init_source();
 init_logger();
 init_config();
-init_phoneOptimizer();
 init_CommandPopup();
 
 // src/ui/WelcomeScreen.ts
@@ -15800,7 +15831,28 @@ function getSessionId() {
   }
 }
 
+// src/utils/renderMarkdown.ts
+init_source();
+function renderMarkdown(text) {
+  let result = text;
+  result = result.replace(/^### (.+)$/gm, (_, m) => source_default.cyan.bold(m));
+  result = result.replace(/^## (.+)$/gm, (_, m) => source_default.yellow.bold(m));
+  result = result.replace(/^# (.+)$/gm, (_, m) => source_default.white.bold.underline(m));
+  result = result.replace(/\*\*(.+?)\*\*/g, (_, m) => source_default.bold(m));
+  result = result.replace(/\*(.+?)\*/g, (_, m) => source_default.italic(m));
+  result = result.replace(/`([^`]+)`/g, (_, m) => source_default.bgGray.white(` ${m} `));
+  result = result.replace(
+    /```[\w]*\n([\s\S]+?)```/g,
+    (_, code) => code.split("\n").map((l) => source_default.gray("\u2502 ") + source_default.green(l)).join("\n")
+  );
+  result = result.replace(/^[-*] (.+)$/gm, (_, m) => source_default.cyan("  \u25C6 ") + m);
+  result = result.replace(/^(\d+)\. (.+)$/gm, (_, n, m) => source_default.yellow(`  ${n}. `) + m);
+  result = result.replace(/^---+$/gm, source_default.gray("\u2500".repeat(60)));
+  return result;
+}
+
 // src/ui/index.ts
+var import_readline = require("readline");
 var logger15 = getLogger("ui");
 var INDICATORS = {
   idle: "\u25CB",
@@ -15824,24 +15876,21 @@ var TUI = class {
   status = "idle";
   approvalMode = "normal";
   agentMode = "chat";
-  outputLines = [];
-  maxOutputLines = 1e3;
   onInput = null;
-  onSpecialKey = null;
+  onCancelRequest = null;
   running = false;
   commandPopup;
-  inputBuffer = "";
   inputHistory = [];
   historyIndex = -1;
-  cursorPos = 0;
   popupActive = false;
   cancelRequested = false;
-  onCancelRequest = null;
-  stdinRaw = false;
+  inputBuffer = "";
+  cursorPos = 0;
+  popupLineCount = 0;
+  prevInput = null;
   constructor() {
     this.commandPopup = new CommandPopup();
     this.loadHistory();
-    this.setupRawMode();
   }
   loadHistory() {
     try {
@@ -15865,332 +15914,273 @@ var TUI = class {
     } catch {
     }
   }
-  setupRawMode() {
-    if (!process.stdin.isTTY) return;
-    try {
-      process.stdin.setRawMode?.(true);
-      this.stdinRaw = true;
-    } catch {
-      this.stdinRaw = false;
-    }
-  }
   setOnCancelRequest(cb) {
     this.onCancelRequest = cb;
   }
   start() {
     this.running = true;
-    this.showPrompt();
-    this.startKeyListener();
-  }
-  startKeyListener() {
     if (!process.stdin.isTTY) {
       this.startLineMode();
       return;
     }
-    process.stdin.on("data", (data) => {
-      if (!this.running) return;
-      const input = data.toString("utf-8");
-      if (this.popupActive) {
-        this.handlePopupKey(input);
-        this.renderScreen();
-        return;
-      }
-      if (input === "\x1B" || input === "\x1B[" || input === "\x1B[" && data.length > 2) {
-        if (input === "\x1B") {
-          if (this.inputBuffer.length === 0) {
-            void this.handleSpecialKey("escape");
-          } else {
-            this.inputBuffer = "";
-            this.cursorPos = 0;
-            this.renderScreen();
-          }
-          return;
-        }
-        return;
-      }
-      if (input === "\x1B[A") {
-        void this.handleSpecialKey("up");
-        return;
-      }
-      if (input === "\x1B[B") {
-        void this.handleSpecialKey("down");
-        return;
-      }
-      if (input === "\x1B[C") {
-        void this.handleSpecialKey("right");
-        return;
-      }
-      if (input === "\x1B[D") {
-        void this.handleSpecialKey("left");
-        return;
-      }
-      if (input === "\r" || input === "\n") {
-        void this.handleSpecialKey("enter");
-        return;
-      }
-      if (input === "\x7F" || input === "\b") {
-        void this.handleSpecialKey("backspace");
-        return;
-      }
-      if (input === "") {
-        void this.handleSpecialKey("ctrl_c");
-        return;
+    this.startTTYMode();
+  }
+  startLineMode() {
+    const { createInterface } = require("readline");
+    const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: "" });
+    rl.on("line", (line) => {
+      const trimmed = line.trim();
+      if (trimmed && this.onInput) {
+        this.addHistory(trimmed);
+        this.onInput(trimmed);
       }
-      if (input === "\f") {
-        void this.handleSpecialKey("ctrl_l");
-        return;
+      rl.prompt();
+    });
+    rl.on("SIGINT", () => process.exit(0));
+    rl.prompt();
+  }
+  startTTYMode() {
+    try {
+      process.stdin.setRawMode?.(true);
+    } catch {
+    }
+    (0, import_readline.emitKeypressEvents)(process.stdin);
+    this.inputBuffer = "";
+    this.cursorPos = 0;
+    this.popupLineCount = 0;
+    process.stdin.on("keypress", this.handleKeypress.bind(this));
+    this.renderScreen();
+  }
+  async handleKeypress(str, key) {
+    if (!this.running) return;
+    if (!key) key = {};
+    const k = key.name || "";
+    const c = key.ctrl || false;
+    if (this.popupActive) {
+      await this.handlePopupKeypress(str, key);
+      return;
+    }
+    if (k === "escape") {
+      if (this.inputBuffer.length > 0) {
+        this.inputBuffer = "";
+        this.cursorPos = 0;
       }
-      if (input === "
") {
-        void this.handleSpecialKey("ctrl_a");
-        return;
+      this.renderScreen();
+      return;
+    }
+    if (k === "return" || k === "enter") {
+      const input = this.inputBuffer.trim();
+      this.inputBuffer = "";
+      this.cursorPos = 0;
+      if (input) {
+        this.addHistory(input);
+        if (this.onInput) {
+          await this.onInput(input);
+        }
       }
-      if (input === "") {
-        void this.handleSpecialKey("ctrl_e");
-        return;
+      this.renderScreen();
+      return;
+    }
+    if (k === "backspace") {
+      if (this.cursorPos > 0) {
+        this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos - 1) + this.inputBuffer.slice(this.cursorPos);
+        this.cursorPos--;
       }
-      if (input === "\n" || input === "\r") {
-        return;
+      this.renderScreen();
+      return;
+    }
+    if (k === "up") {
+      if (this.inputHistory.length > 0) {
+        if (this.historyIndex === -1) {
+          this.historyIndex = this.inputHistory.length - 1;
+        } else if (this.historyIndex > 0) {
+          this.historyIndex--;
+        }
+        this.inputBuffer = this.inputHistory[this.historyIndex];
+        this.cursorPos = this.inputBuffer.length;
       }
-      if (input === "	") {
-        void this.handleSpecialKey("tab");
-        return;
+      this.renderScreen();
+      return;
+    }
+    if (k === "down") {
+      if (this.historyIndex >= 0) {
+        this.historyIndex++;
+        if (this.historyIndex >= this.inputHistory.length) {
+          this.historyIndex = -1;
+          this.inputBuffer = "";
+        } else {
+          this.inputBuffer = this.inputHistory[this.historyIndex];
+        }
+        this.cursorPos = this.inputBuffer.length;
       }
-      if (input === "") {
-        void this.handleSpecialKey("ctrl_o");
-        return;
+      this.renderScreen();
+      return;
+    }
+    if (k === "left") {
+      if (this.cursorPos > 0) this.cursorPos--;
+      this.renderScreen();
+      return;
+    }
+    if (k === "right") {
+      if (this.cursorPos < this.inputBuffer.length) this.cursorPos++;
+      this.renderScreen();
+      return;
+    }
+    if (k === "tab") {
+      this.handleTab();
+      this.renderScreen();
+      return;
+    }
+    if (c && k === "c") {
+      if (this.cancelRequested || this.status === "thinking" || this.status === "executing") {
+        if (this.onCancelRequest) this.onCancelRequest();
+      } else {
+        this.printLine("");
+        this.printLine(source_default.yellow("Use /exit to quit, or press Ctrl+C again to force quit"));
+        this.cancelRequested = true;
+        setTimeout(() => {
+          this.cancelRequested = false;
+        }, 2e3);
       }
-      if (input === "") {
-        void this.handleSpecialKey("ctrl_x");
+      this.renderScreen();
+      return;
+    }
+    if (c && k === "l") {
+      this.clear();
+      this.renderScreen();
+      return;
+    }
+    if (c && k === "x") {
+      await this.openExternalEditor();
+      return;
+    }
+    if (c && k === "a") {
+      this.cursorPos = 0;
+      this.renderScreen();
+      return;
+    }
+    if (c && k === "e") {
+      this.cursorPos = this.inputBuffer.length;
+      this.renderScreen();
+      return;
+    }
+    if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+      this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos) + str + this.inputBuffer.slice(this.cursorPos);
+      this.cursorPos++;
+      if (str === "/") {
+        this.popupActive = true;
+        this.commandPopup.open();
+        this.commandPopup.setFilter("");
+        this.renderScreen();
         return;
       }
-      this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos) + input + this.inputBuffer.slice(this.cursorPos);
-      this.cursorPos += input.length;
-      if (input === "/") {
+      if (this.inputBuffer.startsWith("/") && this.inputBuffer.length > 1) {
         this.popupActive = true;
         this.commandPopup.open();
-        this.commandPopup.setFilter(input);
-      } else {
-        if (this.inputBuffer.startsWith("/") && this.inputBuffer.length > 1) {
-          this.popupActive = true;
-          this.commandPopup.open();
-          this.commandPopup.setFilter(this.inputBuffer);
-        }
+        this.commandPopup.setFilter(this.inputBuffer.slice(1));
+        this.renderScreen();
+        return;
       }
-      this.renderScreen();
-    });
-    process.stdin.on("end", () => {
-    });
+    }
+    this.renderScreen();
   }
-  startLineMode() {
-    const { createInterface } = require("readline");
-    const rl = createInterface({ input: process.stdin, output: process.stdout, prompt: "" });
-    rl.on("line", (line) => {
-      this.inputBuffer = line.trim();
-      if (this.inputBuffer && this.onInput) {
-        this.addHistory(this.inputBuffer);
-        this.onInput(this.inputBuffer);
+  clearPopupLines() {
+    if (this.popupLineCount > 0) {
+      try {
+        (0, import_readline.moveCursor)(process.stdout, 0, -(this.popupLineCount + 1));
+      } catch {
       }
-      this.inputBuffer = "";
-      this.showPrompt();
-    });
-    rl.on("SIGINT", () => process.exit(0));
-    this.showPrompt();
+      for (let i = 0; i <= this.popupLineCount; i++) {
+        try {
+          (0, import_readline.cursorTo)(process.stdout, 0);
+          (0, import_readline.clearLine)(process.stdout, 1);
+          process.stdout.write("\n");
+        } catch {
+        }
+      }
+      this.popupLineCount = 0;
+    }
   }
-  handlePopupKey(input) {
-    if (input === "\x1B") {
+  async handlePopupKeypress(str, key) {
+    const k = key.name || "";
+    if (k === "escape") {
+      this.clearPopupLines();
       this.popupActive = false;
       this.commandPopup.close();
       this.inputBuffer = "";
       this.cursorPos = 0;
+      this.renderScreen();
       return;
     }
-    if (input === "\x1B[A" || input === "\x1BOA") {
+    if (k === "up") {
       this.commandPopup.moveUp();
+      this.renderScreen();
       return;
     }
-    if (input === "\x1B[B" || input === "\x1BOB") {
+    if (k === "down") {
       this.commandPopup.moveDown();
+      this.renderScreen();
       return;
     }
-    if (input === "\r" || input === "\n") {
-      const selectedCmd = this.commandPopup.getSelectedCommand();
-      if (selectedCmd) {
-        this.popupActive = false;
-        this.commandPopup.close();
-        const fullCmd = `/${selectedCmd} `;
-        this.inputBuffer = fullCmd;
-        this.cursorPos = fullCmd.length;
+    if (k === "return" || k === "enter") {
+      const cmd = this.commandPopup.getSelectedCommand();
+      this.popupActive = false;
+      this.commandPopup.close();
+      this.clearPopupLines();
+      if (cmd) {
+        const fullInput = `/${cmd} `;
+        if (this.onInput) {
+          await this.onInput(fullInput.trim());
+        }
       }
+      this.renderScreen();
       return;
     }
-    if (input === "	") {
-      const selectedCmd = this.commandPopup.getSelectedCommand();
-      if (selectedCmd) {
+    if (k === "backspace") {
+      this.commandPopup.deleteChar();
+      const filter = this.commandPopup.getFilterText();
+      if (filter.length === 0) {
+        this.clearPopupLines();
         this.popupActive = false;
         this.commandPopup.close();
-        const fullCmd = `/${selectedCmd} `;
-        this.inputBuffer = fullCmd;
-        this.cursorPos = fullCmd.length;
+        this.inputBuffer = "/";
+        this.cursorPos = 1;
       }
+      this.renderScreen();
       return;
     }
-    if (input === "\x7F" || input === "\b") {
-      const currentFilter = this.commandPopup.getFilterText();
-      if (currentFilter.length <= 1) {
-        this.popupActive = false;
-        this.commandPopup.close();
-        this.inputBuffer = "";
-        this.cursorPos = 0;
-        return;
-      }
-      this.commandPopup.deleteChar();
+    if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+      this.commandPopup.appendChar(str);
+      this.renderScreen();
       return;
     }
-    if (input.length === 1 && input.charCodeAt(0) >= 32) {
-      this.commandPopup.appendChar(input);
-      this.inputBuffer = this.commandPopup.getFilterText();
-      this.cursorPos = this.inputBuffer.length;
-    }
   }
-  async handleSpecialKey(key) {
-    switch (key) {
-      case "escape":
-        if (this.inputBuffer.length > 0) {
-          this.inputBuffer = "";
-          this.cursorPos = 0;
-          this.renderScreen();
-        }
-        break;
-      case "enter":
-        if (this.inputBuffer.trim()) {
-          this.addHistory(this.inputBuffer.trim());
-          const msg = this.inputBuffer.trim();
-          this.inputBuffer = "";
-          this.cursorPos = 0;
-          this.clearOutputLine();
-          if (this.onInput) this.onInput(msg);
-        }
-        this.renderScreen();
-        break;
-      case "backspace":
-        if (this.cursorPos > 0) {
-          this.inputBuffer = this.inputBuffer.slice(0, this.cursorPos - 1) + this.inputBuffer.slice(this.cursorPos);
-          this.cursorPos--;
-          this.updatePopupFilter();
-        }
-        this.renderScreen();
-        break;
-      case "up":
-        if (this.inputHistory.length > 0) {
-          if (this.historyIndex === -1) {
-            this.historyIndex = this.inputHistory.length - 1;
-          } else if (this.historyIndex > 0) {
-            this.historyIndex--;
-          }
-          this.inputBuffer = this.inputHistory[this.historyIndex];
-          this.cursorPos = this.inputBuffer.length;
-          this.renderScreen();
-        }
-        break;
-      case "down":
-        if (this.historyIndex >= 0) {
-          this.historyIndex++;
-          if (this.historyIndex >= this.inputHistory.length) {
-            this.historyIndex = -1;
-            this.inputBuffer = "";
-          } else {
-            this.inputBuffer = this.inputHistory[this.historyIndex];
-          }
-          this.cursorPos = this.inputBuffer.length;
-          this.renderScreen();
-        }
-        break;
-      case "left":
-        if (this.cursorPos > 0) {
-          this.cursorPos--;
-          this.renderScreen();
-        }
-        break;
-      case "right":
-        if (this.cursorPos < this.inputBuffer.length) {
-          this.cursorPos++;
-          this.renderScreen();
-        }
-        break;
-      case "ctrl_a":
-        this.cursorPos = 0;
-        this.renderScreen();
-        break;
-      case "ctrl_e":
+  handleTab() {
+    const match = this.inputBuffer.match(/^\/?(\w*)$/);
+    if (match) {
+      const partial = match[1].toLowerCase();
+      const { ALL_COMMANDS: ALL_COMMANDS2 } = (init_CommandPopup(), __toCommonJS(CommandPopup_exports));
+      const cmds = ALL_COMMANDS2.map((c) => c.command).filter((c) => c.startsWith(partial));
+      if (cmds.length === 1) {
+        this.inputBuffer = `/${cmds[0]} `;
         this.cursorPos = this.inputBuffer.length;
-        this.renderScreen();
-        break;
-      case "ctrl_c":
-        if (this.cancelRequested || this.status === "thinking" || this.status === "executing") {
-          if (this.onCancelRequest) this.onCancelRequest();
-        } else {
-          this.printLine("\n" + source_default.yellow("Use /exit to quit, or press Ctrl+C again to force quit"));
-          this.cancelRequested = true;
-          setTimeout(() => {
-            this.cancelRequested = false;
-          }, 2e3);
-        }
-        break;
-      case "ctrl_l":
-        this.clear();
-        this.printWelcome();
-        this.showPrompt();
-        break;
-      case "tab": {
-        const match = this.inputBuffer.match(/^\/?(\w*)$/);
-        if (match) {
-          const partial = match[1].toLowerCase();
-          const cmds = this.getAllCommands().filter((c) => c.startsWith(partial));
-          if (cmds.length === 1) {
-            this.inputBuffer = `/${cmds[0]} `;
-            this.cursorPos = this.inputBuffer.length;
-            this.renderScreen();
-          }
-        }
-        break;
-      }
-      case "ctrl_o":
-        break;
-      case "ctrl_x":
-        void this.openExternalEditor();
-        break;
-    }
-  }
-  updatePopupFilter() {
-    if (this.popupActive) {
-      this.commandPopup.setFilter(this.inputBuffer);
-      if (this.inputBuffer === "/" || this.inputBuffer === "") {
-        this.popupActive = false;
-        this.commandPopup.close();
       }
     }
   }
-  getAllCommands() {
-    const { ALL_COMMANDS: ALL_COMMANDS2 } = (init_CommandPopup(), __toCommonJS(CommandPopup_exports));
-    return ALL_COMMANDS2.map((c) => c.command);
-  }
   async openExternalEditor() {
     const editor = process.env.EDITOR || "nano";
-    const { writeFileSync: writeFileSync7, unlinkSync: unlinkSync4, existsSync: existsSync11, mkdirSync: mkdirSync7 } = await import("fs");
-    const { join: join8 } = await import("path");
+    const { writeFileSync: writeFileSync7, unlinkSync: unlinkSync4, existsSync: existsSync11, mkdirSync: mkdirSync7, readFileSync: readFileSync11 } = await import("fs");
     const tmpDir = "/tmp/ys-agent";
     if (!existsSync11(tmpDir)) mkdirSync7(tmpDir, { recursive: true });
-    const tmpFile = join8(tmpDir, `input-${Date.now()}.md`);
+    const tmpFile = `/tmp/ys-agent/input-${Date.now()}.md`;
     writeFileSync7(tmpFile, this.inputBuffer, "utf-8");
     const { execSync: execSync4 } = await import("child_process");
     try {
       execSync4(`${editor} "${tmpFile}"`, { stdio: "inherit" });
-      const { readFileSync: readFileSync11 } = await import("fs");
       const content = readFileSync11(tmpFile, "utf-8").trim();
       if (content) {
         this.inputBuffer = content;
         this.cursorPos = content.length;
-        this.renderScreen();
       }
     } catch {
     }
@@ -16198,6 +16188,69 @@ var TUI = class {
       unlinkSync4(tmpFile);
     } catch {
     }
+    this.renderScreen();
+  }
+  renderScreen() {
+    if (!process.stdout.isTTY) return;
+    const promptLine2 = this.buildPromptLine();
+    if (this.popupLineCount > 0) {
+      try {
+        (0, import_readline.moveCursor)(process.stdout, 0, -(this.popupLineCount + 1));
+      } catch {
+      }
+    }
+    if (this.popupActive && this.commandPopup.isVisible()) {
+      const popup = this.commandPopup.render();
+      const popupLines = popup.split("\n");
+      this.popupLineCount = popupLines.length;
+      for (const l of popupLines) {
+        try {
+          (0, import_readline.cursorTo)(process.stdout, 0);
+          (0, import_readline.clearLine)(process.stdout, 1);
+          process.stdout.write(l + "\n");
+        } catch {
+        }
+      }
+    } else {
+      this.popupLineCount = 0;
+    }
+    try {
+      (0, import_readline.cursorTo)(process.stdout, 0);
+      (0, import_readline.clearLine)(process.stdout, 1);
+      process.stdout.write(promptLine2);
+    } catch {
+    }
+  }
+  buildPromptPrefix() {
+    const statusIndicator = STATUS_COLORS[this.status](INDICATORS[this.status]);
+    const config = configManager.getConfig();
+    const model = config.model.model;
+    const modelShort = model.length > 18 ? model.slice(0, 16) + "\u2026" : model;
+    let modeBadge2 = "";
+    if (this.agentMode === "plan") modeBadge2 = source_default.blue(" [plan]");
+    else if (this.agentMode === "goal") modeBadge2 = source_default.magenta(" [goal]");
+    else if (this.agentMode === "arena") modeBadge2 = source_default.yellow(" [arena]");
+    let approvalBadge2 = "";
+    if (this.approvalMode === "safe") approvalBadge2 = source_default.cyan(" [safe]");
+    else if (this.approvalMode === "yolo") approvalBadge2 = source_default.red(" [yolo]");
+    return `${statusIndicator} ${source_default.cyan("ys")} ${source_default.yellow(`[${modelShort}]`)}${modeBadge2}${approvalBadge2} ${source_default.gray("\u203A")} `;
+  }
+  buildPromptLine() {
+    const prefix = this.buildPromptPrefix();
+    const input = this.inputBuffer || "";
+    const cursor = source_default.gray("\u2588");
+    let line;
+    if (this.cursorPos >= input.length) {
+      line = prefix + input + cursor;
+    } else {
+      const before = input.slice(0, this.cursorPos);
+      const after = input.slice(this.cursorPos);
+      line = prefix + before + cursor + after;
+    }
+    return line;
+  }
+  showPrompt() {
+    if (this.running) this.renderScreen();
   }
   addHistory(input) {
     if (this.inputHistory[this.inputHistory.length - 1] !== input) {
@@ -16206,52 +16259,68 @@ var TUI = class {
     this.historyIndex = -1;
     this.saveHistory();
   }
-  renderScreen() {
-    if (!process.stdout.isTTY) return;
-    const lines = this.buildDisplayLines();
-    const clearSeq = `\x1B[0J\x1B[${process.stdout.rows || 24};0H`;
-    const output = clearSeq + lines.join("\n");
+  setOnInput(handler) {
+    this.onInput = handler;
+  }
+  setStatus(status) {
+    this.status = status;
+  }
+  setApprovalMode(mode) {
+    this.approvalMode = mode;
+  }
+  setAgentMode(mode) {
+    this.agentMode = mode;
+  }
+  getApprovalMode() {
+    return this.approvalMode;
+  }
+  getAgentMode() {
+    return this.agentMode;
+  }
+  printLine(line) {
+    if (!process.stdout.isTTY) {
+      console.log(line);
+      return;
+    }
     try {
-      cursorToSync(process.stdout, 0, (process.stdout.rows || 24) - lines.length);
-      process.stdout.write(output);
+      (0, import_readline.cursorTo)(process.stdout, 0);
+      (0, import_readline.clearLine)(process.stdout, 1);
+      process.stdout.write(line + "\n");
     } catch {
+      console.log(line);
     }
   }
-  buildDisplayLines() {
-    const lines = [];
-    if (this.popupActive) {
-      const popupLines = this.commandPopup.render().split("\n");
-      lines.push(...popupLines);
+  printAssistant(message) {
+    const rendered = renderMarkdown(message);
+    for (const line of rendered.split("\n")) {
+      this.printLine(line);
     }
-    lines.push(this.buildPromptLine());
-    return lines;
   }
-  stop() {
-    this.running = false;
-    if (this.stdinRaw && process.stdin.isTTY) {
-      try {
-        process.stdin.setRawMode?.(false);
-      } catch {
-      }
-    }
-    process.stdin.removeAllListeners("data");
-    this.showShutdownScreen();
+  printWarning(message) {
+    this.printLine(source_default.yellow(`\u26A0 ${message}`));
   }
-  clear() {
-    console.clear();
+  printError(error) {
+    const w = Math.max(Math.min(process.stdout.columns || 80, 56), 10);
+    this.printLine(source_default.red(`\u2554${"\u2550".repeat(w)}\u2557`));
+    this.printLine(source_default.red(`\u2551`) + `  ${source_default.red("\u2717")} ${source_default.white(error)}${" ".repeat(Math.max(0, w - error.length - 7))}` + source_default.red(`\u2551`));
+    this.printLine(source_default.red(`\u255A${"\u2550".repeat(w)}\u255D`));
   }
-  clearOutputLine() {
-    try {
-      const { cursorTo, clearLine } = require("readline");
-      cursorTo(process.stdout, 0);
-      clearLine(process.stdout, 1);
-    } catch {
+  printToolCall(toolName, args) {
+    const argsStr = Object.entries(args).slice(0, 3).map(([k, v]) => `${k}=${String(v).slice(0, 50)}`).join(", ");
+    this.printLine(source_default.gray(`  \u26A1 ${toolName}(${argsStr}${Object.keys(args).length > 3 ? ", ..." : ""})`));
+  }
+  printToolResult(result) {
+    if (result.success) {
+      this.printLine(source_default.gray(`  \u2713 ${source_default.green("success")}`));
+    } else {
+      this.printLine(source_default.gray(`  \u2715 ${source_default.red(result.error || "failed")}`));
     }
   }
+  showStatusBar(_info) {
+  }
   printWelcome() {
     const welcome = generateWelcome();
-    const lines = welcome.split("\n");
-    for (const line of lines) {
+    for (const line of welcome.split("\n")) {
       this.printLine(line);
     }
     this.printLine("");
@@ -16312,183 +16381,24 @@ var TUI = class {
     lines.push(bottom);
     for (const l of lines) this.printLine(l);
   }
-  printWarning(message) {
-    const w = Math.max(Math.min(process.stdout.columns || 80, 60), 10);
-    const top = `\u2554${"\u2550".repeat(w)}\u2557`;
-    const bottom = `\u255A${"\u2550".repeat(w)}\u255D`;
-    this.printLine("");
-    this.printLine(source_default.yellow(top));
-    const warnLine = `  \u26A0  ${source_default.yellow(message)}`;
-    const pad = Math.max(0, w - warnLine.length);
-    this.printLine(`\u2551${warnLine}${" ".repeat(pad)}\u2551`);
-    this.printLine(source_default.yellow(bottom));
-  }
-  showPrompt() {
-    if (!this.running) return;
-    const promptLine2 = this.buildPromptLine();
-    if (phoneConfig.isTermux) {
-      this.printLine(promptLine2);
-    } else {
-      this.renderScreen();
-    }
-  }
-  buildPromptLine() {
-    const statusIndicator = STATUS_COLORS[this.status](INDICATORS[this.status]);
-    const config = configManager.getConfig();
-    const model = config.model.model;
-    const modelShort = model.length > 18 ? model.slice(0, 16) + "\u2026" : model;
-    let modeBadge2 = "";
-    if (this.agentMode === "plan") modeBadge2 = source_default.blue(" [plan]");
-    else if (this.agentMode === "goal") modeBadge2 = source_default.magenta(" [goal]");
-    else if (this.agentMode === "arena") modeBadge2 = source_default.yellow(" [arena]");
-    let approvalBadge2 = "";
-    if (this.approvalMode === "safe") approvalBadge2 = source_default.cyan(" [safe]");
-    else if (this.approvalMode === "yolo") approvalBadge2 = source_default.red(" [yolo]");
-    const promptStr = `${statusIndicator} ${source_default.cyan("ys")} ${source_default.yellow(`[${modelShort}]`)}${modeBadge2}${approvalBadge2} ${source_default.gray("\u203A")} `;
-    const inputStr = this.inputBuffer || " ";
-    const cursorChar = phoneConfig.isTermux ? "\u2588" : "\u2588";
-    const cursor = source_default.gray(cursorChar);
-    const displayedInput = inputStr.length > 0 ? inputStr : "";
-    let cursorLine = "";
-    if (this.cursorPos >= displayedInput.length) {
-      cursorLine = promptStr + displayedInput + cursor;
-    } else {
-      const before = displayedInput.slice(0, this.cursorPos);
-      const after = displayedInput.slice(this.cursorPos);
-      cursorLine = promptStr + before + cursor + after;
-    }
-    return cursorLine + "\n" + source_default.gray(`  \u{1F4A1} / for commands  |  \u2191\u2193 history  |  Tab complete`);
-  }
-  setOnInput(handler) {
-    this.onInput = handler;
-  }
-  setOnSpecialKey(handler) {
-    this.onSpecialKey = handler;
-  }
-  setStatus(status) {
-    this.status = status;
-  }
-  setApprovalMode(mode) {
-    this.approvalMode = mode;
-  }
-  setAgentMode(mode) {
-    this.agentMode = mode;
-  }
-  getApprovalMode() {
-    return this.approvalMode;
-  }
-  getAgentMode() {
-    return this.agentMode;
+  clear() {
+    console.clear();
   }
-  printLine(line) {
-    if (!process.stdout.isTTY) {
-      console.log(line);
-      return;
-    }
+  stop() {
+    this.running = false;
+    process.stdin.removeAllListeners("keypress");
     try {
-      const { cursorTo, clearLine } = require("readline");
-      cursorTo(process.stdout, 0);
-      clearLine(process.stdout, 1);
-      console.log(line);
+      process.stdin.setRawMode?.(false);
     } catch {
-      console.log(line);
-    }
-    this.outputLines.push(line);
-    if (this.outputLines.length > this.maxOutputLines) {
-      this.outputLines.shift();
     }
   }
-  printAssistant(message) {
-    this.printLine("");
-    const formatted = source_default.green(message);
-    this.printLine(formatted);
-  }
-  printError(error) {
-    const w = Math.max(Math.min(process.stdout.columns || 80, 56), 10);
-    const top = `\u2554${"\u2550".repeat(w)}\u2557`;
-    const bottom = `\u255A${"\u2550".repeat(w)}\u255D`;
-    this.printLine("");
-    this.printLine(source_default.red(top));
-    this.printLine(`\u2551  ${source_default.red("\u2717")} ${source_default.white(error)}${" ".repeat(Math.max(0, w - error.length - 7))}\u2551`);
-    this.printLine(source_default.red(bottom));
-  }
-  printToolCall(toolName, args) {
-    const argsStr = Object.entries(args).slice(0, 3).map(([k, v]) => `${k}=${String(v).slice(0, 50)}`).join(", ");
-    this.printLine(source_default.gray(`  \u26A1 ${toolName}(${argsStr}${Object.keys(args).length > 3 ? ", ..." : ""})`));
-  }
-  printToolResult(result) {
-    if (result.success) {
-      this.printLine(source_default.gray(`  \u2713 ${source_default.green("success")}`));
-    } else {
-      this.printLine(source_default.gray(`  \u2715 ${source_default.red(result.error || "failed")}`));
-    }
-  }
-  showStatusBar(info) {
-    const statusColor = STATUS_COLORS[info.status];
-    const statusIcon = INDICATORS[info.status];
-    const truncated = info.task ? info.task.slice(0, 40) + (info.task.length > 40 ? "..." : "") : "";
-    const parts = [
-      `${statusColor(`${statusIcon} ${info.status}`)}`,
-      source_default.gray(`msgs:${info.messages}`),
-      source_default.gray(`tok:${info.tokens}`)
-    ];
-    if (info.provider) parts.push(source_default.gray(`prov:${info.provider}`));
-    if (truncated) parts.push(source_default.gray(`task:${truncated}`));
-  }
-  showShutdownScreen() {
-    const w = Math.max(Math.min(process.stdout.columns || 80, 50), 30);
-    const top = `\u256D${"\u2500".repeat(w)}\u256E`;
-    const bottom = `\u2570${"\u2500".repeat(w)}\u256F`;
-    console.log("");
-    console.log(source_default.cyan(top));
-    console.log(`\u2502${" ".repeat(w)}\u2502`);
-    const titleLine = "  \u25C6 YS Code Agent \u2014 Session Complete  ";
-    const titlePad = Math.max(0, Math.floor((w - titleLine.length) / 2));
-    console.log(`\u2502${" ".repeat(titlePad)}${source_default.cyan(titleLine)}${" ".repeat(Math.max(0, w - titlePad - titleLine.length))}\u2502`);
-    console.log(`\u2502${" ".repeat(w)}\u2502`);
-    const { sessionManager: sessionManager2 } = (init_session(), __toCommonJS(session_exports));
-    const session = sessionManager2.getCurrentSession();
-    if (session) {
-      const sessionId = session.id.slice(0, 8);
-      const duration = formatDuration2(Date.now() - session.createdAt);
-      const msgCount = session.state.messages.length;
-      console.log(`\u2502  ${source_default.white("Session")}: ${source_default.yellow(sessionId.padEnd(w - 13))}\u2502`);
-      console.log(`\u2502  ${source_default.white("Duration")}: ${source_default.yellow(duration.padEnd(w - 14))}\u2502`);
-      console.log(`\u2502  ${source_default.white("Messages")}: ${source_default.yellow(String(msgCount).padEnd(w - 14))}\u2502`);
-    }
-    console.log(`\u2502${" ".repeat(w)}\u2502`);
-    console.log(`\u2502  ${source_default.gray("Session saved. Resume with:")} ${source_default.yellow("ys --resume <session>")}${" ".repeat(Math.max(0, w - 43))}\u2502`);
-    console.log(`\u2502${" ".repeat(w)}\u2502`);
-    console.log(source_default.cyan(bottom));
-    console.log("");
-  }
   destroy() {
-    if (this.stdinRaw && process.stdin.isTTY) {
-      try {
-        process.stdin.setRawMode?.(false);
-      } catch {
-      }
-    }
-    process.stdin.removeAllListeners("data");
+    this.stop();
   }
   getOutputLineCount() {
-    return this.outputLines.length;
+    return 0;
   }
 };
-function formatDuration2(ms) {
-  if (ms < 1e3) return `${ms}ms`;
-  if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
-  const m = Math.floor(ms / 6e4);
-  const s = Math.floor(ms % 6e4 / 1e3);
-  return `${m}m ${s}s`;
-}
-function cursorToSync(stream, x, y) {
-  try {
-    const { cursorTo } = require("readline");
-    cursorTo(stream, x, y);
-  } catch {
-  }
-}
 var tui = new TUI();
 
 // src/cli/interactive.ts
@@ -17713,7 +17623,7 @@ reg({
 Session Recap:`));
     tui.printLine(`  ID:       ${source_default.yellow(session.id.slice(0, 8))}`);
     tui.printLine(`  Name:     ${source_default.yellow(session.name)}`);
-    tui.printLine(`  Duration: ${source_default.yellow(formatDuration3(duration))}`);
+    tui.printLine(`  Duration: ${source_default.yellow(formatDuration2(duration))}`);
     tui.printLine(`  Messages: ${source_default.yellow(String(messages.length))} (${userMsgs.length} user, ${asstMsgs.length} assistant)`);
     return true;
   }
@@ -18295,7 +18205,7 @@ function getProgressBar(pct, width) {
   const color = pct > 80 ? source_default.red : pct > 50 ? source_default.yellow : source_default.green;
   return color(fillChar.repeat(filled)) + source_default.gray(emptyChar.repeat(empty));
 }
-function formatDuration3(ms) {
+function formatDuration2(ms) {
   if (ms < 1e3) return `${ms}ms`;
   if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
   const m = Math.floor(ms / 6e4);
@@ -18829,10 +18739,10 @@ var InteractiveMode = class {
     const config = configManager.getConfig();
     const provider = configManager.getActiveProvider();
     if (!provider.apiKey && !process.env[`${provider.type.toUpperCase()}_API_KEY`]) {
-      console.log(source_default.yellow(`
+      tui.printLine(source_default.yellow(`
 \u26A0 No API key configured for ${provider.name}`));
-      console.log(source_default.gray(`  Set ${provider.type.toUpperCase()}_API_KEY environment variable`));
-      console.log(source_default.gray("  Or use /provider <name> to switch to a configured provider"));
+      tui.printLine(source_default.gray(`  Set ${provider.type.toUpperCase()}_API_KEY environment variable`));
+      tui.printLine(source_default.gray("  Or use /provider <name> to switch to a configured provider"));
     }
   }
   async handleInput(input) {
@@ -18898,7 +18808,7 @@ var InteractiveMode = class {
 // src/cli/index.ts
 var import_fs10 = require("fs");
 var logger18 = getLogger("cli");
-var APP_VERSION = true ? "2.0.1" : "1.0.0";
+var APP_VERSION = true ? "3.0.0" : "1.0.0";
 var program2 = new Command();
 program2.name("ys").description("YS Code Agent - AI-Powered Terminal Coding Agent").version(APP_VERSION).option("-c, --config <path>", "Path to config file").option("-m, --model <model>", "Model to use").option("-p, --provider <provider>", "Provider to use").option("-d, --directory <path>", "Working directory").option("--read-only", "Enable read-only mode").option("--sandbox", "Enable sandbox mode").option("--verbose", "Enable verbose logging").option("--non-interactive", "Run in non-interactive mode").hook("preAction", () => {
   initializeTools();
@@ -19181,6 +19091,7 @@ async function main() {
     return;
   }
   applyGlobalOptions(rawArgs);
+  initializeTools();
   showBanner();
   const interactive = new InteractiveMode();
   await interactive.start();