@autohq/cli 0.1.539 → 0.1.541

package/dist/agent-bridge.js

@@ -30870,7 +30870,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.539",
+  version: "0.1.541",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -75803,7 +75803,7 @@ import {
   writeFileSync as writeFileSync4
 } from "fs";
 import { tmpdir } from "os";
-import { delimiter, dirname as dirname5, join as join3 } from "path";
+import { basename as basename2, delimiter, dirname as dirname5, isAbsolute as isAbsolute2, join as join3 } from "path";
 
 // src/commands/agent-bridge/harness/codex/options.ts
 import { join as join2 } from "path";
@@ -75987,6 +75987,7 @@ var CODEX_EDIT_PROBE = {
   ].join("\n")
 };
 var PROBE_TIMEOUT_MS = 15e3;
+var MAX_CODEX_SHIM_BYTES = 4096;
 var MAX_EVIDENCE_LENGTH = 300;
 var CODEX_PLATFORM_VENDOR_TARGETS = {
   linux: {
@@ -76029,8 +76030,8 @@ function codexEditFallthroughMarker(item) {
   return `agent_bridge_codex_edit_fallthrough item_id=${item.id} exit_code=127`;
 }
 function resolveCodexVendorLayout() {
-  const wrapper = whichOnPath(CODEX_EXECUTABLE_PATH);
-  if (!wrapper) {
+  const wrappers = executableCodexCandidates(CODEX_EXECUTABLE_PATH);
+  if (wrappers.length === 0) {
     throw new Error("codex executable not found on PATH");
   }
   const target = CODEX_PLATFORM_VENDOR_TARGETS[process.platform]?.[process.arch];
@@ -76039,40 +76040,92 @@ function resolveCodexVendorLayout() {
       `unsupported platform for codex vendor layout: ${process.platform}/${process.arch}`
     );
   }
-  const packageRoot = join3(dirname5(realpathSync3(wrapper)), "..");
   const platformPackage = `@openai/codex-${platformPackageSuffix()}`;
-  const candidates = [
-    join3(packageRoot, "node_modules", platformPackage, "vendor", target),
-    join3(packageRoot, "vendor", target)
-  ];
-  for (const vendorDir of candidates) {
-    const binary = join3(vendorDir, "bin", "codex");
-    const codexPathDir = join3(vendorDir, "codex-path");
-    if (existsSync5(binary) && existsSync5(codexPathDir)) {
-      return { binary, codexPathDir };
+  const attemptedVendorDirs = [];
+  for (const wrapper of wrappers) {
+    const packageRoot = join3(dirname5(realpathSync3(wrapper)), "..");
+    const vendorDirs = [
+      join3(packageRoot, "node_modules", platformPackage, "vendor", target),
+      join3(packageRoot, "vendor", target)
+    ];
+    attemptedVendorDirs.push(...vendorDirs);
+    for (const vendorDir of vendorDirs) {
+      const binary = join3(vendorDir, "bin", "codex");
+      const codexPathDir = join3(vendorDir, "codex-path");
+      if (isExecutable(binary) && existsSync5(codexPathDir)) {
+        return { binary, codexPathDir };
+      }
     }
   }
   throw new Error(
-    `codex vendor layout not found (wrapper=${wrapper} candidates=${candidates.join(",")})`
+    `codex vendor layout not found (wrappers=${wrappers.join(",")} candidates=${attemptedVendorDirs.join(",")})`
   );
 }
 function platformPackageSuffix() {
   const os = process.platform === "darwin" ? "darwin" : "linux";
   return `${os}-${process.arch}`;
 }
-function whichOnPath(command) {
+function executableCandidatesOnPath(command) {
+  const candidates = [];
+  const seen = /* @__PURE__ */ new Set();
   for (const dir of (process.env.PATH ?? "").split(delimiter)) {
     if (!dir) {
       continue;
     }
     const candidate = join3(dir, command);
-    try {
-      accessSync(candidate, constants.X_OK);
-      return candidate;
-    } catch {
+    if (!seen.has(candidate) && isExecutable(candidate)) {
+      seen.add(candidate);
+      candidates.push(candidate);
     }
   }
-  return null;
+  return candidates;
+}
+function executableCodexCandidates(command) {
+  const candidates = executableCandidatesOnPath(command);
+  const seen = new Set(candidates);
+  for (let index = 0; index < candidates.length; index += 1) {
+    const candidate = candidates[index];
+    if (!candidate) {
+      continue;
+    }
+    const target = directCodexShimTarget(candidate);
+    if (target && !seen.has(target)) {
+      seen.add(target);
+      candidates.push(target);
+    }
+  }
+  return candidates;
+}
+function directCodexShimTarget(candidate) {
+  try {
+    const resolved = realpathSync3(candidate);
+    const metadata = lstatSync3(resolved);
+    if (!metadata.isFile() || metadata.size > MAX_CODEX_SHIM_BYTES) {
+      return null;
+    }
+    const script = readFileSync7(resolved, "utf8");
+    if (!/^#!\/(?:bin\/|usr\/bin\/env )(?:ba)?sh\r?\n/.test(script)) {
+      return null;
+    }
+    const targets = script.split(/\r?\n/).map(
+      (line) => line.match(/^\s*exec\s+(?:"([^"]+)"|'([^']+)'|([^\s]+))\s+"\$@"\s*$/)
+    ).filter((match) => match !== null).map((match) => match[1] ?? match[2] ?? match[3] ?? "");
+    const [target] = targets;
+    if (!target || targets.length !== 1) {
+      return null;
+    }
+    return isAbsolute2(target) && basename2(target) === CODEX_EXECUTABLE_PATH && isExecutable(target) ? target : null;
+  } catch {
+    return null;
+  }
+}
+function isExecutable(path2) {
+  try {
+    accessSync(path2, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function provisionApplyPatchAlias(layout) {
   const alias = join3(layout.codexPathDir, CODEX_APPLY_PATCH_ALIAS);
@@ -76388,10 +76441,17 @@ var CodexAgentBridgeSessionImpl = class {
     this.input.writeOutput?.(
       `agent_bridge_codex_startup_started codex_home=${options.codexHome}`
     );
-    ensureCodexEditCapability({
-      command: options.command,
-      ...this.input.writeOutput ? { writeOutput: this.input.writeOutput } : {}
-    });
+    try {
+      ensureCodexEditCapability({
+        command: options.command,
+        ...this.input.writeOutput ? { writeOutput: this.input.writeOutput } : {}
+      });
+    } catch (error51) {
+      throw new AgentBridgeTerminalPrepareError(
+        error51 instanceof Error ? error51.message : String(error51),
+        { cause: error51 }
+      );
+    }
     const proc = spawn(options.command, options.args, {
       env: options.env,
       stdio: ["pipe", "pipe", "pipe"]

package/dist/index.js

@@ -81644,7 +81644,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.539",
+      version: "0.1.541",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -81769,10 +81769,10 @@ var init_project_apply_filesystem_source = __esm({
 // src/commands/agents/authoring.ts
 import { readFileSync as readFileSync8, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
 import {
-  basename as basename3,
+  basename as basename4,
   dirname as dirname8,
   extname,
-  isAbsolute as isAbsolute2,
+  isAbsolute as isAbsolute3,
   join as join7,
   resolve as resolve3
 } from "path";
@@ -81831,7 +81831,7 @@ function readLocalAgentAuthoringStatuses(input) {
   );
   const paths = agentAuthoringFiles(agentsDirectory);
   return paths.map((path2) => {
-    const fallbackName = basename3(path2, extname(path2));
+    const fallbackName = basename4(path2, extname(path2));
     try {
       const result = compileAgentFile(path2);
       return {
@@ -81970,7 +81970,7 @@ function importPaths(document) {
   });
 }
 function resolveImportPath(importPath, importerPath) {
-  if (isAbsolute2(importPath) || /^[A-Za-z]+:\/\//.test(importPath)) {
+  if (isAbsolute3(importPath) || /^[A-Za-z]+:\/\//.test(importPath)) {
     throw new Error(`Agent import must be a relative path: ${importPath}`);
   }
   const resolved = resolve3(dirname8(importerPath), importPath);
@@ -82143,7 +82143,7 @@ function resolveFileBackedString(value, input) {
     );
   }
   const filePath = file2.trim();
-  if (isAbsolute2(filePath) || /^[A-Za-z]+:\/\//.test(filePath)) {
+  if (isAbsolute3(filePath) || /^[A-Za-z]+:\/\//.test(filePath)) {
     throw new Error(
       `Invalid agent authoring file ${input.path}: ${input.field}.file must be a relative path`
     );
@@ -84966,7 +84966,7 @@ var init_project_apply_files2 = __esm({
 
 // src/commands/apply/files.ts
 import { existsSync as existsSync6, readFileSync as readFileSync9, realpathSync as realpathSync3, statSync as statSync4 } from "fs";
-import { basename as basename4, dirname as dirname9, extname as extname3, isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
+import { basename as basename5, dirname as dirname9, extname as extname3, isAbsolute as isAbsolute4, resolve as resolve4 } from "path";
 function readProjectApplyBundleInput(options) {
   if (options.file && options.directory) {
     throw new Error("Cannot use --file with --directory.");
@@ -85071,7 +85071,7 @@ function filesystemAssetReader(projectRoot) {
 function applyFileProjectRoot(file2) {
   let dir = dirname9(resolve4(file2));
   while (true) {
-    if (basename4(dir) === ".auto") {
+    if (basename5(dir) === ".auto") {
       return dirname9(dir);
     }
     if (directoryHasAutoRoot(dir)) {
@@ -85099,7 +85099,7 @@ function isInside(path2, parent) {
   return path2.startsWith(`${parent}/`);
 }
 function validateAgentAvatarAsset(input) {
-  if (isAbsolute3(input.asset)) {
+  if (isAbsolute4(input.asset)) {
     throw new Error(
       `Invalid identity avatar asset for "${input.resourceName}": asset path must be relative`
     );
@@ -98837,7 +98837,7 @@ import {
   writeFileSync as writeFileSync5
 } from "fs";
 import { tmpdir } from "os";
-import { delimiter, dirname as dirname7, join as join5 } from "path";
+import { basename as basename3, delimiter, dirname as dirname7, isAbsolute as isAbsolute2, join as join5 } from "path";
 
 // src/commands/agent-bridge/harness/codex/options.ts
 import { join as join4 } from "path";
@@ -99021,6 +99021,7 @@ var CODEX_EDIT_PROBE = {
   ].join("\n")
 };
 var PROBE_TIMEOUT_MS = 15e3;
+var MAX_CODEX_SHIM_BYTES = 4096;
 var MAX_EVIDENCE_LENGTH = 300;
 var CODEX_PLATFORM_VENDOR_TARGETS = {
   linux: {
@@ -99063,8 +99064,8 @@ function codexEditFallthroughMarker(item) {
   return `agent_bridge_codex_edit_fallthrough item_id=${item.id} exit_code=127`;
 }
 function resolveCodexVendorLayout() {
-  const wrapper = whichOnPath(CODEX_EXECUTABLE_PATH);
-  if (!wrapper) {
+  const wrappers = executableCodexCandidates(CODEX_EXECUTABLE_PATH);
+  if (wrappers.length === 0) {
     throw new Error("codex executable not found on PATH");
   }
   const target = CODEX_PLATFORM_VENDOR_TARGETS[process.platform]?.[process.arch];
@@ -99073,40 +99074,92 @@ function resolveCodexVendorLayout() {
       `unsupported platform for codex vendor layout: ${process.platform}/${process.arch}`
     );
   }
-  const packageRoot = join5(dirname7(realpathSync2(wrapper)), "..");
   const platformPackage = `@openai/codex-${platformPackageSuffix()}`;
-  const candidates = [
-    join5(packageRoot, "node_modules", platformPackage, "vendor", target),
-    join5(packageRoot, "vendor", target)
-  ];
-  for (const vendorDir of candidates) {
-    const binary = join5(vendorDir, "bin", "codex");
-    const codexPathDir = join5(vendorDir, "codex-path");
-    if (existsSync4(binary) && existsSync4(codexPathDir)) {
-      return { binary, codexPathDir };
+  const attemptedVendorDirs = [];
+  for (const wrapper of wrappers) {
+    const packageRoot = join5(dirname7(realpathSync2(wrapper)), "..");
+    const vendorDirs = [
+      join5(packageRoot, "node_modules", platformPackage, "vendor", target),
+      join5(packageRoot, "vendor", target)
+    ];
+    attemptedVendorDirs.push(...vendorDirs);
+    for (const vendorDir of vendorDirs) {
+      const binary = join5(vendorDir, "bin", "codex");
+      const codexPathDir = join5(vendorDir, "codex-path");
+      if (isExecutable(binary) && existsSync4(codexPathDir)) {
+        return { binary, codexPathDir };
+      }
     }
   }
   throw new Error(
-    `codex vendor layout not found (wrapper=${wrapper} candidates=${candidates.join(",")})`
+    `codex vendor layout not found (wrappers=${wrappers.join(",")} candidates=${attemptedVendorDirs.join(",")})`
   );
 }
 function platformPackageSuffix() {
   const os = process.platform === "darwin" ? "darwin" : "linux";
   return `${os}-${process.arch}`;
 }
-function whichOnPath(command) {
+function executableCandidatesOnPath(command) {
+  const candidates = [];
+  const seen = /* @__PURE__ */ new Set();
   for (const dir of (process.env.PATH ?? "").split(delimiter)) {
     if (!dir) {
       continue;
     }
     const candidate = join5(dir, command);
-    try {
-      accessSync(candidate, constants.X_OK);
-      return candidate;
-    } catch {
+    if (!seen.has(candidate) && isExecutable(candidate)) {
+      seen.add(candidate);
+      candidates.push(candidate);
     }
   }
-  return null;
+  return candidates;
+}
+function executableCodexCandidates(command) {
+  const candidates = executableCandidatesOnPath(command);
+  const seen = new Set(candidates);
+  for (let index = 0; index < candidates.length; index += 1) {
+    const candidate = candidates[index];
+    if (!candidate) {
+      continue;
+    }
+    const target = directCodexShimTarget(candidate);
+    if (target && !seen.has(target)) {
+      seen.add(target);
+      candidates.push(target);
+    }
+  }
+  return candidates;
+}
+function directCodexShimTarget(candidate) {
+  try {
+    const resolved = realpathSync2(candidate);
+    const metadata = lstatSync2(resolved);
+    if (!metadata.isFile() || metadata.size > MAX_CODEX_SHIM_BYTES) {
+      return null;
+    }
+    const script = readFileSync7(resolved, "utf8");
+    if (!/^#!\/(?:bin\/|usr\/bin\/env )(?:ba)?sh\r?\n/.test(script)) {
+      return null;
+    }
+    const targets = script.split(/\r?\n/).map(
+      (line) => line.match(/^\s*exec\s+(?:"([^"]+)"|'([^']+)'|([^\s]+))\s+"\$@"\s*$/)
+    ).filter((match) => match !== null).map((match) => match[1] ?? match[2] ?? match[3] ?? "");
+    const [target] = targets;
+    if (!target || targets.length !== 1) {
+      return null;
+    }
+    return isAbsolute2(target) && basename3(target) === CODEX_EXECUTABLE_PATH && isExecutable(target) ? target : null;
+  } catch {
+    return null;
+  }
+}
+function isExecutable(path2) {
+  try {
+    accessSync(path2, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
 }
 function provisionApplyPatchAlias(layout) {
   const alias = join5(layout.codexPathDir, CODEX_APPLY_PATCH_ALIAS);
@@ -99422,10 +99475,17 @@ var CodexAgentBridgeSessionImpl = class {
     this.input.writeOutput?.(
       `agent_bridge_codex_startup_started codex_home=${options.codexHome}`
     );
-    ensureCodexEditCapability({
-      command: options.command,
-      ...this.input.writeOutput ? { writeOutput: this.input.writeOutput } : {}
-    });
+    try {
+      ensureCodexEditCapability({
+        command: options.command,
+        ...this.input.writeOutput ? { writeOutput: this.input.writeOutput } : {}
+      });
+    } catch (error51) {
+      throw new AgentBridgeTerminalPrepareError(
+        error51 instanceof Error ? error51.message : String(error51),
+        { cause: error51 }
+      );
+    }
     const proc = spawn2(options.command, options.args, {
       env: options.env,
       stdio: ["pipe", "pipe", "pipe"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.539",
+  "version": "0.1.541",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"