oasis_test_v2 0.0.0 → 0.2.0

package/dist/_base/wrapper-base.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+# Shared wrapper logic for CLI connectors.
+#
+# Source this from your connector wrapper and call oasis_resolve_bin + oasis_check_available.
+# Before sourcing, set:
+#   OASIS_BIN_VAR   — name of env var that holds the absolute binary path (e.g., "GH_BIN")
+#   OASIS_CMD_NAME  — command name to find (e.g., "gh")
+#
+# Example:
+#   OASIS_BIN_VAR="GH_BIN"
+#   OASIS_CMD_NAME="gh"
+#   source "$(dirname "$(realpath "$0")")/../_base/wrapper-base.sh"
+#   oasis_resolve_bin
+#   oasis_check_available
+#   # Add connector-specific env injection here
+#   exec "$GH_BIN" "$@"
+
+set -euo pipefail
+
+# Resolve the real binary path (avoid recursion into self).
+# 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}"
+
+  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
+  # 空 / 不可执行 / 指向自己：清掉，让下面的 PATH 扫描重新填。
+  unset "$bin_var" 2>/dev/null || true
+
+  # Fallback: scan PATH for real binary (skip self to avoid recursion)
+  local candidate
+  while IFS= read -r dir; do
+    candidate="$dir/$cmd_name"
+    if [ -x "$candidate" ] && [ "$(realpath "$candidate" 2>/dev/null)" != "$SELF" ]; then
+      printf -v "$bin_var" '%s' "$candidate"
+      export "$bin_var"
+      return 0
+    fi
+  done <<< "$(echo "$PATH" | tr ':' '\n')"
+}
+
+# Check that the resolved binary is accessible and responds to --version.
+# If not (e.g., locked during upgrade), exit with user-friendly message.
+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: ${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 ! "$bin_path" --version >/dev/null 2>&1; then
+    echo "error: $bin_path --version 失败——真实 CLI 可能正在升级，30 秒后重试；若持续失败请检查该路径是否指向 oasis wrapper 自身。" >&2
+    exit 1
+  fi
+}

package/dist/feishu/wrapper.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# Feishu CLI wrapper — 通过前置 PATH 替换 lark-cli。
+#
+# 凭据保护：敏感凭据（App Secret / User Access Token）**不**放进 agent 环境变量，
+# 而是写在只有本 wrapper 读取的临时文件里（inject() 写，chmod 600）。agent 环境里
+# 只有一个非敏感的文件路径指针 FEISHU_CREDS_FILE。wrapper 在调用真实 lark-cli 前
+# `source` 该文件，把 LARKSUITE_CLI_* 外部凭据变量注入**本 wrapper 子进程**——
+# 这些秘密从不出现在 agent 自身的 env / /proc/self/environ，也不被 agent 其它子进程继承。
+#
+# 环境变量：
+#   LARK_BIN          — 真实 lark-cli 绝对路径（避免递归调用自身）
+#   FEISHU_CREDS_FILE — 凭据文件路径（内含 export LARKSUITE_CLI_* 行）
+
+set -euo pipefail
+
+OASIS_BIN_VAR="LARK_BIN"
+OASIS_CMD_NAME="lark-cli"
+# shellcheck source=../_base/wrapper-base.sh
+source "$(dirname "$(realpath "$0")")/../_base/wrapper-base.sh"
+
+oasis_resolve_bin
+oasis_check_available
+
+# Load feishu credentials into THIS process only (not visible to the agent).
+if [ -n "${FEISHU_CREDS_FILE:-}" ] && [ -f "${FEISHU_CREDS_FILE}" ]; then
+  # shellcheck disable=SC1090
+  source "${FEISHU_CREDS_FILE}"
+fi
+
+exec "$LARK_BIN" "$@"

package/dist/github/wrapper.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# GitHub CLI wrapper — replaces `gh` in the agent's PATH.
+#
+# The wrapper reads the token from an env var injected by inject(),
+# never exposing it in a way the agent can read directly (the agent
+# sees the wrapper name "gh" on PATH, not the token value).
+#
+# Environment variables (written by inject(), read here only):
+#   GH_CREDS_FILE  — path to a chmod-600 file with `export GH_TOKEN=...` lines
+#                    (token value is NOT in the agent env — only this path is)
+#   GH_BIN         — absolute path to the real gh binary
+#   GIT_AUTHOR_NAME / GIT_COMMITTER_NAME — set by inject() directly (non-secret)
+
+set -euo pipefail
+
+OASIS_BIN_VAR="GH_BIN"
+OASIS_CMD_NAME="gh"
+# shellcheck source=../_base/wrapper-base.sh
+source "$(dirname "$(realpath "$0")")/../_base/wrapper-base.sh"
+
+oasis_resolve_bin
+oasis_check_available
+
+# Load the GitHub token into THIS process only (not visible to the agent).
+# The token lives in a chmod-600 file the wrapper sources; the agent env only
+# holds the non-secret path GH_CREDS_FILE.
+if [ -n "${GH_CREDS_FILE:-}" ] && [ -f "${GH_CREDS_FILE}" ]; then
+  # shellcheck disable=SC1090
+  source "${GH_CREDS_FILE}"
+fi
+
+if [ "${OASIS_EXTERNAL_EFFECT_CAPTURE:-}" = "1" ]; then
+  exec oasis connector-effect-run github "$GH_BIN" "$@"
+fi
+
+exec "$GH_BIN" "$@"