fix(src): Resolve merge conflicts

Accept 'theirs' version for conflicting files

Author: Dmitrii Vasilev

.trinity/mu/heartbeat.json

@@ -1 +1 @@
-{"agent":"mu","wake":125,"timestamp":1775200664,"errors_scanned":0,"fixes_applied":0,"build_ok":false,"test_ok":false}
+{"agent":"mu","wake":130,"timestamp":1775203028,"errors_scanned":0,"fixes_applied":0,"build_ok":false,"test_ok":false}

PELLIS_EMAIL_DRAFT.md

@@ -49,13 +49,15 @@ pub const Config = struct {
     optimal_times_twitter: []const u8,
 };
 
+const DEFAULT_REDDITS = [_][]const u8{
+    "r/programming",
+    "r/rust",
+    "r/coolgithubprojects",
+    "r/MachineLearning",
+};
+
 const DEFAULT_CONFIG = Config{
-    .target_subreddits = &[_][]const u8{
-        "r/programming",
-        "r/rust",
-        "r/coolgithubprojects",
-        "r/MachineLearning",
-    },
+    .target_subreddits = &DEFAULT_REDDITS,
     .optimal_times_reddit = @as([]const u8, "Tue-Thu 14:00-17:00 UTC"),
     .optimal_times_twitter = @as([]const u8, "Peak audience times (depends on analytics)"),
 };
@@ -165,7 +167,7 @@ fn generateTwitterThread(allocator: Allocator, highlights: [][]const u8) !Twitte
 }
 
 /// Generate Reddit post using showcase template
-fn generateRedditPost(allocator: Allocator, highlights: [][]const u8, project_name: []const u8) !RedditPost {
+fn generateRedditPost(allocator: Allocator) !RedditPost {
     const title_slice = try std.fmt.allocPrint(allocator, "[Trinity]: Agent T ready", .{});
     defer allocator.free(title_slice);
 

src/tri/copywright.zig

@@ -742,7 +742,7 @@ pub fn execute(cpu: *CPUState, inst: Instruction, memory: []align(8) u8) ExecErr
             // Convert to null-terminated C string
             var path_buf: [256]u8 = undefined;
             const copy_len = @min(path_slice.len, 255);
-            @memcpy(&path_buf, path_slice.ptr, copy_len);
+            @memcpy(path_buf[0..copy_len], path_slice[0..copy_len]);
             path_buf[copy_len] = 0; // Null-terminate
 
             // Use std.fs.cwd() for relative paths
@@ -818,7 +818,7 @@ pub fn execute(cpu: *CPUState, inst: Instruction, memory: []align(8) u8) ExecErr
             // Convert to null-terminated C string
             var path_buf: [256]u8 = undefined;
             const copy_len = @min(path_slice.len, 255);
-            @memcpy(&path_buf, path_slice.ptr, copy_len);
+            @memcpy(path_buf[0..copy_len], path_slice[0..copy_len]);
             path_buf[copy_len] = 0; // Null-terminate
 
             // Use std.fs.cwd() for relative paths
@@ -870,7 +870,7 @@ pub fn execute(cpu: *CPUState, inst: Instruction, memory: []align(8) u8) ExecErr
             // Convert to null-terminated C string
             var path_buf: [256]u8 = undefined;
             const copy_len = @min(path_slice.len, 255);
-            @memcpy(&path_buf, path_slice.ptr, copy_len);
+            @memcpy(path_buf[0..copy_len], path_slice[0..copy_len]);
             path_buf[copy_len] = 0; // Null-terminate
 
             // Use std.fs.cwd() for relative paths

src/tri27/emu/executor.zig

@@ -13,7 +13,7 @@ const std = @import("std");
 pub const bigint = @import("bigint.zig");
 pub const packed_trit = @import("packed_trit.zig");
 pub const hybrid = @import("hybrid.zig");
-pub const vsa = @import("vsa.zig");
+pub const vsa = @import("vsa/agent.zig");
 pub const vm = @import("vm.zig");
 
 // SDK modules (high-level API)