@optima-chat/dev-skills 0.7.4 → 0.7.5

package/bin/helpers/query-db.ts

@@ -102,16 +102,59 @@ function setupSSHTunnel(ec2Host: string, dbHost: string, localPort: number): voi
   console.log(`✓ SSH tunnel established on port ${localPort}`);
 }
 
-function queryDatabase(host: string, port: number, user: string, password: string, database: string, sql: string): string {
-  const psqlPath = '/usr/local/opt/postgresql@16/bin/psql';
+function findPsqlPath(): string {
+  // 1. 优先从 PATH 中查找
+  const whichCmd = process.platform === 'win32' ? 'where psql' : 'which psql';
+  try {
+    const result = execSync(whichCmd, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] });
+    const foundPath = result.trim().split(/\r?\n/)[0]; // Windows where 可能返回 \r\n
+    if (foundPath && fs.existsSync(foundPath)) {
+      return foundPath;
+    }
+  } catch {
+    // which/where 失败，继续尝试常见路径
+  }
 
-  if (!fs.existsSync(psqlPath)) {
-    throw new Error('PostgreSQL client not found. Install with: brew install postgresql@16');
+  // 2. 回退到常见安装路径
+  const fallbackPaths = process.platform === 'win32'
+    ? [
+        'C:\\Program Files\\PostgreSQL\\16\\bin\\psql.exe',
+        'C:\\Program Files\\PostgreSQL\\15\\bin\\psql.exe',
+        'C:\\Program Files\\PostgreSQL\\14\\bin\\psql.exe',
+      ]
+    : [
+        '/usr/local/opt/postgresql@16/bin/psql',  // macOS Homebrew
+        '/usr/local/opt/postgresql@15/bin/psql',
+        '/opt/homebrew/bin/psql',                 // macOS ARM Homebrew
+        '/usr/bin/psql',                          // Linux
+        '/usr/local/bin/psql',
+      ];
+
+  for (const p of fallbackPaths) {
+    if (fs.existsSync(p)) {
+      return p;
+    }
   }
 
+  // 3. 未找到
+  const installHint = process.platform === 'darwin'
+    ? 'brew install postgresql@16'
+    : process.platform === 'win32'
+    ? 'Download from https://www.postgresql.org/download/windows/'
+    : 'sudo apt install postgresql-client';
+
+  throw new Error(`PostgreSQL client (psql) not found. Install with: ${installHint}`);
+}
+
+function queryDatabase(host: string, port: number, user: string, password: string, database: string, sql: string): string {
+  const psqlPath = findPsqlPath();
+
   const result = execSync(
-    `PGPASSWORD="${password}" ${psqlPath} -h ${host} -p ${port} -U ${user} -d ${database} -c "${sql}"`,
-    { encoding: 'utf-8' }
+    `"${psqlPath}" -h ${host} -p ${port} -U ${user} -d ${database} -c "${sql}"`,
+    {
+      encoding: 'utf-8',
+      env: { ...process.env, PGPASSWORD: password }
+    }
   );
   return result;
 }

package/dist/bin/helpers/query-db.js

@@ -104,12 +104,52 @@ function setupSSHTunnel(ec2Host, dbHost, localPort) {
     (0, child_process_1.execSync)(`ssh -i ${sshKeyPath} -f -N -o StrictHostKeyChecking=no -L ${localPort}:${dbHost}:5432 ec2-user@${ec2Host}`, { stdio: 'inherit' });
     console.log(`✓ SSH tunnel established on port ${localPort}`);
 }
-function queryDatabase(host, port, user, password, database, sql) {
-    const psqlPath = '/usr/local/opt/postgresql@16/bin/psql';
-    if (!fs.existsSync(psqlPath)) {
-        throw new Error('PostgreSQL client not found. Install with: brew install postgresql@16');
+function findPsqlPath() {
+    // 1. 优先从 PATH 中查找
+    const whichCmd = process.platform === 'win32' ? 'where psql' : 'which psql';
+    try {
+        const result = (0, child_process_1.execSync)(whichCmd, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] });
+        const foundPath = result.trim().split(/\r?\n/)[0]; // Windows where 可能返回 \r\n
+        if (foundPath && fs.existsSync(foundPath)) {
+            return foundPath;
+        }
+    }
+    catch {
+        // which/where 失败，继续尝试常见路径
     }
-    const result = (0, child_process_1.execSync)(`PGPASSWORD="${password}" ${psqlPath} -h ${host} -p ${port} -U ${user} -d ${database} -c "${sql}"`, { encoding: 'utf-8' });
+    // 2. 回退到常见安装路径
+    const fallbackPaths = process.platform === 'win32'
+        ? [
+            'C:\\Program Files\\PostgreSQL\\16\\bin\\psql.exe',
+            'C:\\Program Files\\PostgreSQL\\15\\bin\\psql.exe',
+            'C:\\Program Files\\PostgreSQL\\14\\bin\\psql.exe',
+        ]
+        : [
+            '/usr/local/opt/postgresql@16/bin/psql', // macOS Homebrew
+            '/usr/local/opt/postgresql@15/bin/psql',
+            '/opt/homebrew/bin/psql', // macOS ARM Homebrew
+            '/usr/bin/psql', // Linux
+            '/usr/local/bin/psql',
+        ];
+    for (const p of fallbackPaths) {
+        if (fs.existsSync(p)) {
+            return p;
+        }
+    }
+    // 3. 未找到
+    const installHint = process.platform === 'darwin'
+        ? 'brew install postgresql@16'
+        : process.platform === 'win32'
+            ? 'Download from https://www.postgresql.org/download/windows/'
+            : 'sudo apt install postgresql-client';
+    throw new Error(`PostgreSQL client (psql) not found. Install with: ${installHint}`);
+}
+function queryDatabase(host, port, user, password, database, sql) {
+    const psqlPath = findPsqlPath();
+    const result = (0, child_process_1.execSync)(`"${psqlPath}" -h ${host} -p ${port} -U ${user} -d ${database} -c "${sql}"`, {
+        encoding: 'utf-8',
+        env: { ...process.env, PGPASSWORD: password }
+    });
     return result;
 }
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/dev-skills",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Claude Code Skills for Optima development team - cross-environment collaboration tools",
   "main": "index.js",
   "bin": {

package/.claude/settings.local.json

@@ -1,40 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "WebSearch",
-      "WebFetch(domain:code.claude.com)",
-      "WebFetch(domain:platform.claude.com)",
-      "WebFetch(domain:github.com)",
-      "Bash(gh repo view:*)",
-      "Bash(gh repo clone:*)",
-      "Bash(gh repo list:*)",
-      "Read(//private/tmp/optima-docs/**)",
-      "Read(//tmp/optima-docs/**)",
-      "Bash(git init:*)",
-      "Bash(gh repo create:*)",
-      "Read(//private/tmp/optima-workspace/**)",
-      "Read(//tmp/optima-workspace/**)",
-      "Read(//tmp/optima-workspace/.claude/commands/**)",
-      "Bash(git add:*)",
-      "Bash(git push:*)",
-      "Bash(find:*)",
-      "Bash(git commit:*)",
-      "Bash(aws logs get-log-events:*)",
-      "Bash(npm install:*)",
-      "Bash(optima-dev-skills:*)",
-      "Bash(optima-generate-test-token:*)",
-      "Bash(optima-query-db:*)",
-      "Bash(gh variable set:*)",
-      "Bash(npm publish:*)",
-      "Bash(python3:*)",
-      "Bash(gh api:*)",
-      "Bash(curl -s http://auth.optima.chat/openapi.json)",
-      "Bash(curl -s https://auth.optima.chat/openapi.json)",
-      "Bash(cat:*)",
-      "Bash(node /Users/verypro/optima-dev-skills/scripts/install.js:*)",
-      "Bash(aws logs tail:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

package/.claude/skills/logs/SKILL.md

@@ -1,188 +0,0 @@
----
-name: "logs"
-description: "当用户请求查看日志、查看服务日志、排查问题、看看日志、检查日志、商品服务日志、后端日志、API日志、正式环境日志、生产环境日志、CI环境日志、开发环境日志、MCP日志时，使用此技能。支持 CI、Stage、Prod 三个环境的 commerce-backend、user-auth、mcp-host、agentic-chat、commerce-mcp、comfy-mcp 服务。"
-allowed-tools: ["Bash", "SlashCommand"]
----
-
-# 查看服务器日志
-
-当你需要查看服务日志排查问题时，使用这个场景。
-
-## 🎯 适用情况
-
-- API 返回错误，需要查看详细错误信息
-- 服务行为异常，需要查看运行日志
-- 监控服务状态，查看日志输出
-- 排查数据库连接、配置问题
-
-## 🚀 快速操作
-
-### 1. 查看 CI 环境日志（默认）
-
-```
-/logs commerce-backend
-/logs user-auth 100
-```
-
-**说明**：
-- 查看 CI 开发环境（dev.optima.chat）
-- 默认环境，不需要指定 `ci` 参数
-- 通过 SSH + Docker Compose 访问
-- 从 GitHub Variables 获取认证信息
-
-### 2. 查看 Stage 环境日志
-
-```
-/logs commerce-backend 50 stage
-```
-
-**说明**：
-- 查看 Stage 预发布环境
-- 使用 AWS CloudWatch Logs
-
-**常用服务**：
-- `commerce-backend` - 电商 API
-- `user-auth` - 用户认证
-- `mcp-host` - MCP 协调器
-- `agentic-chat` - AI 聊天服务
-- `commerce-mcp` - 电商 MCP 服务
-- `comfy-mcp` - ComfyUI MCP 服务
-
-### 3. 查看更多日志行数
-
-```
-/logs commerce-backend 200
-```
-
-查看最近 200 行日志，用于排查历史问题。
-
-### 4. 查看 Prod 环境日志
-
-```
-/logs commerce-backend 100 prod
-```
-
-查看生产环境日志（通过 AWS CloudWatch）。
-
-## 📋 常见问题排查
-
-### 问题 1：API 返回 500 错误
-
-**步骤**：
-1. 查看日志：`/logs commerce-backend 100`
-2. 搜索 ERROR 关键字
-3. 查看完整错误堆栈
-4. 定位问题代码或数据
-
-**示例日志**：
-```
-ERROR - 2025-01-23 10:30:45 - Exception in /products endpoint
-Traceback:
-  File "app/routes/products.py", line 45
-    merchant = db.query(Merchant).filter(id == product.merchant_id).first()
-  MerchantNotFound: Merchant with id 'xxx' not found
-```
-
-### 问题 2：服务启动失败
-
-**步骤**：
-1. 查看启动日志：`/logs commerce-backend 200`
-2. 查找启动错误信息
-3. 检查环境变量、数据库连接
-
-**常见错误**：
-- 数据库连接失败
-- Redis 连接失败
-- 环境变量缺失
-
-**示例日志**：
-```
-redis.exceptions.ConnectionError: Error connecting to localhost:8285.
-Multiple exceptions: [Errno 111] Connection refused
-ERROR:    Application startup failed. Exiting.
-```
-
-### 问题 3：性能问题（响应慢）
-
-**步骤**：
-1. 查看日志：`/logs commerce-backend`
-2. 查找 "response_time" 或包含毫秒数的日志
-3. 识别慢查询或慢接口
-
-**示例**：
-```
-INFO - GET /products - response_time: 3500ms (SLOW)
-INFO - Database query took 3200ms: SELECT * FROM products WHERE...
-```
-
-## 🔍 日志分析技巧
-
-### 过滤关键信息
-
-查看日志后，可以使用 grep 过滤：
-
-```bash
-# 只看错误
-/logs commerce-backend 200 | grep -i error
-
-# 只看特定 API
-/logs commerce-backend 200 | grep "GET /products"
-
-# 查看 Redis 相关日志
-/logs commerce-backend 200 | grep -i redis
-```
-
-### 日志级别
-
-日志级别说明：
-- **ERROR** - 错误，需要立即处理
-- **WARNING** - 警告，可能有问题
-- **INFO** - 信息，正常运行日志
-- **DEBUG** - 调试信息，详细输出
-
-## 🌐 环境对比
-
-### CI 环境
-
-```
-/logs user-auth 100 ci
-```
-
-**特点**：
-- CI 开发环境，适合开发调试
-- 实时性最好
-- 查看 Docker Compose 日志
-
-### Stage 环境
-
-```
-/logs commerce-backend 100 stage
-```
-
-**特点**：
-- 预发布环境
-- AWS ECS 运行
-- 通过 CloudWatch Logs 查看
-
-### Prod 环境
-
-```
-/logs commerce-backend 100 prod
-```
-
-**特点**：
-- 生产环境
-- EC2 + Docker Compose
-- 通过 CloudWatch Logs 查看
-
-## 💡 最佳实践
-
-1. **先查日志，再动手修** - 不要猜测，看日志确认问题
-2. **查足够多的行数** - 有时错误原因在更早的日志里
-3. **关注启动日志** - 服务启动时的错误最关键
-4. **保留错误日志** - 复制错误信息，方便分享讨论
-5. **对比环境差异** - Stage 出错、Prod 正常？对比日志差异
-
-## 🔗 相关命令
-
-- `/logs` - 查看服务日志（详细使用方法和技术细节请查看 `/logs --help`）