agent-phonon 0.2.7 → 0.2.8

package/dist/daemon.d.ts

@@ -24,17 +24,20 @@ interface AdapterConfig {
     /** 默认 OpenClaw sub-agent。 */
     defaultAgent?: string;
     /** claude-code：网关 baseUrl/token/默认模型。 */
+    claudeBinPath?: string;
     claudeBaseUrl?: string;
     claudeAuthToken?: string;
     claudeDefaultModel?: string;
     claudeModels?: ModelInfo[];
     /** codex：网关 baseUrl(/v1)/key/默认模型/wireApi。 */
+    codexBinPath?: string;
     codexBaseUrl?: string;
     codexApiKey?: string;
     codexDefaultModel?: string;
     codexModels?: ModelInfo[];
     codexWireApi?: "responses" | "chat";
     /** hermes：默认模型/provider（用现有 hermes config）。 */
+    hermesBinPath?: string;
     hermesModel?: string;
     hermesProvider?: string;
     /** opencode：binary 路径/默认模型。 */

package/dist/daemon.js

@@ -4723,7 +4723,7 @@ ${prompt}`;
   }
   run(args, stdin, turnId, emit, opts) {
     return new Promise((resolve5) => {
-      const child = spawn3("codex", args, {
+      const child = spawn3(this.env.binPath ?? "codex", args, {
         cwd: this.cwd,
         env: { ...process.env, ...opts.environment ?? {}, ...this.env.apiKey ? { OPENAI_API_KEY: this.env.apiKey } : {} }
       });
@@ -4852,7 +4852,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));
@@ -5162,7 +5162,7 @@ ${prompt}`;
   }
   run(args, turnId, emit, opts) {
     return new Promise((resolve5) => {
-      const child = spawn5("hermes", args, {
+      const child = spawn5(this.env.binPath ?? "hermes", args, {
         cwd: this.cwd,
         env: { ...process.env, ...opts.environment ?? {}, HERMES_PROFILE: this.profile }
       });
@@ -5328,7 +5328,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 }]));
@@ -5348,7 +5348,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));
@@ -5583,7 +5583,7 @@ ${prompt}`;
         if (v !== void 0)
           childEnv[k] = v;
       }
-      const child = spawn6("claude", args, { cwd: this.cwd, env: { ...childEnv, ...opts.environment ?? {} } });
+      const child = spawn6(this.env.binPath ?? "claude", args, { cwd: this.cwd, env: { ...childEnv, ...opts.environment ?? {} } });
       this.current = child;
       let buf = "";
       let acc = "";
@@ -5725,7 +5725,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));
@@ -6092,6 +6092,21 @@ function probe(bin, args = ["--version"]) {
   const r = spawnSync(bin, args, { 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 openCodeBin() {
   const bundled = join12(homedir10(), ".opencode", "bin", "opencode");
   return existsSync12(bundled) ? bundled : "opencode";
@@ -6099,11 +6114,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;
 }
 
@@ -6248,11 +6277,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") {