arona-agent 1.0.7 → 1.0.9

package/README.md

@@ -17,12 +17,21 @@
 ```bash
 npm i -g arona-agent
 
-# 初始化配置文件
-arona setup
-
-# 初始化后可直接启动
+# 首次运行自动进入初始化向导
 arona
 
+# 或着如果想先上手玩玩
+npx arona-agent
+```
+
+---
+
+## 扩展指令
+
+```bash
+# 重新初始化（可选）
+arona setup
+
 # 更新
 npm u -g arona-agent
 

package/README_en.md

@@ -15,12 +15,21 @@ A terminal-based conversational AI Agent built on the [Pi SDK](https://www.npmjs
 ```bash
 npm i -g arona-agent
 
-# Initialize configuration
-arona setup
-
-# Launch after setup
+# First run auto-starts the setup wizard, then launches ARONA
 arona
 
+# Quick Start
+npx arona-agent
+```
+
+---
+
+## Optional commands
+
+```bash
+# Re-run setup manually (optional)
+arona setup
+
 # Upgrade
 npm u -g arona-agent
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arona-agent",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Terminal AI Agent with desktop pet Arona — eye-tracking pupils, voice cloning, Computer Use, TTS/STT, MCP.",
   "license": "MIT",
   "type": "module",

package/python/oss_upload.py

@@ -17,8 +17,22 @@ stdout:
 
 import json
 import os
+import socket
 import sys
 
+# ---- IPv4 优先解析（同 tts_say.py / voice_clone.py）----
+# macOS 家宽坑：有全局 IPv6 但出口路由不通，python 无 Happy Eyeballs →
+# getaddrinfo v6 在前，每次请求先卡满 v6 超时再回落 v4。重排 AF_INET 在前根治。
+_orig_getaddrinfo = socket.getaddrinfo
+
+
+def _ipv4_first_getaddrinfo(*args, **kwargs):
+    res = _orig_getaddrinfo(*args, **kwargs)
+    return sorted(res, key=lambda r: 0 if r[0] == socket.AF_INET else 1)
+
+
+socket.getaddrinfo = _ipv4_first_getaddrinfo
+
 
 def fail(msg):
     print(json.dumps({"error": msg}))

package/python/voice_clone.py

@@ -16,9 +16,32 @@ All logging goes to stderr so stdout stays clean JSON.
 import json
 import os
 import re
+import socket
 import sys
 import time
 
+from _i18n import t
+
+# ---- IPv4 优先解析（同 tts_say.py）----
+# macOS 家宽坑：系统有全局 IPv6 地址但出口路由不通，python 无 Happy Eyeballs，
+# getaddrinfo 返回 v6 在前 → 每次请求先卡满 v6 超时才回落 v4（上传/轮询多请求叠加=分钟级卡死，
+# 表现为"正在克隆"卡住；开代理可用是因为代理直连 127.0.0.1 恰好绕开 v6）。
+# 重排 AF_INET 在前根治；IPv4 不可用时仍按序回落 IPv6。
+_orig_getaddrinfo = socket.getaddrinfo
+
+
+def _ipv4_first_getaddrinfo(*args, **kwargs):
+    res = _orig_getaddrinfo(*args, **kwargs)
+    return sorted(res, key=lambda r: 0 if r[0] == socket.AF_INET else 1)
+
+
+socket.getaddrinfo = _ipv4_first_getaddrinfo
+
+
+def log(msg_zh, msg_en):
+    # 阶段诊断只走 stderr：Node 侧 --verbose 会逐行转发实时可见，stdout 保持纯 JSON。
+    print(f"[voice_clone] {t(msg_zh, msg_en)}", file=sys.stderr, flush=True)
+
 
 def fail(msg):
     print(json.dumps({"error": msg}))
@@ -52,29 +75,39 @@ def main():
 
     # 1. Upload audio to DashScope hosted OSS
     try:
+        log(f"上传音频 {os.path.basename(audio_file)} 到 DashScope 托管 OSS...",
+            f"Uploading {os.path.basename(audio_file)} to DashScope OSS...")
         resp = Files.upload(file_path=audio_file, purpose="voice_clone")
         file_id = resp.output["uploaded_files"][0]["file_id"]
+        log(f"上传完成 file_id={file_id}", f"Upload complete file_id={file_id}")
     except Exception as e:
         fail(f"Upload failed: {e}")
 
     # 2. Get the Alibaba Cloud internal URL (must use internal address)
     try:
+        log("获取 OSS 内部地址...", "Getting OSS internal URL...")
         oss_url = Files.get(file_id).output["url"]
+        log("OSS 内部地址获取成功", "OSS internal URL acquired")
     except Exception as e:
         fail(f"Failed to get OSS URL: {e}")
 
     # 3. Submit voice cloning
     try:
+        log(f"提交音色克隆（model={target_model}，prefix={prefix}）...",
+            f"Submitting voice creation (model={target_model}, prefix={prefix})...")
         svc = VoiceEnrollmentService()
         voice_id = svc.create_voice(target_model=target_model, prefix=prefix, url=oss_url)
+        log(f"已提交，voice_id={voice_id}", f"Submitted, voice_id={voice_id}")
     except Exception as e:
         fail(f"create_voice failed: {e}")
 
     # 4. Wait for voice to be ready (max 5 minutes)
     try:
-        for _ in range(30):
+        for i in range(30):
             info = svc.query_voice(voice_id=voice_id)
             status = info.get("status")
+            log(f"查询克隆状态：{status}（第 {i + 1}/30 次，每 10s）",
+                f"Voice status: {status} ({i + 1}/30, every 10s)")
             if status == "OK":
                 break
             if status == "UNDEPLOYED":
@@ -87,10 +120,12 @@ def main():
 
     # 5. Delete the uploaded file (best-effort cleanup)
     try:
+        log("删除已上传文件（尽力清理）...", "Deleting uploaded file (best-effort)...")
         Files.delete(file_id)
     except Exception:
         pass  # Cleanup is best-effort
 
+    log(f"音色克隆完成 voice_id={voice_id}", f"Voice clone complete voice_id={voice_id}")
     print(json.dumps({"voice_id": voice_id}))
 
 

package/src/config.ts

@@ -277,6 +277,16 @@ function loadConfig(): AronaConfig {
 
 export const config = loadConfig();
 
+/**
+ * 重新加载 settings.json 并就地更新 config 单例（首次运行引导 setup 完成后调用）。
+ * ESM 模块缓存无法重建模块级 const，只能改对象字段；所有消费方均通过 config.xxx
+ * 运行时引用属性，就地覆盖即全局生效（无顶层解构，见 index.ts 引导注释）。
+ */
+export function reloadConfig(): AronaConfig {
+  Object.assign(config, loadConfig());
+  return config;
+}
+
 /**
  * STT 全局热键键名（pynput 命名，供 repl.ts 注入 ARONA_HOTKEY_KEY）：
  * macOS 右 Cmd（pynput 有 Key.cmd_r），Windows/Linux 右 Ctrl（pynput Key.ctrl_r 三平台皆有效）。

package/src/index.ts

@@ -1,17 +1,51 @@
+import { spawn } from "node:child_process";
+import { join } from "node:path";
 import { initAgent } from "./agent.ts";
 import { Repl } from "./repl.ts";
 import { resetConversationFlag, loadSession } from "./memory.ts";
 import { startPet } from "./pet.ts";
-import { config, settingsExist } from "./config.ts";
+import { config, settingsExist, reloadConfig, PROJECT_ROOT } from "./config.ts";
 import { preloadGptSovitsLocal } from "./tts_provider.ts";
 import { syncSkillsFromAgentsDir } from "./skills.ts";
-import { t } from "./locale.ts";
+import { t, refreshLanguage } from "./locale.ts";
 import chalk from "chalk";
 
+/**
+ * 首次运行引导：以子进程拉起 setup 向导（stdio inherit 复用当前终端交互）。
+ * 传 ARONA_AUTO_SETUP=1 让向导末尾提示"正在启动"而非"运行 arona"。setup 在
+ * 独立进程写 settings.json，主进程随后 reloadConfig 即可（ESM 缓存无法重建单例）。
+ */
+function runSetupWizard(): Promise<number> {
+  const tsxBin = process.platform === "win32"
+    ? join(PROJECT_ROOT, "node_modules", ".bin", "tsx.cmd")
+    : join(PROJECT_ROOT, "node_modules", ".bin", "tsx");
+  return new Promise((resolve) => {
+    const child = spawn(tsxBin, [join(PROJECT_ROOT, "src", "setup.ts"), ...process.argv.slice(2)], {
+      cwd: process.cwd(),
+      stdio: "inherit",
+      shell: process.platform === "win32",
+      env: { ...process.env, ARONA_AUTO_SETUP: "1" },
+    });
+    child.on("exit", (code) => resolve(code ?? 0));
+  });
+}
+
 async function main() {
+  // 首次运行引导：无 settings.json 时直接进入 setup 向导，配置完成后继续 REPL
   if (!settingsExist()) {
-    console.log(chalk.yellow(t("未找到配置文件，请运行 arona setup 初始化。", "Config file not found. Run `arona setup` to initialize.")));
-    process.exit(1);
+    console.log(chalk.yellow(t("未找到配置文件，正在进入初始化向导…", "Config file not found. Starting the setup wizard…")));
+    const setupCode = await runSetupWizard();
+    if (setupCode !== 0) {
+      console.log(chalk.yellow(t("初始化已中止，配置未保存。", "Setup aborted, configuration not saved.")));
+      process.exit(setupCode);
+    }
+    if (!settingsExist()) {
+      console.log(chalk.yellow(t("配置未保存，无法启动。请重新运行 arona 完成初始化。", "Configuration was not saved. Re-run arona to initialize.")));
+      process.exit(1);
+    }
+    // setup 在子进程内写配置：就地刷新 config 单例与 UI 语言后继续
+    reloadConfig();
+    refreshLanguage();
   }
 
   if (!config.apiKey) {

package/src/locale.ts

@@ -129,3 +129,13 @@ export function getLang(): Language {
 export function setLang(l: Language): void {
   lang = l;
 }
+
+/**
+ * 按 settings.json 的 language 字段重新定型语言（首次运行引导 setup 完成后调用；
+ * 不重新探测系统/环境，仅尊重向导写入的显式配置）。auto/缺失保持现状返回当前值。
+ */
+export function refreshLanguage(): Language {
+  const setting = readSettingsLanguage();
+  if (setting === "zh" || setting === "en") lang = setting;
+  return lang;
+}

package/src/setup.ts

@@ -694,7 +694,12 @@ async function main() {
 
       console.log(chalk.green(t(`\n✓ 配置已保存到 ${SETTINGS_FILE}`, `\n✓ Configuration saved to ${SETTINGS_FILE}`)));
     }
-    console.log(chalk.cyan(t("  运行 arona 启动 Agent。\n", "  Run arona to start the Agent.\n")));
+    if (process.env.ARONA_AUTO_SETUP === "1") {
+      // 首次运行自动引导（index.ts spawn 传入）：配置完成后主进程直接续跑 REPL
+      console.log(chalk.cyan(t("  配置完成，正在启动 ARONA...\n", "  Configuration saved. Starting ARONA...\n")));
+    } else {
+      console.log(chalk.cyan(t("  运行 arona 启动 Agent。\n", "  Run arona to start the Agent.\n")));
+    }
   } finally {
     rl.close();
   }

package/src/utils/python.ts

@@ -1,6 +1,6 @@
 import type { ChildProcessWithoutNullStreams } from "child_process";
 import { join } from "path";
-import { PYTHON_DIR, config } from "../config.ts";
+import { PYTHON_DIR, config, verbose } from "../config.ts";
 import { t, getLang } from "../locale.ts";
 import { spawnCompat, stripProxyEnv } from "./spawn.ts";
 
@@ -42,6 +42,13 @@ export async function runPython(
     });
     proc.stderr.on("data", (data) => {
       stderr += data.toString();
+      // --verbose：逐行实时转发 python stderr，可见 voice_clone 上传/轮询等阶段进度
+      if (verbose) {
+        for (const line of data.toString().split(/[\r\n]+/)) {
+          const msg = line.trim();
+          if (msg) console.error(`[python:${scriptName}]`, msg);
+        }
+      }
     });
     proc.on("close", (code) => {
       clearTimeout(timer);