fix(ci): restore cross-platform data mode checks

The Data mode branch exposed three CI-only regressions after rebasing: a PostgreSQL sabotage test referenced the pre-microdollar pricing column, portable mapping paths conflicted with native Windows expectations and legacy rows, and incremental identity publication reloaded a session that the append lookup had already populated.

Keep copied mapping keys portable across database generations and carry both resolved and parser-source projects through incremental writes so identity remains correct without the extra hot-path query.

Author: wesm

internal/db/db_test.go

@@ -5752,8 +5752,10 @@ func TestCopySessionMetadataPreservesWorktreeProjectMappings(t *testing.T) {
 	for _, m := range got {
 		projects[m.PathPrefix] = m.Project
 	}
-	require.Equal(t, "src_repo", projects[srcPrefix], "source mapping project")
-	require.Equal(t, "src_conflict", projects[dstPrefix], "destination mapping project")
+	require.Equal(t, "src_repo", projects[filepath.ToSlash(srcPrefix)],
+		"source mapping project")
+	require.Equal(t, "src_conflict", projects[filepath.ToSlash(dstPrefix)],
+		"destination mapping project")
 }
 
 func TestCopySessionMetadataPreservesClears(t *testing.T) {

internal/db/orphaned.go

@@ -724,15 +724,17 @@ func (d *DB) CopySessionMetadataFrom(
 				SELECT 1
 				FROM old_db.worktree_project_mappings old_m
 				WHERE old_m.machine = main.worktree_project_mappings.machine
-				  AND old_m.path_prefix = main.worktree_project_mappings.path_prefix
+				  AND replace(old_m.path_prefix, char(92), '/') =
+					main.worktree_project_mappings.path_prefix
 			)`); err != nil {
 			return fmt.Errorf("reconciling worktree project mappings: %w", err)
 		}
 		if _, err := tx.ExecContext(ctx, `
 			INSERT INTO main.worktree_project_mappings
 				(machine, path_prefix, layout, project, original_project,
 				 enabled, created_at, updated_at)
-			SELECT machine, path_prefix, `+layoutSelect+`, project,
+			SELECT machine, replace(path_prefix, char(92), '/'),
+				`+layoutSelect+`, project,
 				`+originalProjectSelect+`, enabled, created_at, updated_at
 			FROM old_db.worktree_project_mappings
 			WHERE true

internal/db/worktree_mappings.go

@@ -489,7 +489,8 @@ func (db *DB) CopyWorktreeProjectMappingsFrom(sourcePath string) error {
 			INSERT INTO main.worktree_project_mappings
 				(machine, path_prefix, layout, project, original_project,
 				 enabled, created_at, updated_at)
-			SELECT machine, path_prefix, `+layoutSelect+`, project,
+			SELECT machine, replace(path_prefix, char(92), '/'),
+				`+layoutSelect+`, project,
 				`+originalProjectSelect+`, enabled, created_at, updated_at
 			FROM old_db.worktree_project_mappings
 			WHERE TRUE

internal/db/worktree_mappings_test.go

@@ -27,7 +27,7 @@ func TestWorktreeProjectMappingsCRUDNormalizesAndScopesByMachine(t *testing.T) {
 	})
 	require.NoError(t, err, "create mapping")
 	assert.Equal(t, "laptop", m.Machine, "machine")
-	assert.Equal(t, prefix, m.PathPrefix, "path_prefix")
+	assert.Equal(t, filepath.ToSlash(prefix), m.PathPrefix, "path_prefix")
 	assert.Equal(t, WorktreeMappingLayoutExplicit, m.Layout, "layout")
 	assert.Equal(t, "my_app", m.Project, "project")
 
@@ -1557,7 +1557,7 @@ func TestCopyWorktreeProjectMappingsFromFillsOnlyEmptyOriginalProject(
 			assert.Equal(t, tt.wantOriginal, mappings[0].OriginalProject)
 			assert.Equal(t, owned.ID, mappings[0].ID, "destination owns the row")
 			assert.Equal(t, "host-a.example", mappings[0].Machine)
-			assert.Equal(t, prefix, mappings[0].PathPrefix)
+			assert.Equal(t, filepath.ToSlash(prefix), mappings[0].PathPrefix)
 			assert.Equal(t, WorktreeMappingLayoutExplicit, mappings[0].Layout)
 			assert.Equal(t, "destination_service", mappings[0].Project)
 			assert.False(t, mappings[0].Enabled)

internal/postgres/push_pgtest_test.go

@@ -2979,7 +2979,8 @@ func TestSessionProvenanceBackfillMarkerNotWrittenOnFailure(t *testing.T) {
 	// requirement is applied but before the marker can be written, mirroring
 	// TestPushMarkerNotWrittenWhenResetRecoveryFails' model_pricing sabotage.
 	_, err := pg.Exec(
-		`ALTER TABLE model_pricing DROP COLUMN cache_read_per_mtok`,
+		`ALTER TABLE model_pricing
+		 DROP COLUMN cache_read_microdollars_per_mtok`,
 	)
 	require.NoError(t, err, "drop model_pricing column")
 

internal/sync/engine.go

@@ -6579,6 +6579,7 @@ func drainResults(results <-chan syncJob, remaining int) {
 type incrementalUpdate struct {
 	sessionID            string
 	project              string
+	sourceProject        string
 	machine              string
 	cwd                  string
 	msgs                 []parser.ParsedMessage
@@ -8666,7 +8667,8 @@ func (e *Engine) tryIncrementalJSONL(
 			return processResult{
 				incremental: &incrementalUpdate{
 					sessionID:            inc.ID,
-					project:              inc.SourceProject,
+					project:              inc.Project,
+					sourceProject:        inc.SourceProject,
 					machine:              inc.Machine,
 					cwd:                  inc.Cwd,
 					links:                links,
@@ -8783,7 +8785,8 @@ func (e *Engine) tryIncrementalJSONL(
 	return processResult{
 		incremental: &incrementalUpdate{
 			sessionID:            inc.ID,
-			project:              inc.SourceProject,
+			project:              inc.Project,
+			sourceProject:        inc.SourceProject,
 			machine:              inc.Machine,
 			cwd:                  inc.Cwd,
 			msgs:                 newMsgs,
@@ -11143,28 +11146,16 @@ func (e *Engine) writeIncremental(
 	); err != nil {
 		return err
 	}
-	persisted, err := e.db.GetSession(context.Background(), inc.sessionID)
-	if err != nil {
-		return fmt.Errorf(
-			"reload incrementally written session %s: %w",
-			inc.sessionID, err,
-		)
-	}
 	identitySession := db.Session{
 		ID:      inc.sessionID,
 		Project: inc.project,
 		Machine: inc.machine,
 		Cwd:     inc.cwd,
 	}
-	if persisted != nil {
-		identitySession.Project = persisted.Project
-		identitySession.Machine = persisted.Machine
-		identitySession.Cwd = persisted.Cwd
-	}
 	if err := e.writeProjectIdentityObservationWithSnapshotProject(
 		context.Background(),
 		identitySession,
-		inc.project,
+		inc.sourceProject,
 	); err != nil {
 		log.Printf(
 			"incremental project identity observation %s: %v",

internal/sync/engine_integration_test.go

@@ -2599,7 +2599,7 @@ func TestSyncEngineMappingPreservesParserProjectIdentitySnapshot(t *testing.T) {
 	require.NoError(t, err, "ListProjectIdentityObservations")
 	require.Len(t, observations, 1)
 	assert.Equal(t, "canonical_app", observations[0].Project)
-	assert.Equal(t, sessionCwd, observations[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(sessionCwd), observations[0].RootPath)
 
 	snapshots, err := env.db.ListSessionProjectIdentitySnapshots(
 		context.Background(),
@@ -2608,7 +2608,7 @@ func TestSyncEngineMappingPreservesParserProjectIdentitySnapshot(t *testing.T) {
 	require.Len(t, snapshots, 1)
 	assert.Equal(t, "mapped-worktree", snapshots[0].SessionID)
 	assert.Equal(t, "feature_login", snapshots[0].Project)
-	assert.Equal(t, sessionCwd, snapshots[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(sessionCwd), snapshots[0].RootPath)
 }
 
 func TestResyncAllUpgradeKeepsFreshProjectSnapshotAndDropsLegacyOrphan(

internal/sync/engine_test.go

@@ -4128,7 +4128,7 @@ func TestProjectIdentityBulkWriteMappingPreservesParserProjectSnapshot(
 	require.NoError(t, err, "ListProjectIdentityObservations")
 	require.Len(t, observations, 1)
 	assert.Equal(t, "canonical_app", observations[0].Project)
-	assert.Equal(t, cwd, observations[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(cwd), observations[0].RootPath)
 
 	snapshots, err := database.ListSessionProjectIdentitySnapshots(
 		context.Background(),
@@ -4137,7 +4137,7 @@ func TestProjectIdentityBulkWriteMappingPreservesParserProjectSnapshot(
 	require.Len(t, snapshots, 1)
 	assert.Equal(t, "mapped-bulk-identity", snapshots[0].SessionID)
 	assert.Equal(t, "feature_login", snapshots[0].Project)
-	assert.Equal(t, cwd, snapshots[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(cwd), snapshots[0].RootPath)
 }
 
 func TestProjectIdentityFullSessionWriteMappingPreservesParserProjectSnapshot(
@@ -4183,7 +4183,7 @@ func TestProjectIdentityFullSessionWriteMappingPreservesParserProjectSnapshot(
 	require.NoError(t, err, "ListProjectIdentityObservations")
 	require.Len(t, observations, 1)
 	assert.Equal(t, "canonical_app", observations[0].Project)
-	assert.Equal(t, cwd, observations[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(cwd), observations[0].RootPath)
 
 	snapshots, err := database.ListSessionProjectIdentitySnapshots(
 		context.Background(),
@@ -4192,7 +4192,7 @@ func TestProjectIdentityFullSessionWriteMappingPreservesParserProjectSnapshot(
 	require.Len(t, snapshots, 1)
 	assert.Equal(t, "mapped-full-identity", snapshots[0].SessionID)
 	assert.Equal(t, "feature_login", snapshots[0].Project)
-	assert.Equal(t, cwd, snapshots[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(cwd), snapshots[0].RootPath)
 }
 
 func TestProjectIdentityMappedWriteWithEmptyParserProjectOmitsSnapshot(
@@ -4247,7 +4247,7 @@ func TestProjectIdentityMappedWriteWithEmptyParserProjectOmitsSnapshot(
 			require.NoError(t, err, "ListProjectIdentityObservations")
 			require.Len(t, observations, 1)
 			assert.Equal(t, "canonical_app", observations[0].Project)
-			assert.Equal(t, cwd, observations[0].RootPath)
+			assert.Equal(t, filepath.ToSlash(cwd), observations[0].RootPath)
 
 			snapshots, err := database.ListSessionProjectIdentitySnapshots(
 				context.Background(),
@@ -4339,7 +4339,7 @@ func TestProjectIdentityEmptySourceReparsePreservesExistingSnapshot(
 			require.NoError(t, err, "ListProjectIdentityObservations")
 			require.Len(t, observations, 1)
 			assert.Equal(t, "canonical_app", observations[0].Project)
-			assert.Equal(t, cwd, observations[0].RootPath)
+			assert.Equal(t, filepath.ToSlash(cwd), observations[0].RootPath)
 
 			snapshots, err := database.ListSessionProjectIdentitySnapshots(
 				context.Background(),
@@ -4348,7 +4348,7 @@ func TestProjectIdentityEmptySourceReparsePreservesExistingSnapshot(
 			require.Len(t, snapshots, 1)
 			assert.Equal(t, "mapped-reparse-"+tt.name, snapshots[0].SessionID)
 			assert.Equal(t, tt.sourceProject, snapshots[0].Project)
-			assert.Equal(t, cwd, snapshots[0].RootPath)
+			assert.Equal(t, filepath.ToSlash(cwd), snapshots[0].RootPath)
 		})
 	}
 }
@@ -4408,7 +4408,7 @@ func TestProjectIdentityExplicitEmptyDeleteReinsertClearsNewFallback(
 	require.NoError(t, err, "ListProjectIdentityObservations")
 	require.Len(t, observations, 1)
 	assert.Equal(t, "canonical_app", observations[0].Project)
-	assert.Equal(t, cwd, observations[0].RootPath)
+	assert.Equal(t, filepath.ToSlash(cwd), observations[0].RootPath)
 
 	snapshots, err := database.ListSessionProjectIdentitySnapshots(
 		context.Background(),
@@ -4936,7 +4936,8 @@ func TestProjectIdentityIncrementalAppendUsesPersistedMappedProject(t *testing.T
 			e := NewEngine(database, EngineConfig{Machine: machine})
 			t.Cleanup(e.Close)
 			require.NoError(t, e.writeIncremental(&incrementalUpdate{
-				sessionID: sessionID, project: sourceProject, machine: machine, cwd: root,
+				sessionID: sessionID, project: targetProject,
+				sourceProject: sourceProject, machine: machine, cwd: root,
 				msgs: []parser.ParsedMessage{{
 					Role: parser.RoleAssistant, Content: "delta", Ordinal: 1,
 				}},