@opengeni/db 5.0.1-canary.2 → 5.0.1-canary.3

package/dist/capability-components.d.ts

@@ -36,4 +36,4 @@ export declare function assertCapabilityComponentVersionCanChange(db: Database,
  * have claimed a component while its installation is pending or repairing,
  * even though that owner is intentionally hidden from runtime reads.
  */
-export declare function cleanupOrphanedCapabilityComponents(db: Database, workspaceId: string, facetInstallationIds: string[], skillActor?: SkillActor): Promise<SkillSourceReleaseReceipt[]>;
+export declare function cleanupOrphanedCapabilityComponents(db: Database, workspaceId: string, facetInstallationIds: string[], skillActor?: SkillActor, lockedSkillHeadIds?: readonly string[]): Promise<SkillSourceReleaseReceipt[]>;

package/dist/index.d.ts

@@ -10532,7 +10532,7 @@ export { buildHostConnectionTokenResolver, buildHostGatewayConnectionTokenResolv
 export { CapabilityComponentVersionConflictError, cleanupOrphanedCapabilityComponents, effectiveCapabilityOwnerSql, type CapabilityComponentOwnerIdentity, } from "./capability-components.js";
 export { adoptPackComponentReferences, finalizePackComponentOwnership, listPackInstallationComponents, PackComponentResolutionError, previewPackComponentRelease, recordPackInlineSkillComponent, releasePackComponents, resolvePackComponentReferences, resolvePackInlineSkillReferences, type PackInlineSkillRequirement, type StoredPackInstallationComponent, } from "./pack-components.js";
 export { deferPackInstallationOperation, finalizePackInstallationOperation, finalizePackUninstallOperation, PackManifestChangedError, PackOperationClaimLostError, PackOperationInProgressError, PackInstallationVersionConflictError, PackInstallationVersionRequiredError, PackOperationIdempotencyError, preparePackInstallationOperation, preparePackUninstallOperation, touchPackInstallationOperation, type PreparedPackInstallation, } from "./pack-installations.js";
-export { checkpointPluginPackageOperation, deferPluginPackageOperation, finalizePluginPackageInstall, getInstalledPluginPackage, getPluginPackageUninstallPreview, installPluginMcpReference, listInstalledPluginPackages, PluginInstallationVersionConflictError, PluginInstallationVersionRequiredError, PluginOperationIdempotencyError, preparePluginPackageInstall, uninstallPluginPackage, type InstalledPluginPackage, type InstalledPluginPackageSummary, type PluginBomComponent, type PreparedPluginPackage, } from "./plugin-packages.js";
+export { checkpointPluginPackageOperation, deferPluginPackageOperation, finalizePluginPackageInstall, getInstalledPluginPackage, getPluginPackageUninstallPreview, PluginUninstallPreviewChangedError, installPluginMcpReference, listInstalledPluginPackages, PluginInstallationVersionConflictError, PluginInstallationVersionRequiredError, PluginOperationIdempotencyError, preparePluginPackageInstall, uninstallPluginPackage, type InstalledPluginPackage, type InstalledPluginPackageSummary, type PluginBomComponent, type PreparedPluginPackage, } from "./plugin-packages.js";
 export * from "./workspace-artifacts.js";
 export * from "./mcp-oauth.js";
 export * from "./tool-gateway-approvals.js";

package/dist/index.js

@@ -3798,7 +3798,40 @@ async function getPreferenceRegistryFullContent(db, claims, handle) {
   });
 }
 
+// src/skill-source-release-impact.ts
+function classifySkillSourceRelease(head, workspaceId) {
+  if (head.status !== "active" || !head.active_revision_id)
+    return { disposition: "inactive", retentionReasons: [] };
+  const retentionReasons = [];
+  if (head.provenance_source !== "portable_skill") retentionReasons.push("customized");
+  if (head.scope !== "workspace" || head.scope_workspace_id !== workspaceId)
+    retentionReasons.push("re_scoped");
+  return {
+    disposition: retentionReasons.length ? "retained" : "removed",
+    retentionReasons
+  };
+}
+
 // src/skill-source-release.ts
+async function readSkillSourceReleaseHeads(db, workspaceId, facetInstallationIds) {
+  if (!facetInstallationIds.length) return [];
+  return rawRows(
+    db,
+    sql12`
+    SELECT DISTINCT h.id,h.account_id,h.scope,h.scope_workspace_id,h.scope_version,
+      h.status,h.active_revision_id,r.provenance_source,r.title
+    FROM skill_source_bindings b
+    JOIN capability_facet_installations fi ON fi.facet_id=b.skill_facet_id
+      AND fi.account_id=b.account_id AND fi.workspace_id=b.workspace_id
+    JOIN preference_registry_preferences h ON h.id=b.preference_id AND h.account_id=b.account_id
+    LEFT JOIN preference_registry_revisions r ON r.id=h.active_revision_id
+      AND r.preference_id=h.id AND r.account_id=h.account_id
+    WHERE b.workspace_id=${workspaceId}::uuid
+      AND fi.id=ANY(string_to_array(${facetInstallationIds.join(",")},',')::uuid[])
+    ORDER BY h.id
+  `
+  );
+}
 var SkillSourceRemovalAuthorityError = class extends Error {
   code = "skill_source_removal_requires_human";
   constructor() {
@@ -3808,6 +3841,12 @@ var SkillSourceRemovalAuthorityError = class extends Error {
     this.name = "SkillSourceRemovalAuthorityError";
   }
 };
+var SkillSourceReleaseSnapshotChangedError = class extends Error {
+  constructor() {
+    super("Skill source visibility changed during removal; review a refreshed preview.");
+    this.name = "SkillSourceReleaseSnapshotChangedError";
+  }
+};
 async function releaseOrphanedSkillHeads(db, input) {
   if (!input.facetInstallationIds.length) return [];
   const bindings = await rawRows(
@@ -3827,24 +3866,30 @@ async function releaseOrphanedSkillHeads(db, input) {
     throw new SkillSourceRemovalAuthorityError();
   }
   return withWorkspaceSubjectRls(db, input.workspaceId, actor.subjectId, async (tx) => {
-    for (const binding of bindings) {
+    const visibleHeads = await readSkillSourceReleaseHeads(
+      tx,
+      input.workspaceId,
+      input.facetInstallationIds
+    );
+    const lockedHeadIds = new Set(input.lockedHeadIds ?? visibleHeads.map((head) => head.id));
+    if (visibleHeads.some((head) => !lockedHeadIds.has(head.id)))
+      throw new SkillSourceReleaseSnapshotChangedError();
+    for (const binding of input.lockedHeadIds === void 0 ? visibleHeads : []) {
       await tx.execute(
         sql12`SELECT preference_id FROM preference_registry_lock_heads(ARRAY[${binding.id}::uuid])`
       );
     }
-    const rows = await rawRows(
+    const rows = await readSkillSourceReleaseHeads(
       tx,
-      sql12`
-      SELECT h.id,h.account_id,h.scope,h.scope_workspace_id,h.scope_version,h.status,h.active_revision_id,r.provenance_source
-      FROM preference_registry_preferences h LEFT JOIN preference_registry_revisions r
-        ON r.id=h.active_revision_id AND r.preference_id=h.id AND r.account_id=h.account_id
-      WHERE h.id=ANY(string_to_array(${bindings.map((binding) => binding.id).join(",")},',')::uuid[])
-      ORDER BY h.id
-    `
+      input.workspaceId,
+      input.facetInstallationIds
     );
+    if (rows.some((head) => !lockedHeadIds.has(head.id)))
+      throw new SkillSourceReleaseSnapshotChangedError();
     const receipts = [];
     for (const head of rows) {
-      if (head.status !== "active" || !head.active_revision_id) {
+      const impact = classifySkillSourceRelease(head, input.workspaceId);
+      if (impact.disposition === "inactive") {
         receipts.push({
           skillId: head.id,
           revisionId: head.active_revision_id,
@@ -3852,7 +3897,7 @@ async function releaseOrphanedSkillHeads(db, input) {
           eventId: null,
           warning: null
         });
-      } else if (head.provenance_source !== "portable_skill" || head.scope !== "workspace" || head.scope_workspace_id !== input.workspaceId) {
+      } else if (impact.disposition === "retained") {
         receipts.push({
           skillId: head.id,
           revisionId: head.active_revision_id,
@@ -10179,7 +10224,7 @@ async function assertCapabilityComponentVersionCanChange(db, input) {
     throw new CapabilityComponentVersionConflictError(input.pluginKey);
   }
 }
-async function cleanupOrphanedCapabilityComponents(db, workspaceId, facetInstallationIds, skillActor) {
+async function cleanupOrphanedCapabilityComponents(db, workspaceId, facetInstallationIds, skillActor, lockedSkillHeadIds) {
   const uniqueIds = [...new Set(facetInstallationIds)];
   if (uniqueIds.length === 0) return [];
   await db.execute(sql26`SELECT p.id FROM capability_plugin_installations p
@@ -10204,7 +10249,8 @@ async function cleanupOrphanedCapabilityComponents(db, workspaceId, facetInstall
   const skillReleases = await releaseOrphanedSkillHeads(db, {
     workspaceId,
     facetInstallationIds: orphanRows.map((row) => row.facetInstallationId),
-    ...skillActor ? { skillActor } : {}
+    ...skillActor ? { skillActor } : {},
+    ...lockedSkillHeadIds !== void 0 ? { lockedHeadIds: lockedSkillHeadIds } : {}
   });
   await db.delete(capabilityFacetInstallations).where(
     inArray5(
@@ -33932,7 +33978,9 @@ function mapPackInstallation(row) {
 
 // src/plugin-packages.ts
 import { createHash as createHash27 } from "crypto";
-import { stableJson as stableJson14 } from "@opengeni/contracts";
+import {
+  stableJson as stableJson14
+} from "@opengeni/contracts";
 import { and as and40, asc as asc18, eq as eq41, inArray as inArray23, ne as ne6, or as or9, sql as sql66 } from "drizzle-orm";
 var PluginOperationIdempotencyError = class extends Error {
   name = "PluginOperationIdempotencyError";
@@ -33940,6 +33988,14 @@ var PluginOperationIdempotencyError = class extends Error {
 var PluginInstallationVersionConflictError = class extends Error {
   name = "PluginInstallationVersionConflictError";
 };
+var PluginUninstallPreviewChangedError = class extends Error {
+  constructor(preview) {
+    super("Plugin removal impact changed. Review the refreshed preview before confirming again.");
+    this.preview = preview;
+    this.name = "PluginUninstallPreviewChangedError";
+  }
+  code = "plugin_uninstall_preview_changed";
+};
 var PluginInstallationVersionRequiredError = class extends Error {
   name = "PluginInstallationVersionRequiredError";
 };
@@ -34533,22 +34589,20 @@ async function installPluginMcpReferenceInScope(db, input) {
     }
   );
 }
-async function getPluginPackageUninstallPreview(db, workspaceId, pluginKey) {
+async function getPluginPackageUninstallPreview(db, workspaceId, pluginKey, subjectId) {
   return await withWorkspaceRls(db, workspaceId, async (scopedDb) => {
+    if (subjectId) await setSubjectRlsContext(scopedDb, subjectId);
     const plugin = await pluginPackageInScope(scopedDb, workspaceId, pluginKey);
     if (!plugin || plugin.status === "disabled") {
       return { installed: false, version: null, installationVersion: null, components: [] };
     }
-    const components = await pluginOwnedComponents(
-      scopedDb,
-      workspaceId,
-      plugin.pluginInstallationId
-    );
+    const impact = await pluginOwnedComponents(scopedDb, workspaceId, plugin.pluginInstallationId);
     return {
       installed: true,
       version: plugin.version,
       installationVersion: plugin.installationVersion,
-      components
+      components: impact.components,
+      previewToken: pluginUninstallPreviewToken(plugin, impact.stateToken)
     };
   });
 }
@@ -34556,7 +34610,8 @@ async function uninstallPluginPackage(db, input) {
   const requestDigest4 = sha2567(
     stableJson14({
       pluginKey: input.pluginKey,
-      expectedInstallationVersion: input.expectedInstallationVersion
+      expectedInstallationVersion: input.expectedInstallationVersion,
+      ...input.expectedPreviewToken ? { expectedPreviewToken: input.expectedPreviewToken } : {}
     })
   );
   return await withRlsContext(
@@ -34566,6 +34621,7 @@ async function uninstallPluginPackage(db, input) {
       await setSubjectRlsContext(scopedDb, input.subjectId);
       return await scopedDb.transaction(async (txRaw) => {
         const tx = txRaw;
+        await lockSkillPublication(tx, input.workspaceId);
         await tx.execute(
           sql66`select pg_advisory_xact_lock(hashtextextended(${`capability-operation:${input.workspaceId}:${input.idempotencyKey}`}, 0))`
         );
@@ -34603,11 +34659,69 @@ async function uninstallPluginPackage(db, input) {
         if (plugin.installationVersion !== input.expectedInstallationVersion) {
           throw new PluginInstallationVersionConflictError("Plugin installation changed");
         }
-        const components = await pluginOwnedComponents(
+        await tx.execute(sql66`SELECT p.id FROM capability_plugin_installations p
+          WHERE p.workspace_id=${input.workspaceId}::uuid AND p.id IN (
+            SELECT fi.plugin_installation_id FROM capability_facet_installations fi
+            JOIN capability_component_owners o ON o.facet_installation_id=fi.id
+            WHERE o.workspace_id=${input.workspaceId}::uuid AND o.owner_kind='plugin'
+              AND o.owner_id=${plugin.pluginInstallationId}
+          ) ORDER BY p.id FOR UPDATE`);
+        try {
+          await tx.execute(sql66`SELECT fi.id FROM capability_facet_installations fi
+            WHERE fi.workspace_id=${input.workspaceId}::uuid AND EXISTS (
+              SELECT 1 FROM capability_component_owners own
+              WHERE own.facet_installation_id=fi.id AND own.owner_kind='plugin'
+                AND own.owner_id=${plugin.pluginInstallationId}
+            ) ORDER BY fi.id FOR UPDATE NOWAIT`);
+          await tx.execute(sql66`SELECT o.id FROM capability_component_owners o
+            WHERE o.workspace_id=${input.workspaceId}::uuid AND EXISTS (
+              SELECT 1 FROM capability_component_owners own
+              WHERE own.facet_installation_id=o.facet_installation_id
+                AND own.owner_kind='plugin' AND own.owner_id=${plugin.pluginInstallationId}
+            ) ORDER BY o.id FOR UPDATE NOWAIT`);
+        } catch (error) {
+          if (nestedPostgresSqlState(error) === "55P03")
+            throw new PluginUninstallPreviewChangedError();
+          throw error;
+        }
+        const skillBindings = await rawRows(
+          tx,
+          sql66`
+          SELECT DISTINCT h.id FROM skill_source_bindings b
+          JOIN capability_facet_installations fi ON fi.facet_id=b.skill_facet_id
+            AND fi.account_id=b.account_id AND fi.workspace_id=b.workspace_id
+          JOIN capability_component_owners o ON o.facet_installation_id=fi.id
+          JOIN preference_registry_preferences h ON h.id=b.preference_id AND h.account_id=b.account_id
+          WHERE b.workspace_id=${input.workspaceId}::uuid AND o.owner_kind='plugin'
+            AND o.owner_id=${plugin.pluginInstallationId} ORDER BY h.id`
+        );
+        for (const head of skillBindings) {
+          try {
+            await tx.execute(
+              sql66`SELECT preference_id FROM preference_registry_lock_heads(ARRAY[${head.id}::uuid])`
+            );
+          } catch (error) {
+            if (nestedPostgresSqlState(error) === "42501")
+              throw new PluginUninstallPreviewChangedError();
+            throw error;
+          }
+        }
+        const impact = await pluginOwnedComponents(
           tx,
           input.workspaceId,
           plugin.pluginInstallationId
         );
+        const previewToken = pluginUninstallPreviewToken(plugin, impact.stateToken);
+        if (input.expectedPreviewToken && input.expectedPreviewToken !== previewToken) {
+          throw new PluginUninstallPreviewChangedError({
+            pluginKey: input.pluginKey,
+            installed: true,
+            version: plugin.version,
+            installationVersion: plugin.installationVersion,
+            previewToken,
+            components: impact.components
+          });
+        }
         await removeIntegrationFacetBindingOwnersForOwner(tx, {
           workspaceId: input.workspaceId,
           owner: { kind: "plugin", id: plugin.pluginInstallationId }
@@ -34619,18 +34733,26 @@ async function uninstallPluginPackage(db, input) {
             eq41(capabilityComponentOwners.ownerId, plugin.pluginInstallationId)
           )
         ).returning({ facetInstallationId: capabilityComponentOwners.facetInstallationId });
-        const skillReleases = await cleanupOrphanedCapabilityComponents(
-          tx,
-          input.workspaceId,
-          owned.map((row) => row.facetInstallationId),
-          input.skillActor
-        );
+        let skillReleases;
+        try {
+          skillReleases = await cleanupOrphanedCapabilityComponents(
+            tx,
+            input.workspaceId,
+            owned.map((row) => row.facetInstallationId),
+            input.skillActor,
+            skillBindings.map((head) => head.id)
+          );
+        } catch (error) {
+          if (error instanceof SkillSourceReleaseSnapshotChangedError)
+            throw new PluginUninstallPreviewChangedError();
+          throw error;
+        }
         await tx.update(capabilityPluginInstallations).set({
           status: "disabled",
           version: plugin.installationVersion + 1,
           updatedAt: /* @__PURE__ */ new Date()
         }).where(eq41(capabilityPluginInstallations.id, plugin.pluginInstallationId));
-        const retainedComponents = components.filter((component) => component.retainedByOtherOwners).map((component) => component.capabilityId);
+        const retainedComponents = impact.components.filter((component) => component.disposition === "retained").map((component) => component.capabilityId);
         await completeInlineOperation(tx, input, requestDigest4, {
           status: "uninstalled",
           retainedComponents,
@@ -34676,6 +34798,7 @@ async function pluginOwnedComponents(db, workspaceId, ownerPluginInstallationId)
     facetInstallationId: capabilityFacetInstallations.id,
     facetKind: capabilityFacets.kind,
     skillCapabilityId: capabilitySkillFacets.capabilityId,
+    name: capabilityPlugins.name,
     manifest: capabilityPluginVersions.manifest
   }).from(capabilityComponentOwners).innerJoin(
     capabilityFacetInstallations,
@@ -34695,6 +34818,9 @@ async function pluginOwnedComponents(db, workspaceId, ownerPluginInstallationId)
   ).innerJoin(
     capabilityPluginVersions,
     eq41(capabilityPluginVersions.id, capabilityPluginInstallations.pluginVersionId)
+  ).innerJoin(
+    capabilityPlugins,
+    eq41(capabilityPlugins.id, capabilityPluginInstallations.pluginId)
   ).leftJoin(
     capabilitySkillFacets,
     eq41(capabilitySkillFacets.facetId, capabilityFacets.id)
@@ -34713,12 +34839,23 @@ async function pluginOwnedComponents(db, workspaceId, ownerPluginInstallationId)
     if (!capabilityId || !kind) continue;
     const existing = components.get(capabilityId);
     if (existing) existing.facetIds.push(row.facetInstallationId);
-    else components.set(capabilityId, { capabilityId, kind, facetIds: [row.facetInstallationId] });
+    else
+      components.set(capabilityId, {
+        capabilityId,
+        kind,
+        name: row.name,
+        facetIds: [row.facetInstallationId]
+      });
   }
   const result = [];
+  const state = [];
   for (const component of components.values()) {
-    const [ownerCount] = await db.select({ count: sql66`count(*)::int` }).from(capabilityComponentOwners).where(
+    const owners = await db.select({
+      kind: capabilityComponentOwners.ownerKind,
+      id: capabilityComponentOwners.ownerId
+    }).from(capabilityComponentOwners).where(
       and40(
+        eq41(capabilityComponentOwners.workspaceId, workspaceId),
         inArray23(capabilityComponentOwners.facetInstallationId, component.facetIds),
         // Retention is deliberately physical, not runtime-effective. A Plugin
         // in needs_attention may be resumable and must keep shared component
@@ -34731,13 +34868,76 @@ async function pluginOwnedComponents(db, workspaceId, ownerPluginInstallationId)
         )
       )
     );
+    const remainingOwners = [];
+    for (const owner of owners.sort(
+      (a, b) => `${a.kind}:${a.id}`.localeCompare(`${b.kind}:${b.id}`)
+    )) {
+      let name = owner.kind === "direct" ? "Direct installation" : owner.kind === "migration" ? "Migrated installation" : "Another installed owner";
+      if (owner.kind === "plugin") {
+        const [named] = await db.select({ manifest: capabilityPluginVersions.manifest }).from(capabilityPluginInstallations).innerJoin(
+          capabilityPluginVersions,
+          eq41(
+            capabilityPluginVersions.id,
+            capabilityPluginInstallations.pluginVersionId
+          )
+        ).where(
+          and40(
+            eq41(capabilityPluginInstallations.workspaceId, workspaceId),
+            sql66`${capabilityPluginInstallations.id}::text = ${owner.id}`
+          )
+        );
+        name = stringValue5(objectValue3(named?.manifest).name) ?? name;
+      } else if (owner.kind === "pack") {
+        const [named] = await db.select({
+          manifest: packInstallations.manifestSnapshot,
+          packId: packInstallations.packId
+        }).from(packInstallations).where(
+          and40(
+            eq41(packInstallations.workspaceId, workspaceId),
+            or9(
+              sql66`${packInstallations.id}::text = ${owner.id}`,
+              eq41(packInstallations.packId, owner.id)
+            )
+          )
+        );
+        name = stringValue5(objectValue3(named?.manifest).name) ?? named?.packId ?? name;
+      }
+      if (!remainingOwners.some((item) => item.kind === owner.kind && item.name === name))
+        remainingOwners.push({
+          kind: owner.kind,
+          name
+        });
+    }
+    const heads = component.kind === "skill" ? await readSkillSourceReleaseHeads(db, workspaceId, component.facetIds) : [];
+    const head = heads[0];
+    const skillImpact = head ? classifySkillSourceRelease(head, workspaceId) : null;
+    const retainedByOtherOwners = owners.length > 0;
+    const retentionReasons = [];
+    if (retainedByOtherOwners) retentionReasons.push("other_owners");
+    if (skillImpact) retentionReasons.push(...skillImpact.retentionReasons);
+    else if (component.kind === "skill") retentionReasons.push("registry_unavailable");
+    state.push({ facetIds: component.facetIds, owners, heads });
     result.push({
       capabilityId: component.capabilityId,
       kind: component.kind,
-      retainedByOtherOwners: (ownerCount?.count ?? 0) > 0
+      name: head?.title ?? component.name,
+      retainedByOtherOwners,
+      disposition: retainedByOtherOwners ? "retained" : skillImpact?.disposition ?? (component.kind === "skill" ? "retained" : "removed"),
+      retentionReasons,
+      remainingOwners,
+      ...head ? { skillId: head.id } : {}
     });
   }
-  return result;
+  return { components: result, stateToken: sha2567(stableJson14({ state, components: result })) };
+}
+function pluginUninstallPreviewToken(plugin, stateToken) {
+  return sha2567(
+    stableJson14({
+      installationId: plugin.pluginInstallationId,
+      version: plugin.installationVersion,
+      stateToken
+    })
+  );
 }
 async function completeInlineOperation(db, input, requestDigest4, result) {
   await db.insert(capabilityOperations).values({
@@ -94043,6 +94243,7 @@ export {
   PluginInstallationVersionConflictError,
   PluginInstallationVersionRequiredError,
   PluginOperationIdempotencyError,
+  PluginUninstallPreviewChangedError,
   PortableSkillInstallationVersionConflictError,
   PortableSkillInstallationVersionRequiredError,
   PortableSkillSourcePathConflictError,