ghcr-manager 0.9.6 → 0.9.7

package/dist/cli/_tag-selector-resolver.js

@@ -1,3 +1,7 @@
+const BrokenIndexModes = {
+    allMissing: "all-missing",
+    someMissing: "some-missing"
+};
 export function resolveTagSelectors(database, inputs) {
     if (!inputs.deleteGhostImages && !inputs.deletePartialImages && !inputs.deleteOrphanedImages) {
         return inputs;
@@ -14,13 +18,13 @@ export function resolveTagSelectors(database, inputs) {
     };
 }
 function _listLatestGhostTags(database, owner, packageName, cutoffTimestamp) {
-    return _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestamp, "all-missing");
+    return _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestamp, BrokenIndexModes.allMissing);
 }
 function _listLatestPartialTags(database, owner, packageName, cutoffTimestamp) {
-    return _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestamp, "some-missing");
+    return _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestamp, BrokenIndexModes.someMissing);
 }
 function _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestamp, mode) {
-    const havingClause = mode === "all-missing"
+    const havingClause = mode === BrokenIndexModes.allMissing
         ? "COUNT(*) > 0 AND COUNT(child.digest) = 0"
         : "COUNT(child.digest) > 0 AND COUNT(child.digest) < COUNT(*)";
     const rows = database
@@ -30,7 +34,6 @@ function _listLatestBrokenIndexTags(database, owner, packageName, cutoffTimestam
           FROM v_latest_scan_per_package
           WHERE owner = ?
             AND package_name = ?
-          LIMIT 1
         ),
         ghost_roots AS (
           SELECT

package/dist/cli/_untag-command.js

@@ -1,5 +1,6 @@
 import { listPackageVersionTagSources, untagRootTags } from "../execute/index.js";
 import { collectRepeatedOption, hasFlag, requireOption, resolveLogLevel, resolveToken } from "./_args.js";
+import { writeJsonOutput } from "./_json-output.js";
 import { createLogger } from "./_logger.js";
 export async function handleUntag(args) {
     const owner = requireOption(args, "--owner");
@@ -35,7 +36,7 @@ export async function handleUntag(args) {
         roots,
         untaggedTags
     };
-    console.log(JSON.stringify(summary));
+    writeJsonOutput(args, "--summary-json-path", summary);
     return 0;
 }
 function _groupTagSources(tagSources) {

package/dist/cli/index.js

@@ -26,10 +26,10 @@ export async function main(argv) {
 }
 function printUsage() {
     console.error(`Usage:
-  ghcr-manager cleanup --db <path> [--log-level <trace|debug|info|warn|error|silent>] [--dry-run] --owner <org> --package <name> [--token <token>] <cleanup selectors...> [--exclude-tag <tag> ...] [--use-regex] [--older-than <interval>]
+  ghcr-manager cleanup --db <path> [--log-level <trace|debug|info|warn|error|silent>] [--dry-run] [--summary-json-path <path>] --owner <org> --package <name> [--token <token>] <cleanup selectors...> [--exclude-tag <tag> ...] [--use-regex] [--older-than <interval>]
   ghcr-manager db-merge --db <target-path> --source-db <path> [--source-db <path> ...]
   ghcr-manager scan --db <path> [--log-level <trace|debug|info|warn|error|silent>] [--github-output <path>] --owner <org> --package <name> --token <token>
-  ghcr-manager untag [--log-level <trace|debug|info|warn|error|silent>] [--dry-run] --owner <org> --package <name> --token <token> --tag <tag> [--tag <tag> ...]
+  ghcr-manager untag [--log-level <trace|debug|info|warn|error|silent>] [--dry-run] [--summary-json-path <path>] --owner <org> --package <name> --token <token> --tag <tag> [--tag <tag> ...]
 
 Cleanup selectors:
   --delete-untagged

package/dist/core/_types.d.ts

@@ -1,4 +1,12 @@
-export type ManifestKind = "image_index" | "image_manifest" | "artifact_manifest" | "attestation_manifest" | "signature_manifest";
+export declare const ManifestKinds: {
+    readonly indexManifest: "index_manifest";
+    readonly crossArchManifest: "cross_arch_manifest";
+    readonly imageManifest: "image_manifest";
+    readonly artifactManifest: "artifact_manifest";
+    readonly attestationManifest: "attestation_manifest";
+    readonly signatureManifest: "signature_manifest";
+};
+export type ManifestKind = (typeof ManifestKinds)[keyof typeof ManifestKinds];
 export type ManifestEdgeKind = "image-child" | "referrer" | "digest-tag-referrer";
 export interface PackageVersionRecord {
     versionId: number;

package/dist/core/_types.js

@@ -1 +1,8 @@
-export {};
+export const ManifestKinds = {
+    indexManifest: "index_manifest",
+    crossArchManifest: "cross_arch_manifest",
+    imageManifest: "image_manifest",
+    artifactManifest: "artifact_manifest",
+    attestationManifest: "attestation_manifest",
+    signatureManifest: "signature_manifest"
+};

package/dist/core/index.d.ts

@@ -1,4 +1,5 @@
 export type { ManifestEdgeKind, ManifestEdgeRecord, ManifestDescriptorRecord, ManifestKind, ManifestRecord, PackageSnapshot, PackageVersionRecord, TagRecord } from "./_types.js";
+export { ManifestKinds } from "./_types.js";
 export type { HttpErrorResponse } from "./_http-error.js";
 export { buildHttpErrorMessage } from "./_http-error.js";
 export { getOwnerURIComponent } from "./_github-package-owner.js";

package/dist/core/index.js

@@ -1,3 +1,4 @@
+export { ManifestKinds } from "./_types.js";
 export { buildHttpErrorMessage } from "./_http-error.js";
 export { getOwnerURIComponent } from "./_github-package-owner.js";
 export { digestFromDigestTag, isDigestTag } from "./_digest-tag.js";

package/dist/db/_cleanup-run-writer.d.ts

@@ -1,5 +1,5 @@
 import type Database from "better-sqlite3";
-import type { DeletePlan } from "./planner/index.js";
+import { type DeletePlan } from "./planner/index.js";
 export declare class CleanupRunWriter {
     #private;
     constructor(database: Database.Database);

package/dist/db/_cleanup-run-writer.js

@@ -1,8 +1,10 @@
 import { randomUUID } from "node:crypto";
 import { resolveGitHubActionsRunUrl } from "./_github-actions-run-url.js";
+import { DeletePlanValidationStatuses } from "./planner/index.js";
 export class CleanupRunWriter {
     #database;
     #insertSelectedTagStatement;
+    #updateSelectedTagsDeletedStatement;
     #insertRootDecisionStatement;
     #insertProtectedRootBlockStatement;
     #insertCleanupRunStatement;
@@ -12,9 +14,27 @@ export class CleanupRunWriter {
       INSERT INTO cleanup_selected_tags(
         cleanup_run_id,
         scan_id,
-        tag
+        tag,
+        is_deleted
       )
-      VALUES(?, ?, ?)
+      VALUES(?, ?, ?, 0)
+    `);
+        this.#updateSelectedTagsDeletedStatement = this.#database.prepare(`
+      UPDATE cleanup_selected_tags
+      SET is_deleted = 1
+      FROM cleanup_root_decisions decision
+      JOIN manifests manifest
+        ON manifest.scan_id = decision.scan_id
+       AND manifest.digest = decision.digest
+      JOIN tags
+        ON tags.scan_id = manifest.scan_id
+       AND tags.version_id = manifest.version_id
+      WHERE cleanup_selected_tags.cleanup_run_id = ?
+        AND cleanup_selected_tags.scan_id = ?
+        AND decision.cleanup_run_id = cleanup_selected_tags.cleanup_run_id
+        AND decision.scan_id = cleanup_selected_tags.scan_id
+        AND decision.validation_status != 'blocked'
+        AND tags.tag = cleanup_selected_tags.tag
     `);
         this.#insertRootDecisionStatement = this.#database.prepare(`
       INSERT INTO cleanup_root_decisions(
@@ -64,9 +84,6 @@ export class CleanupRunWriter {
     persistCleanupRun(scanId, plan, options) {
         return this.#database.transaction(() => {
             const cleanupRunId = this.#insertCleanupRun(scanId, plan, options);
-            for (const tag of plan.directTargetTags) {
-                this.#insertSelectedTagStatement.run(cleanupRunId, scanId, tag);
-            }
             for (const rootDecision of plan.rootDecisions) {
                 this.#insertRootDecisionStatement.run(cleanupRunId, scanId, rootDecision.digest, rootDecision.selectionMode, rootDecision.selectionReason, rootDecision.validationStatus, rootDecision.validationReasonCode, rootDecision.validationReason, rootDecision.blockingDigest ?? null, rootDecision.overlapDigest ?? null);
             }
@@ -75,6 +92,10 @@ export class CleanupRunWriter {
                     this.#insertProtectedRootBlockStatement.run(cleanupRunId, scanId, protectedRoot.digest, block.blockedDigest, block.blockReasonCode, block.overlapDigest);
                 }
             }
+            for (const tag of plan.directTargetTags) {
+                this.#insertSelectedTagStatement.run(cleanupRunId, scanId, tag);
+            }
+            this.#updateSelectedTagsDeletedStatement.run(cleanupRunId, scanId);
             return cleanupRunId;
         })();
     }
@@ -82,9 +103,9 @@ export class CleanupRunWriter {
         const directTargetTagCount = plan.directTargetTags.length;
         const directTargetRootCount = plan.directTargetRoots.length;
         const deleteRootCandidateCount = plan.directTargetRoots.filter((root) => root.selectionMode === "delete-root").length;
-        const untagOnlyRootCount = plan.rootDecisions.filter((decision) => decision.validationStatus === "untag-only").length;
+        const untagOnlyRootCount = plan.rootDecisions.filter((decision) => decision.validationStatus === DeletePlanValidationStatuses.untagOnly).length;
         const fullyDeletableRootCount = plan.fullyDeletableRoots.length;
-        const blockedDeleteRootCount = plan.rootDecisions.filter((decision) => decision.validationStatus === "blocked").length;
+        const blockedDeleteRootCount = plan.rootDecisions.filter((decision) => decision.validationStatus === DeletePlanValidationStatuses.blocked).length;
         const protectedRootCount = plan.protectedRoots.length;
         const result = this.#insertCleanupRunStatement.run(scanId, randomUUID(), options.cleanupStartedAt, resolveGitHubActionsRunUrl(), options.dryRun ? 1 : 0, JSON.stringify(plan.plannerInputs), directTargetTagCount, directTargetRootCount, deleteRootCandidateCount, untagOnlyRootCount, fullyDeletableRootCount, blockedDeleteRootCount, protectedRootCount);
         return Number(result.lastInsertRowid);

package/dist/db/_db-merge-cleanup-copy.js

@@ -112,12 +112,14 @@ export class DbMergeCleanupCopy {
       INSERT INTO cleanup_selected_tags(
         cleanup_run_id,
         scan_id,
-        tag
+        tag,
+        is_deleted
       )
       SELECT
         ?,
         ?,
-        tag
+        tag,
+        is_deleted
       FROM ${attachName}.cleanup_selected_tags
       WHERE cleanup_run_id = ?
         AND scan_id = ?

package/dist/db/_manifest-kind-refinement.d.ts

@@ -0,0 +1,2 @@
+import type Database from "better-sqlite3";
+export declare function refineManifestKinds(database: Database.Database, scanId: number): void;

package/dist/db/_manifest-kind-refinement.js

@@ -0,0 +1,43 @@
+import { ManifestKinds } from "../core/index.js";
+const _refineManifestKindsStatementByDatabase = new WeakMap();
+export function refineManifestKinds(database, scanId) {
+    _refineManifestKindsStatement(database).run(ManifestKinds.crossArchManifest, scanId, ManifestKinds.indexManifest);
+}
+function _refineManifestKindsStatement(database) {
+    const cached = _refineManifestKindsStatementByDatabase.get(database);
+    if (cached) {
+        return cached;
+    }
+    const statement = database.prepare(`
+    UPDATE manifests AS parent
+    SET manifest_kind = ?
+    WHERE parent.scan_id = ?
+      AND parent.manifest_kind = ?
+      AND parent.media_type IN (
+        'application/vnd.oci.image.index.v1+json',
+        'application/vnd.docker.distribution.manifest.list.v2+json'
+      )
+      AND NOT EXISTS (
+        SELECT 1
+        FROM tags helper_tag
+        WHERE helper_tag.scan_id = parent.scan_id
+          AND helper_tag.version_id = parent.version_id
+          AND helper_tag.is_digest_tag = 1
+      )
+      AND EXISTS (
+        SELECT 1
+        FROM manifest_descriptors descriptor
+        JOIN manifests child
+          ON child.scan_id = descriptor.scan_id
+         AND child.digest = descriptor.child_digest
+        WHERE descriptor.scan_id = parent.scan_id
+          AND descriptor.parent_digest = parent.digest
+          AND child.media_type IN (
+            'application/vnd.oci.image.manifest.v1+json',
+            'application/vnd.docker.distribution.manifest.v2+json'
+          )
+      )
+  `);
+    _refineManifestKindsStatementByDatabase.set(database, statement);
+    return statement;
+}

package/dist/db/_scan-writer.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { isDigestTag } from "../core/index.js";
 import { resolveGitHubActionsRunUrl } from "./_github-actions-run-url.js";
+import { refineManifestKinds } from "./_manifest-kind-refinement.js";
 import { rebuildManifestReachability } from "./_manifest-reachability.js";
 export class ScanWriter {
     #database;
@@ -179,7 +180,9 @@ export class ScanWriter {
         });
     }
     rebuildManifestReachability() {
-        rebuildManifestReachability(this.#database, this.#requireScanId());
+        const scanId = this.#requireScanId();
+        rebuildManifestReachability(this.#database, scanId);
+        refineManifestKinds(this.#database, scanId);
     }
     getActiveScanId() {
         return this.#requireScanId();

package/dist/db/index.d.ts

@@ -4,6 +4,7 @@ export { CleanupRunWriter } from "./_cleanup-run-writer.js";
 export { DbMergeRepository } from "./_db-merge-repository.js";
 export { PlannerRepository } from "./planner/index.js";
 export { SnapshotRepository } from "./_snapshot-repository.js";
-export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanSelectionMode, DeletePlanSelectionReason } from "./planner/index.js";
+export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanSelectionMode, DeletePlanSelectionReason, DeletePlanValidationReasonCode, DeletePlanValidationStatus } from "./planner/index.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./planner/index.js";
 export type { DbMergeSourceSummary } from "./_db-merge-repository.js";
 export declare function openDatabase(databasePath: string): Database.Database;

package/dist/db/index.js

@@ -5,6 +5,7 @@ export { CleanupRunWriter } from "./_cleanup-run-writer.js";
 export { DbMergeRepository } from "./_db-merge-repository.js";
 export { PlannerRepository } from "./planner/index.js";
 export { SnapshotRepository } from "./_snapshot-repository.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./planner/index.js";
 export function openDatabase(databasePath) {
     const database = new Database(databasePath);
     initializeSchema(database);

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

@@ -3,6 +3,7 @@ import { type DeletePlanRoot } from "./_planner-types.js";
 export interface DirectTargetRootOptions {
     deleteTags: string[];
     deleteTagsRequested: boolean;
+    deleteOrphanedImages?: boolean;
     excludeTags: string[];
     deleteUntagged: boolean;
     keepNTagged?: number;

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

@@ -17,20 +17,21 @@ export class PlannerDirectTargetRoots {
         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 = 0
-          AND (${selectedTagPredicate.sql})
-      `
+          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
-      `;
+          SELECT NULL AS version_id, NULL AS tag
+          WHERE 1 = 0
+        `;
         if (selectedTagPredicate) {
-            params.push(scanId, ...selectedTagPredicate.params);
+            params.push(scanId, selectedTagDigestFlag, ...selectedTagPredicate.params);
         }
         const excludedVersionsSql = excludedTagPredicate
             ? `
@@ -49,10 +50,13 @@ export class PlannerDirectTargetRoots {
         }
         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,
@@ -100,14 +104,21 @@ export class PlannerDirectTargetRoots {
           rc.root_digest,
           rc.root_manifest_kind,
           rc.created_at,
-          rc.tag_count AS total_tag_count,
+          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
+        WHERE (
+            rc.is_tagged = 1
+            OR (? = 1 AND COALESCE(mtc.matched_tag_count, 0) > 0)
+          )
           AND ev.version_id IS NULL
           AND ? = 1
       ),

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

@@ -2,5 +2,5 @@ import { PlannerSql } from "./_planner-sql.js";
 export declare class PlannerDirectTargetTags {
     #private;
     constructor(sql: PlannerSql);
-    listDeleteTagDirectTargetTags(scanId: number, deleteTags: string[], excludeTags: string[], useRegex: boolean, cutoffTimestamp?: string): string[];
+    listDeleteTagDirectTargetTags(scanId: number, deleteTags: string[], excludeTags: string[], useRegex: boolean, deleteOrphanedImages: boolean, cutoffTimestamp?: string): string[];
 }

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

@@ -5,7 +5,7 @@ export class PlannerDirectTargetTags {
     constructor(sql) {
         this.#sql = sql;
     }
-    listDeleteTagDirectTargetTags(scanId, deleteTags, excludeTags, useRegex, cutoffTimestamp) {
+    listDeleteTagDirectTargetTags(scanId, deleteTags, excludeTags, useRegex, deleteOrphanedImages, cutoffTimestamp) {
         if (deleteTags.length === 0) {
             return [];
         }
@@ -30,6 +30,8 @@ export class PlannerDirectTargetTags {
             olderThanSql = "AND pv.created_at < ?";
             params.push(cutoffTimestamp);
         }
+        const digestTagFlag = deleteOrphanedImages ? 1 : 0;
+        params.splice(1, 0, digestTagFlag);
         const sql = `
       SELECT DISTINCT tag AS target_tag
       FROM tags t
@@ -40,7 +42,7 @@ export class PlannerDirectTargetTags {
         ON roots.scan_id = t.scan_id
        AND roots.root_version_id = t.version_id
       WHERE t.scan_id = ?
-        AND t.is_digest_tag = 0
+        AND t.is_digest_tag = ?
         AND roots.has_ancestor = 0
         AND (${selectedTagPredicate.sql})
         ${excludedRootSql}

package/dist/db/planner/_planner-output.js

@@ -1,3 +1,4 @@
+import { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./_planner-types.js";
 export function buildPlanOutputs(directTargetTags, directTargetRoots, planArtifacts) {
     const rootDecisions = buildRootDecisions(directTargetRoots, planArtifacts);
     const protectedRoots = buildProtectedRoots(planArtifacts.blockedRoots);
@@ -28,8 +29,8 @@ export function buildRootDecisions(directTargetRoots, planArtifacts) {
                 manifestKind: root.manifestKind,
                 selectionMode: root.selectionMode,
                 selectionReason: root.reason,
-                validationStatus: "untag-only",
-                validationReasonCode: "untag-only-partial-tag-match",
+                validationStatus: DeletePlanValidationStatuses.untagOnly,
+                validationReasonCode: DeletePlanValidationReasonCodes.untagOnlyPartialTagMatch,
                 validationReason: "matched tags cover only part of this root's tag set, so the version is retained and only those tags can be detached"
             };
         }
@@ -40,8 +41,8 @@ export function buildRootDecisions(directTargetRoots, planArtifacts) {
                 manifestKind: root.manifestKind,
                 selectionMode: root.selectionMode,
                 selectionReason: root.reason,
-                validationStatus: "fully-deletable",
-                validationReasonCode: "fully-deletable-no-retained-overlap",
+                validationStatus: DeletePlanValidationStatuses.fullyDeletable,
+                validationReasonCode: DeletePlanValidationReasonCodes.fullyDeletableNoRetainedOverlap,
                 validationReason: "selected tags cover the whole root and its manifest closure does not overlap any retained root"
             };
         }
@@ -52,8 +53,8 @@ export function buildRootDecisions(directTargetRoots, planArtifacts) {
             manifestKind: root.manifestKind,
             selectionMode: root.selectionMode,
             selectionReason: root.reason,
-            validationStatus: "blocked",
-            validationReasonCode: "blocked-overlap-with-retained-root",
+            validationStatus: DeletePlanValidationStatuses.blocked,
+            validationReasonCode: DeletePlanValidationReasonCodes.blockedOverlapWithRetainedRoot,
             validationReason: buildBlockedValidationReason(blockedRoot),
             blockingVersionId: blockedRoot?.blockingVersionId,
             blockingDigest: blockedRoot?.blockingDigest,

package/dist/db/planner/_planner-repository.d.ts

@@ -1,6 +1,7 @@
 import type Database from "better-sqlite3";
 import type { DeletePlan, PlannerLogger } from "./_planner-types.js";
-export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanBlockedRoot, DeletePlanClosureManifest, DeletePlanProtectedRoot, DeletePlanRoot, DeletePlanRootDecision, DeletePlanSelectionMode, DeletePlanSelectionReason } from "./_planner-types.js";
+export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanBlockedRoot, DeletePlanClosureManifest, DeletePlanProtectedRoot, DeletePlanRoot, DeletePlanRootDecision, DeletePlanSelectionMode, DeletePlanSelectionReason, DeletePlanValidationReasonCode, DeletePlanValidationStatus } from "./_planner-types.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./_planner-types.js";
 export declare class PlannerRepository {
     #private;
     constructor(database: Database.Database, logger?: PlannerLogger);

package/dist/db/planner/_planner-repository.js

@@ -4,6 +4,7 @@ import { PlannerLatestScan } from "./_planner-latest-scan.js";
 import { buildPlanOutputs } from "./_planner-output.js";
 import { PlannerPlanArtifacts } from "./_planner-plan-artifacts.js";
 import { PlannerSql } from "./_planner-sql.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./_planner-types.js";
 export class PlannerRepository {
     #latestScan;
     #directTargetTags;
@@ -60,10 +61,11 @@ export class PlannerRepository {
         const scan = this.#latestScan.get(owner, packageName);
         const deleteTags = options?.deleteTags ?? [];
         const excludeTags = options?.excludeTags ?? [];
-        const directTargetTags = this.#directTargetTags.listDeleteTagDirectTargetTags(scan.scan_id, deleteTags, excludeTags, options?.useRegex ?? false, options?.cutoffTimestamp);
+        const directTargetTags = this.#directTargetTags.listDeleteTagDirectTargetTags(scan.scan_id, deleteTags, excludeTags, options?.useRegex ?? false, options?.deleteOrphanedImages ?? false, options?.cutoffTimestamp);
         const directTargetRoots = this.#directTargetRoots.list(scan.scan_id, {
             deleteTags,
             deleteTagsRequested: options?.deleteTagsRequested ?? false,
+            deleteOrphanedImages: options?.deleteOrphanedImages ?? false,
             excludeTags,
             deleteUntagged: options?.deleteUntagged ?? false,
             keepNTagged: options?.keepNTagged,

package/dist/db/planner/_planner-types.d.ts

@@ -40,10 +40,22 @@ export interface ScanRow {
 export type DeletePlanSelectionMode = "delete-root" | "untag-only";
 export type DeletePlanSelectionReason = "delete-tags-all-tags-selected" | "delete-tags-partial-tag-match" | "delete-untagged" | "keep-n-tagged-overflow" | "keep-n-untagged-overflow";
 export type DeletePlanBlockReasonCode = "overlap-with-retained-root";
+export declare const DeletePlanValidationStatuses: {
+    readonly fullyDeletable: "fully-deletable";
+    readonly blocked: "blocked";
+    readonly untagOnly: "untag-only";
+};
+export type DeletePlanValidationStatus = (typeof DeletePlanValidationStatuses)[keyof typeof DeletePlanValidationStatuses];
+export declare const DeletePlanValidationReasonCodes: {
+    readonly untagOnlyPartialTagMatch: "untag-only-partial-tag-match";
+    readonly fullyDeletableNoRetainedOverlap: "fully-deletable-no-retained-overlap";
+    readonly blockedOverlapWithRetainedRoot: "blocked-overlap-with-retained-root";
+};
+export type DeletePlanValidationReasonCode = (typeof DeletePlanValidationReasonCodes)[keyof typeof DeletePlanValidationReasonCodes];
 export interface DeletePlanRoot {
     versionId: number;
     digest: string;
-    manifestKind?: string;
+    manifestKind?: ManifestKind;
     reason: DeletePlanSelectionReason;
     selectionMode: DeletePlanSelectionMode;
 }
@@ -52,7 +64,7 @@ export interface DeletePlanClosureManifest {
     sourceDigest: string;
     memberVersionId: number;
     memberDigest: string;
-    memberManifestKind?: string;
+    memberManifestKind?: ManifestKind;
     hopsFromRoot: number;
     memberRole: string;
 }
@@ -62,22 +74,22 @@ export interface DeletePlanBlockedRoot {
     blockingVersionId: number;
     blockingDigest: string;
     overlapDigest: string;
-    overlapManifestKind?: string;
+    overlapManifestKind?: ManifestKind;
     reason: DeletePlanBlockReasonCode;
 }
 export interface DeletePlanRootDecision {
     versionId: number;
     digest: string;
-    manifestKind?: string;
+    manifestKind?: ManifestKind;
     selectionMode: DeletePlanSelectionMode;
     selectionReason: DeletePlanSelectionReason;
-    validationStatus: "fully-deletable" | "blocked" | "untag-only";
-    validationReasonCode: "untag-only-partial-tag-match" | "fully-deletable-no-retained-overlap" | "blocked-overlap-with-retained-root";
+    validationStatus: DeletePlanValidationStatus;
+    validationReasonCode: DeletePlanValidationReasonCode;
     validationReason: string;
     blockingVersionId?: number;
     blockingDigest?: string;
     overlapDigest?: string;
-    overlapManifestKind?: string;
+    overlapManifestKind?: ManifestKind;
 }
 export interface DeletePlanProtectedRoot {
     versionId: number;
@@ -87,7 +99,7 @@ export interface DeletePlanProtectedRoot {
         blockedDigest: string;
         blockReasonCode: DeletePlanBlockReasonCode;
         overlapDigest: string;
-        overlapManifestKind?: string;
+        overlapManifestKind?: ManifestKind;
     }>;
 }
 export interface PlanArtifacts {
@@ -126,4 +138,5 @@ export declare function mapPlanRootRow(row: _PlanRootRow): DeletePlanRoot;
 export declare function mapPlanTagRows(rows: _PlanTagRow[]): string[];
 export declare function mapClosureManifestRow(row: _ClosureManifestRow): DeletePlanClosureManifest;
 export declare function mapBlockedRootRow(row: _BlockedRootRow): DeletePlanBlockedRoot;
+import type { ManifestKind } from "../../core/index.js";
 export {};

package/dist/db/planner/_planner-types.js

@@ -1,3 +1,13 @@
+export const DeletePlanValidationStatuses = {
+    fullyDeletable: "fully-deletable",
+    blocked: "blocked",
+    untagOnly: "untag-only"
+};
+export const DeletePlanValidationReasonCodes = {
+    untagOnlyPartialTagMatch: "untag-only-partial-tag-match",
+    fullyDeletableNoRetainedOverlap: "fully-deletable-no-retained-overlap",
+    blockedOverlapWithRetainedRoot: "blocked-overlap-with-retained-root"
+};
 export const silentPlannerLogger = {
     trace() { },
     debug() { }
@@ -6,7 +16,7 @@ export function mapPlanRootRow(row) {
     return {
         versionId: row.version_id,
         digest: row.root_digest,
-        manifestKind: row.root_manifest_kind ?? undefined,
+        manifestKind: (row.root_manifest_kind ?? undefined),
         reason: row.direct_target_reason,
         selectionMode: row.selection_mode
     };
@@ -20,7 +30,7 @@ export function mapClosureManifestRow(row) {
         sourceDigest: row.source_digest,
         memberVersionId: row.member_version_id,
         memberDigest: row.member_digest,
-        memberManifestKind: row.member_manifest_kind ?? undefined,
+        memberManifestKind: (row.member_manifest_kind ?? undefined),
         hopsFromRoot: row.hops_from_root,
         memberRole: row.member_role
     };
@@ -32,7 +42,7 @@ export function mapBlockedRootRow(row) {
         blockingVersionId: row.blocking_version_id,
         blockingDigest: row.blocking_digest,
         overlapDigest: row.overlap_digest,
-        overlapManifestKind: row.overlap_manifest_kind ?? undefined,
+        overlapManifestKind: (row.overlap_manifest_kind ?? undefined),
         reason: row.block_reason
     };
 }

package/dist/db/planner/index.d.ts

@@ -1,2 +1,3 @@
 export { PlannerRepository } from "./_planner-repository.js";
-export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanBlockedRoot, DeletePlanClosureManifest, DeletePlanProtectedRoot, DeletePlanRoot, DeletePlanRootDecision, DeletePlanSelectionMode, DeletePlanSelectionReason } from "./_planner-repository.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./_planner-repository.js";
+export type { DeletePlan, DeletePlanBlockReasonCode, DeletePlanBlockedRoot, DeletePlanClosureManifest, DeletePlanProtectedRoot, DeletePlanRoot, DeletePlanRootDecision, DeletePlanSelectionMode, DeletePlanSelectionReason, DeletePlanValidationReasonCode, DeletePlanValidationStatus } from "./_planner-repository.js";

package/dist/db/planner/index.js

@@ -1 +1,2 @@
 export { PlannerRepository } from "./_planner-repository.js";
+export { DeletePlanValidationReasonCodes, DeletePlanValidationStatuses } from "./_planner-repository.js";

package/dist/execute/_plan-executor.d.ts

@@ -1,3 +1,3 @@
-import type { DeletePlan } from "../db/index.js";
+import { type DeletePlan } from "../db/index.js";
 import { type DeleteExecutionOptions, type DeleteExecutionSummary } from "./_types.js";
 export declare function executeDeletePlan(plan: DeletePlan, options: DeleteExecutionOptions): Promise<DeleteExecutionSummary>;