fix: Various bug fixes for conflict monitor/vitest generation

.changeset/all-shirts-move.md

@@ -0,0 +1,5 @@
+---
+'@halfdomelabs/core-generators': patch
+---
+
+Fix global setup script path to be relative to src

.changeset/breezy-crabs-lie.md

@@ -0,0 +1,5 @@
+---
+'@halfdomelabs/project-builder-server': patch
+---
+
+Update status of sync metadata when keeping or deleting files

.changeset/honest-mirrors-fix.md

@@ -0,0 +1,5 @@
+---
+'@halfdomelabs/project-builder-server': patch
+---
+
+Fix conflict watcher handling of .conflict files

packages/core-generators/src/generators/node/vitest/vitest.generator.ts

@@ -74,7 +74,7 @@ export const vitestGenerator = createGenerator({
 
         eslint.getConfig().appendUnique('eslintIgnore', [vitestConfigFilename]);
 
-        const globalSetupPath = 'src/tests/scripts/global-setup.ts';
+        const globalSetupPath = 'tests/scripts/global-setup.ts';
 
         return {
           build: async (builder) => {
@@ -83,7 +83,7 @@ export const vitestGenerator = createGenerator({
               await builder.apply(
                 typescriptFile.renderTemplateFile({
                   template: NODE_VITEST_TS_TEMPLATES.globalSetup,
-                  destination: globalSetupPath,
+                  destination: `src/${globalSetupPath}`,
                   variables: {
                     TPL_OPERATIONS: TsCodeUtils.mergeFragments(
                       globalSetupOperations,

packages/project-builder-server/src/service/builder-service.ts

@@ -31,6 +31,7 @@ import { ConflictFileMonitor } from '@src/sync/conflict-file-monitor.js';
 import { buildProject } from '@src/sync/index.js';
 import { SyncMetadataController } from '@src/sync/sync-metadata-controller.js';
 import { deleteSyncMetadata } from '@src/sync/sync-metadata-service.js';
+import { getPackageSyncStatusFromResult } from '@src/sync/utils.js';
 
 import type { BaseplateUserConfig } from '../user-config/user-config-schema.js';
 
@@ -455,17 +456,24 @@ export class ProjectBuilderService extends TypedEventEmitter<ProjectBuilderServi
   private removeConflictFile(packageId: string, relativePath: string): void {
     this.syncMetadataController.updateMetadataForPackage(
       packageId,
-      (packageInfo) => ({
-        ...packageInfo,
-        result: packageInfo.result
-          ? {
-              ...packageInfo.result,
-              filesWithConflicts: packageInfo.result.filesWithConflicts?.filter(
-                (file) => file.relativePath !== relativePath,
-              ),
-            }
-          : undefined,
-      }),
+      (packageInfo) => {
+        const updatedPackageInfo = {
+          ...packageInfo,
+          result: packageInfo.result
+            ? {
+                ...packageInfo.result,
+                filesWithConflicts:
+                  packageInfo.result.filesWithConflicts?.filter(
+                    (file) => file.relativePath !== relativePath,
+                  ),
+              }
+            : undefined,
+        };
+        updatedPackageInfo.status = getPackageSyncStatusFromResult(
+          updatedPackageInfo.result,
+        );
+        return updatedPackageInfo;
+      },
     );
   }
 

packages/project-builder-server/src/sync/conflict-file-monitor.ts

@@ -67,6 +67,7 @@ export class ConflictFileMonitor {
 
   private async checkFileForConflicts(filePath: string): Promise<boolean> {
     try {
+      if (filePath.endsWith('.conflict')) return false;
       const contents = await readFile(filePath, 'utf8').catch(
         handleFileNotFoundError,
       );