skill-distill 1.0.1 → 1.0.4

package/dist/cli.js

@@ -42,54 +42,144 @@ var SessionLoader = class {
 
 // src/loaders/claude.ts
 var ClaudeSessionLoader = class extends SessionLoader {
+  transcriptsPath;
+  projectsPath;
   constructor(options = {}) {
     super(options);
+    const claudeDir = join(homedir(), ".claude");
+    this.transcriptsPath = join(claudeDir, "transcripts");
+    this.projectsPath = join(claudeDir, "projects");
   }
   getDefaultBasePath() {
-    return join(homedir(), ".claude", "transcripts");
+    return join(homedir(), ".claude");
   }
   async listSessions() {
+    const sessions = [];
+    const transcriptSessions = await this.listTranscriptSessions();
+    const projectSessions = await this.listProjectSessions();
+    sessions.push(...transcriptSessions, ...projectSessions);
+    return sessions.sort(
+      (a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime()
+    );
+  }
+  async listTranscriptSessions() {
     const sessions = [];
     try {
-      const files = await fs.readdir(this.basePath);
+      const files = await fs.readdir(this.transcriptsPath);
       for (const file of files) {
         if (!file.endsWith(".jsonl") || !file.startsWith("ses_")) continue;
-        const filePath = join(this.basePath, file);
-        const stat = await fs.stat(filePath);
+        const filePath = join(this.transcriptsPath, file);
         const sessionId = file.replace(".jsonl", "");
-        const entries = await this.readTranscriptFile(filePath);
-        if (entries.length === 0) continue;
-        const userMessages = entries.filter((e) => e.type === "user");
-        const firstEntry = entries[0];
-        const lastEntry = entries[entries.length - 1];
-        sessions.push({
-          id: sessionId,
-          projectPath: "",
-          startTime: firstEntry.timestamp,
-          endTime: lastEntry.timestamp,
-          messageCount: userMessages.length,
-          summary: this.extractSummary(entries)
-        });
+        try {
+          const entries = await this.readTranscriptFile(filePath);
+          if (entries.length === 0) continue;
+          const userMessages = entries.filter((e) => e.type === "user");
+          const firstEntry = entries[0];
+          const lastEntry = entries[entries.length - 1];
+          sessions.push({
+            id: sessionId,
+            projectPath: "[transcripts]",
+            startTime: firstEntry.timestamp,
+            endTime: lastEntry.timestamp,
+            messageCount: userMessages.length,
+            summary: this.extractTranscriptSummary(entries)
+          });
+        } catch {
+          continue;
+        }
       }
-    } catch (error) {
-      throw new Error(`Failed to list sessions: ${error}`);
+    } catch {
     }
-    return sessions.sort(
-      (a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime()
-    );
+    return sessions;
+  }
+  async listProjectSessions() {
+    const sessions = [];
+    const sessionMap = /* @__PURE__ */ new Map();
+    try {
+      const projectDirs = await fs.readdir(this.projectsPath);
+      for (const projectDir of projectDirs) {
+        if (projectDir.startsWith(".")) continue;
+        const projectPath = join(this.projectsPath, projectDir);
+        const stat = await fs.stat(projectPath);
+        if (!stat.isDirectory()) continue;
+        const files = await fs.readdir(projectPath);
+        for (const file of files) {
+          if (!file.endsWith(".jsonl")) continue;
+          if (file.startsWith("agent-")) continue;
+          const filePath = join(projectPath, file);
+          const sessionId = file.replace(".jsonl", "");
+          sessionMap.set(sessionId, {
+            id: sessionId,
+            filePath,
+            projectPath: this.decodeProjectPath(projectDir),
+            source: "projects"
+          });
+        }
+      }
+      for (const [sessionId, source] of sessionMap) {
+        try {
+          const entries = await this.readProjectFile(source.filePath);
+          if (entries.length === 0) continue;
+          const userMessages = entries.filter(
+            (e) => e.type === "user" && e.message?.role === "user"
+          );
+          const timestamps = entries.filter((e) => e.timestamp).map((e) => e.timestamp);
+          if (timestamps.length === 0) continue;
+          sessions.push({
+            id: sessionId,
+            projectPath: source.projectPath,
+            startTime: timestamps[0],
+            endTime: timestamps[timestamps.length - 1],
+            messageCount: userMessages.length,
+            summary: this.extractProjectSummary(entries)
+          });
+        } catch {
+          continue;
+        }
+      }
+    } catch {
+    }
+    return sessions;
   }
   async getSession(id) {
-    const filePath = join(this.basePath, `${id}.jsonl`);
+    const transcriptPath = join(this.transcriptsPath, `${id}.jsonl`);
     try {
-      await fs.access(filePath);
+      await fs.access(transcriptPath);
+      const entries = await this.readTranscriptFile(transcriptPath);
+      if (entries.length > 0) {
+        return this.transformTranscriptSession(id, entries);
+      }
     } catch {
-      throw new Error(`Session not found: ${id}`);
     }
-    const entries = await this.readTranscriptFile(filePath);
-    if (entries.length === 0) {
-      throw new Error(`Empty session: ${id}`);
+    const projectFile = await this.findProjectSessionFile(id);
+    if (projectFile) {
+      const entries = await this.readProjectFile(projectFile.filePath);
+      return this.transformProjectSession(id, entries, projectFile.projectPath);
     }
-    return this.transformSession(id, entries);
+    throw new Error(`Session not found: ${id}`);
+  }
+  async findProjectSessionFile(sessionId) {
+    try {
+      const projectDirs = await fs.readdir(this.projectsPath);
+      for (const projectDir of projectDirs) {
+        if (projectDir.startsWith(".")) continue;
+        const projectPath = join(this.projectsPath, projectDir);
+        const stat = await fs.stat(projectPath);
+        if (!stat.isDirectory()) continue;
+        const sessionFile = join(projectPath, `${sessionId}.jsonl`);
+        try {
+          await fs.access(sessionFile);
+          return {
+            filePath: sessionFile,
+            projectPath: this.decodeProjectPath(projectDir)
+          };
+        } catch {
+          continue;
+        }
+      }
+    } catch {
+    }
+    return null;
   }
   async readTranscriptFile(path) {
     try {
@@ -100,7 +190,16 @@ var ClaudeSessionLoader = class extends SessionLoader {
       return [];
     }
   }
-  transformSession(id, entries) {
+  async readProjectFile(path) {
+    try {
+      const content = await fs.readFile(path, "utf-8");
+      const lines = content.trim().split("\n").filter(Boolean);
+      return lines.map((line) => JSON.parse(line));
+    } catch {
+      return [];
+    }
+  }
+  transformTranscriptSession(id, entries) {
     const messages = [];
     let currentAssistantContent = "";
     let currentToolCalls = [];
@@ -111,7 +210,7 @@ var ClaudeSessionLoader = class extends SessionLoader {
         if (currentAssistantContent || currentToolCalls?.length) {
           messages.push({
             role: "assistant",
-            content: currentAssistantContent,
+            content: currentAssistantContent.trim(),
             timestamp: lastTimestamp,
             toolCalls: currentToolCalls.length > 0 ? currentToolCalls : void 0,
             toolResults: currentToolResults.length > 0 ? currentToolResults : void 0
@@ -156,19 +255,64 @@ var ClaudeSessionLoader = class extends SessionLoader {
     const lastEntry = entries[entries.length - 1];
     return {
       id,
-      projectPath: "",
+      projectPath: "[transcripts]",
       startTime: firstEntry.timestamp,
       endTime: lastEntry.timestamp,
       messages
     };
   }
-  extractSummary(entries) {
+  transformProjectSession(id, entries, projectPath) {
+    const messages = [];
+    for (const entry of entries) {
+      if (entry.type === "file-history-snapshot") continue;
+      if (entry.message) {
+        const content = this.extractMessageContent(entry.message.content);
+        if (content) {
+          messages.push({
+            role: entry.message.role === "user" ? "user" : "assistant",
+            content,
+            timestamp: entry.timestamp
+          });
+        }
+      }
+    }
+    const timestamps = entries.filter((e) => e.timestamp).map((e) => e.timestamp);
+    return {
+      id,
+      projectPath,
+      startTime: timestamps[0] ?? "",
+      endTime: timestamps[timestamps.length - 1] ?? "",
+      messages
+    };
+  }
+  extractMessageContent(content) {
+    if (typeof content === "string") {
+      return content;
+    }
+    if (Array.isArray(content)) {
+      return content.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n");
+    }
+    return "";
+  }
+  decodeProjectPath(encoded) {
+    return encoded.replace(/-/g, "/").replace(/^\//, "");
+  }
+  extractTranscriptSummary(entries) {
     const firstUserEntry = entries.find((e) => e.type === "user");
     if (!firstUserEntry?.content) return "";
     const content = firstUserEntry.content;
     const firstLine = content.split("\n")[0];
     return firstLine.length > 80 ? firstLine.slice(0, 80) + "..." : firstLine;
   }
+  extractProjectSummary(entries) {
+    const firstUserEntry = entries.find(
+      (e) => e.type === "user" && e.message?.role === "user"
+    );
+    if (!firstUserEntry?.message) return "";
+    const content = this.extractMessageContent(firstUserEntry.message.content);
+    const firstLine = content.split("\n")[0];
+    return firstLine.length > 80 ? firstLine.slice(0, 80) + "..." : firstLine;
+  }
 };
 
 // src/loaders/codex.ts
@@ -413,7 +557,41 @@ ${userPrompts.map((p) => `- ${p}`).join("\n")}` : "";
       qualityEnhancement(JSON.stringify(skill, null, 2)),
       SYSTEM_SKILL_WRITER
     );
-    return this.parseJson(response, z.any());
+    try {
+      const enhanced = this.parseJson(response, z.any());
+      const mergedSteps = (enhanced.steps ?? skill.steps ?? []).map((step) => {
+        if (typeof step === "object" && step !== null) {
+          const s = step;
+          return {
+            title: String(s.title ?? s.name ?? "Step"),
+            description: String(s.description ?? s.content ?? ""),
+            substeps: Array.isArray(s.substeps) ? s.substeps.map(String) : void 0
+          };
+        }
+        return { title: "Step", description: String(step) };
+      });
+      const mergedExamples = (enhanced.examples ?? skill.examples ?? []).map((ex) => {
+        if (typeof ex === "string") return ex;
+        if (typeof ex === "object" && ex !== null) {
+          const e = ex;
+          return String(e.text ?? e.example ?? e.content ?? JSON.stringify(ex));
+        }
+        return String(ex);
+      });
+      return {
+        metadata: enhanced.metadata ?? skill.metadata ?? { name: "Untitled", description: "", version: "1.0.0" },
+        overview: enhanced.overview ?? skill.overview ?? "",
+        triggers: enhanced.triggers ?? skill.triggers ?? [],
+        prerequisites: enhanced.prerequisites ?? skill.prerequisites ?? [],
+        steps: mergedSteps,
+        parameters: enhanced.parameters ?? skill.parameters ?? [],
+        errorHandling: enhanced.errorHandling ?? skill.errorHandling ?? {},
+        examples: mergedExamples,
+        notes: enhanced.notes ?? skill.notes ?? []
+      };
+    } catch {
+      return skill;
+    }
   }
   async generateDescription(intent) {
     const response = await this.chat(
@@ -805,7 +983,7 @@ var Distiller = class {
 
 // src/generators/skill-generator.ts
 import { promises as fs4 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/generators/frontmatter-builder.ts
 import { stringify } from "yaml";
@@ -1044,6 +1222,14 @@ var TemplateValidator = class {
 
 // src/utils/fs.ts
 import { promises as fs3 } from "fs";
+import { homedir as homedir4 } from "os";
+import { join as join5 } from "path";
+function expandHome(path) {
+  if (path.startsWith("~")) {
+    return join5(homedir4(), path.slice(1));
+  }
+  return path;
+}
 async function ensureDir(path) {
   await fs3.mkdir(path, { recursive: true });
 }
@@ -1071,7 +1257,7 @@ var SkillGenerator = class {
   async generate(skill, options) {
     const { outputDir, overwrite = false, includeReferences = true } = options;
     const skillDirName = this.toKebabCase(skill.metadata.name);
-    const skillDir = join5(outputDir, skillDirName);
+    const skillDir = join6(outputDir, skillDirName);
     if (!overwrite && await this.exists(skillDir)) {
       throw new Error(`Skill directory already exists: ${skillDir}`);
     }
@@ -1081,7 +1267,7 @@ var SkillGenerator = class {
     });
     const content = this.renderSkill(skill);
     const validation = this.validator.validate(content, skill);
-    const skillPath = join5(skillDir, "SKILL.md");
+    const skillPath = join6(skillDir, "SKILL.md");
     await fs4.writeFile(skillPath, content, "utf-8");
     const files = [skillPath];
     if (includeReferences && skill.references?.length) {
@@ -1122,9 +1308,9 @@ var SkillGenerator = class {
     return parts.join("\n\n");
   }
   async generateReferences(skillDir, skill) {
-    const refDir = join5(skillDir, "references");
+    const refDir = join6(skillDir, "references");
     await ensureDir(refDir);
-    const patternsPath = join5(refDir, "patterns.md");
+    const patternsPath = join6(refDir, "patterns.md");
     const patternsContent = `# Patterns and Best Practices
 
 This file contains detailed patterns extracted from the original conversation.
@@ -1190,8 +1376,8 @@ async function collectPromptsInteractively() {
 
 // src/installers/claude.ts
 import { promises as fs5 } from "fs";
-import { join as join6 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join7 } from "path";
+import { homedir as homedir5 } from "os";
 
 // src/installers/base.ts
 var AgentInstaller = class {
@@ -1213,7 +1399,7 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
     this.generator = new SkillGenerator();
   }
   getDefaultBasePath() {
-    return join6(homedir4(), ".claude", "plugins", "local", "skills");
+    return join7(homedir5(), ".claude", "plugins", "local", "skills");
   }
   getPlatformName() {
     return "Claude Code";
@@ -1221,7 +1407,7 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
   async install(skill, options = {}) {
     const { overwrite = false, backup = true, verify = true } = options;
     const skillDirName = this.toKebabCase(skill.metadata.name);
-    const skillPath = join6(this.basePath, skillDirName);
+    const skillPath = join7(this.basePath, skillDirName);
     if (await fileExists(skillPath)) {
       if (!overwrite) {
         return {
@@ -1257,7 +1443,7 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
     };
   }
   async uninstall(skillName) {
-    const skillPath = join6(this.basePath, this.toKebabCase(skillName));
+    const skillPath = join7(this.basePath, this.toKebabCase(skillName));
     if (!await fileExists(skillPath)) {
       throw new Error(`Skill not found: ${skillName}`);
     }
@@ -1269,14 +1455,14 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
       const entries = await fs5.readdir(this.basePath, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
-        const skillMdPath = join6(this.basePath, entry.name, "SKILL.md");
+        const skillMdPath = join7(this.basePath, entry.name, "SKILL.md");
         if (await fileExists(skillMdPath)) {
           const content = await fs5.readFile(skillMdPath, "utf-8");
           const metadata = this.parseMetadata(content);
           const stat = await fs5.stat(skillMdPath);
           skills.push({
             name: metadata.name ?? entry.name,
-            path: join6(this.basePath, entry.name),
+            path: join7(this.basePath, entry.name),
             version: metadata.version ?? "0.0.0",
             installedAt: stat.mtime.toISOString()
           });
@@ -1287,7 +1473,7 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
     return skills;
   }
   async verifyInstallation(skillPath) {
-    const skillMd = join6(skillPath, "SKILL.md");
+    const skillMd = join7(skillPath, "SKILL.md");
     if (!await fileExists(skillMd)) {
       return false;
     }
@@ -1320,8 +1506,8 @@ var ClaudeCodeInstaller = class extends AgentInstaller {
 
 // src/installers/codex.ts
 import { promises as fs6 } from "fs";
-import { join as join7 } from "path";
-import { homedir as homedir5 } from "os";
+import { join as join8 } from "path";
+import { homedir as homedir6 } from "os";
 
 // src/formatters/claude-formatter.ts
 import { stringify as stringify2 } from "yaml";
@@ -1584,7 +1770,7 @@ var CodexInstaller = class extends AgentInstaller {
     this.converter = new FormatConverter();
   }
   getDefaultBasePath() {
-    return join7(homedir5(), ".codex", "agents");
+    return join8(homedir6(), ".codex", "agents");
   }
   getPlatformName() {
     return "Codex CLI";
@@ -1592,7 +1778,7 @@ var CodexInstaller = class extends AgentInstaller {
   async install(skill, options = {}) {
     const { overwrite = false } = options;
     const agentName = this.toKebabCase(skill.metadata.name);
-    const agentPath = join7(this.basePath, `${agentName}.md`);
+    const agentPath = join8(this.basePath, `${agentName}.md`);
     if (await fileExists(agentPath) && !overwrite) {
       return {
         success: false,
@@ -1610,7 +1796,7 @@ var CodexInstaller = class extends AgentInstaller {
     };
   }
   async uninstall(skillName) {
-    const agentPath = join7(this.basePath, `${this.toKebabCase(skillName)}.md`);
+    const agentPath = join8(this.basePath, `${this.toKebabCase(skillName)}.md`);
     if (!await fileExists(agentPath)) {
       throw new Error(`Agent not found: ${skillName}`);
     }
@@ -1622,7 +1808,7 @@ var CodexInstaller = class extends AgentInstaller {
       const files = await fs6.readdir(this.basePath);
       for (const file of files) {
         if (!file.endsWith(".md")) continue;
-        const agentPath = join7(this.basePath, file);
+        const agentPath = join8(this.basePath, file);
         const stat = await fs6.stat(agentPath);
         skills.push({
           name: file.replace(".md", ""),
@@ -1642,7 +1828,7 @@ var CodexInstaller = class extends AgentInstaller {
 
 // src/installers/cursor.ts
 import { promises as fs7 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var CursorInstaller = class extends AgentInstaller {
   converter;
   projectPath;
@@ -1659,7 +1845,7 @@ var CursorInstaller = class extends AgentInstaller {
   }
   async install(skill, options = {}) {
     const { overwrite = false, backup = true } = options;
-    const rulesPath = join8(this.basePath, ".cursorrules");
+    const rulesPath = join9(this.basePath, ".cursorrules");
     if (await fileExists(rulesPath)) {
       if (!overwrite) {
         return {
@@ -1682,14 +1868,14 @@ var CursorInstaller = class extends AgentInstaller {
     };
   }
   async uninstall(_skillName) {
-    const rulesPath = join8(this.basePath, ".cursorrules");
+    const rulesPath = join9(this.basePath, ".cursorrules");
     if (!await fileExists(rulesPath)) {
       throw new Error(".cursorrules not found");
     }
     await fs7.unlink(rulesPath);
   }
   async list() {
-    const rulesPath = join8(this.basePath, ".cursorrules");
+    const rulesPath = join9(this.basePath, ".cursorrules");
     if (!await fileExists(rulesPath)) {
       return [];
     }
@@ -1724,16 +1910,16 @@ function createInstaller(platform, options = {}) {
 
 // src/cli/config.ts
 import { promises as fs8 } from "fs";
-import { join as join9 } from "path";
-import { homedir as homedir6 } from "os";
-var CONFIG_DIR = join9(homedir6(), ".skill-distill");
-var CONFIG_FILE = join9(CONFIG_DIR, "config.json");
+import { join as join10 } from "path";
+import { homedir as homedir7 } from "os";
+var CONFIG_DIR = join10(homedir7(), ".skill-distill");
+var CONFIG_FILE = join10(CONFIG_DIR, "config.json");
 var DEFAULT_CONFIG = {
   defaultPlatform: "claude",
-  outputDir: join9(homedir6(), ".skills"),
+  outputDir: join10(homedir7(), ".skills"),
   autoInstall: false,
   sessionSources: {
-    claude: join9(homedir6(), ".claude", "projects")
+    claude: join10(homedir7(), ".claude", "projects")
   }
 };
 async function loadConfig() {
@@ -1817,7 +2003,7 @@ async function runDistill(sessionArg, options) {
       `  Token usage: ${chalk3.white(result.metadata.tokenUsage.input + result.metadata.tokenUsage.output)}`
     )
   );
-  const outputDir = options.output ?? config.outputDir ?? "./skills";
+  const outputDir = expandHome(options.output ?? config.outputDir ?? "~/.skills");
   spinner.start("Generating Skill files...");
   const generator = new SkillGenerator();
   const genResult = await generator.generate(result.skill, {