kimiflare 0.56.0 → 0.57.0

package/dist/index.js

@@ -3285,7 +3285,11 @@ ${toolsBlock}`;
 Project context from ${ctx.name} (${ctx.lineCount} lines, treat as authoritative):
 ${ctx.content.trim()}` : "";
   const modeBlock = opts2.mode ? systemPromptForMode(opts2.mode) : "";
-  const skillsBlock = opts2.selectedSkills && opts2.selectedSkills.length > 0 ? `
+  const skillsBlock = opts2.skillContext ? `
+
+## Relevant Skills
+
+${opts2.skillContext}` : opts2.selectedSkills && opts2.selectedSkills.length > 0 ? `
 
 Active skills for this turn:
 ${opts2.selectedSkills.map((s) => `--- ${s.name} ---
@@ -6246,7 +6250,12 @@ async function pollForToken(deviceCode, deviceId) {
 async function fetchCloudUsage(token, deviceId) {
   const headers = { Authorization: `Bearer ${token}` };
   if (deviceId) headers["X-Device-ID"] = deviceId;
-  const res = await fetch(`${CLOUD_API_URL}/v1/usage`, { headers });
+  let res;
+  try {
+    res = await fetch(`${CLOUD_API_URL}/v1/usage`, { headers });
+  } catch {
+    return null;
+  }
   if (!res.ok) return null;
   const data = await res.json();
   if (typeof data.remaining !== "number" || typeof data.input_token_limit !== "number" || typeof data.input_tokens_used !== "number" || typeof data.expires_at !== "string") {
@@ -6860,21 +6869,28 @@ async function fetchWithRetry(url, init, retries = 3) {
 }
 async function fetchEmbeddings(opts2) {
   const model = opts2.model ?? DEFAULT_MODEL2;
-  const url = opts2.gateway ? `https://gateway.ai.cloudflare.com/v1/${opts2.accountId}/${opts2.gateway.id}/workers-ai/${model}` : `https://api.cloudflare.com/client/v4/accounts/${opts2.accountId}/ai/run/${model}`;
+  let url;
   const headers = {
-    Authorization: `Bearer ${opts2.apiToken}`,
     "Content-Type": "application/json",
     "User-Agent": getUserAgent()
   };
-  if (opts2.gateway?.metadata) {
-    for (const [k, v] of Object.entries(opts2.gateway.metadata)) {
-      headers[`cf-aig-metadata-${k}`] = String(v);
+  if (opts2.cloudMode) {
+    url = "https://api.kimiflare.com/v1/embeddings";
+    if (opts2.cloudToken) headers.Authorization = `Bearer ${opts2.cloudToken}`;
+    if (opts2.cloudDeviceId) headers["X-Device-ID"] = opts2.cloudDeviceId;
+  } else {
+    url = opts2.gateway ? `https://gateway.ai.cloudflare.com/v1/${opts2.accountId}/${opts2.gateway.id}/workers-ai/${model}` : `https://api.cloudflare.com/client/v4/accounts/${opts2.accountId}/ai/run/${model}`;
+    headers.Authorization = `Bearer ${opts2.apiToken}`;
+    if (opts2.gateway?.metadata) {
+      for (const [k, v] of Object.entries(opts2.gateway.metadata)) {
+        headers[`cf-aig-metadata-${k}`] = String(v);
+      }
     }
   }
   const results = [];
   for (const text of opts2.texts) {
     const truncated = truncateForEmbedding(text);
-    const body = JSON.stringify({ text: [truncated] });
+    const body = opts2.cloudMode ? JSON.stringify({ model, texts: [truncated] }) : JSON.stringify({ text: [truncated] });
     const res = await fetchWithRetry(url, { method: "POST", headers, body });
     const json = await res.json();
     let vectors = [];
@@ -6949,8 +6965,8 @@ function computeExactScore(memory, queryText, cwd) {
   let score = 0;
   const lowerQuery = queryText.toLowerCase();
   for (const file of memory.relatedFiles) {
-    const basename5 = file.split("/").pop() ?? file;
-    if (lowerQuery.includes(basename5.toLowerCase()) || basename5.toLowerCase().includes(lowerQuery)) {
+    const basename6 = file.split("/").pop() ?? file;
+    if (lowerQuery.includes(basename6.toLowerCase()) || basename6.toLowerCase().includes(lowerQuery)) {
       score += 0.3;
     }
     if (cwd && file.startsWith(cwd)) {
@@ -9062,8 +9078,8 @@ var init_session = __esm({
           const parts = [{ type: "text", text }];
           for (const img of options.images) {
             if ("path" in img) {
-              const { readFile: readFile20 } = await import("fs/promises");
-              const data = await readFile20(img.path, "base64");
+              const { readFile: readFile21 } = await import("fs/promises");
+              const data = await readFile21(img.path, "base64");
               const mimeType = img.path.endsWith(".png") ? "image/png" : img.path.endsWith(".jpg") || img.path.endsWith(".jpeg") ? "image/jpeg" : "image/webp";
               parts.push({ type: "image_url", image_url: { url: `data:${mimeType};base64,${data}` } });
             } else {
@@ -9307,7 +9323,7 @@ var init_session = __esm({
               this.lspManager?.notifyChange(path, content);
             } else {
               void import("fs/promises").then(
-                ({ readFile: readFile20 }) => readFile20(path, "utf8").then((c) => this.lspManager?.notifyChange(path, c)).catch(() => {
+                ({ readFile: readFile21 }) => readFile21(path, "utf8").then((c) => this.lspManager?.notifyChange(path, c)).catch(() => {
                 })
               ).catch(() => {
               });
@@ -13154,70 +13170,176 @@ var init_loader = __esm({
   }
 });
 
-// src/skills/router.ts
-import { minimatch } from "minimatch";
-function matchSkill(skill, prompt, cwd) {
-  if (!skill.enabled) return false;
-  if (skill.match.length === 0) return true;
-  for (const pattern of skill.match) {
-    if (pattern.includes("/") || pattern.includes("*")) {
-      if (minimatch(cwd, pattern) || minimatch(cwd, `**/${pattern}`)) {
-        return true;
-      }
-    }
-    if (prompt.toLowerCase().includes(pattern.toLowerCase())) {
-      return true;
-    }
+// src/skills/db.ts
+function initSkillsSchema(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS skill_index (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT NOT NULL,
+      description TEXT,
+      file_path TEXT NOT NULL,
+      content_hash TEXT NOT NULL,
+      parser_version INTEGER NOT NULL DEFAULT 1,
+      updated_at INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS skill_sections (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      skill_id INTEGER NOT NULL,
+      heading TEXT NOT NULL,
+      body TEXT NOT NULL,
+      embedding BLOB NOT NULL,
+      FOREIGN KEY (skill_id) REFERENCES skill_index(id) ON DELETE CASCADE
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_skill_path ON skill_index(file_path);
+  `);
+}
+function getSkillByPath(db, filePath) {
+  const row = db.prepare("SELECT id, content_hash, parser_version FROM skill_index WHERE file_path = ?").get(filePath);
+  if (!row) return null;
+  return { id: row.id, contentHash: row.content_hash, parserVersion: row.parser_version };
+}
+function upsertSkill(db, skill) {
+  const existing = getSkillByPath(db, skill.filePath);
+  const now2 = Date.now();
+  if (existing) {
+    db.prepare(
+      `UPDATE skill_index
+       SET name = ?, description = ?, content_hash = ?, parser_version = ?, updated_at = ?
+       WHERE id = ?`
+    ).run(skill.name, skill.description, skill.contentHash, skill.parserVersion, now2, existing.id);
+    db.prepare("DELETE FROM skill_sections WHERE skill_id = ?").run(existing.id);
+    return existing.id;
   }
-  return false;
+  const result = db.prepare(
+    `INSERT INTO skill_index (name, description, file_path, content_hash, parser_version, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?)`
+  ).run(skill.name, skill.description, skill.filePath, skill.contentHash, skill.parserVersion, now2);
+  return Number(result.lastInsertRowid);
 }
-function findConflicts(skill, memorySnippets) {
-  const conflicts = [];
-  for (const mem of memorySnippets) {
-    const memLower = mem.toLowerCase();
-    const skillLower = skill.name.toLowerCase();
-    if (memLower.includes(skillLower) || skillLower.includes(memLower)) {
-      conflicts.push({
-        skillName: skill.name,
-        memoryContent: mem.slice(0, 200),
-        memoryId: ""
-        // populated by caller if available
-      });
-    }
+function insertSections(db, skillId, sections, embeddings) {
+  const insert = db.prepare(
+    `INSERT INTO skill_sections (skill_id, heading, body, embedding)
+     VALUES (?, ?, ?, ?)`
+  );
+  for (let i = 0; i < sections.length; i++) {
+    const section = sections[i];
+    const embedding = embeddings[i];
+    insert.run(skillId, section.heading, section.body, Buffer.from(embedding.buffer));
   }
-  return conflicts;
-}
-function selectSkills(skills, options) {
-  const tierBudget = TIER_BUDGETS[options.tier];
-  const effectiveBudget = Math.min(tierBudget, options.maxSkillTokens);
-  const matched = skills.filter((s) => matchSkill(s, options.prompt, options.cwd));
-  const selected = [];
-  const dropped = [];
-  const allConflicts = [];
-  let runningTotal = 0;
-  for (const skill of matched) {
-    const conflicts = findConflicts(skill, options.memorySnippets);
-    allConflicts.push(...conflicts);
-    if (runningTotal + skill.estimatedTokens <= effectiveBudget) {
-      selected.push(skill);
-      runningTotal += skill.estimatedTokens;
-    } else {
-      dropped.push(skill);
-    }
+}
+function deleteOrphanedSkills(db, existingPaths) {
+  if (existingPaths.length === 0) {
+    const result2 = db.prepare("DELETE FROM skill_index").run();
+    return Number(result2.changes);
   }
-  const budgetUsed = effectiveBudget > 0 ? Math.round(runningTotal / effectiveBudget * 100) : 0;
+  const placeholders = existingPaths.map(() => "?").join(",");
+  const result = db.prepare(`DELETE FROM skill_index WHERE file_path NOT IN (${placeholders})`).run(...existingPaths);
+  return Number(result.changes);
+}
+function listAllSectionRows(db) {
+  return db.prepare(
+    `SELECT s.id, s.heading, s.body, s.embedding, i.name, i.description, i.file_path
+       FROM skill_sections s
+       JOIN skill_index i ON s.skill_id = i.id`
+  ).all();
+}
+function rowToSectionResult(row) {
   return {
-    selectedSkills: selected,
-    droppedSkills: dropped,
-    totalSkillTokens: runningTotal,
-    budgetUsed,
-    memoryConflicts: allConflicts
+    id: row.id,
+    heading: row.heading,
+    body: row.body,
+    name: row.name,
+    description: row.description,
+    filePath: row.file_path
   };
 }
-var TIER_BUDGETS;
-var init_router = __esm({
-  "src/skills/router.ts"() {
+var init_db2 = __esm({
+  "src/skills/db.ts"() {
+    "use strict";
+  }
+});
+
+// src/skills/search.ts
+async function searchSections(query, db, opts2) {
+  const embeddings = await fetchEmbeddings({
+    accountId: opts2.accountId,
+    apiToken: opts2.apiToken,
+    model: opts2.model,
+    texts: [query],
+    gateway: opts2.gateway,
+    cloudMode: opts2.cloudMode,
+    cloudToken: opts2.cloudToken,
+    cloudDeviceId: opts2.cloudDeviceId
+  });
+  const queryEmbedding = embeddings[0];
+  if (!queryEmbedding) {
+    throw new Error("Failed to embed query: no embedding returned");
+  }
+  const rows = listAllSectionRows(db);
+  const scored = [];
+  for (const row of rows) {
+    const sectionEmbedding = new Float32Array(row.embedding);
+    const similarity = cosineSimilarity(queryEmbedding, sectionEmbedding);
+    scored.push({
+      ...rowToSectionResult(row),
+      similarity
+    });
+  }
+  scored.sort((a, b) => b.similarity - a.similarity);
+  return scored;
+}
+var init_search = __esm({
+  "src/skills/search.ts"() {
+    "use strict";
+    init_embeddings();
+    init_db2();
+  }
+});
+
+// src/skills/format.ts
+function estimateTokens(text) {
+  return Math.ceil(text.length / 4);
+}
+function formatSection(section) {
+  return `### ${section.name} \u2014 ${section.heading}
+${section.body}
+
+`;
+}
+function packSections(sections, budget) {
+  let context = "";
+  let used = 0;
+  let count = 0;
+  for (const section of sections) {
+    if (section.similarity < MIN_SIMILARITY) break;
+    const text = formatSection(section);
+    const tokens = estimateTokens(text);
+    if (used + tokens > budget) break;
+    context += text;
+    used += tokens;
+    count++;
+  }
+  return { context, tokens: used, count };
+}
+function buildSkillContext(sections, tier, maxSkillTokens) {
+  const tierBudget = TIER_BUDGETS[tier];
+  const effectiveBudget = Math.min(tierBudget, maxSkillTokens ?? tierBudget);
+  const packed = packSections(sections, effectiveBudget);
+  const budgetUsed = effectiveBudget > 0 ? Math.round(packed.tokens / effectiveBudget * 100) : 0;
+  return {
+    skillContext: packed.context,
+    sectionCount: packed.count,
+    totalTokens: packed.tokens,
+    budgetUsed
+  };
+}
+var MIN_SIMILARITY, TIER_BUDGETS;
+var init_format = __esm({
+  "src/skills/format.ts"() {
     "use strict";
+    MIN_SIMILARITY = 0.3;
     TIER_BUDGETS = {
       light: 2e3,
       medium: 8e3,
@@ -13226,27 +13348,281 @@ var init_router = __esm({
   }
 });
 
-// src/skills/index.ts
-async function routeSkills(skillDir, opts2) {
-  const skills = await loadSkillsFromDir(skillDir);
-  return selectSkills(skills, opts2);
+// src/skills/router.ts
+async function selectSkills(opts2, deps) {
+  const sections = await searchSections(opts2.prompt, deps.db, {
+    accountId: deps.accountId,
+    apiToken: deps.apiToken,
+    model: deps.embeddingModel,
+    gateway: deps.gateway,
+    cloudMode: deps.cloudMode,
+    cloudToken: deps.cloudToken,
+    cloudDeviceId: deps.cloudDeviceId
+  });
+  return buildSkillContext(sections, opts2.tier, opts2.maxSkillTokens);
+}
+var init_router = __esm({
+  "src/skills/router.ts"() {
+    "use strict";
+    init_search();
+    init_format();
+  }
+});
+
+// src/skills/discovery.ts
+import { readdir as readdir5, stat as stat6, readFile as readFile15 } from "fs/promises";
+import { join as join21, extname as extname2 } from "path";
+async function dirExists(path) {
+  try {
+    const s = await stat6(path);
+    return s.isDirectory();
+  } catch {
+    return false;
+  }
 }
+async function fileExists(path) {
+  try {
+    const s = await stat6(path);
+    return s.isFile();
+  } catch {
+    return false;
+  }
+}
+async function scanSkillDir(dirPath, source) {
+  if (!await dirExists(dirPath)) return [];
+  const entries = await readdir5(dirPath, { withFileTypes: true });
+  const files = [];
+  for (const entry of entries) {
+    if (!entry.isFile()) continue;
+    if (!SKILL_EXTENSIONS.has(extname2(entry.name))) continue;
+    files.push({ filePath: join21(dirPath, entry.name), source });
+  }
+  return files;
+}
+async function discoverSkills(cwd) {
+  const agentsSkills = await scanSkillDir(join21(cwd, ".agents", "skills"), "agents");
+  const agentsMd = await fileExists(join21(cwd, "AGENTS.md")) ? [{ filePath: join21(cwd, "AGENTS.md"), source: "agents-md" }] : [];
+  const githubSkills = await scanSkillDir(join21(cwd, ".github", "skills"), "github");
+  const kimiflareSkills = await scanSkillDir(join21(cwd, ".kimiflare", "skills"), "kimiflare");
+  const ordered = [...agentsSkills, ...agentsMd, ...githubSkills, ...kimiflareSkills];
+  return ordered;
+}
+async function readSkillFile(filePath) {
+  const bytes = await readFile15(filePath);
+  return { bytes, text: bytes.toString("utf-8") };
+}
+var SKILL_EXTENSIONS;
+var init_discovery = __esm({
+  "src/skills/discovery.ts"() {
+    "use strict";
+    SKILL_EXTENSIONS = /* @__PURE__ */ new Set([".md"]);
+  }
+});
+
+// src/skills/parser.ts
+import matter2 from "gray-matter";
+import { createHash as createHash2 } from "crypto";
+function sha256(input) {
+  return createHash2("sha256").update(input).digest("hex");
+}
+function computeContentHash(rawText, parserVersion) {
+  return sha256(`${rawText}
+<!-- parser_version: ${parserVersion} -->`);
+}
+function extractDescription(body, heading) {
+  const lines = body.split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
+  if (lines.length === 0) return heading;
+  const first = lines[0];
+  if (first.startsWith("```") || first.startsWith("-") || first.startsWith("*") || first.startsWith("#") || first.match(/^\d+\./) || first.length < 20) {
+    return heading;
+  }
+  const sentenceMatch = first.match(/^(.+?[.!?])(?:\s|$)/);
+  if (sentenceMatch) {
+    return sentenceMatch[1];
+  }
+  return first.length <= 120 ? first : heading;
+}
+function splitIntoSections(markdown) {
+  const lines = markdown.split("\n");
+  const sections = [];
+  let currentHeading = "";
+  let currentBody = [];
+  for (const line of lines) {
+    const h2Match = line.match(/^##\s+(.*)$/);
+    if (h2Match) {
+      const body = currentBody.join("\n").trim();
+      if (body.length > 0 || currentHeading) {
+        sections.push({
+          heading: currentHeading,
+          body
+        });
+      }
+      currentHeading = h2Match[1].trim();
+      currentBody = [];
+    } else {
+      currentBody.push(line);
+    }
+  }
+  const finalBody = currentBody.join("\n").trim();
+  if (finalBody.length > 0 || currentHeading) {
+    sections.push({
+      heading: currentHeading,
+      body: finalBody
+    });
+  }
+  return sections;
+}
+function parseSkillFile(filePath, rawText) {
+  const parsed = matter2(rawText);
+  const name = typeof parsed.data.name === "string" ? parsed.data.name : "";
+  const description = typeof parsed.data.description === "string" ? parsed.data.description : "";
+  if (!name) {
+    throw new Error(`Skill file missing required 'name' field: ${filePath}`);
+  }
+  const sections = splitIntoSections(parsed.content);
+  if (sections.length === 0) {
+    sections.push({ heading: name, body: parsed.content.trim() });
+  }
+  const firstSection = sections[0];
+  if (firstSection && firstSection.heading === "") {
+    firstSection.heading = name;
+  }
+  return {
+    name,
+    description,
+    filePath,
+    contentHash: computeContentHash(rawText, PARSER_VERSION),
+    parserVersion: PARSER_VERSION,
+    sections
+  };
+}
+function parseAgentsMd(filePath, rawText) {
+  const sections = splitIntoSections(rawText);
+  const skills = [];
+  for (const section of sections) {
+    if (!section.heading) continue;
+    const description = extractDescription(section.body, section.heading);
+    skills.push({
+      name: section.heading,
+      description,
+      filePath,
+      contentHash: computeContentHash(rawText, PARSER_VERSION),
+      parserVersion: PARSER_VERSION,
+      sections: [{ heading: section.heading, body: section.body }]
+    });
+  }
+  return skills;
+}
+var PARSER_VERSION;
+var init_parser = __esm({
+  "src/skills/parser.ts"() {
+    "use strict";
+    PARSER_VERSION = 1;
+  }
+});
+
+// src/skills/indexer.ts
+function buildEmbeddingInput(skill, section) {
+  return `${skill.name}: ${skill.description}
+
+${section.heading}
+${section.body}`;
+}
+async function indexSkills(opts2) {
+  initSkillsSchema(opts2.db);
+  const discovered = await discoverSkills(opts2.cwd);
+  const errors = [];
+  const parsedSkills = [];
+  for (const file of discovered) {
+    try {
+      const { text } = await readSkillFile(file.filePath);
+      if (file.source === "agents-md") {
+        const skills = parseAgentsMd(file.filePath, text);
+        parsedSkills.push(...skills);
+      } else {
+        const skill = parseSkillFile(file.filePath, text);
+        parsedSkills.push(skill);
+      }
+    } catch (err) {
+      errors.push(`Failed to parse ${file.filePath}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  const seenNames = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const skill of parsedSkills) {
+    if (seenNames.has(skill.name)) continue;
+    seenNames.add(skill.name);
+    deduped.push(skill);
+  }
+  let indexed = 0;
+  let skipped = 0;
+  for (const skill of deduped) {
+    const existing = getSkillByPath(opts2.db, skill.filePath);
+    if (existing && existing.contentHash === skill.contentHash && existing.parserVersion === skill.parserVersion) {
+      skipped++;
+      continue;
+    }
+    const skillId = upsertSkill(opts2.db, skill);
+    if (skill.sections.length > 0) {
+      const inputs = skill.sections.map((section) => buildEmbeddingInput(skill, section));
+      try {
+        const embeddings = await fetchEmbeddings({
+          accountId: opts2.accountId,
+          apiToken: opts2.apiToken,
+          model: opts2.embeddingModel,
+          texts: inputs,
+          gateway: opts2.gateway,
+          cloudMode: opts2.cloudMode,
+          cloudToken: opts2.cloudToken,
+          cloudDeviceId: opts2.cloudDeviceId
+        });
+        insertSections(opts2.db, skillId, skill.sections, embeddings);
+      } catch (err) {
+        errors.push(
+          `Failed to embed sections for ${skill.filePath}: ${err instanceof Error ? err.message : String(err)}`
+        );
+        continue;
+      }
+    }
+    indexed++;
+  }
+  const existingPaths = deduped.map((s) => s.filePath);
+  const removed = deleteOrphanedSkills(opts2.db, existingPaths);
+  return { indexed, skipped, removed, errors };
+}
+var init_indexer = __esm({
+  "src/skills/indexer.ts"() {
+    "use strict";
+    init_embeddings();
+    init_discovery();
+    init_parser();
+    init_db2();
+  }
+});
+
+// src/skills/index.ts
 var init_skills = __esm({
   "src/skills/index.ts"() {
     "use strict";
     init_loader();
     init_router();
+    init_indexer();
+    init_search();
+    init_format();
+    init_discovery();
+    init_parser();
+    init_db2();
   }
 });
 
 // src/skills/manager.ts
-import { mkdir as mkdir11, writeFile as writeFile11, unlink as unlink2, readFile as readFile15 } from "fs/promises";
-import { join as join21 } from "path";
-import matter2 from "gray-matter";
+import { mkdir as mkdir11, writeFile as writeFile11, unlink as unlink2, readFile as readFile16 } from "fs/promises";
+import { join as join22 } from "path";
+import matter3 from "gray-matter";
 function getSkillDirs(cwd) {
   return {
-    projectDir: join21(cwd, ".kimiflare", "skills"),
-    globalDir: join21(process.env.HOME ?? "", ".config", "kimiflare", "skills")
+    projectDir: join22(cwd, ".kimiflare", "skills"),
+    globalDir: join22(process.env.HOME ?? "", ".config", "kimiflare", "skills")
   };
 }
 async function listAllSkills(cwd) {
@@ -13260,7 +13636,7 @@ async function listAllSkills(cwd) {
 async function createSkill(opts2) {
   const dirs = getSkillDirs(opts2.cwd);
   const dir = opts2.scope === "project" ? dirs.projectDir : dirs.globalDir;
-  const filepath = join21(dir, `${opts2.name}.md`);
+  const filepath = join22(dir, `${opts2.name}.md`);
   const frontmatter = {
     name: opts2.name,
     enabled: true,
@@ -13296,8 +13672,8 @@ async function setSkillEnabled(name, enabled, cwd) {
   const all = await listAllSkills(cwd);
   const skill = all.project.find((s) => s.name === name) ?? all.global.find((s) => s.name === name);
   if (!skill) throw new Error(`skill "${name}" not found`);
-  const raw = await readFile15(skill.filePath, "utf-8");
-  const parsed = matter2(raw);
+  const raw = await readFile16(skill.filePath, "utf-8");
+  const parsed = matter3(raw);
   parsed.data.enabled = enabled;
   const yaml = Object.entries(parsed.data).map(([k, v]) => {
     if (Array.isArray(v)) return `${k}:
@@ -13324,10 +13700,10 @@ var init_manager4 = __esm({
 });
 
 // src/util/image.ts
-import { readFile as readFile16 } from "fs/promises";
-import { basename as basename3 } from "path";
+import { readFile as readFile17 } from "fs/promises";
+import { basename as basename4 } from "path";
 async function encodeImageFile(filePath) {
-  const buf = await readFile16(filePath);
+  const buf = await readFile17(filePath);
   if (buf.byteLength > MAX_IMAGE_BYTES) {
     throw new Error(
       `image too large (${(buf.byteLength / 1024 / 1024).toFixed(1)} MB); max is ${MAX_IMAGE_BYTES / 1024 / 1024} MB`
@@ -13337,7 +13713,7 @@ async function encodeImageFile(filePath) {
   const mime = EXT_TO_MIME[ext] ?? "image/jpeg";
   const b64 = buf.toString("base64");
   return {
-    filename: basename3(filePath),
+    filename: basename4(filePath),
     mime,
     dataUrl: `data:${mime};base64,${b64}`
   };
@@ -13363,16 +13739,16 @@ var init_image = __esm({
 });
 
 // src/util/state.ts
-import { readFile as readFile17, writeFile as writeFile12, mkdir as mkdir12 } from "fs/promises";
+import { readFile as readFile18, writeFile as writeFile12, mkdir as mkdir12 } from "fs/promises";
 import { homedir as homedir13 } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function statePath() {
-  const xdg = process.env.XDG_CONFIG_HOME || join22(homedir13(), ".config");
-  return join22(xdg, "kimiflare", "state.json");
+  const xdg = process.env.XDG_CONFIG_HOME || join23(homedir13(), ".config");
+  return join23(xdg, "kimiflare", "state.json");
 }
 async function readState() {
   try {
-    const raw = await readFile17(statePath(), "utf8");
+    const raw = await readFile18(statePath(), "utf8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -13380,7 +13756,7 @@ async function readState() {
 }
 async function writeState(state) {
   const path = statePath();
-  await mkdir12(join22(path, ".."), { recursive: true });
+  await mkdir12(join23(path, ".."), { recursive: true });
   await writeFile12(path, JSON.stringify(state, null, 2) + "\n", "utf8");
 }
 async function markCreatorMessageSeen(version) {
@@ -13455,14 +13831,14 @@ var init_frontmatter = __esm({
 // src/commands/loader.ts
 import { open, realpath } from "fs/promises";
 import { homedir as homedir14 } from "os";
-import { join as join23, relative as relative4, sep as sep2 } from "path";
+import { join as join24, relative as relative4, sep as sep2 } from "path";
 import fg3 from "fast-glob";
 function projectCommandsDir(cwd = process.cwd()) {
-  return join23(cwd, ".kimiflare", "commands");
+  return join24(cwd, ".kimiflare", "commands");
 }
 function globalCommandsDir() {
-  const xdg = process.env.XDG_CONFIG_HOME || join23(homedir14(), ".config");
-  return join23(xdg, "kimiflare", "commands");
+  const xdg = process.env.XDG_CONFIG_HOME || join24(homedir14(), ".config");
+  return join24(xdg, "kimiflare", "commands");
 }
 async function loadCustomCommands(cwd = process.cwd()) {
   const warnings = [];
@@ -14283,12 +14659,12 @@ var init_command_wizard = __esm({
 
 // src/init/context-generator.ts
 import { existsSync as existsSync3, statSync as statSync3 } from "fs";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 function detectFlavor(cwd) {
   for (const [flavor, signatures] of Object.entries(FLAVOR_SIGNATURES)) {
     if (flavor === "generic") continue;
     for (const sig of signatures) {
-      const path = join24(cwd, sig);
+      const path = join25(cwd, sig);
       if (sig.includes("*")) {
         try {
           const parts = sig.split("*");
@@ -14309,14 +14685,14 @@ function detectFlavor(cwd) {
 }
 function findFile(cwd, candidates) {
   for (const c of candidates) {
-    if (existsSync3(join24(cwd, c))) return c;
+    if (existsSync3(join25(cwd, c))) return c;
   }
   return null;
 }
 function findSourceRoots(cwd) {
   const roots = [];
   for (const r of SOURCE_ROOT_CANDIDATES) {
-    const p = join24(cwd, r);
+    const p = join25(cwd, r);
     try {
       const s = statSync3(p);
       if (s.isDirectory()) roots.push(r);
@@ -14327,9 +14703,9 @@ function findSourceRoots(cwd) {
 }
 function findCiConfig(cwd) {
   for (const c of CI_PATHS) {
-    if (existsSync3(join24(cwd, c))) {
+    if (existsSync3(join25(cwd, c))) {
       try {
-        const s = statSync3(join24(cwd, c));
+        const s = statSync3(join25(cwd, c));
         return s.isDirectory() ? c : c;
       } catch {
       }
@@ -14466,7 +14842,7 @@ function analyzeProject(cwd) {
     ciConfig: findCiConfig(cwd),
     readme: findFile(cwd, ["README.md", "README.rst", "README.txt", "Readme.md"]),
     sourceRoots: findSourceRoots(cwd),
-    hasGit: existsSync3(join24(cwd, ".git"))
+    hasGit: existsSync3(join25(cwd, ".git"))
   };
 }
 function bashDiscoveryCommands(profile) {
@@ -14631,7 +15007,7 @@ Aim for 100\u2013200 lines total. Use markdown tables where they save space.
 }
 function buildInitPrompt(cwd) {
   const existingName = ["KIMI.md", "KIMIFLARE.md", "AGENT.md"].find(
-    (n) => existsSync3(join24(cwd, n))
+    (n) => existsSync3(join25(cwd, n))
   );
   const isRefresh = existingName !== void 0;
   const targetFilename = existingName ?? "KIMI.md";
@@ -16273,11 +16649,11 @@ var init_wcag = __esm({
 });
 
 // src/ui/theme-loader.ts
-import { readFile as readFile18, readdir as readdir5 } from "fs/promises";
-import { join as join25 } from "path";
+import { readFile as readFile19, readdir as readdir6 } from "fs/promises";
+import { join as join26 } from "path";
 import { homedir as homedir15 } from "os";
 function projectThemesDir(cwd = process.cwd()) {
-  return join25(cwd, ".kimiflare", "themes");
+  return join26(cwd, ".kimiflare", "themes");
 }
 function isHexColor(c) {
   return /^#[0-9a-fA-F]{6}$/.test(c);
@@ -16361,15 +16737,15 @@ async function loadThemesFromDir(dir, source) {
   const errors = [];
   let files;
   try {
-    files = await readdir5(dir);
+    files = await readdir6(dir);
   } catch {
     return { themes, errors };
   }
   for (const file of files.filter((f) => f.endsWith(".json"))) {
-    const path = join25(dir, file);
+    const path = join26(dir, file);
     let raw;
     try {
-      raw = await readFile18(path, "utf-8");
+      raw = await readFile19(path, "utf-8");
     } catch (e) {
       errors.push(`${path}: ${e instanceof Error ? e.message : String(e)}`);
       continue;
@@ -16515,8 +16891,8 @@ var init_theme_loader = __esm({
     "use strict";
     init_wcag();
     init_theme();
-    USER_THEMES_DIR = join25(
-      process.env.XDG_CONFIG_HOME || join25(homedir15(), ".config"),
+    USER_THEMES_DIR = join26(
+      process.env.XDG_CONFIG_HOME || join26(homedir15(), ".config"),
       "kimiflare",
       "themes"
     );
@@ -16707,15 +17083,15 @@ var tui_report_exports = {};
 __export(tui_report_exports, {
   getCategoryReportText: () => getCategoryReportText
 });
-import { readFile as readFile19 } from "fs/promises";
-import { join as join26 } from "path";
+import { readFile as readFile20 } from "fs/promises";
+import { join as join27 } from "path";
 import { homedir as homedir16 } from "os";
 function usageDir3() {
-  const xdg = process.env.XDG_DATA_HOME || join26(homedir16(), ".local", "share");
-  return join26(xdg, "kimiflare");
+  const xdg = process.env.XDG_DATA_HOME || join27(homedir16(), ".local", "share");
+  return join27(xdg, "kimiflare");
 }
 function usagePath3() {
-  return join26(usageDir3(), "usage.json");
+  return join27(usageDir3(), "usage.json");
 }
 function today3() {
   return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
@@ -16727,7 +17103,7 @@ function daysAgo2(n) {
 }
 async function loadLog3() {
   try {
-    const raw = await readFile19(usagePath3(), "utf8");
+    const raw = await readFile20(usagePath3(), "utf8");
     return JSON.parse(raw);
   } catch {
     return { version: 1, days: [], sessions: [] };
@@ -16797,7 +17173,7 @@ import React15, { useState as useState12, useRef as useRef3, useEffect as useEff
 import { Box as Box23, Text as Text24, useApp, useInput as useInput9, render } from "ink";
 import SelectInput10 from "ink-select-input";
 import { existsSync as existsSync4, statSync as statSync4 } from "fs";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 import { unlink as unlink4 } from "fs/promises";
 import { execSync as execSync2 } from "child_process";
 import { spawn as spawn4 } from "child_process";
@@ -16875,7 +17251,7 @@ function buildFilePickerIgnoreList(cwd) {
   ];
   const gitignorePatterns = [];
   try {
-    const gitignorePath = join27(cwd, ".gitignore");
+    const gitignorePath = join28(cwd, ".gitignore");
     const stats = statSync4(gitignorePath);
     if (stats.size > MAX_GITIGNORE_SIZE) {
       return hardcoded;
@@ -17113,7 +17489,6 @@ function App({
   const [skillsActive, setSkillsActive] = useState12(0);
   const [memoryRecalled, setMemoryRecalled] = useState12(false);
   const [intentTier, setIntentTier] = useState12(null);
-  const skillsDirRef = useRef3(join27(process.cwd(), ".kimiflare", "skills"));
   const [kimiMdStale, setKimiMdStale] = useState12(false);
   const [gitBranch, setGitBranch] = useState12(null);
   const [lastSessionTopic, setLastSessionTopic] = useState12(null);
@@ -17419,7 +17794,7 @@ ${wcagWarnings.join("\n")}` }
       }
     });
     if (cfg.memoryEnabled) {
-      const dbPath = cfg.memoryDbPath ?? join27(process.cwd(), ".kimiflare", "memory.db");
+      const dbPath = cfg.memoryDbPath ?? join28(process.cwd(), ".kimiflare", "memory.db");
       const manager = new MemoryManager({
         dbPath,
         accountId: cfg.accountId,
@@ -17468,7 +17843,7 @@ ${wcagWarnings.join("\n")}` }
         } catch {
         }
       })();
-      if (existsSync4(join27(cwd, "KIMI.md"))) {
+      if (existsSync4(join28(cwd, "KIMI.md"))) {
         const lastRefresh = manager.getLastKimiMdRefreshTime(cwd);
         const driftCount = manager.countHighSignalMemoriesSince(cwd, lastRefresh);
         if (driftCount >= 5) {
@@ -17479,6 +17854,32 @@ ${wcagWarnings.join("\n")}` }
       memoryManagerRef.current?.close();
       memoryManagerRef.current = null;
     }
+    const skillDbPath = cfg.memoryDbPath ?? join28(process.cwd(), ".kimiflare", "memory.db");
+    const skillDb = getMemoryDb() ?? openMemoryDb(skillDbPath);
+    initSkillsSchema(skillDb);
+    void indexSkills({
+      cwd: process.cwd(),
+      db: skillDb,
+      accountId: cfg.accountId,
+      apiToken: cfg.apiToken,
+      gateway: gatewayFromConfig(cfg),
+      embeddingModel: cfg.memoryEmbeddingModel,
+      cloudMode: cfg.cloudMode,
+      cloudToken: cloudToken ?? initialCloudToken,
+      cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId
+    }).then((result) => {
+      if (result.indexed > 0) {
+        setEvents((e) => [
+          ...e,
+          { kind: "info", key: mkKey(), text: `indexed ${result.indexed} skill${result.indexed === 1 ? "" : "s"}` }
+        ]);
+      }
+      if (result.errors.length > 0) {
+        for (const err of result.errors) {
+          setEvents((e) => [...e, { kind: "info", key: mkKey(), text: `skill index error: ${err}` }]);
+        }
+      }
+    });
     void loadCustomCommands(process.cwd()).then(({ commands, warnings }) => {
       customCommandsRef.current = commands;
       setCustomCommandsVersion((v) => v + 1);
@@ -18212,7 +18613,7 @@ ${wcagWarnings.join("\n")}` }
             lspManagerRef.current.notifyChange(path, content);
           } else {
             void import("fs/promises").then(
-              ({ readFile: readFile20 }) => readFile20(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+              ({ readFile: readFile21 }) => readFile21(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
               })
             );
           }
@@ -18353,7 +18754,7 @@ ${wcagWarnings.join("\n")}` }
           }
         }
       });
-      if (existsSync4(join27(cwd, "KIMI.md"))) {
+      if (existsSync4(join28(cwd, "KIMI.md"))) {
         if (cacheStableRef.current) {
           messagesRef.current[1] = {
             role: "system",
@@ -19072,7 +19473,7 @@ ${lines.join("\n")}` }]);
           try {
             ensureSessionId();
             const { sessionsDir: sessionsDir3 } = await Promise.resolve().then(() => (init_sessions(), sessions_exports));
-            const filePath = join27(sessionsDir3(), `${sessionIdRef.current}.json`);
+            const filePath = join28(sessionsDir3(), `${sessionIdRef.current}.json`);
             await addCheckpoint(filePath, cp);
             setEvents((e) => [...e, { kind: "info", key: mkKey(), text: `checkpoint saved: "${label}"` }]);
           } catch (e) {
@@ -19093,7 +19494,7 @@ ${lines.join("\n")}` }]);
         void (async () => {
           try {
             const { sessionsDir: sessionsDir3 } = await Promise.resolve().then(() => (init_sessions(), sessions_exports));
-            const file = await loadSession(join27(sessionsDir3(), `${currentId}.json`));
+            const file = await loadSession(join28(sessionsDir3(), `${currentId}.json`));
             const cps = file.checkpoints ?? [];
             if (cps.length === 0) {
               setEvents((e) => [...e, { kind: "info", key: mkKey(), text: "no checkpoints in this session" }]);
@@ -19662,7 +20063,7 @@ ${lines.join("\n")}` }]);
         }
       }
       turnCounterRef.current += 1;
-      if (turnCounterRef.current % 15 === 0 && existsSync4(join27(process.cwd(), "KIMI.md")) && !kimiMdStale) {
+      if (turnCounterRef.current % 15 === 0 && existsSync4(join28(process.cwd(), "KIMI.md")) && !kimiMdStale) {
         setEvents((e) => [
           ...e,
           { kind: "info", key: mkKey(), text: "Tip: Rerunning /init occasionally helps KimiFlare stay accurate as your project evolves." }
@@ -19680,16 +20081,28 @@ ${lines.join("\n")}` }]);
       }
       let skillResult;
       try {
-        skillResult = await routeSkills(skillsDirRef.current, {
-          cwd: process.cwd(),
-          prompt: trimmed,
-          memorySnippets: [],
-          // TODO: wire memory snippets when available
-          tier: classification.tier,
-          maxSkillTokens: CONTEXT_LIMIT - 1e4
-          // leave headroom
-        });
-        setSkillsActive(skillResult.selectedSkills.length);
+        const db = getMemoryDb();
+        if (db) {
+          skillResult = await selectSkills(
+            {
+              prompt: trimmed,
+              tier: classification.tier,
+              maxSkillTokens: CONTEXT_LIMIT - 1e4
+              // leave headroom
+            },
+            {
+              db,
+              accountId: cfg.accountId,
+              apiToken: cfg.apiToken,
+              embeddingModel: cfg.memoryEmbeddingModel,
+              gateway: gatewayFromConfig(cfg),
+              cloudMode: cfg.cloudMode,
+              cloudToken: cloudToken ?? initialCloudToken,
+              cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId
+            }
+          );
+          setSkillsActive(skillResult.sectionCount);
+        }
       } catch {
         setSkillsActive(0);
       }
@@ -19701,7 +20114,6 @@ ${lines.join("\n")}` }]);
       const turnReasoningEffort = overrideEffort ?? effortForTier[classification.tier] ?? effortRef.current;
       const effectiveCodeMode = classification.tier === "heavy";
       setCodeMode(effectiveCodeMode);
-      const selectedSkills = skillResult?.selectedSkills.map((s) => ({ name: s.name, body: s.body }));
       if (cacheStableRef.current) {
         messagesRef.current[1] = {
           role: "system",
@@ -19710,7 +20122,7 @@ ${lines.join("\n")}` }]);
             tools: [...ALL_TOOLS, ...mcpToolsRef.current, ...lspToolsRef.current],
             model: cfg.model,
             mode: modeRef.current,
-            selectedSkills
+            skillContext: skillResult?.skillContext
           })
         };
       } else {
@@ -19721,7 +20133,7 @@ ${lines.join("\n")}` }]);
             tools: [...ALL_TOOLS, ...mcpToolsRef.current, ...lspToolsRef.current],
             model: cfg.model,
             mode: modeRef.current,
-            selectedSkills
+            skillContext: skillResult?.skillContext
           })
         };
       }
@@ -19731,7 +20143,7 @@ ${lines.join("\n")}` }]);
           kind: "meta",
           key: mkKey(),
           intentTier: classification.tier,
-          skillsActive: skillResult?.selectedSkills.length ?? 0,
+          skillsActive: skillResult?.sectionCount ?? 0,
           memoryRecalled: false
         }
       ]);
@@ -19929,13 +20341,12 @@ ${lines.join("\n")}` }]);
           cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId,
           onIterationEnd,
           intentClassification: classification,
-          selectedSkills,
           onFileChange: (path, content2) => {
             if (content2) {
               lspManagerRef.current.notifyChange(path, content2);
             } else {
               void import("fs/promises").then(
-                ({ readFile: readFile20 }) => readFile20(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
+                ({ readFile: readFile21 }) => readFile21(path, "utf8").then((c) => lspManagerRef.current.notifyChange(path, c)).catch(() => {
                 })
               );
             }
@@ -20222,7 +20633,7 @@ ${lines.join("\n")}` }]);
       {
         servers: cfg?.lspServers ?? {},
         currentScope: lspScope,
-        hasProjectDir: existsSync4(join27(process.cwd(), ".kimiflare")),
+        hasProjectDir: existsSync4(join28(process.cwd(), ".kimiflare")),
         onDone: () => setShowLspWizard(false),
         onSave: (servers, enabled, scope) => {
           setCfg((c) => c ? { ...c, lspEnabled: enabled, lspServers: servers } : c);
@@ -20518,6 +20929,7 @@ var init_app = __esm({
     init_mode();
     init_classify();
     init_skills();
+    init_db();
     init_manager4();
     init_sessions();
     init_image();