@sokeai/cli 1.0.39 → 1.0.53

package/scripts/release.sh

@@ -48,10 +48,10 @@ check_tools() {
 check_git_status() {
     echo -e "${YELLOW}检查 Git 状态...${NC}"
 
-    # 检查当前分支是否为 master
+    # 检查当前分支是否为 soke-cli
     CURRENT_BRANCH=$(git branch --show-current)
-    if [ "$CURRENT_BRANCH" != "master" ]; then
-        echo -e "${RED}错误: 当前分支为 $CURRENT_BRANCH，发布必须在 master 分支上进行${NC}"
+    if [ "$CURRENT_BRANCH" != "soke-cli" ]; then
+        echo -e "${RED}错误: 当前分支为 $CURRENT_BRANCH，发布必须在 soke-cli 分支上进行${NC}"
         exit 1
     fi
 
@@ -62,6 +62,19 @@ check_git_status() {
         exit 1
     fi
 
+    # 配置 GitHub 远程仓库
+    GITHUB_REMOTE="git@github.com:sokeai/soke-cli.git"
+    if git remote get-url github &> /dev/null; then
+        CURRENT_URL=$(git remote get-url github)
+        if [ "$CURRENT_URL" != "$GITHUB_REMOTE" ]; then
+            echo -e "${YELLOW}更新 github 远程仓库地址...${NC}"
+            git remote set-url github "$GITHUB_REMOTE"
+        fi
+    else
+        echo -e "${YELLOW}添加 github 远程仓库...${NC}"
+        git remote add github "$GITHUB_REMOTE"
+    fi
+
     echo -e "${GREEN}✓ 工作目录干净${NC}"
     echo ""
 }
@@ -161,13 +174,34 @@ npm install -g @sokeai/cli
 publish_npm() {
     echo -e "${YELLOW}发布到 NPM...${NC}"
 
-    # 检查是否已登录
+    # 如果有环境变量，优先配置（会持久化到 ~/.npmrc）
+    if [ -n "$NPM_TOKEN" ]; then
+        npm config set //registry.npmjs.org/:_authToken="${NPM_TOKEN}"
+        echo -e "${GREEN}✓ 已通过 NPM_TOKEN 配置认证${NC}"
+    fi
+
+    # 验证认证是否有效（支持 npm login 和 token 两种方式）
     if ! npm whoami &> /dev/null; then
-        echo -e "${RED}错误: 未登录 NPM${NC}"
-        echo "请先运行: npm login"
+        echo -e "${RED}错误: NPM 认证失败${NC}"
+        echo ""
+        echo "可能原因："
+        echo "  1. 未配置认证令牌"
+        echo "  2. 令牌已过期或被撤销"
+        echo ""
+        echo "解决方法（任选其一）："
+        echo "  方法1: 持久化配置令牌（推荐，一次配置永久生效）"
+        echo "    npm config set //registry.npmjs.org/:_authToken=npm_xxx"
+        echo ""
+        echo "  方法2: 交互式登录（需要浏览器）"
+        echo "    npm login"
+        echo ""
+        echo "令牌创建地址: https://www.npmjs.com/settings/<YOUR_USER>/tokens"
+        echo "注意: 需要创建 Granular Access Token，并勾选「Bypass 2FA」"
         exit 1
     fi
 
+    echo -e "${GREEN}✓ NPM 认证已就绪 ($(npm whoami 2>/dev/null))${NC}"
+
     # 发布
     npm publish --access public
 
@@ -190,7 +224,7 @@ main() {
 
     check_tools
     check_git_status
-    check_tag
+    # check_tag
     run_tests
     build_binaries
     create_tag
@@ -221,9 +255,12 @@ echo "  4. 创建 Git 标签并推送"
 echo "  5. 上传到 GitHub Releases"
 echo "  6. 发布到 NPM"
 echo ""
-read -p "确认继续? (y/N) " -n 1 -r
+read -p "确认继续? [Y/n] " -n 1 -r
 echo ""
 
+# 默认是 Y
+REPLY=${REPLY:-Y}
+
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then
     echo "已取消发布"
     exit 0

package/scripts/test-auto-detect.js

@@ -5,14 +5,66 @@
  */
 
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
-const {
-  detectSkillNames,
-  parseSkillMetadata,
-  pruneManagedSkillDirs,
-  pruneRegistrySkills
-} = require('./install.js');
+
+// 复制 detectSkillNames 函数
+function detectSkillNames(packagedSkillsDir) {
+  if (!fs.existsSync(packagedSkillsDir)) return [];
+
+  try {
+    const entries = fs.readdirSync(packagedSkillsDir, { withFileTypes: true });
+    return entries
+      .filter(entry => entry.isDirectory() && entry.name.startsWith('soke-'))
+      .map(entry => entry.name)
+      .sort();
+  } catch (_) {
+    return [];
+  }
+}
+
+// 复制 parseSkillMetadata 函数
+function parseSkillMetadata(skillDir) {
+  const skillMdPath = path.join(skillDir, 'SKILL.md');
+  if (!fs.existsSync(skillMdPath)) {
+    return null;
+  }
+
+  try {
+    const content = fs.readFileSync(skillMdPath, 'utf8');
+
+    const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+    if (!frontmatterMatch) return null;
+
+    const frontmatter = frontmatterMatch[1];
+    const metadata = {};
+
+    const nameMatch = frontmatter.match(/^name:\s*(.+)$/m);
+    if (nameMatch) metadata.name = nameMatch[1].trim();
+
+    const summaryMatch = frontmatter.match(/^summary:\s*(.+)$/m);
+    if (summaryMatch) metadata.summary = summaryMatch[1].trim();
+
+    const descMatch = frontmatter.match(/^description:\s*["'](.+)["']$/m);
+    if (descMatch) {
+      metadata.description = descMatch[1].trim();
+    } else {
+      const descMatch2 = frontmatter.match(/^description:\s*(.+)$/m);
+      if (descMatch2) metadata.description = descMatch2[1].trim();
+    }
+
+    const versionMatch = frontmatter.match(/^version:\s*(.+)$/m);
+    if (versionMatch) metadata.version = versionMatch[1].trim();
+
+    const binsMatch = frontmatter.match(/bins:\s*\[(.+?)\]/);
+    if (binsMatch) {
+      metadata.bins = binsMatch[1].split(',').map(b => b.trim().replace(/['"]/g, ''));
+    }
+
+    return metadata;
+  } catch (_) {
+    return null;
+  }
+}
 
 // 测试
 const packageRoot = path.join(__dirname, '..');
@@ -50,13 +102,19 @@ for (const skillName of skillNames) {
 // 验证结果
 console.log('📊 验证结果:\n');
 
-const requiredSkills = ['soke-shared'];
-const missingRequiredSkills = requiredSkills.filter(s => !skillNames.includes(s));
-if (missingRequiredSkills.length > 0) {
-  console.log(`❌ 缺少基础 skills: ${missingRequiredSkills.join(', ')}`);
-  process.exit(1);
+const expectedSkills = ['soke-course', 'soke-exam', 'soke-shared'];
+const missingSkills = expectedSkills.filter(s => !skillNames.includes(s));
+const extraSkills = skillNames.filter(s => !expectedSkills.includes(s));
+
+if (missingSkills.length > 0) {
+  console.log(`❌ 缺少的 skills: ${missingSkills.join(', ')}`);
+} else {
+  console.log('✅ 所有预期的 skills 都已检测到');
+}
+
+if (extraSkills.length > 0) {
+  console.log(`ℹ️  额外的 skills: ${extraSkills.join(', ')}`);
 }
-console.log('✅ 基础 skills 检测通过');
 
 console.log('');
 console.log('🎉 测试完成！');
@@ -65,38 +123,3 @@ console.log('💡 提示:');
 console.log('   - 新增 skill 时，只需在 skills/ 目录下创建 soke-* 目录');
 console.log('   - 确保每个 skill 都有 SKILL.md 文件，包含完整的 frontmatter');
 console.log('   - install.js 会自动检测并注册所有 skills');
-
-// 验证清理逻辑
-const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'soke-skill-prune-'));
-const targetDir = path.join(tempRoot, 'skills');
-fs.mkdirSync(targetDir, { recursive: true });
-fs.mkdirSync(path.join(targetDir, 'soke-stale'));
-fs.mkdirSync(path.join(targetDir, 'soke-course'));
-fs.mkdirSync(path.join(targetDir, 'custom-skill'));
-
-const removedDirs = pruneManagedSkillDirs(targetDir, ['soke-course']);
-if (!removedDirs.includes('soke-stale')) {
-  console.error('❌ pruneManagedSkillDirs 未删除过期 managed skill');
-  process.exit(1);
-}
-if (!fs.existsSync(path.join(targetDir, 'custom-skill'))) {
-  console.error('❌ pruneManagedSkillDirs 错误删除了非受管 skill');
-  process.exit(1);
-}
-
-const registry = {
-  skills: [
-    { name: 'soke-stale' },
-    { name: 'soke-course' },
-    { name: 'custom-skill' }
-  ]
-};
-const removedEntries = pruneRegistrySkills(registry, ['soke-course']);
-if (removedEntries !== 1) {
-  console.error('❌ pruneRegistrySkills 未正确移除过期条目');
-  process.exit(1);
-}
-if (!registry.skills.find((entry) => entry.name === 'custom-skill')) {
-  console.error('❌ pruneRegistrySkills 错误移除了非受管条目');
-  process.exit(1);
-}

package/skills/README.md

@@ -13,7 +13,6 @@ npm install -g @sokeai/cli
 
 2. 已完成配置和认证：
 ```bash
-soke-cli config init
 soke-cli auth login
 ```
 

package/skills/oss-upload/skill.md

@@ -0,0 +1,50 @@
+---
+name: oss-upload
+description: 上传本地文件到阿里云OSS存储
+skill_version: 1.0.0
+---
+
+# OSS文件上传工具
+
+这个skill用于将本地文件上传到阿里云OSS对象存储。
+
+## 功能特性
+
+- 通过授客AI接口动态获取上传签名
+- 支持表单POST方式上传文件（无需安装阿里云SDK）
+- 自动处理认证和签名
+- 支持自定义文件路径
+- 支持进度显示
+
+## 使用方法
+
+```bash
+# 上传单个文件
+soke-cli oss upload <本地文件路径> [--object-name <OSS对象名>]
+
+# 示例
+soke-cli oss upload ./document.pdf
+soke-cli oss upload ./document.pdf --object-name uploads/2024/document.pdf
+```
+
+## 参数说明
+
+- `file`: 本地文件路径（必填）
+- `--object-name`: OSS中的对象名称（可选，默认使用文件名）
+
+## 配置要求
+
+需要先登录授客AI：
+
+```bash
+
+# 用户登录
+soke-cli auth login
+```
+
+## 实现原理
+
+1. 从配置文件读取用户访问令牌（UserToken）
+2. 调用授客AI接口获取OSS上传签名和配置
+3. 使用获取的签名通过表单方式上传文件到OSS
+4. 无需在本地配置OSS密钥，更安全便捷

package/skills/oss-upload/upload.py

@@ -0,0 +1,355 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+阿里云OSS文件上传工具
+通过授客AI接口获取签名后上传文件
+仅使用Python标准库，无需安装第三方依赖
+"""
+
+import os
+import sys
+import json
+import urllib.request
+import urllib.parse
+import urllib.error
+import mimetypes
+import uuid
+import time
+
+
+MAX_FILE_SIZE = 2 * 1024 * 1024 * 1024  # 2GB
+
+def load_config():
+    """加载配置文件获取access_token"""
+    config_path = os.path.expanduser("~/.soke-cli/config.json")
+    if not os.path.exists(config_path):
+        print("错误: 配置文件不存在，请先运行 'soke-cli config init'")
+        sys.exit(1)
+
+    with open(config_path, 'r', encoding='utf-8') as f:
+        config = json.load(f)
+
+    if 'UserToken' not in config or not config['UserToken']:
+        print("错误: 未找到用户令牌，请先运行 'soke-cli auth login' 登录")
+        sys.exit(1)
+
+    return config
+
+
+def get_upload_signature(access_token, api_base_url, max_retries=3):
+    """从接口获取上传签名和配置"""
+    params = urllib.parse.urlencode({
+        'lang': 'zh',
+        'utcoffset': '-28800'
+    })
+    signature_url = f"{api_base_url}/skills/uploadFile/signature?{params}"
+
+    headers = {
+        'Authorization': f'{access_token}',
+        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+    }
+
+    for attempt in range(max_retries):
+        try:
+            if attempt > 0:
+                print(f"正在重试... ({attempt + 1}/{max_retries})")
+                time.sleep(2 ** attempt)  # 指数退避: 2s, 4s, 8s
+            else:
+                print("正在获取上传签名...")
+
+            req = urllib.request.Request(signature_url, method='POST', headers=headers)
+
+            with urllib.request.urlopen(req, timeout=30) as response:
+                response_data = response.read().decode('utf-8')
+                result = json.loads(response_data)
+
+            # 检查响应格式
+            # 支持多种格式:
+            # 1. {"code": 0, "message": "success", "data": {...}}
+            # 2. {"code": "get_success", "status": "ok", "message": "获取成功", "data": {...}}
+            # 3. {"success": true, "err_code": 0, "err_message": "success", "data": {...}}
+            code = result.get('code')
+            status = result.get('status', '')
+            success = result.get('success')
+            err_code = result.get('err_code')
+
+            # 判断是否成功
+            is_success = (
+                (isinstance(code, int) and code == 0) or  # 数字格式
+                (isinstance(code, str) and code in ['get_success', 'success']) or  # 字符串格式
+                (status == 'ok') or  # 通过status判断
+                (success is True and err_code == 0)  # success格式
+            )
+
+            if not is_success:
+                print(f"✗ 获取签名失败: {result.get('message', result.get('err_message', '未知错误'))}")
+                return None
+
+            # 提取签名数据
+            data = result.get('data', {})
+            if not data:
+                print("✗ 响应数据为空")
+                return None
+
+            print("✓ 签名获取成功")
+            return data
+
+        except urllib.error.HTTPError as e:
+            error_msg = f"HTTP {e.code} {e.reason}"
+            try:
+                error_body = e.read().decode('utf-8')
+            except:
+                error_body = ""
+
+            # 503/502/504 等服务端错误可以重试
+            if e.code in [502, 503, 504] and attempt < max_retries - 1:
+                print(f"✗ {error_msg} - 服务暂时不可用，将自动重试...")
+                continue
+            else:
+                print(f"✗ HTTP错误: {error_msg}")
+                if error_body:
+                    print(f"响应内容: {error_body}")
+                if e.code == 503:
+                    print("\n提示: 503错误通常表示服务端暂时不可用，请稍后重试")
+                    print("可能的原因:")
+                    print("  1. 服务正在维护或重启")
+                    print("  2. 服务负载过高")
+                    print("  3. 网络连接问题")
+                return None
+
+        except urllib.error.URLError as e:
+            if attempt < max_retries - 1:
+                print(f"✗ 网络错误: {str(e.reason)} - 将自动重试...")
+                continue
+            else:
+                print(f"✗ 请求失败: {str(e.reason)}")
+                return None
+
+        except json.JSONDecodeError as e:
+            print(f"✗ 响应解析失败: {str(e)}")
+            return None
+
+        except Exception as e:
+            print(f"✗ 发生错误: {str(e)}")
+            return None
+
+    print(f"✗ 已重试 {max_retries} 次，仍然失败")
+    return None
+
+
+def create_multipart_form_data(fields, file_path):
+    """创建multipart/form-data格式的请求体"""
+    boundary = f'----WebKitFormBoundary{uuid.uuid4().hex[:16]}'
+
+    body = []
+
+    # 添加表单字段
+    for key, value in fields.items():
+        body.append(f'--{boundary}'.encode())
+        body.append(f'Content-Disposition: form-data; name="{key}"'.encode())
+        body.append(b'')
+        body.append(str(value).encode())
+
+    # 添加文件
+    filename = os.path.basename(file_path)
+    mimetype = mimetypes.guess_type(file_path)[0] or 'application/octet-stream'
+
+    body.append(f'--{boundary}'.encode())
+    body.append(f'Content-Disposition: form-data; name="file"; filename="{filename}"'.encode())
+    body.append(f'Content-Type: {mimetype}'.encode())
+    body.append(b'')
+
+    with open(file_path, 'rb') as f:
+        body.append(f.read())
+
+    body.append(f'--{boundary}--'.encode())
+    body.append(b'')
+
+    content_type = f'multipart/form-data; boundary={boundary}'
+    body_bytes = b'\r\n'.join(body)
+
+    return content_type, body_bytes
+
+
+def upload_file(file_path, object_name, signature_data, corp_id):
+    """上传文件到OSS"""
+    if not os.path.exists(file_path):
+        print(f"错误: 文件不存在: {file_path}")
+        sys.exit(1)
+
+    # 从签名数据中提取上传配置
+    upload_url = signature_data.get('host')
+    access_key_id = signature_data.get('accessid') or signature_data.get('OSSAccessKeyId')
+    policy = signature_data.get('policy')
+    signature = signature_data.get('signature')
+    callback = signature_data.get('callback', '')
+    dir_prefix = signature_data.get('dir', '')
+
+    if not all([upload_url, access_key_id, policy, signature]):
+        print("✗ 签名数据不完整")
+        print(f"签名数据: {json.dumps(signature_data, indent=2, ensure_ascii=False)}")
+        return False
+
+    # 获取文件信息
+    file_size = os.path.getsize(file_path)
+    file_name = os.path.basename(file_path)
+    file_ext = os.path.splitext(file_name)[1].lstrip('.')  # 移除点号，如 pdf
+
+    # 构建完整的对象路径：CorpID/dir_prefix/object_name
+    if corp_id:
+        # 如果有CorpID，添加为顶层目录
+        if dir_prefix:
+            # 移除dir_prefix开头的斜杠（如果有）
+            dir_prefix = dir_prefix.lstrip('/')
+            full_path = f"{corp_id}/{dir_prefix}{object_name}"
+        else:
+            full_path = f"{corp_id}/{object_name}"
+    else:
+        # 如果没有CorpID，使用原逻辑
+        if dir_prefix and not object_name.startswith(dir_prefix):
+            full_path = dir_prefix + object_name
+        else:
+            full_path = object_name
+
+    # 准备表单数据
+    form_fields = {
+        'key': full_path,
+        'policy': policy,
+        'OSSAccessKeyId': access_key_id,
+        'signature': signature,
+        'success_action_status': '200',
+    }
+
+    # 如果有callback，添加到表单
+    if callback:
+        form_fields['callback'] = callback
+
+    # 显示上传信息
+    print(f"\n正在上传文件: {file_path}")
+    print(f"文件名称: {file_name}")
+    print(f"文件大小: {file_size} 字节")
+    print(f"文件后缀: {file_ext if file_ext else '(无后缀)'}")
+    if corp_id:
+        print(f"企业ID: {corp_id}")
+    print(f"目标路径: {full_path}")
+    print(f"上传地址: {upload_url}")
+
+    try:
+        # 创建multipart/form-data请求体
+        content_type, body = create_multipart_form_data(form_fields, file_path)
+
+        headers = {
+            'Content-Type': content_type,
+            'Content-Length': str(len(body))
+        }
+
+        req = urllib.request.Request(upload_url, data=body, headers=headers, method='POST')
+
+        with urllib.request.urlopen(req, timeout=300) as response:
+            response_code = response.getcode()
+            response_body = response.read().decode('utf-8')
+
+        if response_code == 200:
+            file_url = f"{upload_url.rstrip('/')}/{full_path}"
+
+            print(f"\n✓ 上传成功!")
+            print(f"=" * 60)
+            print(f"文件信息:")
+            print(f"  - 文件名: {file_name}")
+            print(f"  - 大小: {file_size} 字节")
+            print(f"  - 后缀: {file_ext if file_ext else '(无后缀)'}")
+            print(f"  - OSS路径: {full_path}")
+            print(f"  - 访问URL: {file_url}")
+            print(f"=" * 60)
+
+            # 如果有callback响应，打印出来
+            if response_body:
+                try:
+                    callback_result = json.loads(response_body)
+                    if callback_result:
+                        print(f"\n回调响应: {json.dumps(callback_result, indent=2, ensure_ascii=False)}")
+                except:
+                    pass
+
+            return True
+        else:
+            print(f"\n✗ 上传失败!")
+            print(f"状态码: {response_code}")
+            print(f"响应内容: {response_body}")
+            return False
+
+    except urllib.error.HTTPError as e:
+        print(f"\n✗ 上传失败: HTTP {e.code} {e.reason}")
+        try:
+            error_body = e.read().decode('utf-8')
+            print(f"响应内容: {error_body}")
+        except:
+            pass
+        return False
+    except urllib.error.URLError as e:
+        print(f"\n✗ 上传失败: {str(e.reason)}")
+        return False
+    except Exception as e:
+        print(f"\n✗ 发生错误: {str(e)}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+def main():
+    """主函数"""
+    if len(sys.argv) < 2:
+        print("用法: python upload.py <本地文件路径> [OSS对象名]")
+        print("示例: python upload.py ./document.pdf uploads/2024/document.pdf")
+        sys.exit(1)
+
+    file_path = sys.argv[1]
+
+    # 检查文件是否存在
+    if not os.path.exists(file_path):
+        print(f"错误: 文件不存在: {file_path}")
+        sys.exit(1)
+
+    # 检查是否是文件（不是目录）
+    if not os.path.isfile(file_path):
+        print(f"错误: 路径不是文件: {file_path}")
+        sys.exit(1)
+
+    # 检查文件大小（不能超过2GB）
+    file_size = os.path.getsize(file_path)
+    if file_size > MAX_FILE_SIZE:
+        print(f"错误: 文件大小超过限制")
+        print(f"  当前大小: {file_size / (1024 * 1024 * 1024):.2f} GB ({file_size} 字节)")
+        print(f"  最大限制: 2 GB ({MAX_FILE_SIZE} 字节)")
+        sys.exit(1)
+
+    # 如果未指定对象名，使用文件名
+    if len(sys.argv) >= 3:
+        object_name = sys.argv[2]
+    else:
+        object_name = os.path.basename(file_path)
+
+    # 加载配置
+    config = load_config()
+    access_token = config.get('UserToken')
+    api_base_url = config.get('APIBaseURL', 'https://app2651.eapps.dingtalkcloud.com/NewSoke')
+    corp_id = config.get('CorpID', '')
+
+    if not corp_id:
+        print("警告: 未找到CorpID配置，文件将上传到根目录")
+        print("建议在配置文件中添加 CorpID 字段")
+
+    # 获取上传签名
+    signature_data = get_upload_signature(access_token, api_base_url)
+    if not signature_data:
+        print("✗ 无法获取上传签名")
+        sys.exit(1)
+
+    # 上传文件
+    success = upload_file(file_path, object_name, signature_data, corp_id)
+
+    sys.exit(0 if success else 1)
+
+
+if __name__ == '__main__':
+    main()