oasis_test 0.1.82 → 0.1.84

package/dist/_base/wrapper-base.sh

@@ -18,26 +18,32 @@
 set -euo pipefail
 
 # Resolve the real binary path (avoid recursion into self).
-# If ${OASIS_BIN_VAR} is already set (injected by inject()), use it.
-# Otherwise, scan PATH for the first executable that isn't this wrapper.
+# If ${OASIS_BIN_VAR} is already set (injected by inject()), use it — unless it points
+# back at this very wrapper. Otherwise scan PATH for the first executable that isn't us.
 oasis_resolve_bin() {
   local bin_var="${OASIS_BIN_VAR:?OASIS_BIN_VAR must be set}"
   local cmd_name="${OASIS_CMD_NAME:?OASIS_CMD_NAME must be set}"
 
-  # If already set by inject() AND executable on THIS machine, skip PATH scan.
-  # ${OASIS_BIN_VAR} (LARK_BIN/GH_BIN) is resolved server-side via `which`; on a remote
-  # node the real binary may live at a different path than the server's. Don't blindly
-  # exec a stale/non-existent path — fall through to the PATH scan below (which skips
-  # this wrapper to avoid recursion) so a node-local install is still found.
-  if [ -n "${!bin_var:-}" ] && [ -x "${!bin_var:-}" ]; then
+  local SELF
+  SELF="$(realpath "$0" 2>/dev/null || echo "$0")"
+
+  # If already set by inject() AND executable on THIS machine, skip the PATH scan —
+  # but **only if it isn't this wrapper itself**.
+  #
+  # 为什么要查自指（2026-08-03 实测踩到）：inject() 用 `which <cmd>` 在 **daemon 进程的
+  # PATH** 下解析真实二进制，而 daemon 的 PATH 可能被 agent 会话的 wrapper 目录污染
+  # （`oasis daemon start` 会把当时 shell 的 PATH 固化进 systemd unit；在 agent 会话里
+  # 触发更新就会把 /tmp/oasis-conn-* 带进去）。于是 GH_BIN 指向 wrapper 自己 →
+  # 这里的快路径直接 return → 后面 exec "$GH_BIN" 就是无限递归调用自身。
+  # 症状还特别误导：递归被 oasis_check_available 拦下，报的是「cli is upgrading」。
+  if [ -n "${!bin_var:-}" ] && [ -x "${!bin_var:-}" ] \
+     && [ "$(realpath "${!bin_var}" 2>/dev/null)" != "$SELF" ]; then
     return 0
   fi
-  # Stale/non-executable injected path: clear it so the PATH scan can repopulate cleanly.
+  # 空 / 不可执行 / 指向自己：清掉，让下面的 PATH 扫描重新填。
   unset "$bin_var" 2>/dev/null || true
 
   # Fallback: scan PATH for real binary (skip self to avoid recursion)
-  local SELF
-  SELF="$(realpath "$0" 2>/dev/null || echo "$0")"
   local candidate
   while IFS= read -r dir; do
     candidate="$dir/$cmd_name"
@@ -55,13 +61,21 @@ oasis_check_available() {
   local bin_var="${OASIS_BIN_VAR:?OASIS_BIN_VAR must be set}"
   local bin_path="${!bin_var:-}"
 
+  # 报错要分流：说清是「PATH 上根本没有真实 CLI」还是「找到了但跑不起来」。
+  # 旧实现两种都打「cli is upgrading, try again in 30 seconds」——那句话在真正的
+  # 升级窗口里是对的，但在「PATH 被污染、解析到 wrapper 自己」时纯属误导：等多久都不会好。
   if [ -z "$bin_path" ]; then
-    echo "error: The requested cli is upgrading, please try again in 30 seconds." >&2
+    echo "error: ${OASIS_CMD_NAME:-cli} not found on PATH — 连接器需要的真实 CLI 未安装，或 PATH 上只剩 oasis wrapper。" >&2
+    exit 1
+  fi
+
+  if [ ! -x "$bin_path" ]; then
+    echo "error: ${OASIS_BIN_VAR} 指向的 $bin_path 不可执行。" >&2
     exit 1
   fi
 
-  if [ ! -x "$bin_path" ] || ! "$bin_path" --version >/dev/null 2>&1; then
-    echo "error: The requested cli is upgrading, please try again in 30 seconds." >&2
+  if ! "$bin_path" --version >/dev/null 2>&1; then
+    echo "error: $bin_path --version 失败——真实 CLI 可能正在升级，30 秒后重试；若持续失败请检查该路径是否指向 oasis wrapper 自身。" >&2
     exit 1
   fi
 }