@devosurf/vynt 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devosurf/vynt",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "files": [
     "bin",

package/src/bridge.ts

@@ -1,6 +1,6 @@
 import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http"
 import { watch, type FSWatcher } from "node:fs"
-import { readFile } from "node:fs/promises"
+import { readFile, unlink } from "node:fs/promises"
 import { dirname, resolve } from "node:path"
 import { fileURLToPath } from "node:url"
 import { applySelectionsToWorkspace, getLatestSnapshot, rollbackWorkspaceToSnapshot } from "./switch.js"
@@ -187,12 +187,18 @@ function markVariantSelectedInState(state: VariantStore, objectiveId: string, va
   }
 }
 
-function finalizeVariantInObjectiveState(state: VariantStore, objectiveId: string, variantId: string): VariantStore {
+function finalizeVariantInObjectiveState(
+  state: VariantStore,
+  objectiveId: string,
+  variantId: string,
+): { nextState: VariantStore; removedVariants: VariantArtifact[] } {
   const objectiveItem = findObjective(state, objectiveId)
-  findVariant(objectiveItem, variantId)
+  const winner = findVariant(objectiveItem, variantId)
   const now = new Date().toISOString()
+  const removedVariants = objectiveItem.variants.filter((variant) => variant.id !== variantId)
 
   return {
+    nextState: {
     ...state,
     activeProfileId: undefined,
     objectives: state.objectives.map((item) => {
@@ -204,23 +210,49 @@ function finalizeVariantInObjectiveState(state: VariantStore, objectiveId: strin
         winnerVariantId: variantId,
         status: "finalized" as const,
         updatedAt: now,
-        variants: objectiveItem.variants.map((variant) => {
-          if (variant.id === variantId) {
-            return {
-              ...variant,
-              status: "selected" as const,
-              updatedAt: now,
-            }
-          }
-
-          return {
-            ...variant,
-            status: "archived" as const,
+        variants: [
+          {
+            ...winner,
+            status: "selected" as const,
             updatedAt: now,
-          }
-        }),
+          },
+        ],
       }
     }),
+    },
+    removedVariants,
+  }
+}
+
+function collectPatchFiles(state: VariantStore): Set<string> {
+  const files = new Set<string>()
+  for (const objective of state.objectives) {
+    for (const variant of objective.variants) {
+      files.add(variant.patchFile)
+    }
+  }
+  return files
+}
+
+async function pruneRemovedVariantPatchFiles(
+  nextState: VariantStore,
+  removedVariants: VariantArtifact[],
+): Promise<void> {
+  if (removedVariants.length === 0) return
+  const retainedPatchFiles = collectPatchFiles(nextState)
+  const deleteCandidates = new Set<string>()
+
+  for (const variant of removedVariants) {
+    if (!retainedPatchFiles.has(variant.patchFile)) {
+      deleteCandidates.add(variant.patchFile)
+    }
+  }
+
+  for (const patchFile of deleteCandidates) {
+    try {
+      await unlink(patchFile)
+    } catch {
+    }
   }
 }
 
@@ -743,7 +775,9 @@ export async function startBridgeServer(options: StartBridgeServerOptions): Prom
           },
         ])
 
-        const nextState = finalizeVariantInObjectiveState(state, target.objective.id, target.variant.id)
+        const finalized = finalizeVariantInObjectiveState(state, target.objective.id, target.variant.id)
+        await pruneRemovedVariantPatchFiles(finalized.nextState, finalized.removedVariants)
+        const nextState = finalized.nextState
         await saveState(projectRoot, nextState)
 
         emitEvent("finalize.succeeded", {

package/src/cli.ts

@@ -1,5 +1,5 @@
 import { execFile } from "node:child_process"
-import { access, mkdir, readFile, writeFile } from "node:fs/promises"
+import { access, mkdir, readFile, unlink, writeFile } from "node:fs/promises"
 import { basename, join, resolve } from "node:path"
 import process from "node:process"
 import { createInterface } from "node:readline/promises"
@@ -544,6 +544,38 @@ function findProfile(state: VariantStore, profileId: string): PreviewProfile {
   return found
 }
 
+function collectPatchFiles(state: VariantStore): Set<string> {
+  const files = new Set<string>()
+  for (const objective of state.objectives) {
+    for (const variant of objective.variants) {
+      files.add(variant.patchFile)
+    }
+  }
+  return files
+}
+
+async function pruneRemovedVariantPatchFiles(
+  nextState: VariantStore,
+  removedVariants: VariantArtifact[],
+): Promise<void> {
+  if (removedVariants.length === 0) return
+  const retainedPatchFiles = collectPatchFiles(nextState)
+  const deleteCandidates = new Set<string>()
+
+  for (const variant of removedVariants) {
+    if (!retainedPatchFiles.has(variant.patchFile)) {
+      deleteCandidates.add(variant.patchFile)
+    }
+  }
+
+  for (const patchFile of deleteCandidates) {
+    try {
+      await unlink(patchFile)
+    } catch {
+    }
+  }
+}
+
 function findVariantAcrossObjectives(
   state: VariantStore,
   variantId: string,
@@ -829,17 +861,26 @@ function createProgram(cwd: string): Command {
     .action(async (objectiveId: string, variantId: string) => {
       const state = requireState(await loadState(cwd))
       const current = findObjective(state, objectiveId)
-      findVariant(current, variantId)
+      const winner = findVariant(current, variantId)
+      const removedVariants = current.variants.filter((variant) => variant.id !== variantId)
 
       const now = new Date().toISOString()
       const next = upsertObjective(state, {
         ...current,
         status: "finalized",
         winnerVariantId: variantId,
-        activeVariantId: current.activeVariantId ?? variantId,
+        activeVariantId: variantId,
         updatedAt: now,
+        variants: [
+          {
+            ...winner,
+            status: "selected",
+            updatedAt: now,
+          },
+        ],
       })
 
+      await pruneRemovedVariantPatchFiles(next, removedVariants)
       await saveState(cwd, next)
       process.stdout.write(`Objective ${objectiveId} finalized with winner ${variantId}\n`)
     })

package/web/vynt-toolbar.js

@@ -576,13 +576,35 @@
     objectiveOverlayRoot.style.width = `${Math.max(0, width)}px`;
     objectiveOverlayRoot.style.height = `${Math.max(0, height)}px`;
 
-    const panelBottom = -50;
-    if (y + height + panelBottom + 48 > window.innerHeight) {
-      objectivePanel.style.bottom = "auto";
-      objectivePanel.style.top = "-50px";
+    const panelGap = 8;
+    const panelWidth = 220;
+    const panelHeight = 40;
+    const rightSpace = window.innerWidth - (x + width);
+    const leftSpace = x;
+    const alignedTop = Math.max(0, Math.min(Math.max(0, height - panelHeight), (height - panelHeight) / 2));
+
+    objectivePanel.style.bottom = "auto";
+    objectivePanel.style.top = `${alignedTop}px`;
+
+    if (rightSpace >= panelWidth + panelGap) {
+      objectivePanel.style.left = `${width + panelGap}px`;
+      objectivePanel.style.transform = "none";
+      return;
+    }
+
+    if (leftSpace >= panelWidth + panelGap) {
+      objectivePanel.style.left = `${-panelGap}px`;
+      objectivePanel.style.transform = "translateX(-100%)";
+      return;
+    }
+
+    objectivePanel.style.left = "50%";
+    objectivePanel.style.transform = "translateX(-50%)";
+    if (y + height + panelGap + panelHeight > window.innerHeight) {
+      objectivePanel.style.top = `${-panelGap}px`;
+      objectivePanel.style.transform = "translate(-50%, -100%)";
     } else {
-      objectivePanel.style.top = "auto";
-      objectivePanel.style.bottom = "-50px";
+      objectivePanel.style.top = `${height + panelGap}px`;
     }
   }