Refactor: Replace manual transaction handling with withTx() helper

Fixes bd-1b0a

Changes:
- Added withTx() helper in util.go for cleaner transaction handling
- Kept ExecInTransaction() as deprecated wrapper for backward compatibility
- Refactored all manual BEGIN/COMMIT/ROLLBACK blocks to use withTx():
  - events.go: AddComment
  - dirty.go: MarkIssuesDirty, ClearDirtyIssuesByID
  - labels.go: executeLabelOperation
  - dependencies.go: AddDependency, RemoveDependency
  - compact.go: ApplyCompaction

All tests pass.

Amp-Thread-ID: https://ampcode.com/threads/T-dfacc972-f6c8-4bb3-8997-faa079b5d070
Co-authored-by: Amp <amp@ampcode.com>

internal/storage/sqlite/compact.go

@@ -267,18 +267,13 @@ func (s *SQLiteStorage) CheckEligibility(ctx context.Context, issueID string, ti
 func (s *SQLiteStorage) ApplyCompaction(ctx context.Context, issueID string, level int, originalSize int, compressedSize int, commitHash string) error {
 	now := time.Now().UTC()
 	
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-	
 		var commitHashPtr *string
 		if commitHash != "" {
 			commitHashPtr = &commitHash
 		}
 		
-	_, err = tx.ExecContext(ctx, `
+		_, err := tx.ExecContext(ctx, `
 			UPDATE issues
 			SET compaction_level = ?,
 			    compacted_at = ?,
@@ -309,9 +304,6 @@ func (s *SQLiteStorage) ApplyCompaction(ctx context.Context, issueID string, lev
 			return fmt.Errorf("failed to record compaction event: %w", err)
 		}
 		
-	if err := tx.Commit(); err != nil {
-		return fmt.Errorf("failed to commit transaction: %w", err)
-	}
-	
 		return nil
+	})
 }

internal/storage/sqlite/dependencies.go

@@ -68,12 +68,7 @@ func (s *SQLiteStorage) AddDependency(ctx context.Context, dep *types.Dependency
 		dep.CreatedBy = actor
 	}
 
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
 		// Cycle Detection and Prevention
 	//
 	// We prevent cycles across ALL dependency types (blocks, related, parent-child, discovered-from)
@@ -155,17 +150,13 @@ func (s *SQLiteStorage) AddDependency(ctx context.Context, dep *types.Dependency
 			return err
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // RemoveDependency removes a dependency
 func (s *SQLiteStorage) RemoveDependency(ctx context.Context, issueID, dependsOnID string, actor string) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
 		result, err := tx.ExecContext(ctx, `
 			DELETE FROM dependencies WHERE issue_id = ? AND depends_on_id = ?
 		`, issueID, dependsOnID)
@@ -196,7 +187,8 @@ func (s *SQLiteStorage) RemoveDependency(ctx context.Context, issueID, dependsOn
 			return err
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // GetDependenciesWithMetadata returns issues that this issue depends on, including dependency type

internal/storage/sqlite/dirty.go

@@ -26,12 +26,7 @@ func (s *SQLiteStorage) MarkIssuesDirty(ctx context.Context, issueIDs []string)
 		return nil
 	}
 
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
 		now := time.Now()
 		stmt, err := tx.PrepareContext(ctx, `
 			INSERT INTO dirty_issues (issue_id, marked_at)
@@ -49,7 +44,8 @@ func (s *SQLiteStorage) MarkIssuesDirty(ctx context.Context, issueIDs []string)
 			}
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // GetDirtyIssues returns the list of issue IDs that need to be exported
@@ -116,12 +112,7 @@ func (s *SQLiteStorage) ClearDirtyIssuesByID(ctx context.Context, issueIDs []str
 		return nil
 	}
 
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
 		stmt, err := tx.PrepareContext(ctx, `DELETE FROM dirty_issues WHERE issue_id = ?`)
 		if err != nil {
 			return fmt.Errorf("failed to prepare statement: %w", err)
@@ -134,7 +125,8 @@ func (s *SQLiteStorage) ClearDirtyIssuesByID(ctx context.Context, issueIDs []str
 			}
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // GetDirtyIssueCount returns the count of dirty issues (for monitoring/debugging)

internal/storage/sqlite/events.go

@@ -13,13 +13,8 @@ const limitClause = " LIMIT ?"
 
 // AddComment adds a comment to an issue
 func (s *SQLiteStorage) AddComment(ctx context.Context, issueID, actor, comment string) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
+		_, err := tx.ExecContext(ctx, `
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	_, err = tx.ExecContext(ctx, `
 			INSERT INTO events (issue_id, event_type, actor, comment)
 			VALUES (?, ?, ?, ?)
 		`, issueID, types.EventCommented, actor, comment)
@@ -46,7 +41,8 @@ func (s *SQLiteStorage) AddComment(ctx context.Context, issueID, actor, comment
 			return fmt.Errorf("failed to mark issue dirty: %w", err)
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // GetEvents returns the event history for an issue

internal/storage/sqlite/labels.go

@@ -2,6 +2,7 @@ package sqlite
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -18,13 +19,8 @@ func (s *SQLiteStorage) executeLabelOperation(
 	eventComment string,
 	operationError string,
 ) error {
-	tx, err := s.db.BeginTx(ctx, nil)
+	return s.withTx(ctx, func(tx *sql.Tx) error {
-	if err != nil {
+		_, err := tx.ExecContext(ctx, labelSQL, labelSQLArgs...)
-		return fmt.Errorf("failed to begin transaction: %w", err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	_, err = tx.ExecContext(ctx, labelSQL, labelSQLArgs...)
 		if err != nil {
 			return fmt.Errorf("%s: %w", operationError, err)
 		}
@@ -47,7 +43,8 @@ func (s *SQLiteStorage) executeLabelOperation(
 			return fmt.Errorf("failed to mark issue dirty: %w", err)
 		}
 
-	return tx.Commit()
+		return nil
+	})
 }
 
 // AddLabel adds a label to an issue

internal/storage/sqlite/util.go

@@ -18,10 +18,10 @@ func (s *SQLiteStorage) BeginTx(ctx context.Context) (*sql.Tx, error) {
 	return s.db.BeginTx(ctx, nil)
 }
 
-// ExecInTransaction executes a function within a database transaction.
+// withTx executes a function within a database transaction.
 // If the function returns an error, the transaction is rolled back.
 // Otherwise, the transaction is committed.
-func (s *SQLiteStorage) ExecInTransaction(ctx context.Context, fn func(*sql.Tx) error) error {
+func (s *SQLiteStorage) withTx(ctx context.Context, fn func(*sql.Tx) error) error {
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
 		return fmt.Errorf("failed to begin transaction: %w", err)
@@ -39,6 +39,11 @@ func (s *SQLiteStorage) ExecInTransaction(ctx context.Context, fn func(*sql.Tx)
 	return nil
 }
 
+// ExecInTransaction is deprecated. Use withTx instead.
+func (s *SQLiteStorage) ExecInTransaction(ctx context.Context, fn func(*sql.Tx) error) error {
+	return s.withTx(ctx, fn)
+}
+
 // IsUniqueConstraintError checks if an error is a UNIQUE constraint violation
 func IsUniqueConstraintError(err error) bool {
 	if err == nil {