arona-agent 1.1.4 → 1.1.6

package/README.md

@@ -6,7 +6,7 @@
 
 > 谁不想在电脑上养一只 ~~香香软软~~ 可可爱爱的阿洛娜呢？
 
-![示意图](https://cdn.jsdelivr.net/gh/SRC114514/arona-agent/intro.png)
+![示意图](https://cdn.jsdelivr.net/gh/SRC114514/arona-agent/intro.jpeg)
 
 基于 [Pi SDK](https://www.npmjs.com/package/@earendil-works/pi-coding-agent) 构建的终端对话式 AI Agent，集成 Computer Use、TTS / STT、桌面宠物与持久记忆。
 
@@ -38,6 +38,9 @@ npm u -g arona-agent
 # 禁用TTS+STT并启动
 arona --no-voice
 
+# 以命令行启动
+arona --cli
+
 # 补全/重新克隆某角色音色
 arona voice add [<角色名>]   # 不带角色名则进入 TUI 选择未补全的角色
 
@@ -93,6 +96,7 @@ arona doctor
 | `tavilyApiKey` | Tavily API Key | — |
 | `pythonPath` | Python 路径 | `python3` |
 | `autoLoadSkills` | 启动时自动从 `~/.agents` 补全缺失的Skill | `true` |
+| `CLIEnabled` | 裸 `arona` 启动时进入命令行 | `false` |
 | `mcpServers` | MCP 服务器 JSON | `{}` |
 
 模型名前缀自动检测：若 `model` 不含 `/`，按模型名前缀或 `apiBaseUrl` 域名自动补 `provider/`。

package/README_en.md

@@ -4,7 +4,7 @@
 
 ![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)
 
-![Screenshot](https://cdn.jsdelivr.net/gh/SRC114514/arona-agent/intro.png)
+![Screenshot](https://cdn.jsdelivr.net/gh/SRC114514/arona-agent/intro.jpeg)
 
 A terminal-based conversational AI Agent built on the [Pi SDK](https://www.npmjs.com/package/@earendil-works/pi-coding-agent), featuring Computer Use, TTS / STT, desktop pets and persistent memory.
 
@@ -36,6 +36,9 @@ npm u -g arona-agent
 # Launch with TTS/STT disabled
 arona --no-voice
 
+# Use --cli for the command line
+arona --cli
+
 # Clone/re-clone a character's voice
 arona voice add [<character-name>]   # omit the name to enter the TUI for missing voices
 
@@ -90,6 +93,7 @@ All configuration lives in the JSON file `~/.arona/settings.json`, mostly genera
 | `tavilyApiKey` | Tavily API key | — |
 | `pythonPath` | Python path | `python3` |
 | `autoLoadSkills` | Automatically load missing Skills from `~/.agents` on startup | `true` |
+| `CLIEnabled` | Launch the CLI when running bare `arona` | `false` |
 | `mcpServers` | MCP server JSON | `{}` |
 
 Model prefix auto-detection: if `model` contains no `/`, a `provider/` prefix is added automatically based on the model name prefix or the `apiBaseUrl` domain.

package/bin/arona.mjs

@@ -6,41 +6,49 @@
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import { dirname, join } from 'node:path';
+import { dirname, join, delimiter } from 'node:path';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = join(__dirname, '..');
 const args = process.argv.slice(2);
 
+// 自包含运行时（npm run package 产物 runtime/）：存在则前置 PATH，
+// 让 tsx 的 `#!/usr/bin/env node` 及一切后续子进程都解析到包内 Node/Python，
+// 即使不经 arona.sh 直接用系统 node 启动本文件也一样自包含。
+const runtimePathEntries = process.platform === 'win32'
+  ? [join(root, 'runtime', 'node'), join(root, 'runtime', 'python')]
+  : [join(root, 'runtime', 'node', 'bin'), join(root, 'runtime', 'python', 'bin')];
+const bundledEntries = runtimePathEntries.filter((p) => existsSync(p));
+if (bundledEntries.length) {
+  process.env.PATH = [...bundledEntries, process.env.PATH].join(delimiter);
+}
+
 const isSetup = args[0] === 'setup';
 const isVoice = args[0] === 'voice';
 const isDoctor = args[0] === 'doctor';
+// 裸 `arona` 默认进 GUI：src/index.ts 依据 --cli / settings.json CLIEnabled 自行分流
 const target = isSetup ? 'src/setup.ts' : isVoice ? 'src/voice_cli.ts' : isDoctor ? 'src/doctor.ts' : 'src/index.ts';
 const passArgs = (isSetup || isVoice || isDoctor) ? args.slice(1) : args;
 
-// tsx ships a CLI binary alongside the package. We prefer the local install.
-const tsxBin = process.platform === 'win32'
-  ? join(root, 'node_modules', '.bin', 'tsx.cmd')
-  : join(root, 'node_modules', '.bin', 'tsx');
+// tsx 以库形式随包内置：直接用当前 node 运行其 CLI，避免依赖 node_modules/.bin
+// （Windows 包里没有 .cmd shim，且跨平台无需 PATH 里能找到 node）。
+const tsxCli = join(root, 'node_modules', 'tsx', 'dist', 'cli.mjs');
 
-if (!existsSync(tsxBin)) {
+if (!existsSync(tsxCli)) {
   // 此文件无法 import TS，内联判定语言（仅环境变量）
   const isEn = /^en/i.test(process.env.LANG ?? "");
   console.error(
     isEn
-      ? `Error: tsx not found at ${tsxBin}.\nRun \`npm install\` in ${root} (or run \`arona setup\` to install dependencies).`
-      : `错误：未找到 tsx（${tsxBin}）。\n请在 ${root} 运行 \`npm install\`（或运行 \`arona setup\` 安装依赖）。`,
+      ? `Error: tsx not found at ${tsxCli}.\nRun \`npm install\` in ${root} (or run \`arona setup\` to install dependencies).`
+      : `错误：未找到 tsx（${tsxCli}）。\n请在 ${root} 运行 \`npm install\`（或运行 \`arona setup\` 安装依赖）。`,
   );
   process.exit(1);
 }
 
-const child = spawn(tsxBin, [join(root, target), ...passArgs], {
+const child = spawn(process.execPath, [tsxCli, join(root, target), ...passArgs], {
   // 保持用户调用 arona 时所在的目录作为工作目录（Workspace = CWD）。
   // 之前固定 cwd: root 会让全局安装的 arona 把包目录当工作区，文件工具/项目文档/undo 全部错位。
   cwd: process.cwd(),
   stdio: 'inherit',
-  // Windows: tsxBin 是 .cmd 批处理文件。Node >=20.12.2/18.20.2（CVE-2024-27980 修复）
-  // 起，spawn .bat/.cmd 且不设 shell 会直接抛 EINVAL，导致 `arona setup` 在 Windows 上无法启动。
-  shell: process.platform === 'win32',
 });
 child.on('exit', (code) => process.exit(code ?? 0));

package/gui/main.cjs

@@ -0,0 +1,292 @@
+// ARONA GUI Electron 主进程：单窗口，与 Node 后端父进程经 stdin/stdout JSON lines 通信
+// （协议行前缀 ###GUI### 过滤 Electron 日志；与桌宠桥同模式）。
+const { app, BrowserWindow, ipcMain, nativeImage } = require("electron");
+const fs = require("fs");
+const path = require("path");
+
+const APP_TITLE = "Arona Agent";
+const ICON_PATH = path.join(__dirname, "renderer", "assets", "icon.png");
+
+const PREFIX = "###GUI###";
+const VERBOSE = process.env.ARONA_GUI_VERBOSE === "1";
+
+function send(msg) {
+  try {
+    process.stdout.write(PREFIX + JSON.stringify(msg) + "\n");
+  } catch {
+    // stdout 已关闭，忽略
+  }
+}
+
+let win = null;
+let rendererReady = false;
+// backend 在 spawn 后立刻写 mode/ready 行，此时页面尚未 loadFile 完成——
+// 直接 send 会静默丢弃，两页 .page 均保持 hidden → 白屏。就绪前入缓冲，did-finish-load 后 flush。
+const pending = [];
+
+function forward(msg) {
+  if (win && !win.isDestroyed() && rendererReady) {
+    win.webContents.send("gui-event", msg);
+  } else {
+    pending.push(msg);
+  }
+}
+
+function flushPending() {
+  if (!win || win.isDestroyed()) return;
+  while (pending.length) {
+    win.webContents.send("gui-event", pending.shift());
+  }
+}
+
+// ARONA_GUI_SMOKE=1：loadFile + flush 后探测 DOM（页面可见性 / preload / 渲染层脚本），
+// 结果打 SMOKE_RESULT 行后退出——冒烟验证 mode 事件不丢（无需人工看窗口）。
+// 另起 SMOKE_UI 探测（8s 后，等 startMain 就绪）：欢迎页 LOGO / 浅色背景 / 斜杠菜单过滤 / 工具行样式。
+function smokeProbe(skipQuit) {
+  const js = '(function(){var p=document.querySelectorAll(".page:not(.hidden)");'
+    + 'return JSON.stringify({visible:p.length?p[0].id:null,'
+    + 'api:!!(window.guiAPI&&window.guiAPI.send&&window.guiAPI.on),'
+    + 'setup:!!(window.SetupUI&&window.SetupUI.handle)});})()';
+  setTimeout(() => {
+    win.webContents.executeJavaScript(js)
+      // stderr 会被 backend 转发到终端（stdout 被 ###GUI### 协议解析占用）
+      .then((r) => { console.error("SMOKE_RESULT " + r); if (!skipQuit) app.quit(); })
+      .catch((e) => { console.error("SMOKE_ERROR " + e); if (!skipQuit) app.quit(); });
+  }, 300);
+}
+
+function smokeProbeUI() {
+  const js = `(function(){
+    var p=document.querySelectorAll(".page:not(.hidden)");
+    var logo=document.querySelector(".wl-logo");
+    var input=document.getElementById("input");
+    var menu=document.getElementById("slash-menu");
+    var names=[];
+    if(input&&menu){
+      input.value="/"; input.dispatchEvent(new Event("input"));
+      menu.querySelectorAll(".slash-item .name").forEach(function(n){names.push(n.textContent);});
+      input.value=""; input.dispatchEvent(new Event("input"));
+    }
+    var probe=document.createElement("div"); probe.className="msg-tool";
+    probe.innerHTML='<span class="t-icon"></span><span class="t-label">终端</span><span class="t-status run"></span>';
+    document.body.appendChild(probe);
+    var cs=getComputedStyle(probe);
+    var out={visible:p.length?p[0].id:null,
+      logo:logo?{loaded:logo.naturalWidth>0,h:logo.clientHeight}:null,
+      welcome:!!document.getElementById("welcome"),
+      chatKids:document.getElementById("chat")?document.getElementById("chat").children.length:-1,
+      bg:getComputedStyle(document.body).backgroundColor,
+      menu:names,
+      toolDisplay:cs.display,toolFlex:cs.alignItems};
+    probe.remove();
+    return JSON.stringify(out);})()`;
+  setTimeout(() => {
+    win.webContents.executeJavaScript(js)
+      .then((r) => { console.error("SMOKE_UI " + r); app.quit(); })
+      .catch((e) => { console.error("SMOKE_UI_ERROR " + e); app.quit(); });
+  }, 8000);
+}
+
+// ARONA_GUI_DEMO=1：不调用 LLM，向前端注入一段脚本化 agent_event 序列（思考 / 工具行 /
+// 编码子代理实时过程 / 总结文本），预览渲染效果；结束时 capturePage 截图到 /tmp/arona_gui_demo.png。
+function demoScenario() {
+  const send = (m) => { if (win && !win.isDestroyed()) win.webContents.send("gui-event", m); };
+  const ev = (agentId, type, extra = {}) => send({ type: "agent_event", agentId, event: { type, ...extra } });
+  const delta = (agentId, kind, text) => ev(agentId, "message_update", { assistantMessageEvent: { type: kind, delta: text } });
+  const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+  return (async () => {
+    // —— 回放测试：ARONA_GUI_DEMO_SESSION=<会话路径> 时读取真实会话 + coding sidecar 注入前端 ——
+    const sessPath = process.env.ARONA_GUI_DEMO_SESSION;
+    if (sessPath) {
+      try {
+        const sidecar = sessPath.replace(/\.jsonl$/, ".coding.jsonl");
+        const runs = [];
+        if (fs.existsSync(sidecar)) {
+          for (const line of fs.readFileSync(sidecar, "utf-8").split("\n")) {
+            if (!line.trim()) continue;
+            const p = JSON.parse(line);
+            if (p.type !== "arona-coding-log") runs.push(p);
+          }
+        }
+        send({ type: "coding_runs", runs });
+        // 用 marked 官方 hooks 记录 parse 入参 + 调用栈（定位报告文本的渲染路径）
+        await win.webContents.executeJavaScript(
+          'window.__mdCalls=[]; window.marked.use({hooks:{preprocess:function(t){'
+          + 'if(String(t).indexOf("入口")>=0){window.__mdCalls.push(String(t).slice(0,40)+"\\nSTACK:"+new Error().stack.split("\\n").slice(1,5).join(" | "));}'
+          + 'return t;}}}); true',
+        ).catch(() => {});
+        const messages = fs.readFileSync(sessPath, "utf-8").split("\n")
+          .filter((l) => l.trim())
+          .map((l) => JSON.parse(l))
+          .filter((m) => m.type !== "arona-session" && m.role);
+        send({ type: "history", messages });
+        console.error("DEMO_SESSION_REPLAY " + sessPath + " runs=" + runs.length);
+        await sleep(2000);
+        // 滚动到报告中第一个 Markdown 表格附近（文本 "2.1 入口"），预览表格渲染
+        await win.webContents.executeJavaScript(
+          'var els=Array.from(document.querySelectorAll(".msg-body h2,.msg-body h3,.msg-body h4,.msg-body p,.msg-body strong"));'
+          + 'var t=els.find(function(e){return e.textContent.indexOf("2.1")>=0;});'
+          + 'if(t) t.scrollIntoView({block:"start"}); true',
+        ).catch(() => {});
+        await sleep(300);
+        const check = await win.webContents.executeJavaScript(
+          '(function(){var out=window.marked.parse("| `a` | 挂载 `<App />` 到 `#root` |",{breaks:true,gfm:true,async:false});'
+          + 'return JSON.stringify(String(out).slice(0,300));})()',
+        ).catch((e) => "CHECK_ERROR " + e);
+        console.error("DEMO_CHECK " + check);
+        const calls = await win.webContents.executeJavaScript('JSON.stringify(window.__mdCalls)').catch((e) => "ERR");
+        console.error("DEMO_MDCALLS " + calls);
+        // 自动展开第一条 Bash 工具行，预览输入 + 输出（Markdown 渲染）效果
+        await win.webContents.executeJavaScript(
+          'var r=document.querySelector(".msg-tool[data-tool=\\"bash\\"]"); if(r) r.classList.add("open"); true',
+        ).catch(() => {});
+        await sleep(300);
+        const imgTop = await win.webContents.capturePage();
+        fs.writeFileSync("/tmp/arona_gui_demo.png", imgTop.toPNG());
+        console.error("DEMO_CAPTURE /tmp/arona_gui_demo.png");
+        return;
+      } catch (e) {
+        console.error("DEMO_SESSION_ERROR " + e);
+      }
+    }
+
+    // —— 主 Agent：思考 + 派出编码子代理 ——
+    ev("arona", "message_start");
+    for (const chunk of ["用户想让我看看项目结构。", "这个任务适合派 millennium 去探索，", "我先设置情绪，然后调用 create_subagent。"]) {
+      delta("arona", "thinking_delta", chunk);
+      await sleep(260);
+    }
+    ev("arona", "message_end");
+    ev("arona", "tool_execution_start", { toolName: "change_emotion", input: { emotion: "curious" } });
+    await sleep(400);
+    ev("arona", "tool_execution_end", { isError: false, result: "已切换情绪为 curious" });
+    ev("arona", "tool_execution_start", { toolName: "create_subagent", input: { task: "探索 /Users/sunrongchen/Desktop/Projects/m2_her_webui 这个项目的源码结构。简要列出：1. 主要目录结构 2. 核心文件及其职责 3. 关键技术栈", agent: "millennium" } });
+
+    // —— 编码子代理 millennium：实时过程（思考 / 工具调用 / 报告文本）——
+    await sleep(500);
+    ev("millennium", "message_start");
+    for (const chunk of ["收到探索任务。", "先看顶层目录，再深入 src/。"]) {
+      delta("millennium", "thinking_delta", chunk);
+      await sleep(240);
+    }
+    ev("millennium", "message_end");
+    ev("millennium", "tool_execution_start", { toolName: "bash", input: { command: "ls src/ && find src -name '*.tsx' | head -20" } });
+    await sleep(600);
+    ev("millennium", "tool_execution_end", {
+      isError: false,
+      result: "App.tsx\ncomponents/\n  ChatInput.tsx\n  MessageBubble.tsx\ncontext/\n  ChatContext.tsx\n  SettingsContext.tsx\n\n共 **20** 个 `.tsx` 文件，全部位于 `src/` 下的二级目录中。",
+    });
+    ev("millennium", "tool_execution_start", { toolName: "read", input: { file_path: "src/App.tsx" } });
+    await sleep(500);
+    ev("millennium", "tool_execution_end", { isError: false, result: "import React from 'react';\nimport ChatContext from './context/ChatContext';\n\nexport default function App() {\n  return <ChatContext.Provider>…</ChatContext.Provider>;\n}" });
+    ev("millennium", "tool_execution_start", { toolName: "web_search", input: { query: "React 18 release notes" } });
+    await sleep(500);
+    ev("millennium", "tool_execution_end", { isError: false, result: "React 18.3.1 稳定版；并发特性默认可用。" });
+    ev("millennium", "message_start");
+    for (const chunk of ["探索完成。这是一个 React 18 + Vite + Tailwind 的纯前端调试台，", "25 个文件约 3500 行，状态管理用 Context + localStorage，无第三方状态库。"]) {
+      delta("millennium", "text_delta", chunk);
+      await sleep(240);
+    }
+    ev("millennium", "message_end");
+
+    // —— 主 Agent：收回结果并总结（同轮次复用说话人标签）——
+    ev("arona", "tool_execution_end", { isError: false, result: "子Agent任务完成，最终报告已返回。" });
+    ev("arona", "message_start");
+    for (const chunk of ["子Agent报告收到啦~ 给 Sensei 划个重点：\n\n", "**项目本质**：纯前端 React SPA，无后端，状态全靠 Context + localStorage。\n\n", "下次需要深挖代码，直接叫它就行~"]) {
+      delta("arona", "text_delta", chunk);
+      await sleep(240);
+    }
+    ev("arona", "message_end");
+    send({
+      type: "ready",
+      state: {
+        model: "demo", mainAgent: "arona", mainAgentLabel: "阿洛娜", subAgents: [],
+        ttsEnabled: false, sttEnabled: false, noVoice: true,
+        processing: false, recording: false, currentSessionPath: null,
+      },
+    });
+
+    await sleep(600);
+    try {
+      const img = await win.webContents.capturePage();
+      fs.writeFileSync("/tmp/arona_gui_demo.png", img.toPNG());
+      console.error("DEMO_CAPTURE /tmp/arona_gui_demo.png");
+    } catch (e) {
+      console.error("DEMO_CAPTURE_ERROR " + e);
+    }
+  })();
+}
+
+function createWindow() {
+  win = new BrowserWindow({
+    width: 1100,
+    height: 760,
+    minWidth: 720,
+    minHeight: 480,
+    title: APP_TITLE,
+    backgroundColor: "#f6f7f9",
+    titleBarStyle: "hiddenInset",
+    trafficLightPosition: { x: 16, y: 16 },
+    icon: ICON_PATH,
+    webPreferences: {
+      preload: path.join(__dirname, "preload.cjs"),
+      contextIsolation: true,
+      nodeIntegration: false,
+    },
+  });
+  // 先挂监听再 loadFile：避免加载完成事件在挂监听前触发导致 rendererReady 永不置位
+  win.webContents.once("did-finish-load", () => {
+    rendererReady = true;
+    flushPending();
+    if (process.env.ARONA_GUI_SMOKE === "1") { smokeProbe(true); smokeProbeUI(); }
+    if (process.env.ARONA_GUI_DEMO === "1") setTimeout(demoScenario, 2000);
+  });
+  win.loadFile(path.join(__dirname, "renderer", "index.html"));
+  win.on("closed", () => { win = null; rendererReady = false; });
+  win.webContents.on("did-fail-load", (_e, code, desc, url) => {
+    console.error(`[gui] did-fail-load ${code} ${desc} ${url}`);
+  });
+  if (VERBOSE) win.webContents.openDevTools({ mode: "detach" });
+}
+
+// renderer → backend
+ipcMain.on("gui-send", (_event, msg) => {
+  send(msg);
+});
+
+// backend → renderer（行缓冲解析）
+let buffer = "";
+process.stdin.on("data", (data) => {
+  buffer += data.toString();
+  const lines = buffer.split("\n");
+  buffer = lines.pop() || "";
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith(PREFIX)) continue;
+    try {
+      forward(JSON.parse(trimmed.slice(PREFIX.length)));
+    } catch {
+      // 非 JSON，忽略
+    }
+  }
+});
+
+// 窗口全关：先发 exit 请求让后端走完整清理，再退出（延迟让协议行先 flush）
+app.on("window-all-closed", () => {
+  send({ type: "exit" });
+  setTimeout(() => app.quit(), 200);
+});
+
+app.whenReady().then(() => {
+  // macOS 开发模式下 Dock 图标默认是 Electron 图标，用 LOGO 替换（打包后由应用 bundle 提供）
+  if (process.platform === "darwin" && app.dock) {
+    const icon = nativeImage.createFromPath(ICON_PATH);
+    if (!icon.isEmpty()) app.dock.setIcon(icon);
+  }
+  createWindow();
+});
+
+app.on("render-process-gone", (_e, details) => {
+  console.error(`[gui] render-process-gone reason=${details.reason} exitCode=${details.exitCode}`);
+});

package/gui/preload.cjs

@@ -0,0 +1,11 @@
+// GUI preload：contextBridge 暴露双向协议通道（send / on）
+const { contextBridge, ipcRenderer } = require("electron");
+
+contextBridge.exposeInMainWorld("guiAPI", {
+  send(msg) {
+    ipcRenderer.send("gui-send", msg);
+  },
+  on(cb) {
+    ipcRenderer.on("gui-event", (_e, msg) => cb(msg));
+  },
+});