@pwddd/skills-scanner 3.0.22 → 4.0.0

package/src/commands.ts

@@ -2,57 +2,43 @@
  * Command handlers module
  */
 
-import { existsSync, execSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { join, basename } from "node:path";
-import { promisify } from "node:util";
-import { exec } from "node:child_process";
 import { runScan } from "./scanner.js";
-import { buildDailyReport } from "./report.js";
 import { loadState, saveState, expandPath } from "./state.js";
-import { isPythonReady } from "./deps.js";
 import { generateConfigGuide } from "./config.js";
-import { ensureCronJob, getOpenClawCommand } from "./cron.js";
-import type { ScannerConfig } from "./types.js";
-
-const execAsync = promisify(exec);
+import type { ScannerConfig, CommandResponse, PluginLogger } from "./types.js";
 
 export function createCommandHandlers(
   cfg: ScannerConfig,
   apiUrl: string,
-  scanDirs: string[],
   behavioral: boolean,
   useLLM: boolean,
   policy: string,
-  preInstallScan: string,
   onUnsafe: string,
-  pythonCmd: string | null,
-  scanScript: string,
-  logger: any
+  logger: PluginLogger,
+  apiConfig?: any
 ) {
-  async function handleScanCommand(args: string): Promise<any> {
+  async function handleScanCommand(args: string): Promise<CommandResponse> {
     if (!args) {
       return {
-        text: "用法：`/skills-scanner scan <路径> [--detailed] [--behavioral] [--recursive] [--report]`\n或：`/skills-scanner scan clawhub <URL> [--detailed] [--behavioral]`",
+        text: "用法：`/skills-scanner scan <路径> [--detailed] [--behavioral] [--recursive]`\n或：`/skills-scanner scan clawhub <URL> [--detailed] [--behavioral]`",
       };
     }
 
-    if (!isPythonReady(pythonCmd)) {
-      return { text: "⚠️ Python 依赖尚未就绪，请稍后重试或查看日志" };
-    }
-
     const parts = args.split(/\s+/);
 
     // Check if this is a ClawHub scan
     if (parts[0] === "clawhub") {
       const clawhubUrl = parts.find((p) => p.startsWith("https://clawhub.ai/"));
       if (!clawhubUrl) {
-        return { text: "⚠️ 请提供有效的 ClawHub URL (例如: https://clawhub.ai/username/project)" };
+        return { text: "⚠️ 请提供有效的 ClawHub URL (例如：https://clawhub.ai/username/project)" };
       }
 
       const detailed = parts.includes("--detailed");
       const useBehav = parts.includes("--behavioral") || behavioral;
 
-      const res = await runScan(pythonCmd, scanScript, "clawhub", clawhubUrl, {
+      const res = await runScan("clawhub", clawhubUrl, {
         detailed,
         behavioral: useBehav,
         apiUrl,
@@ -67,25 +53,6 @@ export function createCommandHandlers(
     const detailed = parts.includes("--detailed");
     const useBehav = parts.includes("--behavioral") || behavioral;
     const recursive = parts.includes("--recursive");
-    const isReport = parts.includes("--report");
-
-    // Report mode: use configured scanDirs
-    if (isReport) {
-      if (scanDirs.length === 0) {
-        return { text: "⚠️ 未找到可扫描目录，请检查配置" };
-      }
-      const report = await buildDailyReport(
-        scanDirs,
-        useBehav,
-        apiUrl,
-        useLLM,
-        policy,
-        logger,
-        pythonCmd,
-        scanScript
-      );
-      return { text: report };
-    }
 
     // Regular scan mode: require path
     if (!targetPath) {
@@ -93,23 +60,41 @@ export function createCommandHandlers(
     }
 
     if (!existsSync(targetPath)) {
-      return { text: `⚠️ 路径不存在: ${targetPath}` };
+      return { text: `⚠️ 路径不存在：${targetPath}` };
     }
 
     const isSingleSkill = existsSync(join(targetPath, "SKILL.md"));
 
     if (isSingleSkill) {
-      const res = await runScan(pythonCmd, scanScript, "scan", targetPath, {
+      logger.info(`[命令] 开始扫描单个 Skill: ${targetPath}`);
+      logger.debug(`[命令] 扫描参数`, {
+        mode: "scan",
+        targetPath,
         detailed,
         behavioral: useBehav,
         apiUrl,
         useLLM,
         policy,
       });
+
+      const res = await runScan("scan", targetPath, {
+        detailed,
+        behavioral: useBehav,
+        apiUrl,
+        useLLM,
+        policy,
+        timeoutMs: 180000, // 3 minutes
+      });
+
+      logger.info(`[命令] 扫描完成`, {
+        exitCode: res.exitCode,
+        hasData: !!res.data,
+      });
+
       const icon = res.exitCode === 0 ? "✅" : "❌";
       return { text: `${icon} 扫描完成\n\`\`\`\n${res.output}\n\`\`\`` };
     } else {
-      const res = await runScan(pythonCmd, scanScript, "batch", targetPath, {
+      const res = await runScan("batch", targetPath, {
         recursive,
         detailed,
         behavioral: useBehav,
@@ -122,55 +107,38 @@ export function createCommandHandlers(
     }
   }
 
-  async function handleHealthCommand(): Promise<any> {
-    const state = loadState() as any;
-    const alerts: string[] = state.pendingAlerts ?? [];
+  async function handleHealthCommand(): Promise<CommandResponse> {
+    const state = loadState();
+    const alerts: string[] = (state as any).pendingAlerts ?? [];
 
     const lines = [
       "✅ *Skills Scanner 状态*",
-      `API 地址: ${apiUrl}`,
-      `Python 依赖: ${isPythonReady(pythonCmd) ? "✅ 就绪" : "❌ 未就绪"}`,
-      `安装前扫描: ${preInstallScan === "on" ? `✅ 监听中 (${onUnsafe})` : "⏭️ 已禁用"}`,
-      `扫描策略: ${policy}`,
-      `LLM 分析: ${useLLM ? "✅ 启用" : "❌ 禁用"}`,
-      `行为分析: ${behavioral ? "✅ 启用" : "❌ 禁用"}`,
-      `上次扫描: ${state.lastScanAt ? new Date(state.lastScanAt).toLocaleString("zh-CN") : "从未"}`,
-      `扫描目录:\n${scanDirs.map((d) => `  📁 ${d}`).join("\n")}`,
+      `API 地址：${apiUrl}`,
+      `扫描策略：${policy}`,
+      `LLM 分析：${useLLM ? "✅ 启用" : "❌ 禁用"}`,
+      `行为分析：${behavioral ? "✅ 启用" : "❌ 禁用"}`,
+      `上次扫描：${state.lastScanAt ? new Date(state.lastScanAt).toLocaleString("zh-CN") : "从未"}`,
     ];
 
-    if (isPythonReady(pythonCmd)) {
-      lines.push("", "✅ *API 服务检查*");
-      try {
-        const cmd = `"${pythonCmd}" "${scanScript}" --api-url "${apiUrl}" health`;
-        const env = { ...process.env };
-        delete env.http_proxy;
-        delete env.https_proxy;
-        delete env.HTTP_PROXY;
-        delete env.HTTPS_PROXY;
-        delete env.all_proxy;
-        delete env.ALL_PROXY;
-
-        const { stdout, stderr } = await execAsync(cmd, { timeout: 5000, env });
-        const output = (stdout + stderr).trim();
-
-        if (output.includes("✅") || output.includes("✓") || output.includes("OK")) {
-          lines.push(`API 服务: ✅ 正常`);
-          const jsonMatch = output.match(/\{[\s\S]*\}/);
-          if (jsonMatch) {
-            try {
-              const healthData = JSON.parse(jsonMatch[0]);
-              if (healthData.analyzers_available) {
-                lines.push(`可用分析器: ${healthData.analyzers_available.join(", ")}`);
-              }
-            } catch {}
+    // API health check
+    lines.push("", "✅ *API 服务检查*");
+    try {
+      const res = await runScan("health", "", { apiUrl });
+      if (res.exitCode === 0) {
+        lines.push(`API 服务：✅ 正常`);
+        if (res.data) {
+          const healthData = res.data as any;
+          if (healthData.analyzers_available) {
+            lines.push(`可用分析器：${healthData.analyzers_available.join(", ")}`);
           }
-        } else {
-          lines.push(`API 服务: ⚠️ 不可用`);
         }
-      } catch (err: any) {
-        lines.push(`API 服务: ⚠️ 连接失败`);
-        lines.push(`错误: ${err.message}`);
+      } else {
+        lines.push(`API 服务：⚠️ 不可用`);
+        lines.push(`错误：${res.output}`);
       }
+    } catch (err: any) {
+      lines.push(`API 服务：⚠️ 连接失败`);
+      lines.push(`错误：${err.message}`);
     }
 
     if (alerts.length > 0) {
@@ -179,29 +147,21 @@ export function createCommandHandlers(
       saveState({ ...state, pendingAlerts: [] });
     }
 
-    lines.push("", "✅ *定时任务*");
-    if (state.cronJobId && state.cronJobId !== "manual-created") {
-      lines.push(`状态: ✅ 已注册 (${state.cronJobId})`);
-    } else {
-      lines.push("状态: ❌ 未注册");
-      lines.push("ℹ️ 使用 `/skills-scanner cron register` 注册");
-    }
+    // 定时任务功能已移除
 
     return { text: lines.join("\n") };
   }
 
-  async function handleConfigCommand(args: string): Promise<any> {
+  async function handleConfigCommand(args: string): Promise<CommandResponse> {
     const action = args.trim().toLowerCase() || "show";
 
     if (action === "show" || action === "") {
       const configGuide = generateConfigGuide(
         cfg,
         apiUrl,
-        scanDirs,
         behavioral,
         useLLM,
         policy,
-        preInstallScan,
         onUnsafe
       );
       return { text: "```\n" + configGuide + "\n```" };
@@ -212,59 +172,7 @@ export function createCommandHandlers(
         text: "✅ 配置审查标记已重置\n下次重启 Gateway 时将再次显示配置向导",
       };
     } else {
-      return { text: "用法: `/skills-scanner config [show|reset]`" };
-    }
-  }
-
-  async function handleCronCommand(args: string): Promise<any> {
-    const action = args.trim().toLowerCase() || "status";
-    const state = loadState() as any;
-
-    if (action === "setup" || action === "register") {
-      const oldJobId = state.cronJobId;
-      if (oldJobId && oldJobId !== "manual-created") {
-        const openclawCmd = getOpenClawCommand();
-        try {
-          execSync(`${openclawCmd} cron remove ${oldJobId}`, { encoding: "utf-8", timeout: 5000 });
-        } catch {}
-      }
-
-      saveState({ ...state, cronJobId: undefined });
-      await ensureCronJob(logger);
-
-      const newState = loadState() as any;
-      if (newState.cronJobId) {
-        return { text: `✅ 定时任务注册成功\n任务 ID: ${newState.cronJobId}` };
-      } else {
-        return { text: "⚠️ 定时任务注册失败，请查看日志" };
-      }
-    } else if (action === "unregister") {
-      if (!state.cronJobId) {
-        return { text: "ℹ️ 未找到已注册的定时任务" };
-      }
-
-      const openclawCmd = getOpenClawCommand();
-      try {
-        execSync(`${openclawCmd} cron remove ${state.cronJobId}`, {
-          encoding: "utf-8",
-          timeout: 5000,
-        });
-        saveState({ ...state, cronJobId: undefined });
-        return { text: `✅ 定时任务已删除: ${state.cronJobId}` };
-      } catch (err: any) {
-        return { text: `⚠️ 删除失败: ${err.message}` };
-      }
-    } else {
-      const lines = ["✅ *定时任务状态*"];
-      if (state.cronJobId && state.cronJobId !== "manual-created") {
-        lines.push(`任务 ID: ${state.cronJobId}`);
-        lines.push(`执行时间: 每天 08:00 (Asia/Shanghai)`);
-        lines.push("状态: ✅ 已注册");
-      } else {
-        lines.push("状态: ❌ 未注册");
-        lines.push("", "ℹ️ 使用 `/skills-scanner cron setup` 注册");
-      }
-      return { text: lines.join("\n") };
+      return { text: "用法：`/skills-scanner config [show|reset]`" };
     }
   }
 
@@ -280,13 +188,11 @@ export function createCommandHandlers(
       "• `--detailed` - 显示详细发现",
       "• `--behavioral` - 启用行为分析",
       "• `--recursive` - 递归扫描子目录",
-      "• `--report` - 生成日报格式",
       "",
       "示例:",
       "```",
       "/skills-scanner scan ~/.openclaw/skills/my-skill",
       "/skills-scanner scan ~/.openclaw/skills --recursive",
-      "/skills-scanner scan ~/.openclaw/skills --report",
       "/skills-scanner scan clawhub https://clawhub.ai/username/project",
       "/skills-scanner scan clawhub https://clawhub.ai/username/project --detailed",
       "```",
@@ -294,7 +200,6 @@ export function createCommandHandlers(
       "═══ 其他命令 ═══",
       "• `/skills-scanner health` - 健康检查",
       "• `/skills-scanner config [show|reset]` - 配置管理",
-      "• `/skills-scanner cron [register|unregister|status]` - 定时任务管理",
     ].join("\n");
   }
 
@@ -302,7 +207,6 @@ export function createCommandHandlers(
     handleScanCommand,
     handleHealthCommand,
     handleConfigCommand,
-    handleCronCommand,
     getHelpText,
   };
 }

package/src/config-validator.ts

@@ -0,0 +1,94 @@
+/**
+ * Configuration validation module
+ */
+
+import { existsSync } from "node:fs";
+import type { ScannerConfig } from "./types.js";
+import type { PluginLogger } from "openclaw/plugin-sdk/plugin-entry";
+
+export interface ValidationResult {
+  valid: boolean;
+  errors: string[];
+  warnings: string[];
+}
+
+/**
+ * Validate plugin configuration
+ */
+export function validateConfig(
+  cfg: ScannerConfig,
+  logger: PluginLogger
+): ValidationResult {
+  const errors: string[] = [];
+  const warnings: string[] = [];
+
+  // Validate API URL
+  if (cfg.apiUrl) {
+    try {
+      new URL(cfg.apiUrl);
+    } catch {
+      errors.push(`Invalid apiUrl: "${cfg.apiUrl}" is not a valid URL`);
+    }
+  }
+
+  // Validate policy
+  if (cfg.policy && !["strict", "balanced", "permissive"].includes(cfg.policy)) {
+    errors.push(
+      `Invalid policy: "${cfg.policy}". Must be one of: strict, balanced, permissive`
+    );
+  }
+
+  // Validate onUnsafe
+  if (cfg.onUnsafe && !["warn", "delete", "quarantine"].includes(cfg.onUnsafe)) {
+    errors.push(
+      `Invalid onUnsafe: "${cfg.onUnsafe}". Must be one of: warn, delete, quarantine`
+    );
+  }
+
+  // Validate reportDir if specified
+  if (cfg.reportDir && !existsSync(cfg.reportDir)) {
+    warnings.push(`Report directory does not exist: ${cfg.reportDir}`);
+  }
+
+  // Validate quarantineDir if specified
+  if (cfg.quarantineDir && !existsSync(cfg.quarantineDir)) {
+    warnings.push(`Quarantine directory does not exist: ${cfg.quarantineDir}`);
+  }
+
+  // Validate scanTimeoutMs
+  if (cfg.scanTimeoutMs !== undefined) {
+    if (typeof cfg.scanTimeoutMs !== "number" || cfg.scanTimeoutMs <= 0) {
+      errors.push(
+        `Invalid scanTimeoutMs: must be a positive number (milliseconds)`
+      );
+    } else if (cfg.scanTimeoutMs < 10000) {
+      warnings.push(
+        `scanTimeoutMs is very low (${cfg.scanTimeoutMs}ms). Scans may timeout prematurely.`
+      );
+    } else if (cfg.scanTimeoutMs > 600000) {
+      warnings.push(
+        `scanTimeoutMs is very high (${cfg.scanTimeoutMs}ms). Consider reducing for better responsiveness.`
+      );
+    }
+  }
+
+  // Log validation results
+  if (errors.length > 0) {
+    logger.error("[skills-scanner] Configuration validation failed", {
+      errors,
+    });
+  }
+
+  if (warnings.length > 0) {
+    logger.warn("[skills-scanner] Configuration warnings", {
+      warnings,
+    });
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors,
+    warnings,
+  };
+}
+