@ai-development-environment/control-agent 0.0.77 → 0.0.78

package/dist/control-agent.js

@@ -12136,20 +12136,28 @@ function isExecutable(path) {
     return false;
   }
 }
-function findExecutable(name, options = {}) {
-  const env = options.env ?? process.env;
+function toolDirectories(options = {}) {
   const home = options.home ?? homedir4();
   const platform2 = options.platform ?? process.platform;
-  const executable = platform2 === "win32" ? `${name}.exe` : name;
-  const directories = [
-    ...(env.PATH ?? "").split(delimiter).filter(Boolean),
+  return [
     join6(home, ".local", "bin"),
     join6(home, ".bun", "bin"),
     join6(home, ".npm-global", "bin"),
+    // Where the opencode.ai install script puts its binary.
+    join6(home, ".opencode", "bin"),
     // Global npm installs land next to the node binary running this agent.
     options.nodeDirectory ?? dirname3(process.execPath),
     ...platform2 === "darwin" ? ["/opt/homebrew/bin", "/usr/local/bin"] : []
   ];
+}
+function findExecutable(name, options = {}) {
+  const env = options.env ?? process.env;
+  const platform2 = options.platform ?? process.platform;
+  const executable = platform2 === "win32" ? `${name}.exe` : name;
+  const directories = [
+    ...(env.PATH ?? "").split(delimiter).filter(Boolean),
+    ...toolDirectories(options)
+  ];
   const override = options.overrideVariable ? env[options.overrideVariable]?.trim() : void 0;
   const candidates = [
     ...override ? [override] : [],
@@ -12158,6 +12166,26 @@ function findExecutable(name, options = {}) {
   const canExecute = options.isExecutable ?? isExecutable;
   return [...new Set(candidates)].find(canExecute);
 }
+function extendedPath(options = {}) {
+  const env = options.env ?? process.env;
+  const existing = (env.PATH ?? "").split(delimiter).filter(Boolean);
+  const additions = toolDirectories(options).filter(
+    (directory) => !existing.includes(directory)
+  );
+  return [...existing, ...additions].join(delimiter);
+}
+function repairToolPath(options = {}) {
+  const env = options.env ?? process.env;
+  env.PATH = extendedPath(options);
+}
+function prependPathDirectory(directory, env = process.env) {
+  const existing = (env.PATH ?? "").split(delimiter).filter(Boolean);
+  if (existing[0] === directory) return;
+  env.PATH = [
+    directory,
+    ...existing.filter((entry) => entry !== directory)
+  ].join(delimiter);
+}
 
 // src/process-runner.ts
 import { spawn as spawn5 } from "node:child_process";
@@ -16909,7 +16937,7 @@ var CodebaseMonitor = class {
 // src/runs/run-manager.ts
 import { execFile as execFile4 } from "node:child_process";
 import { mkdir as mkdir6, rm as rm13 } from "node:fs/promises";
-import { dirname as dirname9, join as join17 } from "node:path";
+import { dirname as dirname10, join as join17 } from "node:path";
 import { promisify as promisify4 } from "node:util";
 
 // src/runs/journal.ts
@@ -43291,10 +43319,24 @@ var CodexAppServer = class {
     this.initialized ??= this.start();
     return this.initialized;
   }
+  // The service PATH omits Homebrew and npm, so resolve the install once and
+  // use the absolute path for every codex invocation.
+  executable() {
+    const executable = findExecutable("codex", {
+      overrideVariable: "CONTROL_AGENT_CODEX_EXECUTABLE"
+    });
+    if (!executable) {
+      throw new Error(
+        "codex was not found. Install it (brew install codex, or npm install -g @openai/codex) or set CONTROL_AGENT_CODEX_EXECUTABLE to its full path."
+      );
+    }
+    return executable;
+  }
   async start() {
-    const modelCatalogPath = await this.createBundledModelCatalog();
+    const executable = this.executable();
+    const modelCatalogPath = await this.createBundledModelCatalog(executable);
     const modelCatalogDirectory = this.modelCatalogDirectory;
-    const child = spawn7("codex", codexAppServerArgs(modelCatalogPath), {
+    const child = spawn7(executable, codexAppServerArgs(modelCatalogPath), {
       stdio: ["pipe", "pipe", "pipe"],
       env: process.env
     });
@@ -43362,11 +43404,11 @@ var CodexAppServer = class {
       );
     }
   }
-  async createBundledModelCatalog() {
+  async createBundledModelCatalog(executable) {
     const directory = await mkdtemp7(join16(tmpdir7(), "aide-codex-models-"));
     try {
       const { stdout } = await execFileAsync2(
-        "codex",
+        executable,
         ["debug", "models", "--bundled"],
         {
           encoding: "utf8",
@@ -43804,6 +43846,7 @@ var CodexAdapter = class {
 };
 
 // src/runs/opencode-adapter.ts
+import { dirname as dirname9 } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // ../../node_modules/@opencode-ai/sdk/dist/v2/gen/core/serverSentEvents.gen.js
@@ -49475,7 +49518,18 @@ var OpenCodeAdapter = class {
   };
   runtime;
   async client() {
-    this.runtime ??= await createOpencode();
+    if (!this.runtime) {
+      const executable = findExecutable("opencode", {
+        overrideVariable: "CONTROL_AGENT_OPENCODE_EXECUTABLE"
+      });
+      if (!executable) {
+        throw new Error(
+          "opencode was not found. Install it (brew install sst/tap/opencode, or npm install -g opencode-ai) or set CONTROL_AGENT_OPENCODE_EXECUTABLE to its full path."
+        );
+      }
+      prependPathDirectory(dirname9(executable));
+      this.runtime = await createOpencode();
+    }
     return this.runtime.client;
   }
   async catalog() {
@@ -50097,7 +50151,7 @@ var RunManager = class {
         5
       );
       await this.completeCommand(command3.id, "SUCCEEDED");
-      await rm13(join17(dirname9(configPath()), "runs", run.id, "attachments"), {
+      await rm13(join17(dirname10(configPath()), "runs", run.id, "attachments"), {
         recursive: true,
         force: true
       }).catch(() => void 0);
@@ -50279,7 +50333,7 @@ var RunManager = class {
         this.active.delete(run.id);
       this.interruptionRequests.delete(run.id);
       this.executingCommands.delete(command3.id);
-      await rm13(join17(dirname9(configPath()), "runs", run.id, "attachments"), {
+      await rm13(join17(dirname10(configPath()), "runs", run.id, "attachments"), {
         recursive: true,
         force: true
       }).catch(() => void 0);
@@ -50507,7 +50561,7 @@ var RunManager = class {
   }
   async stageAttachments(runId, attachments) {
     if (!attachments.length) return [];
-    const directory = join17(dirname9(configPath()), "runs", runId, "attachments");
+    const directory = join17(dirname10(configPath()), "runs", runId, "attachments");
     await mkdir6(directory, { recursive: true, mode: 448 });
     return Promise.all(
       attachments.map(async (attachment) => {
@@ -51285,6 +51339,7 @@ async function doctor() {
   if (checks.some((check) => !check.ok)) process.exitCode = 1;
 }
 async function main() {
+  repairToolPath();
   const [command3, ...args] = process.argv.slice(2);
   if (!command3 || command3 === "help" || command3 === "--help") {
     usage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-development-environment/control-agent",
-  "version": "0.0.77",
+  "version": "0.0.78",
   "description": "Control agent for the AI Development Environment",
   "license": "MIT",
   "repository": {