@tencent-ai/agent-sdk 0.3.206-dev.0c715ff.202607102010 → 0.3.206

package/cli/vendor/shim/safe-bin/safe-delete-bash-env.sh

@@ -1,5 +1,5 @@
 # genie-safe-delete bash environment — sourced via BASH_ENV for every bash subprocess.
-# Defines safe-bin wrappers to intercept shell file commands.
+# Defines rm/unlink/rmdir wrappers to intercept shell delete commands and move to OS trash.
 if [ -n "${CODEBUDDY_SAFE_DELETE_BIN_DIR:-}" ]; then
     rm() { "${CODEBUDDY_SAFE_DELETE_BIN_DIR}/rm" "$@"; }
     unlink() { "${CODEBUDDY_SAFE_DELETE_BIN_DIR}/unlink" "$@"; }

package/cli/vendor/shim/safe-bin/safe-delete-common.sh

@@ -72,6 +72,11 @@ safe_delete_normalize_path() {
     while [ "$p" != "/" ] && [ "${p%/}" != "$p" ]; do
         p="${p%/}"
     done
+    case "$OS" in
+        MINGW*|MSYS*|CYGWIN*)
+            p="$(printf '%s' "$p" | tr '[:upper:]' '[:lower:]')"
+            ;;
+    esac
     printf '%s' "$p"
 }
 
@@ -143,50 +148,17 @@ SAFE_DELETE_OS_TMP_DIRS="$(safe_delete_build_os_tmp_dirs)"
 safe_delete_is_under_os_tmp_dir() {
     local abs
     abs="$(safe_delete_normalize_path "$(safe_delete_abs_path "$1")")"
-
-    # 用数组分片而不是 heredoc/here-string 遍历 tmp 目录列表：heredoc 在 bash 内部
-    # 会落一个临时文件再 unlink（/tmp/sh-thd-*），在沙箱 broker 场景下这次 unlink
-    # 会被 Seatbelt 的 file-write-unlink 监控误判为一次“受保护文件修改”拦截，
-    # 抢在批量删除确认信号之前触发提权 UI。纯数组分片不产生任何文件系统操作。
-    local tmp_dir
-    local __sdiotd_old_ifs="$IFS"
-    IFS=$'\n'
-    set -f
-    local -a __sdiotd_tmp_dirs=($SAFE_DELETE_OS_TMP_DIRS)
-    set +f
-    IFS="$__sdiotd_old_ifs"
-
-    for tmp_dir in "${__sdiotd_tmp_dirs[@]}"; do
+    while IFS= read -r tmp_dir; do
         [ -n "$tmp_dir" ] || continue
-        case "$OS" in
-            MINGW*|MSYS*|CYGWIN*)
-                local abs_lower tmp_lower
-                abs_lower="$(printf '%s' "$abs" | tr '[:upper:]' '[:lower:]')"
-                tmp_lower="$(printf '%s' "$tmp_dir" | tr '[:upper:]' '[:lower:]')"
-                case "$abs_lower" in
-                    "$tmp_lower"/*) return 0 ;;
-                esac
-                continue
-                ;;
-        esac
         case "$abs" in
             "$tmp_dir"/*) return 0 ;;
         esac
-    done
+    done <<EOF
+$SAFE_DELETE_OS_TMP_DIRS
+EOF
     return 1
 }
 
-safe_delete_bulk_guard_non_tmp_check() {
-    local targets=()
-    local p
-    for p in "$@"; do
-        safe_delete_is_under_os_tmp_dir "$p" && continue
-        targets+=("$p")
-    done
-    [ ${#targets[@]} -eq 0 ] && return 0
-    safe_delete_bulk_guard_check "${targets[@]}"
-}
-
 # ---- platform-specific trash helpers -----------------------------------------
 
 trash_darwin() {
@@ -402,57 +374,10 @@ trash_one() {
     esac
 }
 
-try_broker_delete() {
-    local abs="$1"
-    local recursive="${2:-false}"
-    local force="${3:-false}"
-    [ -n "${CODEBUDDY_SANDBOX_BROKER_IPC_ADDRESS:-}" ] || return 2
-    [ -n "${CODEBUDDY_SANDBOX_BROKER_SESSION_ID:-}" ] || return 2
-    [ -n "${CODEBUDDY_SANDBOX_HOST_FILE_OPERATION_COMMAND:-}" ] || return 2
-
-    local helper="${CODEBUDDY_SAFE_DELETE_BROKER_DELETE:-}"
-    local node_bin="${CODEBUDDY_NODE_BIN:-}"
-    [ -n "$helper" ] && [ -f "$helper" ] && [ -n "$node_bin" ] || return 2
-
-    local broker_out broker_rc
-    local broker_args=()
-    [ "$recursive" = "true" ] && broker_args+=("--recursive")
-    [ "$force" = "true" ] && broker_args+=("--force")
-    broker_out="$(
-        NODE_OPTIONS= "$node_bin" "$helper" "${broker_args[@]}" -- "$abs" 2>&1 >/dev/null
-    )"
-    broker_rc=$?
-
-    if [ $broker_rc -eq 0 ]; then
-        return 0
-    fi
-    if [ $broker_rc -eq 2 ]; then
-        _safe_delete_diag "broker unavailable, falling back to local trash: path=$abs"
-        return 2
-    fi
-    _safe_delete_diag "broker denied delete: path=$abs stderr=$(_safe_delete_one_line "$broker_out")"
-    return 1
-}
-
 try_trash() {
     local p="$1"
-    local recursive="${2:-false}"
-    local force="${3:-false}"
     local abs
     abs="$(safe_delete_abs_path "$p")"
-
-    try_broker_delete "$abs" "$recursive" "$force"
-    local broker_rc=$?
-    if [ $broker_rc -eq 0 ]; then
-        return 0
-    fi
-    if [ $broker_rc -eq 1 ]; then
-        local target_json
-        target_json="$(safe_delete_json_string "$p")"
-        echo "[safe-delete][SAFE_DELETE_FAIL_CLOSED] {\"target\":$target_json,\"reason\":\"broker-denied\"}" >&2
-        return 1
-    fi
-
     if trash_one "$p"; then
         safe_delete_record_trash "$abs"
         return 0
@@ -543,9 +468,7 @@ safe_delete_rm() {
             _exit=1
         fi
     done
-    if ! safe_delete_bulk_guard_non_tmp_check "${trash_targets[@]}"; then
-        return 1
-    fi
+    local guarded_targets=()
     for p in "${trash_targets[@]}"; do
         if safe_delete_is_under_os_tmp_dir "$p"; then
             local native_args=()
@@ -555,7 +478,16 @@ safe_delete_rm() {
             if ! "$REAL_RM" "${native_args[@]}" -- "$p"; then
                 _exit=1
             fi
-        elif ! try_trash "$p" "$recursive" "$force"; then
+        else
+            guarded_targets+=("$p")
+        fi
+    done
+
+    if ! safe_delete_bulk_guard_check "${guarded_targets[@]}"; then
+        return 1
+    fi
+    for p in "${guarded_targets[@]}"; do
+        if ! try_trash "$p"; then
             _exit=1
         fi
     done
@@ -593,13 +525,13 @@ safe_delete_unlink() {
         return 1
     fi
 
-    if ! safe_delete_bulk_guard_non_tmp_check "$target"; then
-        return 1
-    fi
     if safe_delete_is_under_os_tmp_dir "$target"; then
         "$REAL_UNLINK" -- "$target"
         return $?
     fi
+    if ! safe_delete_bulk_guard_check "$target"; then
+        return 1
+    fi
 
     try_trash "$target"
     return $?
@@ -658,15 +590,22 @@ safe_delete_rmdir() {
         fi
         trash_targets+=("$p")
     done
-    if ! safe_delete_bulk_guard_non_tmp_check "${trash_targets[@]}"; then
-        return 1
-    fi
+    local guarded_targets=()
     for p in "${trash_targets[@]}"; do
         if safe_delete_is_under_os_tmp_dir "$p"; then
             if ! "$REAL_RMDIR" -- "$p"; then
                 _exit=1
             fi
-        elif ! try_trash "$p"; then
+        else
+            guarded_targets+=("$p")
+        fi
+    done
+
+    if ! safe_delete_bulk_guard_check "${guarded_targets[@]}"; then
+        return 1
+    fi
+    for p in "${guarded_targets[@]}"; do
+        if ! try_trash "$p"; then
             _exit=1
         fi
     done