diff --git a/apps/backend/internal/agent/lifecycle/executor_sprites_lifecycle.go b/apps/backend/internal/agent/lifecycle/executor_sprites_lifecycle.go index 79816e1d6e..28223a3e10 100644 --- a/apps/backend/internal/agent/lifecycle/executor_sprites_lifecycle.go +++ b/apps/backend/internal/agent/lifecycle/executor_sprites_lifecycle.go @@ -129,9 +129,20 @@ func (r *SpritesExecutor) runTerminalCleanupScript(ctx context.Context, sprite * zap.String("reason", instance.StopReason)) } +// Terminal stop reasons that trigger destructive executor cleanup +// (sandbox teardown, container removal, per-instance session-dir removal). +// Anything outside this set is treated as a "preserve" stop — see +// shouldRunExecutorCleanup. +const ( + StopReasonTaskArchived = "task archived" + StopReasonTaskDeleted = "task deleted" + StopReasonSessionArchived = "session archived" + StopReasonSessionDeleted = "session deleted" +) + func shouldRunExecutorCleanup(reason string) bool { switch strings.ToLower(strings.TrimSpace(reason)) { - case "task archived", "task deleted", "session archived", "session deleted": + case StopReasonTaskArchived, StopReasonTaskDeleted, StopReasonSessionArchived, StopReasonSessionDeleted: return true default: return false diff --git a/apps/backend/internal/agent/lifecycle/manager_environment.go b/apps/backend/internal/agent/lifecycle/manager_environment.go index cc2cad923b..3fd8e3a8fb 100644 --- a/apps/backend/internal/agent/lifecycle/manager_environment.go +++ b/apps/backend/internal/agent/lifecycle/manager_environment.go @@ -110,9 +110,15 @@ func (m *Manager) DestroySandbox(ctx context.Context, sandboxID, executionID str if !ok { return fmt.Errorf("sprites backend has unexpected type %T", backend) } + // StopInstance only runs sandbox cleanup when StopReason matches a + // terminal reason (see shouldRunExecutorCleanup). DestroySandbox IS the + // destruction path, so set StopReasonTaskDeleted explicitly — the + // empty StopReason this previously sent was silently treated as a + // preserve-on-stop signal and the sandbox was never destroyed. instance := &ExecutorInstance{ InstanceID: executionID, Metadata: map[string]interface{}{"sprite_name": sandboxID}, + StopReason: StopReasonTaskDeleted, } return spritesExec.StopInstance(ctx, instance, true) }