assistme 0.3.4 → 0.3.6

package/src/agent/skills.ts

@@ -1,6 +1,13 @@
 import { execSync } from "child_process";
 import { log } from "../utils/logger.js";
 import { callMcpHandler } from "../db/api-client.js";
+import { SKILL_DESCRIPTION_BUDGET_CHARS } from "../utils/constants.js";
+import {
+  SkillRowSchema,
+  SkillCreateResultSchema,
+  BrowseSkillRowSchema,
+  safeParse,
+} from "../utils/schemas.js";
 
 // ── Text Processing Helpers ─────────────────────────────────────────
 
@@ -209,7 +216,7 @@ export class SkillManager {
   /** Cache for findRelevant() — keyed by prompt, invalidated on skill changes */
   private relevanceCache: Map<string, { results: Skill[]; maxResults: number }> = new Map();
 
-  private readonly DESCRIPTION_BUDGET_CHARS = 16_000;
+  private readonly DESCRIPTION_BUDGET_CHARS = SKILL_DESCRIPTION_BUDGET_CHARS;
 
   setUserId(userId: string): void {
     this.userId = userId;
@@ -219,10 +226,12 @@ export class SkillManager {
     if (!this.userId) return;
 
     try {
-      const data = await callMcpHandler<Record<string, unknown>[]>("skill.load");
+      const data = await callMcpHandler<unknown[]>("skill.load");
 
       this.skills.clear();
-      for (const row of data || []) {
+      for (const raw of data || []) {
+        const row = safeParse(SkillRowSchema, raw);
+        if (!row) continue;
         const skill = this.rowToSkill(row);
         this.skills.set(skill.name, skill);
       }
@@ -239,22 +248,22 @@ export class SkillManager {
 
   private rowToSkill(row: Record<string, unknown>): Skill {
     return {
-      name: row.name as string,
-      description: (row.description as string) || "",
-      version: (row.version as string) || "1.0.0",
+      name: String(row.name),
+      description: String(row.description ?? ""),
+      version: String(row.version ?? "1.0.0"),
       userInvocable: row.user_invocable !== false,
       disableModelInvocation: row.disable_model_invocation === true,
-      keywords: (row.keywords as string[]) || [],
-      allowedTools: (row.allowed_tools as string[]) || [],
-      argumentHint: (row.argument_hint as string) || "",
+      keywords: Array.isArray(row.keywords) ? row.keywords : [],
+      allowedTools: Array.isArray(row.allowed_tools) ? row.allowed_tools : [],
+      argumentHint: String(row.argument_hint ?? ""),
       metadata: parseDbMetadata(row.metadata),
-      homepage: (row.homepage as string) || "",
-      content: row.content as string,
+      homepage: String(row.homepage ?? ""),
+      content: String(row.content ?? ""),
       filePath: "",
       source: (row.source as Skill["source"]) || "manual",
-      dbId: row.id as string,
-      sourceSkillId: (row.source_skill_id as string) || undefined,
-      invocationCount: (row.invocation_count as number) || 0,
+      dbId: row.id != null ? String(row.id) : undefined,
+      sourceSkillId: row.source_skill_id != null ? String(row.source_skill_id) : undefined,
+      invocationCount: typeof row.invocation_count === "number" ? row.invocation_count : 0,
     };
   }
 
@@ -419,14 +428,15 @@ export class SkillManager {
         }
       );
 
-      const row = (Array.isArray(data) ? data[0] : data) as Record<string, unknown> | null;
+      const raw = Array.isArray(data) ? data[0] : data;
+      const row = safeParse(SkillCreateResultSchema, raw);
       if (!row) {
-        log.debug(`Skill create returned no data for "${name}"`);
+        log.debug(`Skill create returned invalid data for "${name}"`);
         return null;
       }
 
-      const id = (row.out_id || row.id) as string;
-      const skillName = (row.out_name || row.name) as string;
+      const id = row.out_id || row.id!;
+      const skillName = row.out_name || row.name || name;
 
       // Add to in-memory map so the skill is immediately searchable
       this.skills.set(skillName, {
@@ -658,11 +668,11 @@ export class SkillManager {
         });
         if (data) {
           return data.map((row) => ({
-            name: row.name as string,
-            description: (row.description as string) || "",
-            emoji: (row.emoji as string) || "",
-            source: (row.source as string) || "manual",
-            invocationCount: (row.invocation_count as number) || 0,
+            name: String(row.name),
+            description: String(row.description ?? ""),
+            emoji: String(row.emoji ?? ""),
+            source: String(row.source ?? "manual"),
+            invocationCount: typeof row.invocation_count === "number" ? row.invocation_count : 0,
           }));
         }
       } catch {
@@ -757,18 +767,21 @@ export class SkillManager {
         offset: options?.offset || 0,
       });
 
-      return (data || []).map((r) => ({
-        id: r.id as string,
-        name: r.name as string,
-        description: (r.description as string) || "",
-        emoji: (r.emoji as string) || "",
-        version: (r.version as string) || "1.0.0",
-        authorName: (r.author_name as string) || "",
-        category: (r.category as string) || "",
-        installCount: (r.install_count as number) || 0,
-        avgRating: r.avg_rating != null ? (r.avg_rating as number) : null,
-        ratingCount: (r.rating_count as number) || 0,
-      }));
+      return (data || [])
+        .map((r) => safeParse(BrowseSkillRowSchema, r))
+        .filter(Boolean)
+        .map((r) => ({
+          id: r!.id,
+          name: r!.name,
+          description: r!.description,
+          emoji: r!.emoji,
+          version: r!.version,
+          authorName: r!.author_name,
+          category: r!.category,
+          installCount: r!.install_count,
+          avgRating: r!.avg_rating ?? null,
+          ratingCount: r!.rating_count,
+        }));
     } catch {
       return [];
     }
@@ -814,8 +827,16 @@ export function substituteArguments(content: string, args: string): string {
   return content;
 }
 
+/** Safe commands allowed in dynamic context preprocessing */
+const SAFE_DYNAMIC_COMMANDS =
+  /^(date|whoami|hostname|uname|pwd|echo|node\s+--version|npm\s+--version|git\s+(branch|rev-parse|log\s+--oneline)|cat\s+)/;
+
 export function preprocessDynamicContext(content: string, cwd?: string): string {
-  return content.replace(/!`([^`]+)`/g, (_, cmd) => {
+  return content.replace(/!`([^`]+)`/g, (_, cmd: string) => {
+    // Only allow safe, read-only commands to prevent command injection
+    if (!SAFE_DYNAMIC_COMMANDS.test(cmd.trim())) {
+      return `[command blocked: ${cmd}]`;
+    }
     try {
       return execSync(cmd, { timeout: 10_000, encoding: "utf-8", cwd }).trim();
     } catch {