Skip to content

feat(executor): add multiple executor sessions per task #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bborn wants to merge 1 commit into from
+646 −17
Closed

feat(executor): add multiple executor sessions per task #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 223 additions & 0 deletions internal/db/executor_session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
package db

import (
"os"
"path/filepath"
"testing"
)

func TestExecutorSessionCRUD(t *testing.T) {
// Create temp database
tmpDir, err := os.MkdirTemp("", "test-executor-session-*")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

dbPath := filepath.Join(tmpDir, "test.db")
database, err := Open(dbPath)
if err != nil {
t.Fatal(err)
}
defer database.Close()

// Create a task first
task := &Task{
Title: "Test task",
Status: StatusBacklog,
Project: "personal",
Executor: ExecutorClaude,
}
if err := database.CreateTask(task); err != nil {
t.Fatalf("CreateTask failed: %v", err)
}

// Test CreateExecutorSession
session := &ExecutorSession{
TaskID: task.ID,
Executor: ExecutorClaude,
Status: SessionStatusPending,
}
if err := database.CreateExecutorSession(session); err != nil {
t.Fatalf("CreateExecutorSession failed: %v", err)
}
if session.ID == 0 {
t.Error("Expected session ID to be set")
}

// Test GetExecutorSession
retrieved, err := database.GetExecutorSession(session.ID)
if err != nil {
t.Fatalf("GetExecutorSession failed: %v", err)
}
if retrieved == nil {
t.Fatal("Expected session to be retrieved")
}
if retrieved.TaskID != task.ID {
t.Errorf("Expected TaskID %d, got %d", task.ID, retrieved.TaskID)
}
if retrieved.Executor != ExecutorClaude {
t.Errorf("Expected Executor %s, got %s", ExecutorClaude, retrieved.Executor)
}

// Test UpdateExecutorSession
session.Status = SessionStatusActive
session.DaemonSession = "task-daemon-123"
if err := database.UpdateExecutorSession(session); err != nil {
t.Fatalf("UpdateExecutorSession failed: %v", err)
}

updated, _ := database.GetExecutorSession(session.ID)
if updated.Status != SessionStatusActive {
t.Errorf("Expected Status %s, got %s", SessionStatusActive, updated.Status)
}
if updated.DaemonSession != "task-daemon-123" {
t.Errorf("Expected DaemonSession %s, got %s", "task-daemon-123", updated.DaemonSession)
}

// Test DeleteExecutorSession
if err := database.DeleteExecutorSession(session.ID); err != nil {
t.Fatalf("DeleteExecutorSession failed: %v", err)
}
deleted, _ := database.GetExecutorSession(session.ID)
if deleted != nil {
t.Error("Expected session to be deleted")
}
}

func TestMultipleExecutorSessions(t *testing.T) {
// Create temp database
tmpDir, err := os.MkdirTemp("", "test-multi-session-*")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

dbPath := filepath.Join(tmpDir, "test.db")
database, err := Open(dbPath)
if err != nil {
t.Fatal(err)
}
defer database.Close()

// Create a task
task := &Task{
Title: "Test task",
Status: StatusBacklog,
Project: "personal",
Executor: ExecutorClaude,
}
if err := database.CreateTask(task); err != nil {
t.Fatalf("CreateTask failed: %v", err)
}

// Create multiple executor sessions
sessions := []*ExecutorSession{
{TaskID: task.ID, Executor: ExecutorClaude, Status: SessionStatusCompleted},
{TaskID: task.ID, Executor: ExecutorCodex, Status: SessionStatusActive},
{TaskID: task.ID, Executor: ExecutorGemini, Status: SessionStatusPending},
}

for _, s := range sessions {
if err := database.CreateExecutorSession(s); err != nil {
t.Fatalf("CreateExecutorSession failed: %v", err)
}
}

// Test GetExecutorSessionsForTask
retrieved, err := database.GetExecutorSessionsForTask(task.ID)
if err != nil {
t.Fatalf("GetExecutorSessionsForTask failed: %v", err)
}
if len(retrieved) != 3 {
t.Errorf("Expected 3 sessions, got %d", len(retrieved))
}

// Test GetActiveExecutorSession
active, err := database.GetActiveExecutorSession(task.ID)
if err != nil {
t.Fatalf("GetActiveExecutorSession failed: %v", err)
}
if active == nil {
t.Fatal("Expected active session")
}
if active.Executor != ExecutorCodex {
t.Errorf("Expected active executor %s, got %s", ExecutorCodex, active.Executor)
}

// Test SetActiveExecutorSession
if err := database.SetActiveExecutorSession(task.ID, sessions[2].ID); err != nil {
t.Fatalf("SetActiveExecutorSession failed: %v", err)
}
updatedTask, _ := database.GetTask(task.ID)
if updatedTask.ActiveSessionID != sessions[2].ID {
t.Errorf("Expected ActiveSessionID %d, got %d", sessions[2].ID, updatedTask.ActiveSessionID)
}
}

func TestTaskLogsWithSession(t *testing.T) {
// Create temp database
tmpDir, err := os.MkdirTemp("", "test-logs-session-*")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

dbPath := filepath.Join(tmpDir, "test.db")
database, err := Open(dbPath)
if err != nil {
t.Fatal(err)
}
defer database.Close()

// Create a task
task := &Task{
Title: "Test task",
Status: StatusBacklog,
Project: "personal",
Executor: ExecutorClaude,
}
if err := database.CreateTask(task); err != nil {
t.Fatalf("CreateTask failed: %v", err)
}

// Create executor session
session := &ExecutorSession{
TaskID: task.ID,
Executor: ExecutorClaude,
Status: SessionStatusActive,
}
if err := database.CreateExecutorSession(session); err != nil {
t.Fatalf("CreateExecutorSession failed: %v", err)
}

// Add logs with session ID
if err := database.AppendTaskLogForSession(task.ID, session.ID, "output", "Log with session"); err != nil {
t.Fatalf("AppendTaskLogForSession failed: %v", err)
}

// Add legacy log without session ID
if err := database.AppendTaskLog(task.ID, "output", "Legacy log"); err != nil {
t.Fatalf("AppendTaskLog failed: %v", err)
}

// Test GetTaskLogsForSession - should return both session-specific and legacy logs
logs, err := database.GetTaskLogsForSession(task.ID, session.ID, 100)
if err != nil {
t.Fatalf("GetTaskLogsForSession failed: %v", err)
}
if len(logs) != 2 {
t.Errorf("Expected 2 logs, got %d", len(logs))
}

// Verify session ID is set on the session-specific log
sessionLogFound := false
for _, l := range logs {
if l.Content == "Log with session" && l.SessionID == session.ID {
sessionLogFound = true
}
}
if !sessionLogFound {
t.Error("Expected to find log with session ID")
}
}
23 changes: 23 additions & 0 deletions internal/db/sqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,25 @@ func (db *DB) migrate() error {
)`,

`CREATE INDEX IF NOT EXISTS idx_task_compaction_summaries_task_id ON task_compaction_summaries(task_id)`,

// Executor sessions table - tracks multiple executor sessions per task
`CREATE TABLE IF NOT EXISTS task_executor_sessions (
id INTEGER PRIMARY KEY AUTOINCREMENT,
task_id INTEGER NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
executor TEXT NOT NULL DEFAULT 'claude',
session_id TEXT DEFAULT '',
daemon_session TEXT DEFAULT '',
tmux_window_id TEXT DEFAULT '',
claude_pane_id TEXT DEFAULT '',
shell_pane_id TEXT DEFAULT '',
status TEXT DEFAULT 'pending',
dangerous_mode INTEGER DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
started_at DATETIME,
completed_at DATETIME
)`,

`CREATE INDEX IF NOT EXISTS idx_task_executor_sessions_task_id ON task_executor_sessions(task_id)`,
}

for _, m := range migrations {
Expand Down Expand Up @@ -226,6 +245,10 @@ func (db *DB) migrate() error {
`ALTER TABLE tasks ADD COLUMN shell_pane_id TEXT DEFAULT ''`, // tmux pane ID for shell pane (e.g., "%1235")
// Auto-generated project context for caching exploration results
`ALTER TABLE projects ADD COLUMN context TEXT DEFAULT ''`, // Auto-generated project context (codebase summary, patterns, etc.)
// Active executor session tracking - references the currently active session
`ALTER TABLE tasks ADD COLUMN active_session_id INTEGER DEFAULT 0`, // FK to task_executor_sessions.id (0 = none/use legacy)
// Session ID for task logs - associates logs with a specific executor session
`ALTER TABLE task_logs ADD COLUMN session_id INTEGER DEFAULT 0`, // FK to task_executor_sessions.id (0 = legacy/all sessions)
}

for _, m := range alterMigrations {
Expand Down
Loading