@cosmicstack/mercury-agent 0.5.2 → 0.5.4

package/dist/index.js

@@ -942,12 +942,11 @@ function decodeHtmlEntities(text) {
 }
 function renderMarkdown(text) {
   try {
-    const decoded = decodeHtmlEntities(text);
-    const tokens = lexer.lexer(decoded);
+    const tokens = lexer.lexer(text);
     const result = renderTokens(tokens);
-    return result.replace(/\n{3,}/g, "\n\n").trimEnd();
+    return decodeHtmlEntities(result.replace(/\n{3,}/g, "\n\n").trimEnd());
   } catch {
-    return text;
+    return decodeHtmlEntities(text);
   }
 }
 function renderTokens(tokens) {
@@ -1313,10 +1312,8 @@ async function selectWithArrowKeys(title, options, config = {}) {
 
 // src/channels/cli.ts
 var USER_PROMPT = "  You: ";
-var USER_PROMPT_VISIBLE_LEN = USER_PROMPT.length;
-function agentPrefix(name, suffix) {
-  const time = suffix ?? "";
-  return chalk3.cyan(`  ${name}:`) + time;
+function agentName(name, suffix) {
+  return chalk3.cyan(`  ${name}:`) + (suffix ?? "");
 }
 var CLIChannel = class extends BaseChannel {
   type = "cli";
@@ -1326,11 +1323,10 @@ var CLIChannel = class extends BaseChannel {
   menuAbortController = null;
   outputInProgress = 0;
   streamActive = false;
-  streamToolLines = 0;
-  lastUserInput = "";
-  constructor(agentName = "Mercury") {
+  streamLines = 0;
+  constructor(agentName2 = "Mercury") {
     super();
-    this.agentName = agentName;
+    this.agentName = agentName2;
   }
   setAgentName(name) {
     this.agentName = name;
@@ -1345,10 +1341,8 @@ var CLIChannel = class extends BaseChannel {
       input: process.stdin,
       output: process.stdout
     });
-    this.rl.setPrompt(chalk3.yellow(USER_PROMPT));
-    this.rl._promptLength = USER_PROMPT_VISIBLE_LEN;
+    this.rl.setPrompt(USER_PROMPT);
     this.rl.on("line", (line) => {
-      this.lastUserInput = line.trim();
       const trimmed = line.trim();
       if (!trimmed) {
         this.showPrompt();
@@ -1374,12 +1368,10 @@ var CLIChannel = class extends BaseChannel {
     this.closeActiveMenu();
     this.beginOutput();
     const timeStr = elapsedMs != null ? chalk3.dim(` (${(elapsedMs / 1e3).toFixed(1)}s)`) : "";
-    const rendered = renderMarkdown(content);
-    const indented = this.indent(rendered);
-    console.log("");
-    console.log(agentPrefix(this.agentName, timeStr));
-    console.log(indented);
-    console.log("");
+    const block = this.formatBlock(this.agentName, timeStr, content);
+    for (const line of block) {
+      console.log(line);
+    }
     this.endOutput();
   }
   async sendFile(filePath, _targetId) {
@@ -1393,17 +1385,19 @@ var CLIChannel = class extends BaseChannel {
     }
     const stat = fs.statSync(resolved);
     const sizeStr = stat.size > 1024 * 1024 ? `${(stat.size / (1024 * 1024)).toFixed(1)}MB` : stat.size > 1024 ? `${(stat.size / 1024).toFixed(1)}KB` : `${stat.size}B`;
-    console.log("");
-    console.log(agentPrefix(this.agentName, chalk3.dim(" (file)")));
-    console.log(chalk3.dim(`  path: ${resolved}`));
-    console.log(chalk3.dim(`  size: ${sizeStr}`));
-    console.log("");
+    const block = this.formatBlock(this.agentName, chalk3.dim(" (file)"), [
+      chalk3.dim(`path: ${resolved}`),
+      chalk3.dim(`size: ${sizeStr}`)
+    ].join("\n"));
+    for (const line of block) {
+      console.log(line);
+    }
     this.endOutput();
   }
   async sendToolFeedback(toolName, args) {
     const label = formatToolStep(toolName, args);
     if (this.streamActive) {
-      this.streamToolLines++;
+      this.streamLines += 2;
       process.stdout.write(chalk3.dim(`
   ${label}
 `));
@@ -1415,7 +1409,7 @@ var CLIChannel = class extends BaseChannel {
     this.closeActiveMenu();
     this.beginOutput();
     this.streamActive = true;
-    this.streamToolLines = 0;
+    this.streamLines = 0;
     if (!process.stdout.isTTY) {
       process.stdout.write(chalk3.cyan(`  ${this.agentName}: `));
       let full2 = "";
@@ -1428,7 +1422,6 @@ var CLIChannel = class extends BaseChannel {
       this.endOutput();
       return full2;
     }
-    console.log(chalk3.cyan(`  ${this.agentName}:`));
     let full = "";
     for await (const chunk of content) {
       process.stdout.write(chunk);
@@ -1441,27 +1434,26 @@ var CLIChannel = class extends BaseChannel {
       return full;
     }
     const termWidth = process.stdout.columns || 80;
-    let textLineCount = 0;
+    let streamedScreenLines = 0;
     for (const line of full.split("\n")) {
       const visualLen = line.replace(/\x1b\[[0-9;]*m/g, "").length;
-      textLineCount += Math.max(1, Math.ceil((visualLen + 2) / termWidth));
+      streamedScreenLines += Math.max(1, Math.ceil(visualLen / termWidth));
     }
-    const totalLines = 1 + textLineCount + this.streamToolLines;
-    process.stdout.write(`\x1B[${totalLines}A`);
-    for (let i = 0; i < totalLines; i++) {
+    const totalRawLines = streamedScreenLines + this.streamLines + 1;
+    process.stdout.write(`\x1B[${totalRawLines}A`);
+    for (let i = 0; i < totalRawLines; i++) {
       process.stdout.write("\x1B[2K\x1B[1B");
     }
-    process.stdout.write(`\x1B[${totalLines}A`);
-    const rendered = renderMarkdown(full);
-    const indented = this.indent(rendered);
-    console.log(agentPrefix(this.agentName));
-    console.log(indented);
-    console.log("");
+    process.stdout.write(`\x1B[${totalRawLines}A`);
+    const block = this.formatBlock(this.agentName, "", full);
+    for (const line of block) {
+      console.log(line);
+    }
     this.endOutput();
     return full;
   }
   async typing(_targetId) {
-    process.stdout.write(chalk3.dim(`  ${this.agentName} is thinking...\r`));
+    process.stdout.write(chalk3.dim(`  ${this.agentName} is responding...\r`));
   }
   showPrompt() {
     if (this.rl) {
@@ -1469,6 +1461,11 @@ var CLIChannel = class extends BaseChannel {
       process.stdout.write(chalk3.yellow(USER_PROMPT));
     }
   }
+  formatBlock(name, suffix, content) {
+    const header = agentName(name, suffix);
+    const body = renderMarkdown(content).split("\n").map((line) => `  ${line}`).join("\n");
+    return ["", header, "", body, ""];
+  }
   async withMenu(runner) {
     this.menuDepth += 1;
     this.menuAbortController = new AbortController();
@@ -1519,9 +1516,6 @@ var CLIChannel = class extends BaseChannel {
     if (!this.ready || this.rl) return;
     this.createInterface();
   }
-  indent(text) {
-    return text.split("\n").map((line) => `  ${line}`).join("\n");
-  }
   async prompt(question) {
     return new Promise((resolve13) => {
       this.rl?.question(question, (answer) => resolve13(answer.trim()));
@@ -6712,8 +6706,8 @@ async function configure(existingConfig) {
   if (isReconfig) {
     const ownerName = await ask(chalk7.white(`  Your name [${config.identity.owner}]: `));
     if (ownerName) config.identity.owner = ownerName;
-    const agentName = await ask(chalk7.white(`  Agent name [${config.identity.name}]: `));
-    if (agentName) config.identity.name = agentName;
+    const agentName2 = await ask(chalk7.white(`  Agent name [${config.identity.name}]: `));
+    if (agentName2) config.identity.name = agentName2;
   } else {
     const ownerName = await ask(chalk7.white("  Your name: "));
     if (!ownerName) {
@@ -6721,8 +6715,8 @@ async function configure(existingConfig) {
       process.exit(1);
     }
     config.identity.owner = ownerName;
-    const agentName = await ask(chalk7.white(`  Agent name [${config.identity.name}]: `));
-    if (agentName) config.identity.name = agentName;
+    const agentName2 = await ask(chalk7.white(`  Agent name [${config.identity.name}]: `));
+    if (agentName2) config.identity.name = agentName2;
   }
   config.identity.creator = config.identity.creator || "Cosmic Stack";
   hr();
@@ -7351,5 +7345,60 @@ serviceCmd.command("uninstall").description("Uninstall the system service").acti
 serviceCmd.command("status").description("Show system service status").action(() => {
   showServiceStatus();
 });
+program.command("upgrade").description("Upgrade Mercury to the latest version from npm").action(async () => {
+  console.log("");
+  console.log(chalk7.cyan(`  Mercury ${chalk7.white(`v${pkgVersion}`)}`));
+  console.log("");
+  const daemon = getDaemonStatus();
+  if (daemon.running) {
+    console.log(chalk7.dim("  Stopping background daemon..."));
+    stopDaemon();
+    await new Promise((r) => setTimeout(r, 1e3));
+    console.log(chalk7.green("  \u2713 Daemon stopped"));
+  }
+  console.log(chalk7.dim("  Checking for latest version..."));
+  const { execSync: execSync9 } = await import("child_process");
+  let latestVersion = "";
+  try {
+    latestVersion = execSync9("npm view @cosmicstack/mercury-agent version", { encoding: "utf-8" }).trim();
+  } catch {
+    console.log(chalk7.red("  \u2717 Failed to fetch latest version from npm"));
+    console.log("");
+    return;
+  }
+  console.log(chalk7.dim(`  Latest: v${latestVersion}`));
+  if (latestVersion === pkgVersion) {
+    console.log(chalk7.green(`  \u2713 Already on the latest version (v${pkgVersion})`));
+    console.log("");
+    return;
+  }
+  console.log(chalk7.dim(`  Upgrading v${pkgVersion} \u2192 v${latestVersion}...`));
+  console.log("");
+  try {
+    execSync9("npm rm -g @cosmicstack/mercury-agent", { stdio: "pipe" });
+  } catch {
+    try {
+      const globalDir = execSync9("npm root -g", { encoding: "utf-8" }).trim();
+      const pkgDir = join11(globalDir, "@cosmicstack", "mercury-agent");
+      const { rmSync } = await import("fs");
+      try {
+        rmSync(pkgDir, { recursive: true, force: true });
+      } catch {
+      }
+    } catch {
+    }
+  }
+  try {
+    execSync9("npm i -g @cosmicstack/mercury-agent@latest", { stdio: "inherit" });
+    console.log("");
+    console.log(chalk7.green(`  \u2713 Upgraded to v${latestVersion}`));
+    console.log(chalk7.dim("  Run `mercury` to start the new version."));
+  } catch {
+    console.log("");
+    console.log(chalk7.red("  \u2717 Upgrade failed. Try manually:"));
+    console.log(chalk7.dim("    npm rm -g @cosmicstack/mercury-agent && npm i -g @cosmicstack/mercury-agent"));
+  }
+  console.log("");
+});
 program.parse();
 //# sourceMappingURL=index.js.map