@comate/zulu 1.2.1-beta.2 → 1.3.0

package/comate-engine/assets/skills/icode-comate/scripts/common.sh

@@ -0,0 +1,145 @@
+#!/bin/bash
+# common.sh - icode 公共函数库
+# 被其他脚本 source 引用
+
+# ========== 颜色定义 ==========
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# ========== 日志函数 ==========
+log_info() {
+    echo -e "${GREEN}[INFO]${NC} $1"
+}
+
+log_warn() {
+    echo -e "${YELLOW}[WARN]${NC} $1"
+}
+
+log_error() {
+    echo -e "${RED}[ERROR]${NC} $1"
+}
+
+log_step() {
+    echo -e "${BLUE}[STEP]${NC} $1"
+}
+
+log_phase() {
+    echo -e "${CYAN}[PHASE]${NC} $1"
+}
+
+log_success() {
+    echo -e "${GREEN}[SUCCESS]${NC} $1"
+}
+
+# ========== icode-cli 检测 ==========
+get_icode_cli() {
+    if command -v icode-cli &> /dev/null; then
+        echo "icode-cli"
+    elif [ -x "$HOME/.icode/bin/icode-cli" ]; then
+        echo "$HOME/.icode/bin/icode-cli"
+    else
+        log_error "icode-cli 未找到，请先安装"
+        log_error "安装命令: curl -fsSL http://icode-cli.bj.bcebos.com/install.sh | bash -s -- --no-skills"
+        exit 1
+    fi
+}
+
+# ========== Git 仓库检测 ==========
+check_git_repo() {
+    if ! git rev-parse --is-inside-work-tree &> /dev/null; then
+        log_error "当前目录不是 git 仓库"
+        exit 1
+    fi
+}
+
+# ========== 登录状态检测 ==========
+# 返回用户名，失败则退出
+check_login() {
+    local cli=$1
+    log_step "检查登录状态..."
+
+    local login_output
+    login_output=$("$cli" login 2>&1)
+
+    if echo "$login_output" | grep -q "Not logged in"; then
+        log_error "未登录，请先完成认证"
+        echo "$login_output"
+        exit 1
+    fi
+
+    local username
+    # 匹配 "Already logged in as: username (method)" 或 "Logged in as: username (method)" 格式
+    username=$(echo "$login_output" | grep -oE 'logged in as: [^ ]+' | sed 's/logged in as: //')
+
+    if [ -z "$username" ]; then
+        log_error "无法获取用户名"
+        exit 1
+    fi
+
+    log_info "当前用户: $username"
+    echo "$username"
+}
+
+# ========== 获取仓库名 ==========
+get_repo_name() {
+    local remote_url
+    remote_url=$(git remote get-url origin 2>/dev/null)
+
+    if [ -z "$remote_url" ]; then
+        log_error "无法获取 origin 远程地址"
+        exit 1
+    fi
+
+    local repo_name=""
+    if [[ "$remote_url" == ssh://* ]]; then
+        repo_name=$(echo "$remote_url" | sed -E 's|ssh://[^/]+/||')
+    elif [[ "$remote_url" == git@* ]]; then
+        repo_name=$(echo "$remote_url" | sed -E 's|git@[^:]+:||')
+    elif [[ "$remote_url" == http* ]]; then
+        repo_name=$(echo "$remote_url" | sed -E 's|https?://[^/]+/||')
+    else
+        log_error "无法解析远程 URL: $remote_url"
+        exit 1
+    fi
+
+    echo "${repo_name%.git}"
+}
+
+# ========== 获取当前 CR ==========
+# 参数: $1=cli路径 $2=仓库名 $3=用户名
+get_current_cr() {
+    local cli=$1
+    local repo_name=$2
+    local username=$3
+    local local_commit
+    local_commit=$(git rev-parse HEAD)
+
+    local cr_list
+    cr_list=$("$cli" api get_repo_reviews --repo "$repo_name" --status NEW -o json 2>/dev/null || echo '{"data":{"changes":[]}}')
+
+    echo "$cr_list" | "$cli" jq -r ".data.changes[] | select(.owner.username == \"$username\" and .current_revision == \"$local_commit\") | ._number" 2>/dev/null | head -1 || true
+}
+
+# ========== 初始化环境 ==========
+# 执行常见的初始化检查，返回 ICODE_CLI, USERNAME, REPO_NAME
+init_toolkit_env() {
+    check_git_repo
+
+    ICODE_CLI=$(get_icode_cli)
+    export ICODE_CLI
+
+    # 获取用户名（check_login 会输出日志，我们只要最后一行的用户名）
+    local login_result
+    login_result=$(check_login "$ICODE_CLI")
+    USERNAME=$(echo "$login_result" | tail -1)
+    export USERNAME
+
+    log_step "获取仓库信息..."
+    REPO_NAME=$(get_repo_name)
+    export REPO_NAME
+    log_info "仓库: $REPO_NAME"
+}

package/comate-engine/assets/skills/icode-comate/scripts/fix-machine-check.sh

@@ -0,0 +1,131 @@
+#!/bin/bash
+# fix-machine-check.sh - 修复机器检查问题脚本 (Linux/macOS)
+# 自动检测 CR 的机器检查结果，输出问题详情，供 Agent 分析修复
+#
+# 使用方法:
+#   ./fix-machine-check.sh [CR编号] [最大重试次数]
+#
+# 示例:
+#   ./fix-machine-check.sh                    # 自动检测 CR，默认重试 5 次
+#   ./fix-machine-check.sh 120247220          # 指定 CR
+#   ./fix-machine-check.sh 120247220 10       # 指定 CR 和最大重试次数
+
+set -e
+
+# 加载公共函数
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/common.sh"
+
+# 获取机器检查结果
+get_machine_check() {
+    local change_number=$1
+    "$ICODE_CLI" api get_machine_check --change-number "$change_number" -o json 2>/dev/null
+}
+
+# 检查是否有失败项
+check_has_failures() {
+    local result=$1
+    local failed_count
+    failed_count=$(echo "$result" | "$ICODE_CLI" jq '[.data.style.operations[]? | select(.status != "SUCCESS" or .score < 0)] | length' 2>/dev/null || echo "0")
+
+    [[ "$failed_count" -gt 0 ]]
+}
+
+# 输出失败项详情
+print_failures() {
+    local result=$1
+
+    echo ""
+    log_warn "========== 机器检查失败项 =========="
+    echo ""
+
+    echo "$result" | "$ICODE_CLI" jq -r '
+        .data.style.operations[]? |
+        select(.status != "SUCCESS" or .score < 0) |
+        "【检查项】\(.name)\n【状态】\(.status)\n【评分】\(.score)\n【说明】\(.comment)\n"
+    ' 2>/dev/null
+
+    local line_comments
+    line_comments=$(echo "$result" | "$ICODE_CLI" jq -r '
+        .data.style.operations[]? |
+        select(.status != "SUCCESS" or .score < 0) |
+        select(.lineComments != null and .lineComments != {}) |
+        .lineComments | to_entries[] |
+        "【文件】\(.key)\n" + (.value[]? | "  行 \(.line): \(.message // .comment // "无详细信息")")
+    ' 2>/dev/null || true)
+
+    if [[ -n "$line_comments" ]]; then
+        echo ""
+        log_warn "========== 行内评论 =========="
+        echo "$line_comments"
+    fi
+
+    echo ""
+    log_warn "=================================="
+    echo ""
+}
+
+# ========== 主流程 ==========
+
+# 初始化环境
+init_toolkit_env
+
+CHANGE_NUMBER=${1:-""}
+MAX_RETRIES=${2:-5}
+
+# 如果没有指定 CR 编号，自动检测
+if [ -z "$CHANGE_NUMBER" ]; then
+    log_step "检测当前 CR..."
+    CHANGE_NUMBER=$(get_current_cr "$ICODE_CLI" "$REPO_NAME" "$USERNAME")
+
+    if [ -z "$CHANGE_NUMBER" ]; then
+        log_error "未找到当前 commit 对应的 CR"
+        log_warn "请先执行 submit-cr.sh 提交 CR，或手动指定 CR 编号"
+        exit 1
+    fi
+fi
+
+log_info "CR 编号: $CHANGE_NUMBER"
+log_info "最大重试次数: $MAX_RETRIES"
+echo ""
+
+# 修复循环
+RETRY_COUNT=0
+
+while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+    RETRY_COUNT=$((RETRY_COUNT + 1))
+
+    log_step "第 $RETRY_COUNT 次检查 (共 $MAX_RETRIES 次)..."
+
+    RESULT=$(get_machine_check "$CHANGE_NUMBER")
+
+    if [ -z "$RESULT" ]; then
+        log_error "无法获取机器检查结果"
+        exit 1
+    fi
+
+    if ! check_has_failures "$RESULT"; then
+        echo ""
+        log_info "=========================================="
+        log_info "✓ 机器检查全部通过！"
+        log_info "=========================================="
+        exit 0
+    fi
+
+    print_failures "$RESULT"
+
+    if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
+        log_warn "请 Agent 分析上述问题并修复代码"
+        log_warn "修复完成后："
+        log_warn "  1. 使用 Edit 工具修复代码"
+        log_warn "  2. 执行 submit-cr.sh 提交"
+        log_warn "  3. 再次运行: $0 $CHANGE_NUMBER $MAX_RETRIES"
+        exit 2
+    fi
+done
+
+echo ""
+log_error "=========================================="
+log_error "✗ 修复失败，已达到最大重试次数 ($MAX_RETRIES)"
+log_error "=========================================="
+exit 1

package/comate-engine/assets/skills/icode-comate/scripts/merge-cr.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+# merge-cr.sh - 合入代码评审脚本 (Linux/macOS)
+# 尝试打分 +2 并合入，通过打分结果判断是否有合入权限
+#
+# 使用方法:
+#   ./merge-cr.sh [CR编号]
+#
+# 示例:
+#   ./merge-cr.sh                    # 自动检测 CR
+#   ./merge-cr.sh 120247220          # 指定 CR
+
+set -e
+
+# 加载公共函数
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/common.sh"
+
+# 打分 +2
+set_score() {
+    local repo_name=$1
+    local change_number=$2
+
+    local result
+    result=$("$ICODE_CLI" api set_review_score --repo "$repo_name" --change-number "$change_number" --score 2 -o json 2>/dev/null || echo '{"status":"FAIL"}')
+
+    local status
+    status=$(echo "$result" | "$ICODE_CLI" jq -r '.status' 2>/dev/null || echo "FAIL")
+
+    [ "$status" = "OK" ]
+}
+
+# 合入 CR
+submit_cr() {
+    local repo_name=$1
+    local change_number=$2
+
+    local result
+    result=$("$ICODE_CLI" api submit_review --repo "$repo_name" --change-number "$change_number" -o json 2>/dev/null)
+
+    local status
+    status=$(echo "$result" | "$ICODE_CLI" jq -r '.status' 2>/dev/null || echo "FAIL")
+
+    local message
+    message=$(echo "$result" | "$ICODE_CLI" jq -r '.message' 2>/dev/null || echo "未知错误")
+
+    if [ "$status" = "OK" ]; then
+        return 0
+    else
+        echo "$message"
+        return 1
+    fi
+}
+
+# ========== 主流程 ==========
+
+# 初始化环境
+init_toolkit_env
+
+CHANGE_NUMBER=${1:-""}
+
+# 如果没有指定 CR 编号，自动检测
+if [ -z "$CHANGE_NUMBER" ]; then
+    log_step "检测当前 CR..."
+    CHANGE_NUMBER=$(get_current_cr "$ICODE_CLI" "$REPO_NAME" "$USERNAME")
+
+    if [ -z "$CHANGE_NUMBER" ]; then
+        log_error "未找到当前 commit 对应的 CR"
+        log_warn "请先执行 submit-cr.sh 提交 CR，或手动指定 CR 编号"
+        exit 1
+    fi
+fi
+
+log_info "CR 编号: $CHANGE_NUMBER"
+echo ""
+
+# 尝试打分 +2（同时检测权限）
+log_step "尝试打分 +2..."
+if set_score "$REPO_NAME" "$CHANGE_NUMBER"; then
+    log_info "打分成功，有合入权限"
+    echo ""
+
+    log_step "尝试合入 CR..."
+    MERGE_ERROR=""
+    if MERGE_ERROR=$(submit_cr "$REPO_NAME" "$CHANGE_NUMBER"); then
+        echo ""
+        log_success "=========================================="
+        log_success "✓ CR #$CHANGE_NUMBER 合入成功！"
+        log_success "=========================================="
+        exit 0
+    else
+        echo ""
+        log_error "=========================================="
+        log_error "✗ CR 合入失败"
+        log_error "=========================================="
+        log_warn "失败原因: $MERGE_ERROR"
+        exit 1
+    fi
+else
+    echo ""
+    log_error "=========================================="
+    log_error "✗ 打分失败，无合入权限"
+    log_error "=========================================="
+    log_warn "请联系仓库管理员添加权限，或找有权限的评审人帮忙合入"
+    exit 1
+fi

package/comate-engine/assets/skills/icode-comate/scripts/ssh-setup.sh

@@ -0,0 +1,159 @@
+#!/bin/bash
+# ssh-setup.sh - SSH 密钥检测与配置
+# 自动检测本地 SSH 密钥，如不存在则生成，并引导用户完成 iCode 绑定
+
+set -e
+
+# 获取脚本所在目录
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# 引入公共函数
+source "$SCRIPT_DIR/common.sh"
+
+# ========== SSH 密钥路径 ==========
+SSH_DIR="$HOME/.ssh"
+ED25519_KEY="$SSH_DIR/id_ed25519"
+ED25519_PUB="$SSH_DIR/id_ed25519.pub"
+RSA_KEY="$SSH_DIR/id_rsa"
+RSA_PUB="$SSH_DIR/id_rsa.pub"
+
+# iCode 密钥管理页面
+ICODE_KEYS_URL="https://console.cloud.baidu-int.com/devops/icode/account/keys"
+
+# ========== 检测 SSH 密钥 ==========
+detect_ssh_key() {
+    log_step "检测本地 SSH 密钥..."
+
+    if [ -f "$ED25519_KEY" ] && [ -f "$ED25519_PUB" ]; then
+        log_info "检测到已有 SSH 密钥: $ED25519_KEY"
+        echo "$ED25519_PUB"
+        return 0
+    fi
+
+    if [ -f "$RSA_KEY" ] && [ -f "$RSA_PUB" ]; then
+        log_info "检测到已有 SSH 密钥: $RSA_KEY"
+        echo "$RSA_PUB"
+        return 0
+    fi
+
+    log_warn "未检测到 SSH 密钥"
+    echo ""
+    return 0
+}
+
+# ========== 生成 SSH 密钥 ==========
+generate_ssh_key() {
+    log_step "生成新的 SSH 密钥 (ed25519)..."
+
+    # 确保 .ssh 目录存在
+    if [ ! -d "$SSH_DIR" ]; then
+        mkdir -p "$SSH_DIR"
+        chmod 700 "$SSH_DIR"
+        log_info "创建目录: $SSH_DIR"
+    fi
+
+    # 生成密钥（无密码）
+    ssh-keygen -t ed25519 -f "$ED25519_KEY" -N "" -C "icode-$(whoami)@$(hostname)"
+
+    if [ -f "$ED25519_PUB" ]; then
+        log_success "SSH 密钥生成成功: $ED25519_KEY"
+        echo "$ED25519_PUB"
+    else
+        log_error "SSH 密钥生成失败"
+        exit 1
+    fi
+}
+
+# ========== 复制公钥到剪贴板 ==========
+copy_to_clipboard() {
+    local pub_key_file=$1
+    local pub_key_content
+    pub_key_content=$(cat "$pub_key_file")
+
+    log_step "复制公钥到剪贴板..."
+
+    # macOS
+    if command -v pbcopy &> /dev/null; then
+        echo "$pub_key_content" | pbcopy
+        log_success "公钥已复制到剪贴板 (pbcopy)"
+        return 0
+    fi
+
+    # Linux - xclip
+    if command -v xclip &> /dev/null; then
+        echo "$pub_key_content" | xclip -selection clipboard
+        log_success "公钥已复制到剪贴板 (xclip)"
+        return 0
+    fi
+
+    # Linux - xsel
+    if command -v xsel &> /dev/null; then
+        echo "$pub_key_content" | xsel --clipboard
+        log_success "公钥已复制到剪贴板 (xsel)"
+        return 0
+    fi
+
+    # 无剪贴板工具 - 打印公钥
+    log_warn "未找到剪贴板工具，请手动复制以下公钥内容："
+    echo ""
+    echo "========== 公钥内容开始 =========="
+    echo "$pub_key_content"
+    echo "========== 公钥内容结束 =========="
+    echo ""
+    return 1
+}
+
+# ========== 显示引导信息 ==========
+show_guidance() {
+    local copied=$1
+
+    echo ""
+    log_phase "===== SSH 密钥配置完成 ====="
+    echo ""
+
+    if [ "$copied" = "true" ]; then
+        echo "✅ 公钥已复制到剪贴板"
+    else
+        echo "⚠️  请手动复制上方的公钥内容"
+    fi
+
+    echo ""
+    echo "📋 下一步操作："
+    echo "   1. 打开 iCode 密钥管理页面："
+    echo "      ${CYAN}${ICODE_KEYS_URL}${NC}"
+    echo ""
+    echo "   2. 点击「添加 SSH 密钥」"
+    echo ""
+    echo "   3. 粘贴公钥内容并保存"
+    echo ""
+    echo "💡 完成后可使用以下命令测试连接："
+    echo "   ssh -T git@icode.baidu.com"
+    echo ""
+}
+
+# ========== 主流程 ==========
+main() {
+    log_phase "===== SSH 密钥配置 ====="
+    echo ""
+
+    # 1. 检测已有密钥
+    local pub_key_file
+    pub_key_file=$(detect_ssh_key)
+
+    # 2. 如果没有密钥，生成新的
+    if [ -z "$pub_key_file" ]; then
+        pub_key_file=$(generate_ssh_key)
+    fi
+
+    # 3. 复制公钥到剪贴板
+    local copied="false"
+    if copy_to_clipboard "$pub_key_file"; then
+        copied="true"
+    fi
+
+    # 4. 显示引导信息
+    show_guidance "$copied"
+}
+
+# 执行主流程
+main "$@"