ghcr-manager 0.9.7 → 0.9.8

package/dist/db/planner/_planner-direct-target-root-tag-filters.js

@@ -0,0 +1,42 @@
+import { buildTagSelectorPredicate } from "./_planner-tag-selectors.js";
+export function buildDirectTargetRootTagFilters(sql, scanId, options) {
+    const selectedTagPredicate = options.deleteTags.length > 0
+        ? buildTagSelectorPredicate(sql.database, "t.tag", options.deleteTags, options.useRegex ?? false)
+        : undefined;
+    const excludedTagPredicate = options.excludeTags.length > 0
+        ? buildTagSelectorPredicate(sql.database, "xt.tag", options.excludeTags, options.useRegex ?? false)
+        : undefined;
+    const selectedTagDigestFlag = options.deleteOrphanedImages ? 1 : 0;
+    const selectedTagsSql = selectedTagPredicate
+        ? `
+        SELECT DISTINCT t.version_id, t.tag
+        FROM tags t
+        WHERE t.scan_id = ?
+          AND t.is_digest_tag = ?
+          AND (${selectedTagPredicate.sql})
+      `
+        : `
+        SELECT NULL AS version_id, NULL AS tag
+        WHERE 1 = 0
+      `;
+    const selectedParams = selectedTagPredicate ? [scanId, selectedTagDigestFlag, ...selectedTagPredicate.params] : [];
+    const excludedVersionsSql = excludedTagPredicate
+        ? `
+        SELECT DISTINCT xt.version_id
+        FROM tags xt
+        WHERE xt.scan_id = ?
+          AND xt.is_digest_tag = 0
+          AND (${excludedTagPredicate.sql})
+      `
+        : `
+        SELECT NULL AS version_id
+        WHERE 1 = 0
+      `;
+    const excludedParams = excludedTagPredicate ? [scanId, ...excludedTagPredicate.params] : [];
+    return {
+        selectedTagsSql,
+        selectedParams,
+        excludedVersionsSql,
+        excludedParams
+    };
+}

package/dist/db/planner/_planner-direct-target-roots-combined-sql.d.ts

@@ -0,0 +1,7 @@
+import type { DirectTargetRootOptions } from "./_planner-direct-target-root-options.js";
+export interface CombinedDirectTargetRootsQuery {
+    query: string;
+    baseParams: Array<number | string>;
+    tailParams: Array<number | string>;
+}
+export declare function buildCombinedDirectTargetRootsQuery(scanId: number, options: DirectTargetRootOptions, selectedTagsSql: string, excludedVersionsSql: string): CombinedDirectTargetRootsQuery;

package/dist/db/planner/_planner-direct-target-roots-combined-sql.js

@@ -0,0 +1,198 @@
+export function buildCombinedDirectTargetRootsQuery(scanId, options, selectedTagsSql, excludedVersionsSql) {
+    const baseParams = [scanId];
+    const cutoffSql = options.cutoffTimestamp ? "AND created_at < ?" : "";
+    if (options.cutoffTimestamp) {
+        baseParams.push(options.cutoffTimestamp);
+    }
+    const taggedBranchEnabled = options.deleteTagsRequested || options.keepNTagged !== undefined ? 1 : 0;
+    const deleteTagsRequested = options.deleteTagsRequested ? 1 : 0;
+    const deleteOrphanedImages = options.deleteOrphanedImages ? 1 : 0;
+    const keepNTaggedActive = options.keepNTagged !== undefined ? 1 : 0;
+    const deleteUntagged = options.deleteUntagged ? 1 : 0;
+    const keepNUntaggedActive = options.keepNUntagged !== undefined ? 1 : 0;
+    const tailParams = [
+        deleteOrphanedImages,
+        deleteOrphanedImages,
+        taggedBranchEnabled,
+        deleteTagsRequested,
+        deleteTagsRequested,
+        keepNTaggedActive,
+        deleteTagsRequested,
+        keepNTaggedActive,
+        options.keepNTagged ?? 0,
+        deleteUntagged,
+        keepNUntaggedActive,
+        deleteUntagged,
+        deleteUntagged,
+        keepNUntaggedActive,
+        options.keepNUntagged ?? 0
+    ];
+    const query = `
+    WITH base_manifests AS (
+      SELECT
+        m.version_id,
+        m.digest AS root_digest,
+        m.manifest_kind AS root_manifest_kind,
+        pv.created_at
+      FROM manifests m
+      JOIN package_versions pv
+        ON pv.scan_id = m.scan_id
+       AND pv.version_id = m.version_id
+      WHERE m.scan_id = ?
+        ${cutoffSql}
+    ),
+    tag_counts AS (
+      SELECT
+        t.version_id,
+        COUNT(t.tag) AS tag_count
+      FROM tags t
+      WHERE t.scan_id = ?
+        AND t.is_digest_tag = 0
+      GROUP BY t.version_id
+    ),
+    parented_digests AS (
+      SELECT DISTINCT me.child_digest
+      FROM manifest_edges me
+      WHERE me.scan_id = ?
+        AND me.edge_kind != 'digest-tag-referrer'
+    ),
+    root_candidates AS (
+      SELECT
+        bm.version_id,
+        bm.root_digest,
+        bm.root_manifest_kind,
+        bm.created_at,
+        COALESCE(tc.tag_count, 0) AS tag_count,
+        CASE WHEN COALESCE(tc.tag_count, 0) > 0 THEN 1 ELSE 0 END AS is_tagged,
+        CASE WHEN pd.child_digest IS NULL THEN 0 ELSE 1 END AS has_ancestor
+      FROM base_manifests bm
+      LEFT JOIN tag_counts tc
+        ON tc.version_id = bm.version_id
+      LEFT JOIN parented_digests pd
+        ON pd.child_digest = bm.root_digest
+    ),
+    selected_tags AS (
+      ${selectedTagsSql}
+    ),
+    excluded_versions AS (
+      ${excludedVersionsSql}
+    ),
+    matched_tag_counts AS (
+      SELECT
+        st.version_id,
+        COUNT(DISTINCT st.tag) AS matched_tag_count
+      FROM selected_tags st
+      GROUP BY st.version_id
+    ),
+    eligible_tagged_roots AS (
+      SELECT
+        rc.version_id,
+        rc.root_digest,
+        rc.root_manifest_kind,
+        rc.created_at,
+        CASE
+          WHEN ? = 1 AND rc.tag_count = 0 AND COALESCE(mtc.matched_tag_count, 0) > 0
+            THEN COALESCE(mtc.matched_tag_count, 0)
+          ELSE rc.tag_count
+        END AS total_tag_count,
+        COALESCE(mtc.matched_tag_count, 0) AS matched_tag_count
+      FROM root_candidates rc
+      LEFT JOIN matched_tag_counts mtc
+        ON mtc.version_id = rc.version_id
+      LEFT JOIN excluded_versions ev
+        ON ev.version_id = rc.version_id
+      WHERE (
+          rc.is_tagged = 1
+          OR (? = 1 AND COALESCE(mtc.matched_tag_count, 0) > 0)
+        )
+        AND ev.version_id IS NULL
+        AND ? = 1
+    ),
+    ranked_tagged_roots AS (
+      SELECT
+        version_id,
+        root_digest,
+        root_manifest_kind,
+        total_tag_count,
+        matched_tag_count,
+        ROW_NUMBER() OVER (
+          ORDER BY created_at DESC, version_id DESC, root_digest DESC
+        ) AS recency_rank
+      FROM eligible_tagged_roots
+      WHERE ? = 0
+         OR matched_tag_count > 0
+    ),
+    final_tagged_targets AS (
+      SELECT
+        version_id,
+        root_digest,
+        root_manifest_kind,
+        CASE
+          WHEN ? = 0
+            THEN 'keep-n-tagged-overflow'
+          WHEN ? = 1 AND total_tag_count = matched_tag_count
+            THEN 'keep-n-tagged-overflow'
+          WHEN total_tag_count = matched_tag_count
+            THEN 'delete-tags-all-tags-selected'
+          ELSE 'delete-tags-partial-tag-match'
+        END AS direct_target_reason,
+        CASE
+          WHEN ? = 0
+            THEN 'delete-root'
+          WHEN total_tag_count = matched_tag_count
+            THEN 'delete-root'
+          ELSE 'untag-only'
+        END AS selection_mode
+      FROM ranked_tagged_roots
+      WHERE ? = 0
+         OR recency_rank > ?
+    ),
+    ranked_untagged_roots AS (
+      SELECT
+        rc.version_id,
+        rc.root_digest,
+        rc.root_manifest_kind,
+        ROW_NUMBER() OVER (
+          ORDER BY rc.created_at DESC, rc.version_id DESC, rc.root_digest DESC
+        ) AS recency_rank
+      FROM root_candidates rc
+      WHERE rc.is_tagged = 0
+        AND rc.has_ancestor = 0
+        AND (? = 1 OR ? = 1)
+    ),
+    final_untagged_targets AS (
+      SELECT
+        version_id,
+        root_digest,
+        root_manifest_kind,
+        CASE
+          WHEN ? = 1
+            THEN 'delete-untagged'
+          ELSE 'keep-n-untagged-overflow'
+        END AS direct_target_reason,
+        'delete-root' AS selection_mode
+      FROM ranked_untagged_roots
+      WHERE ? = 1
+         OR (? = 1 AND recency_rank > ?)
+    )
+    SELECT
+      version_id,
+      root_digest,
+      root_manifest_kind,
+      direct_target_reason,
+      selection_mode
+    FROM final_tagged_targets
+
+    UNION ALL
+
+    SELECT
+      version_id,
+      root_digest,
+      root_manifest_kind,
+      direct_target_reason,
+      selection_mode
+    FROM final_untagged_targets
+    ORDER BY root_digest
+  `;
+    return { query, baseParams, tailParams };
+}

package/dist/db/planner/_planner-direct-target-roots-combined.d.ts

@@ -0,0 +1,4 @@
+import type { DirectTargetRootOptions } from "./_planner-direct-target-root-options.js";
+import type { PlannerSql } from "./_planner-sql.js";
+import { type DeletePlanRoot } from "./_planner-types.js";
+export declare function listCombinedDirectTargetRoots(sql: PlannerSql, scanId: number, options: DirectTargetRootOptions): DeletePlanRoot[];

package/dist/db/planner/_planner-direct-target-roots-combined.js

@@ -0,0 +1,10 @@
+import { buildDirectTargetRootTagFilters } from "./_planner-direct-target-root-tag-filters.js";
+import { buildCombinedDirectTargetRootsQuery } from "./_planner-direct-target-roots-combined-sql.js";
+import { mapPlanRootRow } from "./_planner-types.js";
+export function listCombinedDirectTargetRoots(sql, scanId, options) {
+    const { selectedTagsSql, selectedParams, excludedVersionsSql, excludedParams } = buildDirectTargetRootTagFilters(sql, scanId, options);
+    const { query, baseParams, tailParams } = buildCombinedDirectTargetRootsQuery(scanId, options, selectedTagsSql, excludedVersionsSql);
+    return sql
+        .all(query, [...baseParams, scanId, scanId, ...selectedParams, ...excludedParams, ...tailParams])
+        .map(mapPlanRootRow);
+}

package/dist/db/planner/_planner-direct-target-roots-tagged.d.ts

@@ -0,0 +1,4 @@
+import { PlannerSql } from "./_planner-sql.js";
+import { type DeletePlanRoot } from "./_planner-types.js";
+import type { DirectTargetRootOptions } from "./_planner-direct-target-root-options.js";
+export declare function listTaggedOnlyDirectTargetRoots(sql: PlannerSql, scanId: number, options: DirectTargetRootOptions): DeletePlanRoot[];

package/dist/db/planner/_planner-direct-target-roots-tagged.js

@@ -0,0 +1,125 @@
+import { buildTagSelectorPredicate } from "./_planner-tag-selectors.js";
+import { mapPlanRootRow } from "./_planner-types.js";
+export function listTaggedOnlyDirectTargetRoots(sql, scanId, options) {
+    const selectedTagPredicate = options.deleteTags.length > 0
+        ? buildTagSelectorPredicate(sql.database, "t.tag", options.deleteTags, options.useRegex ?? false)
+        : undefined;
+    const excludedTagPredicate = options.excludeTags.length > 0
+        ? buildTagSelectorPredicate(sql.database, "xt.tag", options.excludeTags, options.useRegex ?? false)
+        : undefined;
+    const params = [];
+    const cutoffSql = options.cutoffTimestamp ? "AND pv.created_at < ?" : "";
+    if (options.cutoffTimestamp) {
+        params.push(options.cutoffTimestamp);
+    }
+    const selectedTagDigestFlag = options.deleteOrphanedImages ? 1 : 0;
+    const selectedTagsSql = selectedTagPredicate
+        ? `
+        SELECT DISTINCT t.version_id, t.tag
+        FROM tags t
+        WHERE t.scan_id = ?
+          AND t.is_digest_tag = ?
+          AND (${selectedTagPredicate.sql})
+      `
+        : `
+        SELECT NULL AS version_id, NULL AS tag
+        WHERE 1 = 0
+      `;
+    if (selectedTagPredicate) {
+        params.push(scanId, selectedTagDigestFlag, ...selectedTagPredicate.params);
+    }
+    const excludedVersionsSql = excludedTagPredicate
+        ? `
+      SELECT DISTINCT xt.version_id
+      FROM tags xt
+      WHERE xt.scan_id = ?
+        AND xt.is_digest_tag = 0
+        AND (${excludedTagPredicate.sql})
+    `
+        : `
+      SELECT NULL AS version_id
+      WHERE 1 = 0
+    `;
+    if (excludedTagPredicate) {
+        params.push(scanId, ...excludedTagPredicate.params);
+    }
+    const deleteOrphanedImages = options.deleteOrphanedImages ? 1 : 0;
+    const query = `
+    WITH selected_tags AS (
+      ${selectedTagsSql}
+    ),
+    excluded_versions AS (
+      ${excludedVersionsSql}
+    ),
+    matched_tag_counts AS (
+      SELECT
+        st.version_id,
+        COUNT(DISTINCT st.tag) AS matched_tag_count
+      FROM selected_tags st
+      GROUP BY st.version_id
+    ),
+    tagged_versions AS (
+      SELECT
+        m.version_id,
+        m.digest AS root_digest,
+        m.manifest_kind AS root_manifest_kind,
+        COUNT(t.tag) AS total_tag_count
+      FROM manifests m
+      JOIN package_versions pv
+        ON pv.scan_id = m.scan_id
+       AND pv.version_id = m.version_id
+      LEFT JOIN tags t
+        ON t.scan_id = m.scan_id
+       AND t.version_id = m.version_id
+       AND t.is_digest_tag = 0
+      WHERE m.scan_id = ?
+        ${cutoffSql}
+      GROUP BY
+        m.version_id,
+        m.digest,
+        m.manifest_kind
+    ),
+    eligible_tagged_roots AS (
+      SELECT
+        tv.version_id,
+        tv.root_digest,
+        tv.root_manifest_kind,
+        CASE
+          WHEN ? = 1 AND tv.total_tag_count = 0 AND COALESCE(mtc.matched_tag_count, 0) > 0
+            THEN COALESCE(mtc.matched_tag_count, 0)
+          ELSE tv.total_tag_count
+        END AS total_tag_count,
+        COALESCE(mtc.matched_tag_count, 0) AS matched_tag_count
+      FROM tagged_versions tv
+      LEFT JOIN matched_tag_counts mtc
+        ON mtc.version_id = tv.version_id
+      LEFT JOIN excluded_versions ev
+        ON ev.version_id = tv.version_id
+      WHERE (
+          tv.total_tag_count > 0
+          OR (? = 1 AND COALESCE(mtc.matched_tag_count, 0) > 0)
+        )
+        AND ev.version_id IS NULL
+        AND matched_tag_count > 0
+    )
+    SELECT
+      version_id,
+      root_digest,
+      root_manifest_kind,
+      CASE
+        WHEN total_tag_count = matched_tag_count
+          THEN 'delete-tags-all-tags-selected'
+        ELSE 'delete-tags-partial-tag-match'
+      END AS direct_target_reason,
+      CASE
+        WHEN total_tag_count = matched_tag_count
+          THEN 'delete-root'
+        ELSE 'untag-only'
+      END AS selection_mode
+    FROM eligible_tagged_roots
+    ORDER BY root_digest
+  `;
+    return sql
+        .all(query, [...params, scanId, deleteOrphanedImages, deleteOrphanedImages])
+        .map(mapPlanRootRow);
+}

package/dist/db/planner/_planner-direct-target-roots.d.ts

@@ -1,16 +1,6 @@
 import { PlannerSql } from "./_planner-sql.js";
-import { type DeletePlanRoot } from "./_planner-types.js";
-export interface DirectTargetRootOptions {
-    deleteTags: string[];
-    deleteTagsRequested: boolean;
-    deleteOrphanedImages?: boolean;
-    excludeTags: string[];
-    deleteUntagged: boolean;
-    keepNTagged?: number;
-    keepNUntagged?: number;
-    useRegex?: boolean;
-    cutoffTimestamp?: string;
-}
+import type { DeletePlanRoot } from "./_planner-types.js";
+import type { DirectTargetRootOptions } from "./_planner-direct-target-root-options.js";
 export declare class PlannerDirectTargetRoots {
     #private;
     constructor(sql: PlannerSql);

package/dist/db/planner/_planner-direct-target-roots.js

@@ -1,212 +1,17 @@
-import { buildTagSelectorPredicate } from "./_planner-tag-selectors.js";
-import { mapPlanRootRow } from "./_planner-types.js";
+import { listCombinedDirectTargetRoots } from "./_planner-direct-target-roots-combined.js";
+import { listTaggedOnlyDirectTargetRoots } from "./_planner-direct-target-roots-tagged.js";
 export class PlannerDirectTargetRoots {
     #sql;
     constructor(sql) {
         this.#sql = sql;
     }
     list(scanId, options) {
-        const selectedTagPredicate = options.deleteTags.length > 0
-            ? buildTagSelectorPredicate(this.#sql.database, "t.tag", options.deleteTags, options.useRegex ?? false)
-            : undefined;
-        const excludedTagPredicate = options.excludeTags.length > 0
-            ? buildTagSelectorPredicate(this.#sql.database, "xt.tag", options.excludeTags, options.useRegex ?? false)
-            : undefined;
-        const params = [scanId];
-        const cutoffSql = options.cutoffTimestamp ? "AND created_at < ?" : "";
-        if (options.cutoffTimestamp) {
-            params.push(options.cutoffTimestamp);
+        if (options.deleteTagsRequested &&
+            options.keepNTagged === undefined &&
+            !options.deleteUntagged &&
+            options.keepNUntagged === undefined) {
+            return listTaggedOnlyDirectTargetRoots(this.#sql, scanId, options);
         }
-        const selectedTagDigestFlag = options.deleteOrphanedImages ? 1 : 0;
-        const selectedTagsSql = selectedTagPredicate
-            ? `
-          SELECT DISTINCT t.version_id, t.tag
-          FROM tags t
-          WHERE t.scan_id = ?
-            AND t.is_digest_tag = ?
-            AND (${selectedTagPredicate.sql})
-        `
-            : `
-          SELECT NULL AS version_id, NULL AS tag
-          WHERE 1 = 0
-        `;
-        if (selectedTagPredicate) {
-            params.push(scanId, selectedTagDigestFlag, ...selectedTagPredicate.params);
-        }
-        const excludedVersionsSql = excludedTagPredicate
-            ? `
-        SELECT DISTINCT xt.version_id
-        FROM tags xt
-        WHERE xt.scan_id = ?
-          AND xt.is_digest_tag = 0
-          AND (${excludedTagPredicate.sql})
-      `
-            : `
-        SELECT NULL AS version_id
-        WHERE 1 = 0
-      `;
-        if (excludedTagPredicate) {
-            params.push(scanId, ...excludedTagPredicate.params);
-        }
-        const taggedBranchEnabled = options.deleteTagsRequested || options.keepNTagged !== undefined ? 1 : 0;
-        const deleteTagsRequested = options.deleteTagsRequested ? 1 : 0;
-        const deleteOrphanedImages = options.deleteOrphanedImages ? 1 : 0;
-        const keepNTaggedActive = options.keepNTagged !== undefined ? 1 : 0;
-        const deleteUntagged = options.deleteUntagged ? 1 : 0;
-        const keepNUntaggedActive = options.keepNUntagged !== undefined ? 1 : 0;
-        const paramsTail = [
-            deleteOrphanedImages,
-            deleteOrphanedImages,
-            taggedBranchEnabled,
-            deleteTagsRequested,
-            deleteTagsRequested,
-            keepNTaggedActive,
-            deleteTagsRequested,
-            keepNTaggedActive,
-            options.keepNTagged ?? 0,
-            deleteUntagged,
-            keepNUntaggedActive,
-            deleteUntagged,
-            deleteUntagged,
-            keepNUntaggedActive,
-            options.keepNUntagged ?? 0
-        ];
-        const sql = `
-      WITH root_candidates AS (
-        SELECT
-          root_version_id AS version_id,
-          root_digest,
-          root_manifest_kind,
-          created_at,
-          tag_count,
-          is_tagged
-        FROM v_scan_root_manifests
-        WHERE scan_id = ?
-          AND has_ancestor = 0
-          ${cutoffSql}
-      ),
-      selected_tags AS (
-        ${selectedTagsSql}
-      ),
-      excluded_versions AS (
-        ${excludedVersionsSql}
-      ),
-      matched_tag_counts AS (
-        SELECT
-          st.version_id,
-          COUNT(DISTINCT st.tag) AS matched_tag_count
-        FROM selected_tags st
-        GROUP BY st.version_id
-      ),
-      eligible_tagged_roots AS (
-        SELECT
-          rc.version_id,
-          rc.root_digest,
-          rc.root_manifest_kind,
-          rc.created_at,
-          CASE
-            WHEN ? = 1 AND rc.tag_count = 0 AND COALESCE(mtc.matched_tag_count, 0) > 0
-              THEN COALESCE(mtc.matched_tag_count, 0)
-            ELSE rc.tag_count
-          END AS total_tag_count,
-          COALESCE(mtc.matched_tag_count, 0) AS matched_tag_count
-        FROM root_candidates rc
-        LEFT JOIN matched_tag_counts mtc
-          ON mtc.version_id = rc.version_id
-        LEFT JOIN excluded_versions ev
-          ON ev.version_id = rc.version_id
-        WHERE (
-            rc.is_tagged = 1
-            OR (? = 1 AND COALESCE(mtc.matched_tag_count, 0) > 0)
-          )
-          AND ev.version_id IS NULL
-          AND ? = 1
-      ),
-      ranked_tagged_roots AS (
-        SELECT
-          version_id,
-          root_digest,
-          root_manifest_kind,
-          total_tag_count,
-          matched_tag_count,
-          ROW_NUMBER() OVER (
-            ORDER BY created_at DESC, version_id DESC, root_digest DESC
-          ) AS recency_rank
-        FROM eligible_tagged_roots
-        WHERE ? = 0
-           OR matched_tag_count > 0
-      ),
-      final_tagged_targets AS (
-        SELECT
-          version_id,
-          root_digest,
-          root_manifest_kind,
-          CASE
-            WHEN ? = 0
-              THEN 'keep-n-tagged-overflow'
-            WHEN ? = 1 AND total_tag_count = matched_tag_count
-              THEN 'keep-n-tagged-overflow'
-            WHEN total_tag_count = matched_tag_count
-              THEN 'delete-tags-all-tags-selected'
-            ELSE 'delete-tags-partial-tag-match'
-          END AS direct_target_reason,
-          CASE
-            WHEN ? = 0
-              THEN 'delete-root'
-            WHEN total_tag_count = matched_tag_count
-              THEN 'delete-root'
-            ELSE 'untag-only'
-          END AS selection_mode
-        FROM ranked_tagged_roots
-        WHERE ? = 0
-           OR recency_rank > ?
-      ),
-      ranked_untagged_roots AS (
-        SELECT
-          rc.version_id,
-          rc.root_digest,
-          rc.root_manifest_kind,
-          ROW_NUMBER() OVER (
-            ORDER BY rc.created_at DESC, rc.version_id DESC, rc.root_digest DESC
-          ) AS recency_rank
-        FROM root_candidates rc
-        WHERE rc.is_tagged = 0
-          AND (? = 1 OR ? = 1)
-      ),
-      final_untagged_targets AS (
-        SELECT
-          version_id,
-          root_digest,
-          root_manifest_kind,
-          CASE
-            WHEN ? = 1
-              THEN 'delete-untagged'
-            ELSE 'keep-n-untagged-overflow'
-          END AS direct_target_reason,
-          'delete-root' AS selection_mode
-        FROM ranked_untagged_roots
-        WHERE ? = 1
-           OR (? = 1 AND recency_rank > ?)
-      )
-      SELECT
-        version_id,
-        root_digest,
-        root_manifest_kind,
-        direct_target_reason,
-        selection_mode
-      FROM final_tagged_targets
-
-      UNION ALL
-
-      SELECT
-        version_id,
-        root_digest,
-        root_manifest_kind,
-        direct_target_reason,
-        selection_mode
-      FROM final_untagged_targets
-      ORDER BY root_digest
-    `;
-        return this.#sql.all(sql, [...params, ...paramsTail]).map(mapPlanRootRow);
+        return listCombinedDirectTargetRoots(this.#sql, scanId, options);
     }
 }

package/dist/db/planner/_planner-direct-target-tags.js

@@ -38,12 +38,11 @@ export class PlannerDirectTargetTags {
       JOIN package_versions pv
         ON pv.scan_id = t.scan_id
        AND pv.version_id = t.version_id
-      JOIN v_scan_root_manifests roots
-        ON roots.scan_id = t.scan_id
-       AND roots.root_version_id = t.version_id
+      JOIN manifests m
+        ON m.scan_id = pv.scan_id
+       AND m.version_id = pv.version_id
       WHERE t.scan_id = ?
         AND t.is_digest_tag = ?
-        AND roots.has_ancestor = 0
         AND (${selectedTagPredicate.sql})
         ${excludedRootSql}
         ${olderThanSql}