@osdlc/repo-cleaner 0.9.2 → 0.10.1

package/dist/version.generated.d.ts

@@ -1,2 +1,2 @@
 /** This package's version, from its package.json when it was built. */
-export declare const VERSION = "0.9.2";
+export declare const VERSION = "0.10.1";

package/dist/version.generated.js

@@ -1,3 +1,3 @@
 // Generated by cli-tool-stamp-version from package.json. Do not edit.
 /** This package's version, from its package.json when it was built. */
-export const VERSION = '0.9.2';
+export const VERSION = '0.10.1';

package/dist/worktrees.d.ts

@@ -26,7 +26,7 @@ export declare function hasBlockers(item: Pick<SweepItem, 'facts'>): boolean;
  * The branch set is returned because a local branch checked out in a worktree
  * must not be judged on its own: the worktree is what a person would act on.
  */
-export declare function gatherWorktrees(repo: RepoInfo, prs: Map<string, PRInfo>, cwd: string, git: Git, only: string | undefined, probe: ProcessProbe): [SweepItem[], Set<string>];
+export declare function gatherWorktrees(repo: RepoInfo, prs: Map<string, PRInfo>, cwd: string, git: Git, only: string | undefined, probe: ProcessProbe, tick?: (done: number, total: number) => void): [SweepItem[], Set<string>];
 export declare function classifyWorktree(opts: {
     path: string;
     branch: string;

package/dist/worktrees.js

@@ -9,7 +9,7 @@ import { existsSync, statSync } from 'node:fs';
 import { isAbsolute, join, sep } from 'node:path';
 import { shellJoin } from '@osdlc/command-seam';
 import { nodeGuard } from '@osdlc/path-guard/node';
-import { gapSentence, recordPr } from "./branches.js";
+import { gapSentence, mergedFact, recordPr } from "./branches.js";
 import { confirmationNote, judgeLanding, landingConfirmed, recordLanding, unmatchedSentence, } from "./landing.js";
 import { busyHolders, isIdleHolder, parseLockOwner } from "./processes.js";
 import { authorizationsFor, landedRef, makeItem, } from "./types.js";
@@ -141,7 +141,7 @@ function readBlockers(opts) {
  * The branch set is returned because a local branch checked out in a worktree
  * must not be judged on its own: the worktree is what a person would act on.
  */
-export function gatherWorktrees(repo, prs, cwd, git, only, probe) {
+export function gatherWorktrees(repo, prs, cwd, git, only, probe, tick) {
     const all = git.at(repo.root).worktrees();
     const pathsByBranch = new Map();
     for (const entry of all) {
@@ -151,7 +151,8 @@ export function gatherWorktrees(repo, prs, cwd, git, only, probe) {
     }
     const entries = only === undefined ? all : all.filter((entry) => entry.branch === only);
     const items = [];
-    for (const entry of entries) {
+    for (const [i, entry] of entries.entries()) {
+        tick?.(i, entries.length);
         const branch = entry.branch ?? '';
         items.push(classifyWorktree({
             path: entry.path,
@@ -202,8 +203,13 @@ export function classifyWorktree(opts) {
     if (nodeGuard.contains(path, absCwd)) {
         return pinned("current session's worktree");
     }
-    const onDisk = isDir(path);
+    // A directory whose `.git` is gone is no longer a checkout: git lists it as
+    // prunable and `git status` inside it fails. Treat it as gone; the prune
+    // that drops its registration leaves the directory alone.
+    const dirPresent = isDir(path);
+    const onDisk = dirPresent && existsSync(join(path, '.git'));
     facts['on_disk'] = onDisk;
+    facts['directory_left'] = dirPresent && !onDisk;
     let dirtyFiles = [];
     let unpushed = [];
     if (onDisk) {
@@ -244,6 +250,14 @@ export function classifyWorktree(opts) {
         recordLanding(facts, patch);
     const patchLanded = patch !== null && patch.check !== null;
     const unlanded = unpushed.length > 0 && !landed && !landingConfirmed(patch);
+    if (onDisk && head !== null) {
+        // `soft`: a missing default ref reads as not merged.
+        facts['merged'] = mergedFact({
+            landed,
+            patchLanded,
+            ancestor: git.at(repo.root).soft.isAncestor(head, landedRef(repo)),
+        });
+    }
     const requires = authorizationsFor({
         'abandon-unmerged': unlanded,
         'discard-changes': dirtyFiles.length > 0,
@@ -280,7 +294,9 @@ export function classifyWorktree(opts) {
             id: path,
             classification: 'safe-to-delete',
             action: 'remove',
-            reason: 'worktree directory no longer on disk; prune the stale link',
+            reason: dirPresent
+                ? 'directory is no longer a checkout (no .git); prune the stale link, the directory stays'
+                : 'worktree directory no longer on disk; prune the stale link',
             facts,
             commands: pruneOnly,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osdlc/repo-cleaner",
-  "version": "0.9.2",
+  "version": "0.10.1",
   "description": "What has been merged into the default branch, and what can go away. Inventories local branches, worktrees and remote branches across one repository or many, classifying each with the evidence behind the verdict and the command that would act on it. Plans and applies approved deletes, compare-and-swap.",
   "license": "MIT OR Apache-2.0",
   "author": "sksizer",
@@ -50,11 +50,11 @@
   "dependencies": {
     "zod": "4.4.3",
     "@osdlc/cli-tool": "^0.12.0",
-    "@osdlc/command-seam": "^0.14.0",
-    "@osdlc/config-layers": "^0.8.0",
     "@osdlc/path-guard": "^0.3.1",
-    "@osdlc/typed-gh": "^0.14.0",
-    "@osdlc/typed-git": "^0.11.1"
+    "@osdlc/command-seam": "^0.14.0",
+    "@osdlc/typed-git": "^0.12.0",
+    "@osdlc/typed-gh": "^0.14.1",
+    "@osdlc/ux": "^0.1.1"
   },
   "devDependencies": {
     "@types/node": "^26.1.0",
@@ -63,8 +63,8 @@
     "prettier": "3.9.6",
     "typescript": "~6.0.3",
     "vitest": "^5.0.5",
-    "@osdlc/prettier-config": "^0.3.1",
-    "@osdlc/tsconfig": "^0.4.1"
+    "@osdlc/tsconfig": "^0.4.1",
+    "@osdlc/prettier-config": "^0.3.1"
   },
   "scripts": {
     "build": "cli-tool-stamp-version && tsc -p tsconfig.build.json",

package/dist/config.d.ts

@@ -1,53 +0,0 @@
-/**
- * The standalone tool's own configuration file.
- *
- * Only the CLI reads it. The library takes repositories as an argument, so a
- * host that already knows where its repositories are passes them in and never touches this file.
- *
- * Shape, location and loading are `@osdlc/config-layers`'s machine file:
- * `<config-home>/repo-cleaner/config.yaml` over `@osdlc/tiered-dirs`'
- * standalone tier, Zod as the single source of truth, never throws, degrades
- * to the defaults, memoised. Standalone, not suite or vendor, because a
- * general tool must not write a company namespace onto someone else's
- * machine.
- */
-import { z } from 'zod';
-/** The tool's name, and so its config directory segment. */
-export declare const TOOL = "repo-cleaner";
-/** Env var that relocates the config file, for tests and one-off runs. */
-export declare const CONFIG_ENV = "REPO_CLEANER_MACHINE_CONFIG";
-export declare const RepoCleanerConfigSchema: z.ZodObject<{
-    paths: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodString>>;
-    repos: z.ZodDefault<z.ZodArray<z.ZodString>>;
-}, z.core.$strict>;
-export type RepoCleanerConfig = z.infer<typeof RepoCleanerConfigSchema>;
-/**
- * Whose directories the config file, plans and receipts live under: vendor
- * `repo-cleaner`, moved by the `REPO_CLEANER_*` override variables.
- */
-export declare const VENDOR_DIRS: {
-    vendor: string;
-    envVars: import("@osdlc/tiered-dirs").EnvVars;
-};
-export declare const DEFAULT_CONFIG: RepoCleanerConfig;
-/** `<config-home>/repo-cleaner/config.yaml`, unless {@link CONFIG_ENV} says otherwise. */
-export declare const configPath: () => string;
-/**
- * The config, defaults filled.
- *
- * Never throws. A missing file, unreadable file, malformed YAML or wrong
- * shape all degrade to the defaults: a person running the tool in a
- * repository should not be stopped by a config file they never wrote.
- */
-export declare const loadConfig: () => RepoCleanerConfig;
-/** Drop the memoised value. Call from tests between runs. */
-export declare const clearConfigCache: () => void;
-/**
- * The configured entries with their `{name}` path names substituted against
- * `paths:`, relative entries resolved against `baseDir`.
- *
- * A name nothing defines is an error rather than an empty string — a
- * `repos:` entry that quietly becomes `/dev` would sweep whatever happens to
- * be there.
- */
-export declare function configuredRepos(config?: RepoCleanerConfig, baseDir?: string): string[];

package/dist/config.js

@@ -1,67 +0,0 @@
-/**
- * The standalone tool's own configuration file.
- *
- * Only the CLI reads it. The library takes repositories as an argument, so a
- * host that already knows where its repositories are passes them in and never touches this file.
- *
- * Shape, location and loading are `@osdlc/config-layers`'s machine file:
- * `<config-home>/repo-cleaner/config.yaml` over `@osdlc/tiered-dirs`'
- * standalone tier, Zod as the single source of truth, never throws, degrades
- * to the defaults, memoised. Standalone, not suite or vendor, because a
- * general tool must not write a company namespace onto someone else's
- * machine.
- */
-import { envVars } from '@osdlc/cli-tool';
-import { machineConfigFile, pathNames, pathsSchema, substitutePathNames, } from '@osdlc/config-layers';
-import { z } from 'zod';
-/** The tool's name, and so its config directory segment. */
-export const TOOL = 'repo-cleaner';
-/** Env var that relocates the config file, for tests and one-off runs. */
-export const CONFIG_ENV = 'REPO_CLEANER_MACHINE_CONFIG';
-export const RepoCleanerConfigSchema = z
-    .object({
-    paths: pathsSchema()
-        .default({})
-        .describe('Named directories; a `repos:` entry refers to one as `{name}`.'),
-    repos: z
-        .array(z.string().trim().min(1))
-        .default([])
-        .describe('Checkouts, or directories containing checkouts at any depth.'),
-})
-    .strict();
-/**
- * Whose directories the config file, plans and receipts live under: vendor
- * `repo-cleaner`, moved by the `REPO_CLEANER_*` override variables.
- */
-export const VENDOR_DIRS = { vendor: TOOL, envVars: envVars('REPO_CLEANER') };
-const file = machineConfigFile({
-    tool: TOOL,
-    schema: RepoCleanerConfigSchema,
-    vendorDirs: VENDOR_DIRS,
-    env: CONFIG_ENV,
-});
-export const DEFAULT_CONFIG = RepoCleanerConfigSchema.parse({});
-/** `<config-home>/repo-cleaner/config.yaml`, unless {@link CONFIG_ENV} says otherwise. */
-export const configPath = () => file.path();
-/**
- * The config, defaults filled.
- *
- * Never throws. A missing file, unreadable file, malformed YAML or wrong
- * shape all degrade to the defaults: a person running the tool in a
- * repository should not be stopped by a config file they never wrote.
- */
-export const loadConfig = () => file.load();
-/** Drop the memoised value. Call from tests between runs. */
-export const clearConfigCache = () => file.clearCache();
-/**
- * The configured entries with their `{name}` path names substituted against
- * `paths:`, relative entries resolved against `baseDir`.
- *
- * A name nothing defines is an error rather than an empty string — a
- * `repos:` entry that quietly becomes `/dev` would sweep whatever happens to
- * be there.
- */
-export function configuredRepos(config = loadConfig(), baseDir = process.cwd()) {
-    const names = pathNames(baseDir, config.paths, {});
-    return config.repos.map((entry) => substitutePathNames(entry, names, 'repos:'));
-}