Published using @Stream44 Studio

Signed-off-by: Christoph <christoph@christoph.diy>

Author: cadorn

caps/ProjectPublishing.ts

@@ -303,12 +303,12 @@ export async function capsule({
                         }
 
                         // ══════════════════════════════════════════════════════
-                        // INTERNAL: Check for .rej files (unresolved patch conflicts)
+                        // INTERNAL: Check for .rej / .orig files (unresolved patch conflicts)
                         // ══════════════════════════════════════════════════════
                         const allRejFiles: string[] = []
                         for (const [repoName, repoConfig] of Object.entries(matchingRepositories)) {
                             const projectSourceDir = join((repoConfig as any).sourceDir)
-                            const rejFiles = await glob('**/*.rej', {
+                            const rejFiles = await glob('**/*.{rej,orig}', {
                                 cwd: projectSourceDir,
                                 absolute: false,
                                 onlyFiles: true,
@@ -321,13 +321,13 @@ export async function capsule({
                         }
 
                         if (allRejFiles.length > 0) {
-                            console.log(chalk.red('\n[t44] ERROR: Found unresolved patch conflict files (.rej)\n'))
-                            console.log(chalk.red('The following .rej files must be resolved and removed before publishing:\n'))
+                            console.log(chalk.red('\n[t44] ERROR: Found unresolved patch conflict files (.rej / .orig)\n'))
+                            console.log(chalk.red('The following files must be resolved and removed before publishing:\n'))
                             for (const rejFile of allRejFiles) {
                                 console.log(chalk.red(`   • ${rejFile}`))
                             }
                             console.log(chalk.yellow('\nThese files are created when `patch` fails to apply a hunk cleanly.'))
-                            console.log(chalk.yellow('Review each .rej file, manually apply the changes, then delete the .rej files.\n'))
+                            console.log(chalk.yellow('Review each file, manually apply the changes, then delete them.\n'))
                             process.exit(1)
                         }
 

caps/ProjectTest.ts

@@ -208,26 +208,46 @@ export async function capsule({
                         // Stabilize for storage: sort object keys only (preserves array order in snapshots)
                         const stabilizeForStorage = (obj: any): any => JSON.parse(stringify(obj) || 'null')
 
+                        // Detect hash-like strings (32+ hex chars)
+                        const isHashLike = (s: string): boolean => /^[0-9a-f]{32,}$/i.test(s)
+
                         // Deep sort for comparison: sort both object keys AND array elements recursively
+                        // Also normalizes hash-like keys/values that differ between machines
                         const deepSortForComparison = (obj: any): any => {
                             if (obj === null || obj === undefined) return obj
                             if (Array.isArray(obj)) {
-                                // Recursively sort array elements, then sort the array itself
                                 const sorted = obj.map(deepSortForComparison)
-                                // Sort arrays by their JSON representation for deterministic ordering
                                 return sorted.sort((a, b) => {
                                     const aStr = JSON.stringify(a) ?? ''
                                     const bStr = JSON.stringify(b) ?? ''
                                     return aStr.localeCompare(bStr)
                                 })
                             }
                             if (typeof obj === 'object') {
+                                const keys = Object.keys(obj)
+                                const hasHashKeys = keys.some(isHashLike)
+
+                                if (hasHashKeys) {
+                                    // For objects with hash-like keys, convert to a sorted array of values
+                                    // so that different hash keys with same values still match
+                                    const entries = keys.map(k => deepSortForComparison(obj[k]))
+                                    return entries.sort((a, b) => {
+                                        const aStr = JSON.stringify(a) ?? ''
+                                        const bStr = JSON.stringify(b) ?? ''
+                                        return aStr.localeCompare(bStr)
+                                    })
+                                }
+
                                 const sorted: Record<string, any> = {}
-                                for (const key of Object.keys(obj).sort()) {
+                                for (const key of keys.sort()) {
                                     sorted[key] = deepSortForComparison(obj[key])
                                 }
                                 return sorted
                             }
+                            // Normalize hash-like string values to a placeholder
+                            if (typeof obj === 'string' && isHashLike(obj)) {
+                                return '<HASH>'
+                            }
                             return obj
                         }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stream44.studio/t44",
-    "version": "0.4.0-rc.27",
+    "version": "0.4.0-rc.28",
     "license": "LGPL",
     "repository": {
         "type": "git",