fix(docker): resume task environment after refresh

This commit is contained in:
José Almeida
2026-05-03 14:54:43 +01:00
parent 6c045f9a07
commit 09057324b3
4 changed files with 162 additions and 0 deletions
@@ -169,6 +169,17 @@ func (m *Manager) ensureWorkspaceExecutionLocked(ctx context.Context, taskID, se
taskID = info.TaskID
}
if info.TaskEnvironmentID != "" {
if execution, exists := m.executionStore.GetByTaskEnvironmentID(info.TaskEnvironmentID); exists {
m.logger.Info("reusing existing execution for task environment",
zap.String("task_id", taskID),
zap.String("session_id", sessionID),
zap.String("task_environment_id", info.TaskEnvironmentID),
zap.String("execution_id", execution.ID))
return execution, nil
}
}
if info.WorkspacePath == "" {
return nil, fmt.Errorf("%w: session %s has no workspace path yet", ErrSessionWorkspaceNotReady, sessionID)
}
@@ -544,6 +544,52 @@ func TestEnsureWorkspaceExecutionForSession_EmptyTaskID(t *testing.T) {
})
}
func TestEnsureWorkspaceExecutionForSession_ReusesExistingTaskEnvironmentExecution(t *testing.T) {
mgr, backend := newEnvironmentExecutionTestManager(t, &mockWorkspaceInfoProvider{
infos: map[string]*WorkspaceInfo{
"session-1": {
TaskID: "task-1",
SessionID: "session-1",
TaskEnvironmentID: "env-1",
WorkspacePath: "/workspace/task-1",
AgentID: "auggie",
},
"session-2": {
TaskID: "task-1",
SessionID: "session-2",
TaskEnvironmentID: "env-1",
WorkspacePath: "/workspace/task-1",
AgentID: "auggie",
},
},
})
existing := &AgentExecution{
ID: "exec-existing",
SessionID: "session-1",
TaskID: "task-1",
TaskEnvironmentID: "env-1",
Status: v1.AgentStatusRunning,
agentctl: newReadyAgentctlClient(t, newTestLogger()),
}
if err := mgr.executionStore.Add(existing); err != nil {
t.Fatalf("add existing execution: %v", err)
}
got, err := mgr.EnsureWorkspaceExecutionForSession(context.Background(), "task-1", "session-2")
if err != nil {
t.Fatalf("EnsureWorkspaceExecutionForSession returned error: %v", err)
}
if got.ID != existing.ID {
t.Fatalf("execution ID = %q, want existing environment execution %q", got.ID, existing.ID)
}
if got.SessionID != "session-1" {
t.Fatalf("execution session ID = %q, want original owner session", got.SessionID)
}
if backend.createCount.Load() != 0 {
t.Fatalf("CreateInstance calls = %d, want 0", backend.createCount.Load())
}
}
// --- test helpers ---
type createInstanceExecutor struct {
@@ -8,6 +8,7 @@ import (
"github.com/kandev/kandev/internal/agent/lifecycle"
"github.com/kandev/kandev/internal/common/logger"
"github.com/kandev/kandev/internal/task/models"
v1 "github.com/kandev/kandev/pkg/api/v1"
)
func newEnvTestExecutor(t *testing.T) *Executor {
@@ -157,6 +158,84 @@ func TestApplyExistingEnvironmentRuntimeMetadata_CarriesPersistentSecrets(t *tes
}
}
func TestBuildResumeRequest_ReusesTaskEnvironmentRuntimeMetadata(t *testing.T) {
repo := newMockRepository()
agentManager := &mockAgentManager{}
exec := newTestExecutor(t, agentManager, repo)
now := time.Now().UTC()
task := &v1.Task{
ID: "task-1",
WorkspaceID: "workspace-1",
Title: "Task 1",
}
session := &models.TaskSession{
ID: "session-new",
TaskID: "task-1",
AgentProfileID: "profile-1",
ExecutorID: models.ExecutorIDLocalDocker,
TaskEnvironmentID: "env-1",
State: models.TaskSessionStateWaitingForInput,
StartedAt: now,
UpdatedAt: now,
}
repo.executors[models.ExecutorIDLocalDocker] = &models.Executor{
ID: models.ExecutorIDLocalDocker,
Type: models.ExecutorTypeLocalDocker,
Status: models.ExecutorStatusActive,
Resumable: true,
}
repo.taskEnvironments["env-1"] = &models.TaskEnvironment{
ID: "env-1",
TaskID: "task-1",
ExecutorType: string(models.ExecutorTypeLocalDocker),
AgentExecutionID: "exec-old",
ContainerID: "container-old",
Status: models.TaskEnvironmentStatusReady,
}
repo.sessions["session-old"] = &models.TaskSession{
ID: "session-old",
TaskID: "task-1",
TaskEnvironmentID: "env-1",
StartedAt: now.Add(-time.Minute),
UpdatedAt: now.Add(-time.Minute),
}
repo.executorsRunning["session-old"] = &models.ExecutorRunning{
SessionID: "session-old",
TaskID: "task-1",
AgentExecutionID: "exec-old",
ContainerID: "container-old",
Runtime: string(models.ExecutorTypeLocalDocker),
Metadata: map[string]interface{}{
lifecycle.MetadataKeyAuthTokenSecret: "secret-token",
"task_description": "drop me",
},
}
req, _, _, running, err := exec.buildResumeRequest(context.Background(), task, session, true)
if err != nil {
t.Fatalf("buildResumeRequest returned error: %v", err)
}
if running != nil {
t.Fatalf("current session should not have an ExecutorRunning row")
}
if req.TaskEnvironmentID != "env-1" {
t.Fatalf("TaskEnvironmentID = %q, want env-1", req.TaskEnvironmentID)
}
if req.PreviousExecutionID != "exec-old" {
t.Fatalf("PreviousExecutionID = %q, want latest environment execution exec-old", req.PreviousExecutionID)
}
if req.Metadata[lifecycle.MetadataKeyContainerID] != "container-old" {
t.Fatalf("container metadata = %v, want container-old", req.Metadata[lifecycle.MetadataKeyContainerID])
}
if req.Metadata[lifecycle.MetadataKeyAuthTokenSecret] != "secret-token" {
t.Fatalf("auth token secret missing: %v", req.Metadata)
}
if _, ok := req.Metadata["task_description"]; ok {
t.Fatalf("launch-only metadata should be filtered out: %v", req.Metadata)
}
}
func TestApplyExistingEnvironment_SandboxReuse(t *testing.T) {
e := newEnvTestExecutor(t)
req := &LaunchAgentRequest{TaskID: "task-1"}
@@ -2,6 +2,7 @@ package executor
import (
"context"
"fmt"
"strings"
"time"
@@ -477,11 +478,22 @@ func (e *Executor) buildResumeRequest(ctx context.Context, task *v1.Task, sessio
execConfig := e.applyExecutorConfigToResumeRequest(ctx, req, task, session, metadata)
existingEnv, err := e.resolveResumeTaskEnvironment(ctx, task.ID, session)
if err != nil {
return nil, "", execConfig, nil, err
}
if session.TaskEnvironmentID != "" {
req.TaskEnvironmentID = session.TaskEnvironmentID
}
repositoryID, err := e.applyResumeRepoConfig(ctx, task, session, req)
if err != nil {
return nil, "", execConfig, nil, err
}
e.applyExistingEnvironment(req, existingEnv)
e.applyExistingEnvironmentRuntimeMetadata(ctx, req, existingEnv)
// Activate config-mode MCP tools when config_mode is set in session metadata.
if isConfigModeSession(session) {
req.McpMode = McpModeConfig
@@ -492,6 +504,20 @@ func (e *Executor) buildResumeRequest(ctx context.Context, task *v1.Task, sessio
return req, repositoryID, execConfig, existingRunning, nil
}
func (e *Executor) resolveResumeTaskEnvironment(ctx context.Context, taskID string, session *models.TaskSession) (*models.TaskEnvironment, error) {
env, err := e.repo.GetTaskEnvironmentByTaskID(ctx, taskID)
if err != nil {
return nil, fmt.Errorf("lookup existing task environment: %w", err)
}
if env == nil {
return nil, nil
}
if session.TaskEnvironmentID != env.ID {
session.TaskEnvironmentID = env.ID
}
return env, nil
}
// applyExecutorConfigToResumeRequest resolves executor config and applies it to the
// resume request, persisting executor assignment if newly resolved.
func (e *Executor) applyExecutorConfigToResumeRequest(ctx context.Context, req *LaunchAgentRequest, task *v1.Task, session *models.TaskSession, metadata map[string]interface{}) executorConfig {