@aria_asi/cli 0.2.30 → 0.2.32

package/src/connectors/shell.ts

@@ -12,15 +12,32 @@ const SHELL_RC_FILES = ['.bashrc', '.bash_profile', '.profile', '.zshrc', '.zpro
 const SHELL_HOOK_LINE = '[ -f "$HOME/.aria/shell/runtime-client-env.sh" ] && . "$HOME/.aria/shell/runtime-client-env.sh"';
 
 function resolveToolPath(toolName: string): string | null {
+  const sanitizedPath = (process.env.PATH || '')
+    .split(path.delimiter)
+    .filter((entry) => entry && path.resolve(entry) !== path.resolve(WRAPPER_DIR))
+    .join(path.delimiter);
   try {
-    const lines = execSync(`which -a ${toolName}`, { encoding: 'utf-8' })
+    const lines = execSync(`which -a ${toolName}`, {
+      encoding: 'utf-8',
+      env: {
+        ...process.env,
+        PATH: sanitizedPath,
+      },
+    })
       .split('\n')
       .map((line) => line.trim())
       .filter(Boolean);
     const preferred = lines.find((candidate) => !candidate.startsWith(`${WRAPPER_DIR}/`));
     return preferred || lines[0] || null;
   } catch {
-    return null;
+    const fallbackCandidates = [
+      path.join(homedir(), '.npm-global', 'bin', toolName),
+      path.join(homedir(), '.local', 'bin', toolName),
+      path.join('/usr/local/bin', toolName),
+      path.join('/usr/bin', toolName),
+    ];
+    const fallback = fallbackCandidates.find((candidate) => existsSync(candidate));
+    return fallback || null;
   }
 }
 
@@ -72,9 +89,66 @@ if [ -z "\${ARIA_API_KEY:-}" ]; then
     fi
   fi
 fi
+if [ -n "\${ARIA_API_KEY:-}" ] && [ -z "\${OPENAI_API_KEY:-}" ]; then
+  export OPENAI_API_KEY="$ARIA_API_KEY"
+fi
 `;
 }
 
+function buildToolExecBlock(toolName: string, toolPath: string): string {
+  if (toolName !== 'codex') {
+    return `exec "${toolPath}" "$@"`;
+  }
+
+  return `for arg in "$@"; do
+  if [ "$arg" = "--remote" ]; then
+    exec "${toolPath}" "$@"
+  fi
+done
+
+case "\${1:-}" in
+  app-server|exec-server|exec|review)
+    exec "${toolPath}" "$@"
+    ;;
+esac
+
+if [ "\${ARIA_CODEX_BYPASS_BRIDGE:-0}" = "1" ]; then
+  exec "${toolPath}" "$@"
+fi
+
+export ARIA_CODEX_REAL_BIN="\${ARIA_CODEX_REAL_BIN:-${toolPath}}"
+export ARIA_CODEX_BRIDGE_HOST="\${ARIA_CODEX_BRIDGE_HOST:-127.0.0.1}"
+export ARIA_CODEX_BRIDGE_PORT="\${ARIA_CODEX_BRIDGE_PORT:-4320}"
+export ARIA_CODEX_DOWNSTREAM_PORT="\${ARIA_CODEX_DOWNSTREAM_PORT:-4321}"
+
+if command -v systemctl >/dev/null 2>&1; then
+  systemctl --user import-environment ARIA_CODEX_REAL_BIN ARIA_CODEX_BRIDGE_HOST ARIA_CODEX_BRIDGE_PORT ARIA_CODEX_DOWNSTREAM_PORT >/dev/null 2>&1 || true
+  systemctl --user start aria-codex-bridge.service >/dev/null 2>&1 || true
+fi
+
+if ! (exec 9<>"/dev/tcp/$ARIA_CODEX_BRIDGE_HOST/$ARIA_CODEX_BRIDGE_PORT") >/dev/null 2>&1; then
+  nohup "$HOME/.aria/bin/aria-codex-bridge" >/dev/null 2>&1 &
+fi
+
+bridge_ready=0
+for _aria_try in $(seq 1 50); do
+  if (exec 9<>"/dev/tcp/$ARIA_CODEX_BRIDGE_HOST/$ARIA_CODEX_BRIDGE_PORT") >/dev/null 2>&1; then
+    exec 9>&-
+    exec 9<&-
+    bridge_ready=1
+    break
+  fi
+  sleep 0.1
+done
+
+if [ "$bridge_ready" != "1" ]; then
+  echo "Aria Codex bridge did not become ready at ws://$ARIA_CODEX_BRIDGE_HOST:$ARIA_CODEX_BRIDGE_PORT" >&2
+  exit 1
+fi
+
+exec "${toolPath}" --remote "ws://$ARIA_CODEX_BRIDGE_HOST:$ARIA_CODEX_BRIDGE_PORT" "$@"`;
+}
+
 export async function connectShell(
   toolName: string,
   config: AriaConfig,
@@ -93,13 +167,14 @@ export async function connectShell(
 
   const ariaBlock = buildShellWrapperBlock(config, toolName);
   const runtimeBlock = buildRuntimeInjectionBlock();
+  const execBlock = buildToolExecBlock(toolName, toolPath);
   const wrapperPath = path.join(WRAPPER_DIR, toolName);
   const script = `#!/usr/bin/env bash
 # ARIA HARNESS WRAPPER — generated by @aria/connector
 # Wraps ${toolName} with Aria's cognitive harness
 ${ariaBlock}
 ${runtimeBlock}
-exec "${toolPath}" "$@"
+${execBlock}
 `;
 
   writeFileSync(wrapperPath, script);