@hasna/skills 0.7.3 → 0.8.1

package/bin/migrate.js

@@ -2,12 +2,12 @@
 // @bun
 
 // src/server/migrate.ts
-import { existsSync as existsSync4, readdirSync as readdirSync3, readFileSync as readFileSync3 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync4, readdirSync as readdirSync2, readFileSync as readFileSync3 } from "fs";
+import { join as join5 } from "path";
 // package.json
 var package_default = {
   name: "@hasna/skills",
-  version: "0.7.3",
+  version: "0.8.1",
   description: "Skills library for AI coding agents",
   type: "module",
   bin: {
@@ -92,7 +92,8 @@ var package_default = {
   author: "Hasna",
   license: "Apache-2.0",
   devDependencies: {
-    "@hasna/contracts": "1.0.2",
+    "@hasna/contracts": "1.1.0",
+    "@hasna/secrets": "0.4.2",
     "@types/bun": "1.3.14",
     "@types/node": "25.2.3",
     "@types/react": "^18.2.0",
@@ -189,7 +190,6 @@ function resolveServerConfig(env = process.env) {
     port,
     databaseUrl: env[DATABASE_URL_ENV] || env.DATABASE_URL || undefined,
     bootstrapApiKey: env.HASNA_SKILLS_BOOTSTRAP_API_KEY || undefined,
-    seedBundledCorpus: (env.HASNA_SKILLS_SEED_BUNDLED_CORPUS ?? "1") !== "0",
     artifactBucket: env.HASNA_SKILLS_S3_BUCKET || env.SKILLS_S3_BUCKET || undefined,
     artifactPrefix: normalizePrefix(env.HASNA_SKILLS_S3_PREFIX || env.SKILLS_S3_PREFIX || "skills/artifacts"),
     runArtifactPrefix: env.HASNA_SKILLS_S3_RUN_PREFIX ? normalizePrefix(env.HASNA_SKILLS_S3_RUN_PREFIX) : undefined,
@@ -216,12 +216,11 @@ function normalizePrefix(value) {
 }
 
 // src/server/database-url.ts
-import { isAbsolute, join as join3 } from "path";
+import { isAbsolute, join as join2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/lib/config.ts
-import { existsSync as existsSync2, readFileSync, writeFileSync, mkdirSync, copyFileSync, readdirSync, statSync } from "fs";
-import { join as join2, dirname } from "path";
+import { existsSync as existsSync2, readFileSync, writeFileSync, mkdirSync } from "fs";
 
 // src/lib/app-home.ts
 import { existsSync } from "fs";
@@ -281,12 +280,6 @@ function exactDataRoot() {
   }
   return;
 }
-function hasExactOverride(env = process.env) {
-  return Boolean(env[DATA_DIR_ENV]?.trim()) || Boolean(env[HASNA_SKILLS_HOME_ENV]?.trim()) || Boolean(env[SKILLS_HOME_ENV]?.trim());
-}
-function hasOperatorOverride(env = process.env) {
-  return hasExactOverride(env) || Boolean(env.HASNA_DATA_HOME?.trim());
-}
 function getDataRoot() {
   const exact = exactDataRoot();
   if (exact)
@@ -295,42 +288,11 @@ function getDataRoot() {
   return adoptResolverDataRoot(resolved) ? resolve(resolved) : resolve(legacyDataRoot());
 }
 // src/lib/config.ts
-function mergeDirectoryContents(sourceDir, targetDir) {
-  if (!existsSync2(sourceDir))
-    return;
-  mkdirSync(targetDir, { recursive: true });
-  for (const entry of readdirSync(sourceDir)) {
-    const sourcePath = join2(sourceDir, entry);
-    const targetPath = join2(targetDir, entry);
-    try {
-      const sourceStat = statSync(sourcePath);
-      if (sourceStat.isDirectory()) {
-        mergeDirectoryContents(sourcePath, targetPath);
-        continue;
-      }
-      if (!existsSync2(targetPath))
-        copyFileSync(sourcePath, targetPath);
-    } catch {}
-  }
-}
 function getDataDir() {
   const root = getDataRoot();
   try {
     mkdirSync(root, { recursive: true });
   } catch {}
-  if (hasOperatorOverride())
-    return root;
-  const home = effectiveHome();
-  const oldDir = join2(home, ".skills");
-  const oldConfigFile = join2(home, ".skillsrc");
-  try {
-    mergeDirectoryContents(oldDir, root);
-  } catch {}
-  if (existsSync2(oldConfigFile) && !existsSync2(join2(root, "config.json"))) {
-    try {
-      copyFileSync(oldConfigFile, join2(root, "config.json"));
-    } catch {}
-  }
   return root;
 }
 
@@ -342,7 +304,7 @@ var SQLITE_SCHEMES = new Set(["sqlite", "sqlite3", "file"]);
 var MEMORY_SCHEMES = new Set(["memory"]);
 var SQLITE_EXTENSIONS = [".db", ".sqlite", ".sqlite3", ".db3"];
 function defaultSqlitePath() {
-  return join3(getDataDir(), DEFAULT_SQLITE_FILENAME2);
+  return join2(getDataDir(), DEFAULT_SQLITE_FILENAME2);
 }
 function resolveDatabaseTarget(raw) {
   const value = raw?.trim();
@@ -369,7 +331,7 @@ function resolveDatabaseTarget(raw) {
     throw new Error(`unsupported database scheme "${scheme}:". Supported: postgres://, postgresql://, sqlite:, file:, ` + `an absolute or relative path to a .db/.sqlite file, ":memory:", or "memory:" (non-durable, tests only). ` + `Leave the setting empty to use the default SQLite database at ${defaultSqlitePath()}.`);
   }
   if (looksLikeSqlitePath(value)) {
-    const path = isAbsolute(value) ? value : join3(process.cwd(), value);
+    const path = isAbsolute(value) ? value : join2(process.cwd(), value);
     return { kind: "sqlite", path, durable: true, label: `sqlite (${path})` };
   }
   throw new Error(`could not resolve a database backend from "${value}". Use postgres://\u2026, sqlite:\u2026, an absolute or ` + `relative path ending in ${SQLITE_EXTENSIONS.join("/")}, ":memory:", or leave it empty for the ` + `default SQLite database at ${defaultSqlitePath()}.`);
@@ -393,7 +355,7 @@ function sqlitePathFromUrl(value, scheme) {
     }
     return rest.slice(2).replace(/^\/\/+/, "/");
   }
-  return isAbsolute(rest) ? rest : join3(process.cwd(), rest);
+  return isAbsolute(rest) ? rest : join2(process.cwd(), rest);
 }
 function looksLikeSqlitePath(value) {
   if (value.includes("/"))
@@ -403,17 +365,17 @@ function looksLikeSqlitePath(value) {
 
 // src/server/migrations-dir.ts
 import { existsSync as existsSync3 } from "fs";
-import { dirname as dirname2, join as join4 } from "path";
+import { dirname, join as join3 } from "path";
 var MIGRATION_DIALECTS = ["postgres", "sqlite"];
 var MAX_WALK_UP = 6;
 function findMigrationsRoot(startDirs = defaultStartDirs()) {
   for (const start of startDirs) {
     let dir = start;
     for (let level = 0;level < MAX_WALK_UP; level += 1) {
-      const candidate = join4(dir, "migrations");
-      if (MIGRATION_DIALECTS.some((dialect) => existsSync3(join4(candidate, dialect))))
+      const candidate = join3(dir, "migrations");
+      if (MIGRATION_DIALECTS.some((dialect) => existsSync3(join3(candidate, dialect))))
         return candidate;
-      const parent = dirname2(dir);
+      const parent = dirname(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -425,7 +387,7 @@ function resolveMigrationsDir(dialect, root = findMigrationsRoot()) {
   if (!root) {
     throw new Error(`could not locate the migrations directory for dialect "${dialect}". ` + `Expected a migrations/${dialect}/ folder alongside the package root.`);
   }
-  const dir = join4(root, dialect);
+  const dir = join3(root, dialect);
   if (!existsSync3(dir)) {
     throw new Error(`migrations directory not found: ${dir}`);
   }
@@ -540,8 +502,8 @@ class SqliteSkillSelectionStore {
 
 // src/server/sqlite-store.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
-import { dirname as dirname3, join as join5 } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, readdirSync } from "fs";
+import { dirname as dirname2, join as join4 } from "path";
 
 // src/server/auth.ts
 import { createHash } from "crypto";
@@ -1101,7 +1063,7 @@ class SqliteSkillsStore {
   constructor(path = SQLITE_MEMORY_PATH, options = {}) {
     const inMemory = path === SQLITE_MEMORY_PATH;
     if (!inMemory)
-      mkdirSync2(dirname3(path), { recursive: true });
+      mkdirSync2(dirname2(path), { recursive: true });
     this.db = openDatabase(path);
     this.db.exec(`PRAGMA busy_timeout = ${Math.max(0, options.busyTimeoutMs ?? 5000)}`);
     if (!inMemory)
@@ -1654,14 +1616,14 @@ function applySqliteMigrations(db, migrationsDir = resolveMigrationsDir("sqlite"
        version text PRIMARY KEY,
        applied_at text NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
      )`);
-  const files = readdirSync2(migrationsDir).filter((name) => name.endsWith(".sql")).sort();
+  const files = readdirSync(migrationsDir).filter((name) => name.endsWith(".sql")).sort();
   if (files.length === 0) {
     throw new Error(`no .sql migrations found in ${migrationsDir}`);
   }
   const appliedNow = [];
   for (const file of files) {
     const version = file.replace(/\.sql$/, "");
-    const text = readFileSync2(join5(migrationsDir, file), "utf8");
+    const text = readFileSync2(join4(migrationsDir, file), "utf8");
     const apply = db.transaction(() => {
       const already = db.query("SELECT 1 AS present FROM schema_migrations WHERE version = ? LIMIT 1").get(version);
       if (already)
@@ -1743,14 +1705,14 @@ async function runPostgresMigrations(databaseUrl, migrationsDir) {
     const appliedRows = await sql`SELECT version FROM schema_migrations`;
     const applied = new Set(appliedRows.map((row) => row.version));
     const appliedNow = [];
-    const files = readdirSync3(migrationsDir).filter((name) => name.endsWith(".sql")).sort();
+    const files = readdirSync2(migrationsDir).filter((name) => name.endsWith(".sql")).sort();
     if (files.length === 0)
       throw new Error(`no .sql migrations found in ${migrationsDir}`);
     for (const file of files) {
       const version = file.replace(/\.sql$/, "");
       if (applied.has(version))
         continue;
-      const sqlText = readFileSync3(join6(migrationsDir, file), "utf8");
+      const sqlText = readFileSync3(join5(migrationsDir, file), "utf8");
       await sql.unsafe("BEGIN");
       try {
         await sql.unsafe(sqlText);