feat: 实现 Skills 支持

- 添加 hello-world 示例 Skill（SKILL.md + reference + scripts）
- Dockerfile: 复制 skills 到 /opt/claude-skills
- agent_session.py: 运行时复制到 /tmp/.claude-code/skills/，配置 setting_sources=['user']
- 更新 README.md 移除 Skills TODO
- 添加 tests/test_skills_location.py 验证 SDK Skills 加载位置

Author: BukeLy

README.md

@@ -19,7 +19,7 @@ Telegram User → Bot API → API Gateway → sdk-client Lambda
 - **Session 持久化**：DynamoDB 存储映射，S3 存储对话历史，支持跨请求恢复
 - **多租户隔离**：基于 Telegram chat_id + thread_id 实现客户端隔离
 - **SubAgent 支持**：可配置多个专业 Agent（如 AWS 支持）
-- **Skills 支持**：可复用的技能模块（计划中）
+- **Skills 支持**：可复用的技能模块
 - **MCP 集成**：支持 HTTP 和本地命令类型的 MCP 服务器
 - **自动清理**：25天 TTL + S3 生命周期管理
 
@@ -33,7 +33,8 @@ Telegram User → Bot API → API Gateway → sdk-client Lambda
 │   └── claude-config/         # 配置文件
 │       ├── agents.json        # SubAgent定义
 │       ├── mcp.json           # MCP服务器配置
-│       ├── skills/            # Skills定义（计划中）
+│       ├── skills/            # Skills定义
+│       │   └── hello-world/   # 示例 Skill
 │       └── system_prompt.md   # 系统提示
 │
 ├── agent-sdk-client/          # Telegram客户端 (ZIP部署)
@@ -121,7 +122,6 @@ sam deploy --guided
 
 ## TODO
 
-- [ ] 实现 Skills 支持（参考 `docs/anthropic-agent-sdk-official/skills-in-sdk.md`）
 - [ ] 多租户 TenantID 隔离
 
 ## License

agent-sdk-server/Dockerfile

@@ -18,6 +18,10 @@ RUN chmod 644 *.py
 COPY claude-config/ /opt/claude-config/
 RUN chmod -R 755 /opt/claude-config/
 
+# Copy skills to /opt/claude-skills (will be copied to /tmp/.claude-code/skills at runtime)
+COPY claude-config/skills/ /opt/claude-skills/
+RUN chmod -R 755 /opt/claude-skills/
+
 # Create ~/.claude and ~/.aws directories and ensure writable
 RUN mkdir -p /root/.claude/projects /root/.claude/debug /root/.claude/todos /root/.aws && \
     touch /root/.claude.json && \

agent-sdk-server/agent_session.py

@@ -20,6 +20,8 @@
 # Config source (in Docker image) and destination (Lambda writable)
 CONFIG_SRC = Path('/opt/claude-config')
 CONFIG_DST = Path('/tmp/.claude-code')
+SKILLS_SRC = Path('/opt/claude-skills')
+SKILLS_DST = CONFIG_DST / 'skills'
 
 
 def setup_lambda_environment():
@@ -58,6 +60,17 @@ def setup_lambda_environment():
                 shutil.copy2(item, dst)
         print(f"Config copied from {CONFIG_SRC} to {CONFIG_DST}")
 
+    # Copy skills to CLAUDE_CONFIG_DIR/skills/ for SDK to discover
+    if SKILLS_SRC.exists():
+        SKILLS_DST.mkdir(parents=True, exist_ok=True)
+        for item in SKILLS_SRC.iterdir():
+            dst = SKILLS_DST / item.name
+            if item.is_dir():
+                shutil.copytree(item, dst, dirs_exist_ok=True)
+            else:
+                shutil.copy2(item, dst)
+        print(f"Skills copied from {SKILLS_SRC} to {SKILLS_DST}")
+
     print(f"Bedrock profile created at {credentials_file}")
 
 
@@ -154,11 +167,12 @@ async def process_message(
         permission_mode='bypassPermissions',  # Lambda has no interactive terminal
         max_turns=max_turns,
         system_prompt=system_prompt,
+        setting_sources=['user'],  # Load skills from CLAUDE_CONFIG_DIR/skills/
         allowed_tools=[
             #'Bash', 'Read', 'Write', 'Edit',
             #'Glob', 'Grep', 'WebFetch',
-            'Task',
-            'Skill'  # Required for SubAgent invocation
+            'Task',   # For SubAgents
+            'Skill',  # For Skills
         ],
         mcp_servers=mcp_servers if mcp_servers else None,
         agents=agents if agents else None,

agent-sdk-server/claude-config/skills/hello-world/SKILL.md

@@ -0,0 +1,23 @@
+---
+description: Hello World 示例 Skill，演示如何读取 reference 文件并执行脚本
+---
+
+# Hello World Skill
+
+这是一个示例 Skill，用于演示 Skills 的基本结构。
+
+## 使用方法
+
+1. 读取 `reference/message.json` 获取消息内容
+2. 运行 `scripts/print_message.py` 输出所有字符
+
+## 文件结构
+
+```
+hello-world/
+├── SKILL.md
+├── reference/
+│   └── message.json
+└── scripts/
+    └── print_message.py
+```

agent-sdk-server/claude-config/skills/hello-world/reference/message.json

@@ -0,0 +1,3 @@
+{
+  "message": "Hello World"
+}

agent-sdk-server/claude-config/skills/hello-world/scripts/print_message.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+"""输出 reference/message.json 中的所有字符"""
+
+import json
+from pathlib import Path
+
+ref_path = Path(__file__).parent.parent / "reference" / "message.json"
+content = ref_path.read_text(encoding="utf-8")
+
+for char in content:
+    print(char, end="")

tests/test_skills_location.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+"""测试 Claude Agent SDK Skills 加载位置"""
+
+import asyncio
+import os
+import tempfile
+from pathlib import Path
+
+# 创建测试目录结构
+def setup_test_dirs():
+    """创建不同位置的 skill 测试目录"""
+    # 1. Project skills: {cwd}/.claude/skills/
+    # 2. User skills: ~/.claude/skills/
+    # 3. CLAUDE_CONFIG_DIR 相关位置
+
+    test_base = Path(tempfile.mkdtemp(prefix="skill_test_"))
+
+    # 模拟不同的目录结构
+    locations = {
+        "project_cwd": test_base / "workspace",  # cwd
+        "config_dir": test_base / "claude-code",  # CLAUDE_CONFIG_DIR
+    }
+
+    # 创建 skill 在不同位置
+    skill_content = """---
+description: Test skill for location verification
+---
+
+# Test Skill
+
+This is a test skill to verify loading location.
+"""
+
+    # Project skills: {cwd}/.claude/skills/test-skill/SKILL.md
+    project_skill_dir = locations["project_cwd"] / ".claude" / "skills" / "test-skill"
+    project_skill_dir.mkdir(parents=True, exist_ok=True)
+    (project_skill_dir / "SKILL.md").write_text(skill_content)
+
+    # Config dir skills: {CLAUDE_CONFIG_DIR}/skills/test-skill/SKILL.md
+    config_skill_dir = locations["config_dir"] / "skills" / "test-skill"
+    config_skill_dir.mkdir(parents=True, exist_ok=True)
+    (config_skill_dir / "SKILL.md").write_text(skill_content)
+
+    # Config dir .claude/skills: {CLAUDE_CONFIG_DIR}/.claude/skills/test-skill/SKILL.md
+    config_claude_skill_dir = locations["config_dir"] / ".claude" / "skills" / "test-skill"
+    config_claude_skill_dir.mkdir(parents=True, exist_ok=True)
+    (config_claude_skill_dir / "SKILL.md").write_text(skill_content)
+
+    print(f"Test base: {test_base}")
+    print(f"Project cwd: {locations['project_cwd']}")
+    print(f"Config dir: {locations['config_dir']}")
+    print(f"\nCreated skills at:")
+    print(f"  1. {project_skill_dir}/SKILL.md")
+    print(f"  2. {config_skill_dir}/SKILL.md")
+    print(f"  3. {config_claude_skill_dir}/SKILL.md")
+
+    return locations
+
+
+async def test_skill_loading(cwd: str, config_dir: str = None):
+    """测试不同配置下 skill 是否被加载"""
+    from claude_agent_sdk import query, ClaudeAgentOptions
+
+    print(f"\n{'='*60}")
+    print(f"Testing with:")
+    print(f"  cwd: {cwd}")
+    print(f"  CLAUDE_CONFIG_DIR: {config_dir or 'not set'}")
+
+    # 设置环境变量
+    if config_dir:
+        os.environ['CLAUDE_CONFIG_DIR'] = config_dir
+    elif 'CLAUDE_CONFIG_DIR' in os.environ:
+        del os.environ['CLAUDE_CONFIG_DIR']
+
+    options = ClaudeAgentOptions(
+        cwd=cwd,
+        setting_sources=["user", "project"],
+        allowed_tools=["Skill"],
+        model="haiku",
+        max_turns=1,
+    )
+
+    try:
+        print(f"\nQuerying: 'What skills are available?'")
+        async for message in query(
+            prompt="What skills are available? Just list them briefly.",
+            options=options
+        ):
+            print(f"  Response type: {type(message).__name__}")
+            if hasattr(message, 'content'):
+                for block in message.content:
+                    if hasattr(block, 'text'):
+                        print(f"  Text: {block.text[:200]}...")
+    except Exception as e:
+        print(f"  Error: {e}")
+
+
+async def main():
+    locations = setup_test_dirs()
+
+    # 测试 1: cwd 指向 workspace，不设置 CLAUDE_CONFIG_DIR
+    await test_skill_loading(
+        cwd=str(locations["project_cwd"]),
+        config_dir=None
+    )
+
+    # 测试 2: cwd 指向 workspace，CLAUDE_CONFIG_DIR 指向 config_dir
+    await test_skill_loading(
+        cwd=str(locations["project_cwd"]),
+        config_dir=str(locations["config_dir"])
+    )
+
+    # 测试 3: cwd 指向 config_dir
+    await test_skill_loading(
+        cwd=str(locations["config_dir"]),
+        config_dir=str(locations["config_dir"])
+    )
+
+
+if __name__ == "__main__":
+    asyncio.run(main())