trellis-he 0.6.0-beta.17

package/dist/commands/uninstall.js

@@ -0,0 +1,339 @@
+/**
+ * `trellis uninstall` — remove every file written by `trellis init` / `update`
+ * from the current project, plus the `.trellis/` directory itself.
+ *
+ * The single source of truth for "what trellis wrote" is
+ * `.trellis/.template-hashes.json`. Files outside that manifest are never
+ * touched (e.g. user-added hooks under `.cursor/hooks/`).
+ *
+ * Manifest-listed files split into two groups:
+ *   A. Opaque content files (`.py` / `.md` / `.ts` / etc.) — unlinked outright.
+ *   B. Structured config files (settings.json / hooks.json / config.toml /
+ *      package.json) — passed through a scrubber that strips just the trellis
+ *      fields, leaving user-added neighbors intact. If the scrubber says the
+ *      file is fully empty afterwards, we delete it.
+ *
+ * Whether the user has modified a manifest-listed file or not, it is removed
+ * (per the PRD: "全删"). The `.trellis/` tree is removed unconditionally.
+ */
+import fs from "node:fs";
+import path from "node:path";
+import readline from "node:readline";
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { DIR_NAMES } from "../constants/paths.js";
+import { loadHashes } from "../utils/template-hash.js";
+import { cleanupEmptyDirs } from "./update.js";
+import { ALL_MANAGED_DIRS, getConfiguredPlatforms, } from "../configurators/index.js";
+import { pruneOrphanManifestKeys } from "../utils/manifest-prune.js";
+import { isCwdHomedir, homedirGuardMessage, homedirBypassEnabled, } from "../utils/cwd-guard.js";
+import { scrubHooksJson, scrubOpencodePackageJson, scrubPiSettings, scrubCodexConfigToml, } from "../utils/uninstall-scrubbers.js";
+/**
+ * Build the dispatch table for structured config scrubbers.
+ *
+ * Keys are POSIX paths exactly as they appear in `.template-hashes.json`.
+ */
+function buildStructuredFileSpecs() {
+    const specs = [
+        // Nested hooks.{Event}.[].hooks.[] schema
+        ...[
+            ".claude/settings.json",
+            ".gemini/settings.json",
+            ".factory/settings.json",
+            ".codebuddy/settings.json",
+            ".qoder/settings.json",
+            ".codex/hooks.json",
+        ].map((p) => ({
+            posixPath: p,
+            reason: "Strip trellis hooks; preserve user fields",
+            scrub: (content, deletedPaths) => scrubHooksJson(content, deletedPaths, "nested"),
+        })),
+        // Flat hooks.{Event}.[] schema
+        ...[".cursor/hooks.json", ".github/copilot/hooks.json"].map((p) => ({
+            posixPath: p,
+            reason: "Strip trellis hooks; preserve user fields",
+            scrub: (content, deletedPaths) => scrubHooksJson(content, deletedPaths, "flat"),
+        })),
+        {
+            posixPath: ".opencode/package.json",
+            reason: "Remove @opencode-ai/plugin dep; preserve other deps",
+            scrub: (content) => scrubOpencodePackageJson(content),
+        },
+        {
+            posixPath: ".pi/settings.json",
+            reason: "Strip trellis extension/skills/prompts entries; preserve user fields",
+            scrub: (content) => scrubPiSettings(content),
+        },
+        {
+            posixPath: ".codex/config.toml",
+            reason: "Remove trellis project_doc_fallback_filenames and notes",
+            scrub: (content) => scrubCodexConfigToml(content),
+        },
+    ];
+    const map = new Map();
+    for (const spec of specs) {
+        map.set(spec.posixPath, spec);
+    }
+    return map;
+}
+/**
+ * Walk through the manifest and decide, for each entry, whether it is a plain
+ * deletion or a structured modification (or fully-empty modification → still
+ * a deletion at the end).
+ */
+function buildPlan(cwd, hashes) {
+    const structured = buildStructuredFileSpecs();
+    const allPosixPaths = Object.keys(hashes);
+    const deletions = [];
+    const modifications = [];
+    for (const posixPath of allPosixPaths) {
+        const absPath = path.join(cwd, ...posixPath.split("/"));
+        const spec = structured.get(posixPath);
+        if (!spec) {
+            deletions.push({
+                posixPath,
+                absPath,
+                missing: !fs.existsSync(absPath),
+            });
+            continue;
+        }
+        if (!fs.existsSync(absPath)) {
+            // Structured file expected by manifest is gone — nothing to do for it.
+            deletions.push({ posixPath, absPath, missing: true });
+            continue;
+        }
+        const content = fs.readFileSync(absPath, "utf-8");
+        const result = spec.scrub(content, allPosixPaths);
+        if (result.fullyEmpty) {
+            // Strip + delete: nothing meaningful left in the file.
+            deletions.push({ posixPath, absPath, missing: false });
+        }
+        else {
+            modifications.push({
+                posixPath,
+                absPath,
+                reason: spec.reason,
+                result,
+            });
+        }
+    }
+    return {
+        deletions,
+        modifications,
+        removeTrellisDir: true,
+    };
+}
+/**
+ * Render the two-column uninstall plan to stdout.
+ */
+function renderPlan(cwd, plan) {
+    const trellisDir = path.join(cwd, DIR_NAMES.WORKFLOW);
+    console.log(chalk.bold("\nTrellis uninstall plan\n"));
+    const deletePaths = plan.deletions
+        .filter((d) => !d.missing)
+        .map((d) => d.posixPath);
+    console.log(chalk.red.bold(`Will be deleted (${deletePaths.length + 1} entries):`));
+    for (const p of deletePaths) {
+        console.log(`  ${chalk.red("-")} ${p}`);
+    }
+    if (plan.removeTrellisDir && fs.existsSync(trellisDir)) {
+        console.log(`  ${chalk.red("-")} ${DIR_NAMES.WORKFLOW}/  ${chalk.gray("(entire directory, including tasks/runtime/config)")}`);
+    }
+    if (plan.modifications.length > 0) {
+        console.log();
+        console.log(chalk.yellow.bold(`Will be modified (${plan.modifications.length} files):`));
+        for (const m of plan.modifications) {
+            console.log(`  ${chalk.yellow("~")} ${m.posixPath}  ${chalk.gray(`(${m.reason})`)}`);
+        }
+    }
+    const skipped = plan.deletions.filter((d) => d.missing);
+    if (skipped.length > 0) {
+        console.log();
+        console.log(chalk.gray(`(${skipped.length} manifest entries already missing on disk — skipped.)`));
+    }
+    console.log();
+}
+/**
+ * Prompt `Continue? [Y/n]` with default = yes. Returns true if user agrees.
+ *
+ * We use `inquirer` to match update.ts so the CLI behaves consistently and
+ * tests can mock the same library.
+ */
+async function promptContinue() {
+    const { proceed } = await inquirer.prompt([
+        {
+            type: "confirm",
+            name: "proceed",
+            message: "Continue?",
+            default: true,
+        },
+    ]);
+    return proceed;
+}
+/**
+ * Execute the plan: write modifications, unlink deletions, remove `.trellis/`,
+ * then prune empty managed directories.
+ *
+ * Returns counts for the summary.
+ */
+function executePlan(cwd, plan) {
+    let deletedFiles = 0;
+    let modifiedFiles = 0;
+    // 1. Modifications first (preserve user data even if a later step fails).
+    for (const mod of plan.modifications) {
+        fs.writeFileSync(mod.absPath, mod.result.content);
+        modifiedFiles += 1;
+    }
+    // 2. Deletions (skip already-missing entries).
+    const deletedDirCandidates = new Set();
+    for (const del of plan.deletions) {
+        if (del.missing)
+            continue;
+        try {
+            fs.unlinkSync(del.absPath);
+            deletedFiles += 1;
+        }
+        catch {
+            // Best-effort: a file that can't be unlinked (e.g. perm error) is
+            // surfaced via the summary mismatch, but we don't want to abort
+            // halfway through.
+            continue;
+        }
+        deletedDirCandidates.add(path.posix.dirname(del.posixPath));
+    }
+    // 3. Drop `.trellis/` entirely.
+    let deletedDirs = 0;
+    if (plan.removeTrellisDir) {
+        const trellisDir = path.join(cwd, DIR_NAMES.WORKFLOW);
+        if (fs.existsSync(trellisDir)) {
+            fs.rmSync(trellisDir, { recursive: true, force: true });
+            deletedDirs += 1;
+        }
+    }
+    // 4. Recursively clean up now-empty managed subdirectories (e.g. empty
+    // `.claude/hooks/` after every file inside was removed). This will not
+    // touch managed root dirs themselves (`.claude`, `.cursor`, etc.) — those
+    // are guarded by `isManagedRootDir` inside `cleanupEmptyDirs`.
+    for (const dirPosix of deletedDirCandidates) {
+        if (dirPosix === "." || dirPosix === "")
+            continue;
+        cleanupEmptyDirs(cwd, dirPosix);
+    }
+    // 5. Final pass: remove any platform root dir (`.claude`, `.cursor`,
+    // `.agents/skills`, …) that is now empty. We deliberately handle this here
+    // — `cleanupEmptyDirs` refuses to touch managed root dirs because in normal
+    // `update` flow they must persist. During uninstall, an empty platform root
+    // has no purpose. `.trellis` is already gone (step 3), so we skip it.
+    // Process deepest-first so that nested managed dirs (e.g. `.agents/skills`)
+    // are removed before their parents (`.agents`).
+    const sortedManagedDirs = [...ALL_MANAGED_DIRS]
+        .filter((d) => d !== DIR_NAMES.WORKFLOW)
+        .sort((a, b) => b.split("/").length - a.split("/").length);
+    for (const managedDir of sortedManagedDirs) {
+        const abs = path.join(cwd, ...managedDir.split("/"));
+        if (!fs.existsSync(abs))
+            continue;
+        try {
+            const stat = fs.statSync(abs);
+            if (!stat.isDirectory())
+                continue;
+            if (fs.readdirSync(abs).length === 0) {
+                fs.rmdirSync(abs);
+                deletedDirs += 1;
+                // After removing a nested dir, its parent may now be empty. Walk up
+                // until we hit something non-empty or leave the cwd. We keep this
+                // loop bounded to managed-dir territory by checking that the next
+                // parent posix path is still a managed dir (or an ancestor of one).
+                let parentPosix = managedDir.split("/").slice(0, -1).join("/");
+                while (parentPosix.length > 0) {
+                    const parentAbs = path.join(cwd, ...parentPosix.split("/"));
+                    if (!fs.existsSync(parentAbs))
+                        break;
+                    if (fs.readdirSync(parentAbs).length !== 0)
+                        break;
+                    fs.rmdirSync(parentAbs);
+                    deletedDirs += 1;
+                    parentPosix = parentPosix.split("/").slice(0, -1).join("/");
+                }
+            }
+        }
+        catch {
+            // Best-effort cleanup; ignore permission/race errors.
+        }
+    }
+    return { deletedFiles, modifiedFiles, deletedDirs };
+}
+/**
+ * Entry point.
+ */
+export async function uninstall(options = {}) {
+    // Refuse to run in $HOME — same reasoning as init. A manifest poisoned by
+    // a prior buggy init would otherwise unlink global platform runtime data
+    // (chat history, session JSONLs).
+    if (isCwdHomedir() && !homedirBypassEnabled()) {
+        console.error(chalk.red(homedirGuardMessage("uninstall")));
+        process.exit(1);
+    }
+    const cwd = process.cwd();
+    const trellisDir = path.join(cwd, DIR_NAMES.WORKFLOW);
+    // Pre-check 1: must have a `.trellis/` directory.
+    if (!fs.existsSync(trellisDir)) {
+        console.log(chalk.gray("Trellis is not installed in this project (no .trellis/ directory found)."));
+        return;
+    }
+    // Pre-check 2: must have a manifest. Without it we cannot determine which
+    // platform files are trellis-owned vs user-owned.
+    const hashes = loadHashes(cwd);
+    if (Object.keys(hashes).length === 0) {
+        console.error(chalk.red("Trellis directory found but manifest is missing — cannot determine which platform files to remove. " +
+            "You can manually delete .trellis/ if needed."));
+        process.exit(1);
+    }
+    // Self-heal poisoned manifests from buggy init versions: prune any manifest
+    // entry that no current configurator owns. Runs BEFORE buildPlan so the
+    // user-owned paths (.codex/sessions/, .claude/projects/, pre-existing
+    // AGENTS.md, etc.) never reach the deletion list. See PRD R3.
+    //
+    // Dry-run: still compute the pruned hashes (so the plan reflects post-prune
+    // reality) but pass `persist: false` so no disk write happens. The actual
+    // disk write defers to executePlan time, where we'd be rewriting the
+    // manifest only to delete the whole .trellis/ dir anyway — but the
+    // computation must remain to keep the rendered plan honest.
+    const configuredPlatforms = getConfiguredPlatforms(cwd);
+    const { pruned, hashes: prunedHashes } = pruneOrphanManifestKeys(cwd, [...configuredPlatforms], hashes, { persist: !options.dryRun });
+    if (pruned.length > 0) {
+        // Surface counts only — listing every poisoned entry would alarm users
+        // without giving them an actionable signal.
+        console.log(chalk.gray(`   Pruned ${pruned.length} orphan manifest entries (user-owned files trellis did not write).`));
+    }
+    const plan = buildPlan(cwd, prunedHashes);
+    renderPlan(cwd, plan);
+    if (options.dryRun) {
+        console.log(chalk.gray("Dry run — no files were modified."));
+        return;
+    }
+    if (!options.yes) {
+        // Make sure stdin is in a usable state for the prompt; in scripted
+        // environments that closed stdin, inquirer would otherwise raise. We
+        // honor the same UX as `trellis update` (which also fails closed in
+        // that case).
+        if (!process.stdin.isTTY) {
+            console.error(chalk.red("Refusing to prompt for confirmation in a non-interactive shell. " +
+                "Pass --yes/-y to confirm or --dry-run to preview."));
+            // Try to release the readline ref if anything else opened stdin.
+            readline.createInterface({ input: process.stdin }).close();
+            process.exit(1);
+        }
+        const ok = await promptContinue();
+        if (!ok) {
+            console.log(chalk.yellow("Uninstall cancelled. No files modified."));
+            return;
+        }
+    }
+    const summary = executePlan(cwd, plan);
+    console.log();
+    console.log(chalk.green(`Uninstalled trellis: ${summary.deletedFiles} files deleted, ` +
+        `${summary.modifiedFiles} files modified, ` +
+        `${summary.deletedDirs} directories removed.`));
+}
+//# sourceMappingURL=uninstall.js.map

package/dist/commands/uninstall.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/commands/uninstall.ts"],"names":[],"mappings":"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"}

package/dist/commands/update.d.ts

@@ -0,0 +1,72 @@
+import type { ConfigSectionAdded, MigrationItem } from "../types/migration.js";
+export interface UpdateOptions {
+    dryRun?: boolean;
+    force?: boolean;
+    skipAll?: boolean;
+    createNew?: boolean;
+    allowDowngrade?: boolean;
+    migrate?: boolean;
+}
+/**
+ * Load update.skip paths from .trellis/config.yaml
+ *
+ * Parses simple YAML structure:
+ *   update:
+ *     skip:
+ *       - path1
+ *       - path2
+ *
+ * @internal Exported for testing only
+ */
+export declare function loadUpdateSkipPaths(cwd: string): string[];
+/**
+ * Extract a "section" from a config.yaml-style template by sectionHeading.
+ *
+ * A section is delimited by `#---...---` separator lines (the same pattern
+ * used in the bundled `config.yaml` template). The first line inside the
+ * separator block whose `# ` content matches `sectionHeading` identifies the
+ * section; the section spans from that opening separator block through the
+ * line preceding the next `#---` separator block (or EOF).
+ *
+ * Returns the extracted text including its leading separator block, or `null`
+ * when no matching section is found.
+ *
+ * @internal Exported for testing only.
+ */
+export declare function extractConfigSection(template: string, sectionHeading: string): string | null;
+/**
+ * Apply additive config.yaml sections introduced between two versions.
+ *
+ * Walks the supplied entries, dedupes by `file+sentinel`, and for each unique
+ * entry: if the user file exists and lacks the sentinel, extracts the named
+ * section from `templateContent` and appends it. Idempotent — re-running the
+ * step on a file that already contains the sentinel is a no-op.
+ *
+ * @internal Exported for testing only.
+ */
+export declare function applyConfigSectionsAdded(entries: ConfigSectionAdded[], cwd: string, bundledTemplates: Map<string, string>): {
+    appended: number;
+};
+/**
+ * Check if a path should be excluded from backup
+ * @internal Exported for testing only
+ */
+export declare function shouldExcludeFromBackup(relativePath: string): boolean;
+/**
+ * Clean up empty directories after file migration
+ * Recursively removes empty parent directories up to .trellis root
+ */
+/** @internal Exported for testing only */
+export declare function cleanupEmptyDirs(cwd: string, dirPath: string): void;
+/**
+ * Sort migrations for safe execution order
+ * - rename-dir with deeper paths first (to handle nested directories)
+ * - rename-dir before rename/delete
+ */
+/** @internal Exported for testing only */
+export declare function sortMigrationsForExecution(migrations: MigrationItem[]): MigrationItem[];
+/**
+ * Main update command
+ */
+export declare function update(options: UpdateOptions): Promise<void>;
+//# sourceMappingURL=update.d.ts.map

package/dist/commands/update.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EAKd,MAAM,uBAAuB,CAAC;AAmC/B,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAkSD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA6DzD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,GACrB,MAAM,GAAG,IAAI,CA2Bf;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,kBAAkB,EAAE,EAC7B,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CA0CtB;AAibD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAerE;AAqbD;;;GAGG;AACH,0CAA0C;AAC1C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAgCnE;AAED;;;;GAIG;AACH,0CAA0C;AAC1C,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,aAAa,EAAE,GAC1B,aAAa,EAAE,CAajB;AAuMD;;GAEG;AACH,wBAAsB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA8yBlE"}