agent-phonon 0.2.5 → 0.2.8

package/dist/cli.js

@@ -4724,7 +4724,7 @@ ${prompt}`;
   }
   run(args2, stdin, turnId, emit, opts) {
     return new Promise((resolve5) => {
-      const child = spawn3("codex", args2, {
+      const child = spawn3(this.env.binPath ?? "codex", args2, {
         cwd: this.cwd,
         env: { ...process.env, ...opts.environment ?? {}, ...this.env.apiKey ? { OPENAI_API_KEY: this.env.apiKey } : {} }
       });
@@ -4853,7 +4853,7 @@ var CodexAdapter = class {
   }
   probeVersion() {
     return new Promise((resolve5) => {
-      const child = spawn3("codex", ["--version"]);
+      const child = spawn3(this.env.binPath ?? "codex", ["--version"]);
       let out = "";
       child.stdout.on("data", (d) => out += d.toString());
       child.on("error", () => resolve5(null));
@@ -5163,7 +5163,7 @@ ${prompt}`;
   }
   run(args2, turnId, emit, opts) {
     return new Promise((resolve5) => {
-      const child = spawn5("hermes", args2, {
+      const child = spawn5(this.env.binPath ?? "hermes", args2, {
         cwd: this.cwd,
         env: { ...process.env, ...opts.environment ?? {}, HERMES_PROFILE: this.profile }
       });
@@ -5329,7 +5329,7 @@ var HermesAdapter = class {
   /** 枚举 Hermes profile（去 ANSI 色解析 profile list）。 */
   listProfiles() {
     return new Promise((resolve5) => {
-      const child = spawn5("hermes", ["profile", "list"]);
+      const child = spawn5(this.env.binPath ?? "hermes", ["profile", "list"]);
       let out = "";
       child.stdout.on("data", (d) => out += d.toString());
       child.on("error", () => resolve5([{ name: this.defaultProfile }]));
@@ -5349,7 +5349,7 @@ var HermesAdapter = class {
   }
   probeVersion() {
     return new Promise((resolve5) => {
-      const child = spawn5("hermes", ["--version"]);
+      const child = spawn5(this.env.binPath ?? "hermes", ["--version"]);
       let out = "";
       child.stdout.on("data", (d) => out += d.toString());
       child.on("error", () => resolve5(null));
@@ -5584,7 +5584,7 @@ ${prompt}`;
         if (v !== void 0)
           childEnv[k] = v;
       }
-      const child = spawn6("claude", args2, { cwd: this.cwd, env: { ...childEnv, ...opts.environment ?? {} } });
+      const child = spawn6(this.env.binPath ?? "claude", args2, { cwd: this.cwd, env: { ...childEnv, ...opts.environment ?? {} } });
       this.current = child;
       let buf = "";
       let acc = "";
@@ -5726,7 +5726,7 @@ var ClaudeCodeAdapter = class {
   }
   probeVersion() {
     return new Promise((resolve5) => {
-      const child = spawn6("claude", ["--version"]);
+      const child = spawn6(this.env.binPath ?? "claude", ["--version"]);
       let out = "";
       child.stdout.on("data", (d) => out += d.toString());
       child.on("error", () => resolve5(null));
@@ -6144,6 +6144,21 @@ function probe(bin, args2 = ["--version"]) {
   const r = spawnSync(bin, args2, { timeout: 8e3 });
   return { ok: r.status === 0, out: (r.stdout?.toString() ?? "").trim().split("\n")[0] ?? "" };
 }
+function commandPath(bin) {
+  const candidates = [
+    join12(homedir10(), ".npm-global", "bin", bin),
+    join12(homedir10(), ".local", "bin", bin),
+    join12(homedir10(), ".bun", "bin", bin),
+    join12(homedir10(), ".cargo", "bin", bin),
+    `/opt/homebrew/bin/${bin}`,
+    `/usr/local/bin/${bin}`,
+    `/usr/bin/${bin}`
+  ];
+  for (const p of candidates) if (existsSync12(p)) return p;
+  const r = spawnSync("bash", ["-lc", `command -v ${bin}`], { timeout: 3e3 });
+  const out = (r.stdout?.toString() ?? "").trim().split("\n")[0];
+  return r.status === 0 && out ? out : void 0;
+}
 function gatewayReachable(url) {
   try {
     const u = new URL(url.replace(/^ws/, "http"));
@@ -6160,11 +6175,25 @@ function openCodeBin() {
 function autoDetectAdapters(adapters) {
   const out = [...adapters];
   const has = (type2) => out.some((a) => a.type === type2);
-  if (!has("hermes") && probe("hermes").ok) out.push({ type: "hermes" });
+  if (!has("hermes")) {
+    const hermesPath = commandPath("hermes");
+    if (hermesPath && probe(hermesPath).ok) out.push({ type: "hermes", hermesBinPath: hermesPath });
+  }
   const ocBin = openCodeBin();
   if (!has("opencode") && probe(ocBin).ok) out.push({ type: "opencode", opencodeBinPath: ocBin === "opencode" ? void 0 : ocBin });
-  if (!has("claude-code") && probe("claude").ok) out.push({ type: "claude-code", claudeDefaultModel: "default" });
-  if (!has("codex") && probe("codex").ok) out.push({ type: "codex", codexDefaultModel: "default" });
+  for (const a of out) {
+    if (a.type === "hermes" && !a.hermesBinPath) a.hermesBinPath = commandPath("hermes");
+    if (a.type === "claude-code" && !a.claudeBinPath) a.claudeBinPath = commandPath("claude");
+    if (a.type === "codex" && !a.codexBinPath) a.codexBinPath = commandPath("codex");
+  }
+  if (!has("claude-code")) {
+    const claudePath = commandPath("claude");
+    if (claudePath && probe(claudePath).ok) out.push({ type: "claude-code", claudeBinPath: claudePath, claudeDefaultModel: "default" });
+  }
+  if (!has("codex")) {
+    const codexPath = commandPath("codex");
+    if (codexPath && probe(codexPath).ok) out.push({ type: "codex", codexBinPath: codexPath, codexDefaultModel: "default" });
+  }
   return out;
 }
 function cmdDoctor() {
@@ -6218,11 +6247,11 @@ function buildRegistry(adapters) {
       const token = a.gatewayToken ?? readOpenClawGatewayToken();
       if (token) reg.register(new OpenClawGatewayAdapter({ gateway: { baseUrl: a.gatewayUrl ?? "ws://127.0.0.1:18789", token }, defaultAgent: a.defaultAgent ?? "main" }));
     } else if (a.type === "claude-code") {
-      reg.register(new ClaudeCodeAdapter({ env: { baseUrl: a.claudeBaseUrl, authToken: a.claudeAuthToken, defaultModel: a.claudeDefaultModel ?? "default", models: a.claudeModels } }));
+      reg.register(new ClaudeCodeAdapter({ env: { binPath: a.claudeBinPath, baseUrl: a.claudeBaseUrl, authToken: a.claudeAuthToken, defaultModel: a.claudeDefaultModel ?? "default", models: a.claudeModels } }));
     } else if (a.type === "codex") {
-      reg.register(new CodexAdapter({ env: { baseUrl: a.codexBaseUrl, apiKey: a.codexApiKey, defaultModel: a.codexDefaultModel ?? "default", models: a.codexModels, wireApi: a.codexWireApi ?? "responses" } }));
+      reg.register(new CodexAdapter({ env: { binPath: a.codexBinPath, baseUrl: a.codexBaseUrl, apiKey: a.codexApiKey, defaultModel: a.codexDefaultModel ?? "default", models: a.codexModels, wireApi: a.codexWireApi ?? "responses" } }));
     } else if (a.type === "hermes") {
-      reg.register(new HermesAdapter({ env: { defaultModel: a.hermesModel, provider: a.hermesProvider } }));
+      reg.register(new HermesAdapter({ env: { binPath: a.hermesBinPath, defaultModel: a.hermesModel, provider: a.hermesProvider } }));
     } else if (a.type === "opencode") {
       reg.register(new OpenCodeAdapter({ env: { binPath: a.opencodeBinPath, defaultModel: a.opencodeModel } }));
     }
@@ -6238,13 +6267,13 @@ function cmdAdapterAdd(type2, opts) {
       a = { type: "openclaw-gateway", gatewayUrl: opts.gatewayUrl ?? "ws://127.0.0.1:18789", gatewayToken: opts.token, defaultAgent: opts.defaultAgent ?? "main" };
       break;
     case "claude-code":
-      a = { type: "claude-code", claudeBaseUrl: opts.baseUrl, claudeAuthToken: opts.token, claudeDefaultModel: opts.model ?? "default" };
+      a = { type: "claude-code", claudeBinPath: opts.bin, claudeBaseUrl: opts.baseUrl, claudeAuthToken: opts.token, claudeDefaultModel: opts.model ?? "default" };
       break;
     case "codex":
-      a = { type: "codex", codexBaseUrl: opts.baseUrl, codexApiKey: opts.apiKey, codexDefaultModel: opts.model ?? "default", codexWireApi: opts.wireApi ?? "responses" };
+      a = { type: "codex", codexBinPath: opts.bin, codexBaseUrl: opts.baseUrl, codexApiKey: opts.apiKey, codexDefaultModel: opts.model ?? "default", codexWireApi: opts.wireApi ?? "responses" };
       break;
     case "hermes":
-      a = { type: "hermes", hermesModel: opts.model, hermesProvider: opts.provider };
+      a = { type: "hermes", hermesBinPath: opts.bin, hermesModel: opts.model, hermesProvider: opts.provider };
       break;
     case "opencode":
       a = { type: "opencode", opencodeBinPath: opts.bin, opencodeModel: opts.model };
@@ -6435,11 +6464,11 @@ var PhononDaemon = class {
         this.gatewayAdapters.push(ad);
         this.registry.register(ad);
       } else if (a.type === "claude-code") {
-        this.registry.register(new ClaudeCodeAdapter({ env: { baseUrl: a.claudeBaseUrl, authToken: a.claudeAuthToken, defaultModel: a.claudeDefaultModel ?? "default", models: a.claudeModels } }));
+        this.registry.register(new ClaudeCodeAdapter({ env: { binPath: a.claudeBinPath, baseUrl: a.claudeBaseUrl, authToken: a.claudeAuthToken, defaultModel: a.claudeDefaultModel ?? "default", models: a.claudeModels } }));
       } else if (a.type === "codex") {
-        this.registry.register(new CodexAdapter({ env: { baseUrl: a.codexBaseUrl, apiKey: a.codexApiKey, defaultModel: a.codexDefaultModel ?? "default", models: a.codexModels, wireApi: a.codexWireApi ?? "responses" } }));
+        this.registry.register(new CodexAdapter({ env: { binPath: a.codexBinPath, baseUrl: a.codexBaseUrl, apiKey: a.codexApiKey, defaultModel: a.codexDefaultModel ?? "default", models: a.codexModels, wireApi: a.codexWireApi ?? "responses" } }));
       } else if (a.type === "hermes") {
-        this.registry.register(new HermesAdapter({ env: { defaultModel: a.hermesModel, provider: a.hermesProvider } }));
+        this.registry.register(new HermesAdapter({ env: { binPath: a.hermesBinPath, defaultModel: a.hermesModel, provider: a.hermesProvider } }));
       } else if (a.type === "opencode") {
         this.registry.register(new OpenCodeAdapter({ env: { binPath: a.opencodeBinPath, defaultModel: a.opencodeModel } }));
       } else if (a.type === "openclaw-cli") {