ys-code-agent 2.0.2 → 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;
@@ -15799,6 +15831,26 @@ 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");
@@ -15832,7 +15884,10 @@ var TUI = class {
   historyIndex = -1;
   popupActive = false;
   cancelRequested = false;
-  rl = null;
+  inputBuffer = "";
+  cursorPos = 0;
+  popupLineCount = 0;
+  prevInput = null;
   constructor() {
     this.commandPopup = new CommandPopup();
     this.loadHistory();
@@ -15870,55 +15925,301 @@ var TUI = class {
     }
     this.startTTYMode();
   }
-  startTTYMode() {
-    const self = this;
-    this.rl = (0, import_readline.createInterface)({
-      input: process.stdin,
-      output: process.stdout,
-      prompt: "",
-      historySize: 0,
-      removeHistoryDuplicates: true
-    });
-    this.rl.on("line", async (line) => {
+  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) {
+      if (trimmed && this.onInput) {
         this.addHistory(trimmed);
+        this.onInput(trimmed);
+      }
+      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;
+      }
+      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(trimmed);
+          await this.onInput(input);
         }
       }
-      this.showPrompt();
-    });
-    this.rl.on("SIGINT", () => {
+      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--;
+      }
+      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;
+      }
+      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;
+      }
+      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 {
-        process.stdout.write("\n");
+        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);
       }
-      this.showPrompt();
-    });
-    this.rl.on("close", () => {
-      process.exit(0);
-    });
-    this.showPrompt();
+      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;
+      }
+      if (this.inputBuffer.startsWith("/") && this.inputBuffer.length > 1) {
+        this.popupActive = true;
+        this.commandPopup.open();
+        this.commandPopup.setFilter(this.inputBuffer.slice(1));
+        this.renderScreen();
+        return;
+      }
+    }
+    this.renderScreen();
   }
-  startLineMode() {
-    const rl = (0, import_readline.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);
+  clearPopupLines() {
+    if (this.popupLineCount > 0) {
+      try {
+        (0, import_readline.moveCursor)(process.stdout, 0, -(this.popupLineCount + 1));
+      } catch {
       }
-      rl.prompt();
-    });
-    rl.on("SIGINT", () => process.exit(0));
-    rl.prompt();
+      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;
+    }
+  }
+  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 (k === "up") {
+      this.commandPopup.moveUp();
+      this.renderScreen();
+      return;
+    }
+    if (k === "down") {
+      this.commandPopup.moveDown();
+      this.renderScreen();
+      return;
+    }
+    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 (k === "backspace") {
+      this.commandPopup.deleteChar();
+      const filter = this.commandPopup.getFilterText();
+      if (filter.length === 0) {
+        this.clearPopupLines();
+        this.popupActive = false;
+        this.commandPopup.close();
+        this.inputBuffer = "/";
+        this.cursorPos = 1;
+      }
+      this.renderScreen();
+      return;
+    }
+    if (str && str.length === 1 && str.charCodeAt(0) >= 32) {
+      this.commandPopup.appendChar(str);
+      this.renderScreen();
+      return;
+    }
+  }
+  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;
+      }
+    }
+  }
+  async openExternalEditor() {
+    const editor = process.env.EDITOR || "nano";
+    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 = `/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 content = readFileSync11(tmpFile, "utf-8").trim();
+      if (content) {
+        this.inputBuffer = content;
+        this.cursorPos = content.length;
+      }
+    } catch {
+    }
+    try {
+      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]);
@@ -15934,10 +16235,22 @@ var TUI = class {
     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.rl) return;
-    this.rl.setPrompt(this.buildPromptPrefix());
-    this.rl.prompt(true);
+    if (this.running) this.renderScreen();
   }
   addHistory(input) {
     if (this.inputHistory[this.inputHistory.length - 1] !== input) {
@@ -15951,9 +16264,6 @@ var TUI = class {
   }
   setStatus(status) {
     this.status = status;
-    if (this.rl) {
-      this.rl.setPrompt(this.buildPromptPrefix());
-    }
   }
   setApprovalMode(mode) {
     this.approvalMode = mode;
@@ -15981,7 +16291,10 @@ var TUI = class {
     }
   }
   printAssistant(message) {
-    this.printLine(source_default.green(message));
+    const rendered = renderMarkdown(message);
+    for (const line of rendered.split("\n")) {
+      this.printLine(line);
+    }
   }
   printWarning(message) {
     this.printLine(source_default.yellow(`\u26A0 ${message}`));
@@ -16073,11 +16386,11 @@ var TUI = class {
   }
   stop() {
     this.running = false;
-    if (this.rl) {
-      this.rl.close();
-      this.rl = null;
+    process.stdin.removeAllListeners("keypress");
+    try {
+      process.stdin.setRawMode?.(false);
+    } catch {
     }
-    process.stdin.removeAllListeners("data");
   }
   destroy() {
     this.stop();
@@ -16459,8 +16772,8 @@ function getTemplate(ext) {
 }
 function promptConfirm(defaultYes) {
   return new Promise((resolve6) => {
-    const { createInterface: createInterface2 } = require("readline");
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    const { createInterface } = require("readline");
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
     const prompt = defaultYes ? "[Y/n] " : "[y/N] ";
     rl.question(prompt, (answer) => {
       rl.close();
@@ -16756,8 +17069,8 @@ function showGitHelp() {
 }
 function promptWithOptions() {
   return new Promise((resolve6) => {
-    const { createInterface: createInterface2 } = require("readline");
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    const { createInterface } = require("readline");
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question("", (answer) => {
       rl.close();
       const a = answer.trim().toLowerCase();
@@ -16769,8 +17082,8 @@ function promptWithOptions() {
 }
 function promptLine() {
   return new Promise((resolve6) => {
-    const { createInterface: createInterface2 } = require("readline");
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    const { createInterface } = require("readline");
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question("> ", (answer) => {
       rl.close();
       resolve6(answer.trim());
@@ -18245,8 +18558,8 @@ reg({
     tui.printLine(source_default.gray("  1. Build the project"));
     tui.printLine(source_default.gray("  2. Publish to npm registry"));
     tui.printLine(source_default.yellow("\n  Continue? [y/N]"));
-    const { createInterface: createInterface2 } = await import("readline");
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    const { createInterface } = await import("readline");
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question("", async (answer) => {
       rl.close();
       if (answer.trim().toLowerCase() !== "y") {
@@ -18495,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.2" : "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();
@@ -18778,6 +19091,7 @@ async function main() {
     return;
   }
   applyGlobalOptions(rawArgs);
+  initializeTools();
   showBanner();
   const interactive = new InteractiveMode();
   await interactive.start();