@hasna/skills 0.8.12 → 0.9.2

package/bin/migrate.js

@@ -7,7 +7,7 @@ import { join as join5 } from "path";
 // package.json
 var package_default = {
   name: "@hasna/skills",
-  version: "0.8.12",
+  version: "0.9.2",
   description: "Skills library for AI coding agents",
   type: "module",
   bin: {
@@ -499,6 +499,9 @@ class MemorySkillSelectionStore {
   async getProfile(p, id) {
     return structuredClone(this.profiles.get(this.key(p.orgId, id)) ?? null);
   }
+  async profilesReferencingSkill(p, slug) {
+    return [...this.profiles.values()].filter((profile2) => profile2.workspaceId === p.orgId && profile2.selections.some((selection) => selection.slug === slug)).map((profile2) => profile2.id).sort();
+  }
   async saveProfile(p, id, selected, expected) {
     const key = this.key(p.orgId, id), previous = this.profiles.get(key);
     if ((previous?.revision ?? null) !== expected)
@@ -536,14 +539,25 @@ class SqliteSkillSelectionStore {
   constructor(db) {
     this.db = db;
   }
+  async profilesReferencingSkill(p, slug) {
+    const rows = this.db.query("SELECT profile_id,selections_json FROM skills_profiles WHERE org_id=?").all(p.orgId);
+    return rows.filter((row) => selections(row.selections_json).some((selection) => selection.slug === slug)).map((row) => String(row.profile_id)).sort();
+  }
   async getProfile(p, id) {
     const row = this.db.query("SELECT * FROM skills_profiles WHERE org_id=? AND profile_id=?").get(p.orgId, id);
     return row ? profile(row) : null;
   }
   async saveProfile(p, id, selected, expected) {
-    const revision = randomUUID2(), timestamp = new Date().toISOString();
-    const row = expected === null ? this.db.query("INSERT INTO skills_profiles(org_id,profile_id,revision,selections_json,updated_at) VALUES(?,?,?,?,?) ON CONFLICT(org_id,profile_id) DO NOTHING RETURNING *").get(p.orgId, id, revision, JSON.stringify(selected), timestamp) : this.db.query("UPDATE skills_profiles SET revision=?,selections_json=?,updated_at=? WHERE org_id=? AND profile_id=? AND revision=? RETURNING *").get(revision, JSON.stringify(selected), timestamp, p.orgId, id, expected);
-    return row ? profile(row) : null;
+    return this.db.transaction(() => {
+      for (const selection of [...selected].sort((a, b) => a.slug.localeCompare(b.slug))) {
+        const skill = this.db.query("SELECT lifecycle FROM skills_registry WHERE org_id=? AND slug=?").get(p.orgId, selection.slug);
+        if (skill?.lifecycle === "archived")
+          return null;
+      }
+      const revision = randomUUID2(), timestamp = new Date().toISOString();
+      const row = expected === null ? this.db.query("INSERT INTO skills_profiles(org_id,profile_id,revision,selections_json,updated_at) VALUES(?,?,?,?,?) ON CONFLICT(org_id,profile_id) DO NOTHING RETURNING *").get(p.orgId, id, revision, JSON.stringify(selected), timestamp) : this.db.query("UPDATE skills_profiles SET revision=?,selections_json=?,updated_at=? WHERE org_id=? AND profile_id=? AND revision=? RETURNING *").get(revision, JSON.stringify(selected), timestamp, p.orgId, id, expected);
+      return row ? profile(row) : null;
+    }).immediate();
   }
   async getStationState(p, id) {
     const row = this.db.query("SELECT * FROM skills_station_state WHERE org_id=? AND actor_id=? AND station_id=?").get(p.orgId, p.userId, id);
@@ -963,7 +977,11 @@ function rowToSkill(row) {
     revisionId: String(row.revision_id ?? ""),
     revisionNumber: Number(row.revision_number ?? 0),
     ...row.tombstoned_at ? { tombstonedAt: dateString(row.tombstoned_at) } : {},
-    ...row.tombstone_purge_after ? { tombstonePurgeAfter: dateString(row.tombstone_purge_after) } : {}
+    ...row.tombstone_purge_after ? { tombstonePurgeAfter: dateString(row.tombstone_purge_after) } : {},
+    lifecycle: row.lifecycle === "archived" ? "archived" : "active",
+    ...row.archived_at ? { archivedAt: dateString(row.archived_at) } : {},
+    ...row.archive_reason ? { archiveReason: String(row.archive_reason) } : {},
+    ...row.replacement_slug ? { replacementSlug: String(row.replacement_slug) } : {}
   };
 }
 function rowToPin(row) {
@@ -1082,10 +1100,21 @@ class SkillVersionExistsError extends Error {
   }
 }
 
+class SkillLifecycleConflictError extends Error {
+  slug;
+  profiles;
+  constructor(slug, profiles) {
+    super(`cannot archive '${slug}' while active profiles reference it: ${profiles.join(", ")}`);
+    this.slug = slug;
+    this.profiles = profiles;
+    this.name = "SkillLifecycleConflictError";
+  }
+}
+
 // src/lib/revision.ts
 import { createHash as createHash2 } from "crypto";
 function revisionIdOf(content) {
-  const canonical = JSON.stringify({
+  const canonicalContent = {
     slug: content.slug,
     displayName: content.displayName,
     description: content.description,
@@ -1097,7 +1126,13 @@ function revisionIdOf(content) {
     skillMd: content.skillMd ?? null,
     bundleSha256: content.bundleSha256 ?? null,
     bundleByteSize: content.bundleByteSize ?? null
-  });
+  };
+  if (content.lifecycle === "archived" || content.archiveReason !== undefined || content.replacementSlug !== undefined) {
+    canonicalContent.lifecycle = content.lifecycle ?? "active";
+    canonicalContent.archiveReason = content.archiveReason ?? null;
+    canonicalContent.replacementSlug = content.replacementSlug ?? null;
+  }
+  const canonical = JSON.stringify(canonicalContent);
   return createHash2("sha256").update(canonical).digest("hex");
 }
 function revisionIdOfRecord(record) {
@@ -1200,6 +1235,28 @@ class SqliteSkillsStore {
       scopes: parseScopes(row.scopes_json)
     };
   }
+  async updateApiKeyScopes(actor, keyId, expectedScopes, addScopes) {
+    const row = this.get("SELECT scopes_json FROM api_keys WHERE id = ? AND org_id = ? AND revoked_at IS NULL LIMIT 1", [keyId, actor.orgId]);
+    if (!row)
+      return { kind: "not_found" };
+    const current = parseScopes(row.scopes_json);
+    if (current.length !== expectedScopes.length || current.some((scope, index) => scope !== expectedScopes[index])) {
+      return { kind: "stale", scopes: current };
+    }
+    const scopes = [...current, ...addScopes.filter((scope) => !current.includes(scope))];
+    const tx = this.db.transaction(() => {
+      const changed = this.db.run("UPDATE api_keys SET scopes_json = ? WHERE id = ? AND org_id = ? AND revoked_at IS NULL AND scopes_json = ?", [JSON.stringify(scopes), keyId, actor.orgId, JSON.stringify(expectedScopes)]);
+      if (changed.changes !== 1)
+        return false;
+      this.db.run("INSERT INTO skills_audit_events (org_id, user_id, api_key_id, action, target_type, target_id, metadata_json) VALUES (?, ?, ?, ?, ?, ?, ?)", [actor.orgId, actor.userId, actor.apiKeyId, "api_key_scopes_added", "api_key", keyId, JSON.stringify({ added: addScopes, scopes })]);
+      return true;
+    });
+    if (!tx()) {
+      const latest = this.get("SELECT scopes_json FROM api_keys WHERE id = ? AND org_id = ? AND revoked_at IS NULL LIMIT 1", [keyId, actor.orgId]);
+      return { kind: "stale", scopes: latest ? parseScopes(latest.scopes_json) : current };
+    }
+    return { kind: "updated", scopes };
+  }
   async createRun(input) {
     if (input.idempotencyKey) {
       const existing = this.get("SELECT * FROM skills_runs WHERE org_id = ? AND idempotency_key = ? LIMIT 1", [input.principal.orgId, input.idempotencyKey]);
@@ -1521,6 +1578,39 @@ class SqliteSkillsStore {
     const row = this.get("SELECT * FROM skills_registry WHERE org_id = ? AND slug = ? LIMIT 1", [principal.orgId, slug]);
     return row ? rowToSkill(row) : null;
   }
+  async setSkillLifecycle(principal, slug, patch, expectedRevisionId) {
+    return this.db.transaction(() => {
+      const rowCurrent = this.get("SELECT * FROM skills_registry WHERE org_id=? AND slug=? LIMIT 1", [principal.orgId, slug]);
+      const current = rowCurrent ? rowToSkill(rowCurrent) : null;
+      if (!current || current.tombstonedAt)
+        return null;
+      if (expectedRevisionId !== current.revisionId)
+        throw new SkillRevisionConflictError(slug, expectedRevisionId, current.revisionId);
+      if (patch.lifecycle === "archived" && current.lifecycle !== "archived") {
+        const profiles = this.db.query("SELECT profile_id,selections_json FROM skills_profiles WHERE org_id=?").all(principal.orgId);
+        const referencing = profiles.filter((profile2) => {
+          const selections2 = typeof profile2.selections_json === "string" ? JSON.parse(profile2.selections_json) : profile2.selections_json;
+          return Array.isArray(selections2) && selections2.some((selection) => selection?.slug === slug);
+        }).map((profile2) => String(profile2.profile_id)).sort();
+        if (referencing.length)
+          throw new SkillLifecycleConflictError(slug, referencing);
+      }
+      const next2 = { ...current, lifecycle: patch.lifecycle, updatedAt: nowIso(), ...patch.lifecycle === "archived" ? { archivedAt: current.archivedAt ?? nowIso(), ...patch.reason ? { archiveReason: patch.reason } : {}, ...patch.replacementSlug ? { replacementSlug: patch.replacementSlug } : {} } : {} };
+      if (patch.lifecycle === "active") {
+        delete next2.archivedAt;
+        delete next2.archiveReason;
+        delete next2.replacementSlug;
+      }
+      const row = this.get("UPDATE skills_registry SET lifecycle=?, archived_at=?, archive_reason=?, replacement_slug=?, revision_id=?, revision_number=revision_number+1, updated_at=? WHERE org_id=? AND slug=? AND tombstoned_at IS NULL AND revision_id=? RETURNING *", [next2.lifecycle, next2.archivedAt ?? null, next2.archiveReason ?? null, next2.replacementSlug ?? null, revisionIdOfRecord(next2), next2.updatedAt, principal.orgId, slug, current.revisionId]);
+      if (!row)
+        throw new SkillRevisionConflictError(slug, expectedRevisionId, this.getSkillSync(principal, slug)?.revisionId ?? null);
+      return rowToSkill(row);
+    }).immediate();
+  }
+  getSkillSync(principal, slug) {
+    const row = this.get("SELECT * FROM skills_registry WHERE org_id=? AND slug=? LIMIT 1", [principal.orgId, slug]);
+    return row ? rowToSkill(row) : null;
+  }
   async updateSkill(principal, slug, patch, expectedRevisionId) {
     const current = await this.getSkill(principal, slug);
     if (!current || current.tombstonedAt)
@@ -1633,13 +1723,13 @@ class SqliteSkillsStore {
   }
   async listTags(principal) {
     await this.purgeExpiredTombstones(principal);
-    return this.all("SELECT DISTINCT tag FROM skills_tags WHERE org_id = ? ORDER BY tag ASC", [principal.orgId]).map((row) => String(row.tag));
+    return this.all("SELECT DISTINCT t.tag FROM skills_tags t JOIN skills_registry s ON s.org_id=t.org_id AND s.slug=t.slug WHERE t.org_id = ? AND s.lifecycle='active' ORDER BY t.tag ASC", [principal.orgId]).map((row) => String(row.tag));
   }
   async listSkillsByTag(principal, tag) {
     await this.purgeExpiredTombstones(principal);
     return this.all(`SELECT s.* FROM skills_registry s
        JOIN skills_tags t ON t.org_id = s.org_id AND t.slug = s.slug
-       WHERE t.org_id = ? AND t.tag = ? AND s.tombstoned_at IS NULL
+       WHERE t.org_id = ? AND t.tag = ? AND s.tombstoned_at IS NULL AND s.lifecycle = 'active'
        ORDER BY s.slug ASC`, [principal.orgId, tag]).map(rowToSkill);
   }
   async listPinsByTag(principal, tag) {
@@ -1647,7 +1737,7 @@ class SqliteSkillsStore {
     return this.all(`SELECT p.* FROM skills_pins p
        JOIN skills_tags t ON t.org_id = p.org_id AND t.slug = p.slug
        JOIN skills_registry s ON s.org_id = p.org_id AND s.slug = p.slug
-       WHERE p.org_id = ? AND p.principal = ? AND t.tag = ? AND s.tombstoned_at IS NULL
+       WHERE p.org_id = ? AND p.principal = ? AND t.tag = ? AND s.tombstoned_at IS NULL AND s.lifecycle = 'active'
        ORDER BY p.slug ASC`, [principal.orgId, principal.apiKeyId, tag]).map(rowToPin);
   }
   async listPublishedSlugs(principal) {