@intentius/chant 0.0.5 → 0.0.8

package/bin/chant

@@ -0,0 +1,20 @@
+#!/bin/sh
+# Cross-runtime CLI wrapper. Tries bun first, falls back to npx tsx.
+set -e
+
+# Resolve symlinks to find the real script location
+SELF="$0"
+while [ -L "$SELF" ]; do
+  DIR="$(cd "$(dirname "$SELF")" && pwd)"
+  SELF="$(readlink "$SELF")"
+  # Handle relative symlink targets
+  case "$SELF" in /*) ;; *) SELF="$DIR/$SELF" ;; esac
+done
+SCRIPT_DIR="$(cd "$(dirname "$SELF")" && pwd)"
+MAIN_TS="$SCRIPT_DIR/../src/cli/main.ts"
+
+if command -v bun >/dev/null 2>&1; then
+  exec bun "$MAIN_TS" "$@"
+else
+  exec npx tsx "$MAIN_TS" "$@"
+fi

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@intentius/chant",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "license": "Apache-2.0",
   "type": "module",
-  "files": ["src/"],
+  "files": ["src/", "bin/"],
   "publishConfig": {
-  "access": "public"
-},
-"bin": {
-  "chant": "./src/cli/main.ts"
-},
-"exports": {
-  ".": "./src/index.ts",
-  "./cli": "./src/cli/index.ts",
-  "./cli/*": "./src/cli/*",
-  "./*": "./src/*"
-},
-"dependencies": {
-  "fflate": "^0.8.2",
-  "zod": "^4.3.6"
-}
+    "access": "public"
+  },
+  "bin": {
+    "chant": "./bin/chant"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./cli": "./src/cli/index.ts",
+    "./cli/*": "./src/cli/*",
+    "./*": "./src/*"
+  },
+  "dependencies": {
+    "fflate": "^0.8.2",
+    "picomatch": "^4.0.3",
+    "zod": "^4.3.6"
+  }
 }

package/src/cli/commands/__fixtures__/init-lexicon-output/src/plugin.ts

@@ -42,31 +42,6 @@ export const fixturePlugin: LexiconPlugin = {
     console.error(`Packaged ${stats.resources} resources, ${stats.ruleCount} rules, ${stats.skillCount} skills`);
   },
 
-  async rollback(options?: { restore?: string; verbose?: boolean }): Promise<void> {
-    const { listSnapshots, restoreSnapshot } = await import("./codegen/rollback");
-    const { join, dirname } = await import("path");
-    const { fileURLToPath } = await import("url");
-
-    const pkgDir = dirname(dirname(fileURLToPath(import.meta.url)));
-    const snapshotsDir = join(pkgDir, ".snapshots");
-
-    if (options?.restore) {
-      const generatedDir = join(pkgDir, "src", "generated");
-      restoreSnapshot(String(options.restore), generatedDir);
-      console.error(`Restored snapshot: ${options.restore}`);
-    } else {
-      const snapshots = listSnapshots(snapshotsDir);
-      if (snapshots.length === 0) {
-        console.error("No snapshots available.");
-      } else {
-        console.error(`Available snapshots (${snapshots.length}):`);
-        for (const s of snapshots) {
-          console.error(`  ${s.timestamp}  ${s.resources} resources  ${s.path}`);
-        }
-      }
-    }
-  },
-
   // ── Optional extensions (uncomment and implement as needed) ───
 
   // lintRules(): LintRule[] {

package/src/cli/commands/__snapshots__/init-lexicon.test.ts.snap

@@ -152,31 +152,6 @@ export const fixturePlugin: LexiconPlugin = {
     console.error(\`Packaged \${stats.resources} resources, \${stats.ruleCount} rules, \${stats.skillCount} skills\`);
   },
 
-  async rollback(options?: { restore?: string; verbose?: boolean }): Promise<void> {
-    const { listSnapshots, restoreSnapshot } = await import("./codegen/rollback");
-    const { join, dirname } = await import("path");
-    const { fileURLToPath } = await import("url");
-
-    const pkgDir = dirname(dirname(fileURLToPath(import.meta.url)));
-    const snapshotsDir = join(pkgDir, ".snapshots");
-
-    if (options?.restore) {
-      const generatedDir = join(pkgDir, "src", "generated");
-      restoreSnapshot(String(options.restore), generatedDir);
-      console.error(\`Restored snapshot: \${options.restore}\`);
-    } else {
-      const snapshots = listSnapshots(snapshotsDir);
-      if (snapshots.length === 0) {
-        console.error("No snapshots available.");
-      } else {
-        console.error(\`Available snapshots (\${snapshots.length}):\`);
-        for (const s of snapshots) {
-          console.error(\`  \${s.timestamp}  \${s.resources} resources  \${s.path}\`);
-        }
-      }
-    }
-  },
-
   // ── Optional extensions (uncomment and implement as needed) ───
 
   // lintRules(): LintRule[] {

package/src/cli/commands/build.ts

@@ -5,7 +5,7 @@ import { runPostSynthChecks } from "../../lint/post-synth";
 import type { PostSynthCheck } from "../../lint/post-synth";
 import { formatError, formatWarning, formatSuccess, formatBold, formatInfo } from "../format";
 import { writeFileSync } from "fs";
-import { resolve } from "path";
+import { resolve, dirname, join } from "path";
 import { watchDirectory, formatTimestamp, formatChangedFiles } from "../watch";
 
 /**
@@ -172,7 +172,6 @@ export async function buildCommand(options: BuildOptions): Promise<BuildResult>
 
         // Write additional files (e.g. nested stack templates) alongside the primary output
         if (additionalFiles.size > 0) {
-          const { dirname, join } = require("path");
           const outputDir = dirname(outputPath);
           for (const [filename, content] of additionalFiles) {
             let fileContent = content;

package/src/cli/commands/import.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync } from "fs";
 import { join, resolve, basename } from "path";
 import { formatSuccess, formatWarning, formatError } from "../format";
 import type { TemplateIR, ResourceIR, TemplateParser } from "../../import/parser";
@@ -266,7 +266,7 @@ export async function importCommand(options: ImportOptions): Promise<ImportResul
 
   // Check output directory
   if (existsSync(outputDir) && !options.force) {
-    const files = require("fs").readdirSync(outputDir);
+    const files = readdirSync(outputDir);
     if (files.length > 0) {
       warnings.push(`Output directory ${outputDir} is not empty. Use --force to overwrite.`);
     }

package/src/cli/commands/init-lexicon.test.ts

@@ -40,7 +40,6 @@ describe("initLexiconCommand", () => {
       "src/codegen/generate-cli.ts",
       "src/codegen/naming.ts",
       "src/codegen/package.ts",
-      "src/codegen/rollback.ts",
       "src/codegen/docs.ts",
       "src/spec/fetch.ts",
       "src/spec/parse.ts",
@@ -65,7 +64,6 @@ describe("initLexiconCommand", () => {
       "docs/src/content/docs/index.mdx",
       "src/generated/.gitkeep",
       "examples/getting-started/.gitkeep",
-      ".snapshots/.gitkeep",
     ];
 
     for (const file of expectedFiles) {
@@ -83,7 +81,6 @@ describe("initLexiconCommand", () => {
     expect(pluginContent).toContain("async validate(");
     expect(pluginContent).toContain("async coverage(");
     expect(pluginContent).toContain("async package(");
-    expect(pluginContent).toContain("async rollback(");
   });
 
   test("package name uses the provided lexicon name", async () => {

package/src/cli/commands/init-lexicon.ts

@@ -106,31 +106,6 @@ export const ${names.pluginVarName}: LexiconPlugin = {
     console.error(\`Packaged \${stats.resources} resources, \${stats.ruleCount} rules, \${stats.skillCount} skills\`);
   },
 
-  async rollback(options?: { restore?: string; verbose?: boolean }): Promise<void> {
-    const { listSnapshots, restoreSnapshot } = await import("./codegen/rollback");
-    const { join, dirname } = await import("path");
-    const { fileURLToPath } = await import("url");
-
-    const pkgDir = dirname(dirname(fileURLToPath(import.meta.url)));
-    const snapshotsDir = join(pkgDir, ".snapshots");
-
-    if (options?.restore) {
-      const generatedDir = join(pkgDir, "src", "generated");
-      restoreSnapshot(String(options.restore), generatedDir);
-      console.error(\`Restored snapshot: \${options.restore}\`);
-    } else {
-      const snapshots = listSnapshots(snapshotsDir);
-      if (snapshots.length === 0) {
-        console.error("No snapshots available.");
-      } else {
-        console.error(\`Available snapshots (\${snapshots.length}):\`);
-        for (const s of snapshots) {
-          console.error(\`  \${s.timestamp}  \${s.resources} resources  \${s.path}\`);
-        }
-      }
-    }
-  },
-
   // ── Optional extensions (uncomment and implement as needed) ───
 
   // lintRules(): LintRule[] {
@@ -382,55 +357,6 @@ export async function packageLexicon(options?: { verbose?: boolean; force?: bool
 `;
 }
 
-function generateCodegenRollbackTs(): string {
-  return `import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync, cpSync } from "fs";
-import { join, basename } from "path";
-
-export interface Snapshot {
-  timestamp: string;
-  resources: number;
-  path: string;
-}
-
-/**
- * List available generation snapshots.
- */
-export function listSnapshots(snapshotsDir: string): Snapshot[] {
-  if (!existsSync(snapshotsDir)) return [];
-
-  return readdirSync(snapshotsDir)
-    .filter((d) => !d.startsWith("."))
-    .sort()
-    .reverse()
-    .map((dir) => {
-      const fullPath = join(snapshotsDir, dir);
-      const metaPath = join(fullPath, "meta.json");
-      let resources = 0;
-      if (existsSync(metaPath)) {
-        try {
-          const meta = JSON.parse(readFileSync(metaPath, "utf-8"));
-          resources = meta.resources ?? 0;
-        } catch {}
-      }
-      return { timestamp: dir, resources, path: fullPath };
-    });
-}
-
-/**
- * Restore a snapshot to the generated directory.
- */
-export function restoreSnapshot(timestamp: string, generatedDir: string): void {
-  const snapshotsDir = join(generatedDir, "..", "..", ".snapshots");
-  const snapshotDir = join(snapshotsDir, timestamp);
-  if (!existsSync(snapshotDir)) {
-    throw new Error(\`Snapshot not found: \${timestamp}\`);
-  }
-  mkdirSync(generatedDir, { recursive: true });
-  cpSync(snapshotDir, generatedDir, { recursive: true });
-}
-`;
-}
-
 function generateCodegenDocsTs(name: string): string {
   return `import { docsPipeline, writeDocsSite } from "@intentius/chant/codegen/docs";
 
@@ -735,8 +661,7 @@ package: generate validate
 }
 
 function generateGitignore(): string {
-  return `.snapshots/
-dist/
+  return `dist/
 node_modules/
 .cache/
 `;
@@ -899,7 +824,6 @@ export async function initLexiconCommand(options: InitLexiconOptions): Promise<I
     "docs/src/content",
     "docs/src/content/docs",
     "examples/getting-started",
-    ".snapshots",
   ];
 
   for (const dir of dirs) {
@@ -918,7 +842,6 @@ export async function initLexiconCommand(options: InitLexiconOptions): Promise<I
     "src/codegen/generate-cli.ts": generateCodegenGenerateCliTs(),
     "src/codegen/naming.ts": generateCodegenNamingTs(),
     "src/codegen/package.ts": generateCodegenPackageTs(name),
-    "src/codegen/rollback.ts": generateCodegenRollbackTs(),
     "src/codegen/docs.ts": generateCodegenDocsTs(name),
     "src/spec/fetch.ts": generateSpecFetchTs(),
     "src/spec/parse.ts": generateSpecParseTs(),
@@ -947,7 +870,6 @@ export async function initLexiconCommand(options: InitLexiconOptions): Promise<I
   const gitkeeps = [
     "src/generated/.gitkeep",
     "examples/getting-started/.gitkeep",
-    ".snapshots/.gitkeep",
   ];
 
   for (const gk of gitkeeps) {

package/src/cli/commands/init.ts

@@ -426,18 +426,29 @@ export async function initCommand(options: InitOptions): Promise<InitResult> {
   }
 
   // Install skills from the lexicon's plugin
+  // Write to both .chant/skills/ (chant's own location) and .claude/skills/ (Claude Code discovery)
   try {
     const plugin = await loadPlugin(options.lexicon);
     if (plugin.skills) {
       const skills = plugin.skills();
       if (skills.length > 0) {
-        const skillsDir = join(targetDir, ".chant", "skills", options.lexicon);
-        mkdirSync(skillsDir, { recursive: true });
+        // .chant/skills/ — chant's own skill storage
+        const chantSkillsDir = join(targetDir, ".chant", "skills", options.lexicon);
+        mkdirSync(chantSkillsDir, { recursive: true });
         for (const skill of skills) {
-          const skillPath = join(skillsDir, `${skill.name}.md`);
+          const skillPath = join(chantSkillsDir, `${skill.name}.md`);
           writeFileSync(skillPath, skill.content);
           createdFiles.push(`.chant/skills/${options.lexicon}/${skill.name}.md`);
         }
+
+        // .claude/skills/ — Claude Code skill discovery format
+        for (const skill of skills) {
+          const claudeSkillDir = join(targetDir, ".claude", "skills", skill.name);
+          mkdirSync(claudeSkillDir, { recursive: true });
+          const claudeSkillPath = join(claudeSkillDir, "SKILL.md");
+          writeFileSync(claudeSkillPath, skill.content);
+          createdFiles.push(`.claude/skills/${skill.name}/SKILL.md`);
+        }
       }
     }
   } catch {

package/src/cli/commands/list.ts

@@ -51,8 +51,8 @@ export async function listCommand(options: ListOptions): Promise<ListResult> {
   for (const [name, decl] of result.entities) {
     entities.push({
       name,
-      lexicon: decl.lexicon,
-      entityType: decl.entityType,
+      lexicon: decl.lexicon ?? "",
+      entityType: decl.entityType ?? "",
       kind: decl.kind ?? "resource",
     });
   }

package/src/cli/commands/update.ts

@@ -1,5 +1,6 @@
-import { existsSync, mkdirSync, writeFileSync, cpSync, readdirSync, statSync } from "fs";
+import { existsSync, mkdirSync, writeFileSync, cpSync, readdirSync, statSync, readFileSync } from "fs";
 import { join, resolve } from "path";
+import { createRequire } from "module";
 import { formatSuccess, formatWarning, formatError } from "../format";
 import { loadChantConfig } from "../../config";
 import { loadPlugins } from "../plugins";
@@ -63,13 +64,14 @@ function copyTypeFiles(src: string, dest: string): number {
 function resolvePackagePath(packageName: string, projectDir: string): string | undefined {
   // Try resolve from project dir
   try {
-    const entryPoint = require.resolve(packageName, { paths: [projectDir] });
+    const _require = createRequire(join(projectDir, "package.json"));
+    const entryPoint = _require.resolve(packageName);
     // Walk up from entry point to find package root
     let dir = entryPoint;
     while (dir !== "/") {
       dir = join(dir, "..");
       if (existsSync(join(dir, "package.json"))) {
-        const pkg = JSON.parse(require("fs").readFileSync(join(dir, "package.json"), "utf-8"));
+        const pkg = JSON.parse(readFileSync(join(dir, "package.json"), "utf-8"));
         if (pkg.name === packageName) return dir;
       }
     }

package/src/cli/conflict-check.test.ts

@@ -22,7 +22,6 @@ function makePlugin(
     validate: noopAsync,
     coverage: noopAsync,
     package: noopAsync,
-    rollback: noopAsync,
   };
 
   if (opts.rules) {

package/src/cli/handlers/dev.ts

@@ -21,18 +21,10 @@ export async function runDevPublish(ctx: CommandContext): Promise<number> {
   return 0;
 }
 
-export async function runDevRollback(ctx: CommandContext): Promise<number> {
-  for (const plugin of ctx.plugins) {
-    await plugin.rollback({ verbose: ctx.args.verbose });
-    console.error(formatSuccess(`${plugin.name}: rollback complete`));
-  }
-  return 0;
-}
-
 export async function runDevUnknown(ctx: CommandContext): Promise<number> {
   console.error(formatError({
     message: `Unknown dev subcommand: ${ctx.args.path}`,
-    hint: "Available: chant dev generate, chant dev publish, chant dev rollback",
+    hint: "Available: chant dev generate, chant dev publish",
   }));
   return 1;
 }

package/src/cli/main.ts

@@ -4,9 +4,11 @@ import { resolve } from "node:path";
 import { formatSuccess, formatError } from "./format";
 import { loadPlugins, resolveProjectLexicons } from "./plugins";
 import { resolveCommand, type CommandDef, type ParsedArgs } from "./registry";
+import { loadChantConfig } from "../config";
+import { initRuntime } from "../runtime-adapter";
 import { runBuild } from "./handlers/build";
 import { runLint } from "./handlers/lint";
-import { runDevGenerate, runDevPublish, runDevRollback, runDevUnknown } from "./handlers/dev";
+import { runDevGenerate, runDevPublish, runDevUnknown } from "./handlers/dev";
 import { runServeLsp, runServeMcp, runServeUnknown } from "./handlers/serve";
 import { runInit, runInitLexicon } from "./handlers/init";
 import { runList, runImport, runUpdate, runDoctor } from "./handlers/misc";
@@ -89,7 +91,6 @@ Commands:
 Lexicon development:
   dev generate          Generate lexicon artifacts (+ validate + coverage)
   dev publish           Package lexicon for distribution
-  dev rollback          List or restore generation snapshots
 
 Servers:
   serve lsp             Start the LSP server (stdio)
@@ -167,7 +168,6 @@ const registry: CommandDef[] = [
   // Dev subcommands
   { name: "dev generate", requiresPlugins: true, handler: runDevGenerate },
   { name: "dev publish", requiresPlugins: true, handler: runDevPublish },
-  { name: "dev rollback", requiresPlugins: true, handler: runDevRollback },
 
   // Serve subcommands
   { name: "serve lsp", requiresPlugins: true, handler: runServeLsp },
@@ -189,6 +189,16 @@ async function main(): Promise<void> {
     process.exit(args.help ? 0 : 1);
   }
 
+  // Initialize runtime adapter early — before plugins or commands run
+  const projectPath0 = resolve(args.path === "." ? "." : args.path);
+  try {
+    const { config } = await loadChantConfig(projectPath0);
+    initRuntime(config.runtime);
+  } catch {
+    // Config may not exist yet (e.g. `chant init`); auto-detect runtime
+    initRuntime();
+  }
+
   const match = resolveCommand(args, registry);
   if (!match) {
     console.error(formatError({