git-vibe-setup 4.0.0 → 4.1.0

package/dist/cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import { realpathSync } from "node:fs";
-import { resolve } from "node:path";
+import { relative, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { fileURLToPath } from "node:url";
 import { fetchConsumerStarterFiles } from "./consumer-starter.js";
 import { githubTokenFromEnvironment } from "./github-api.js";
-import { blockingInstallPaths, buildInstallFiles, buildUpdateFiles, existingFilesError, installFiles, unmanagedWorkflowUpdateError, unmanagedWorkflowUpdatePaths, updateFiles, } from "./install.js";
+import { blockingInstallPaths, buildInstallFiles, buildUpdateFiles, existingFilesError, installFiles, obsoleteWorkflowCleanupPaths, unmanagedWorkflowUpdateError, unmanagedWorkflowUpdatePaths, updateFiles, } from "./install.js";
 import { renderManualSetupInstructions } from "./instructions.js";
 import { latestReleaseTag } from "./releases.js";
 const usage = `Usage:
@@ -42,10 +42,11 @@ export async function runUpdate(runtime = {}) {
     const sourceFiles = await fetchConsumerStarterFiles({ fetchImpl, githubToken, releaseTag });
     const files = buildUpdateFiles({ cwd, releaseTag, sourceFiles });
     const unmanagedPaths = unmanagedWorkflowUpdatePaths(files);
+    const cleanupPaths = obsoleteWorkflowCleanupPaths(files);
     if (unmanagedPaths.length > 0)
         throw unmanagedWorkflowUpdateError(unmanagedPaths, cwd);
     updateFiles(files);
-    (runtime.log || console.log)(`GitVibe config and workflow files updated with reusable workflows pinned to ${releaseTag}.`);
+    (runtime.log || console.log)(updateSuccessMessage({ cleanupPaths, cwd, releaseTag }));
 }
 export async function setupCli(runtime = {}) {
     const argv = runtime.argv || process.argv.slice(2);
@@ -149,6 +150,15 @@ function validateReleaseTag(releaseTag) {
     }
     throw new Error(`Invalid release tag: ${releaseTag}. Release tags must look like v3.0.4 or v3.0.4-rc.1.`);
 }
+function updateSuccessMessage(options) {
+    const message = `GitVibe config and workflow files updated with reusable workflows pinned to ${options.releaseTag}.`;
+    if (options.cleanupPaths.length === 0)
+        return message;
+    const listed = options.cleanupPaths
+        .map((path) => `- ${relative(options.cwd, path) || path}`)
+        .join("\n");
+    return `${message}\nObsolete workflow files were left in place for manual review:\n${listed}`;
+}
 /* c8 ignore start */
 if (isDirectRun(import.meta.url)) {
     const exitCode = await setupCli();

package/dist/install.d.ts

@@ -16,6 +16,7 @@ export declare function buildUpdateFiles(options: {
 }): InstallFile[];
 export declare function blockingInstallPaths(files: InstallFile[]): string[];
 export declare function unmanagedWorkflowUpdatePaths(files: InstallFile[]): string[];
+export declare function obsoleteWorkflowCleanupPaths(files: InstallFile[]): string[];
 export declare function installFiles(files: InstallFile[]): void;
 export declare function updateFiles(files: InstallFile[]): void;
 export declare function existingFilesError(paths: string[], cwd: string): Error;

package/dist/install.js

@@ -1,9 +1,7 @@
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
 const requiredInstallSourcePaths = [
     ".github/git-vibe.yml",
-    ".github/workflows/address-feedback.yml",
-    ".github/workflows/develop.yml",
     ".github/workflows/investigate.yml",
     ".github/workflows/materialize.yml",
     ".github/workflows/review.yml",
@@ -14,6 +12,7 @@ const requiredInstallSourcePaths = [
 ];
 const requiredWorkflowSourcePaths = requiredInstallSourcePaths.filter(isWorkflowSourcePath);
 const requiredUpdateSourcePaths = [".github/git-vibe.yml", ...requiredWorkflowSourcePaths];
+const managedWorkflowMarker = "# GitVibe managed workflow wrapper";
 export function buildInstallFiles(options) {
     requireSourcePaths(options.sourceFiles, requiredInstallSourcePaths, options.releaseTag);
     return options.sourceFiles
@@ -39,6 +38,12 @@ export function unmanagedWorkflowUpdatePaths(files) {
         .map((file) => file.targetPath)
         .sort();
 }
+export function obsoleteWorkflowCleanupPaths(files) {
+    return obsoleteWorkflowPaths(files)
+        .filter((targetPath) => !isMarkedManagedWorkflowFile(targetPath, basename(targetPath)))
+        .filter((targetPath) => isManagedWorkflowFile(targetPath, basename(targetPath)))
+        .sort();
+}
 export function installFiles(files) {
     const createdDirectories = [];
     const createdFiles = [];
@@ -63,6 +68,10 @@ export function updateFiles(files) {
             snapshots.push(snapshotFile(file.targetPath));
             writeFileSync(file.targetPath, file.content);
         }
+        for (const targetPath of obsoleteManagedWorkflowPaths(files)) {
+            snapshots.push(snapshotFile(targetPath));
+            rmSync(targetPath, { force: true });
+        }
     }
     catch (error) {
         rollbackUpdate(snapshots, createdDirectories);
@@ -85,9 +94,37 @@ export function migrateGitVibeConfigContent(content) {
     return ensureTrailingNewline(migrateGithubAuthConfig(migratedComments));
 }
 function isManagedWorkflowTarget(file) {
+    return isManagedWorkflowFile(file.targetPath, basename(file.targetPath));
+}
+function isManagedWorkflowFile(targetPath, workflowName) {
+    try {
+        return managedWorkflowPattern(workflowName).test(readFileSync(targetPath, "utf8"));
+    }
+    catch {
+        return false;
+    }
+}
+function obsoleteManagedWorkflowPaths(files) {
+    return obsoleteWorkflowPaths(files)
+        .filter((targetPath) => isMarkedManagedWorkflowFile(targetPath, basename(targetPath)))
+        .sort();
+}
+function obsoleteWorkflowPaths(files) {
+    const workflowDirectory = dirname(files.find(isWorkflowInstallFile)?.targetPath || "");
+    if (!workflowDirectory || workflowDirectory === ".")
+        return [];
+    if (!existsSync(workflowDirectory))
+        return [];
+    const currentWorkflowNames = new Set(files.filter(isWorkflowInstallFile).map((file) => basename(file.targetPath)));
+    return readdirSync(workflowDirectory, { withFileTypes: true })
+        .filter((entry) => entry.isFile() && !currentWorkflowNames.has(entry.name))
+        .map((entry) => join(workflowDirectory, entry.name));
+}
+function isMarkedManagedWorkflowFile(targetPath, workflowName) {
     try {
-        const workflowName = basename(file.targetPath);
-        return managedWorkflowPattern(workflowName).test(readFileSync(file.targetPath, "utf8"));
+        const content = readFileSync(targetPath, "utf8");
+        return (content.startsWith(`${managedWorkflowMarker}\n`) &&
+            managedWorkflowPattern(workflowName).test(content));
     }
     catch {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-vibe-setup",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "private": false,
   "type": "module",
   "bin": {