2 files changed, 60 insertions, 0 deletions
diff --git a/internal/executor/executor.go b/internal/executor/executor.go
index 9dd37ae..1c9e667 100644
--- a/internal/executor/executor.go
+++ b/internal/executor/executor.go
@@ -179,6 +179,9 @@ func (p *Pool) executeResume(ctx context.Context, t *task.Task, exec *storage.Ex
 		p.mu.Lock()
 		p.active--
 		p.activePerAgent[agentType]--
+		if p.activePerAgent[agentType] == 0 {
+			delete(p.activePerAgent, agentType)
+		}
 		p.mu.Unlock()
 		select {
 		case p.doneCh <- struct{}{}:
@@ -296,6 +299,9 @@ func (p *Pool) execute(ctx context.Context, t *task.Task) {
 		now := time.Now()
 		for agent := range p.runners {
 			activeTasks[agent] = p.activePerAgent[agent]
+			if deadline, ok := p.rateLimited[agent]; ok && now.After(deadline) {
+				delete(p.rateLimited, agent)
+			}
 			activeUntil := p.rateLimited[agent]
 			isLimited := now.Before(activeUntil)
 			rateLimited[agent] = isLimited
@@ -326,6 +332,9 @@ func (p *Pool) execute(ctx context.Context, t *task.Task) {
 	}
 
 	p.mu.Lock()
+	if deadline, ok := p.rateLimited[agentType]; ok && time.Now().After(deadline) {
+		delete(p.rateLimited, agentType)
+	}
 	p.activePerAgent[agentType]++
 	p.mu.Unlock()
 
@@ -333,6 +342,9 @@ func (p *Pool) execute(ctx context.Context, t *task.Task) {
 		p.mu.Lock()
 		p.active--
 		p.activePerAgent[agentType]--
+		if p.activePerAgent[agentType] == 0 {
+			delete(p.activePerAgent, agentType)
+		}
 		p.mu.Unlock()
 		select {
 		case p.doneCh <- struct{}{}:
diff --git a/internal/executor/executor_test.go b/internal/executor/executor_test.go
index 2292aa5..c0f6d66 100644
--- a/internal/executor/executor_test.go
+++ b/internal/executor/executor_test.go
@@ -496,6 +496,54 @@ func TestPool_RecoverStaleRunning(t *testing.T) {
 	}
 }
 
+func TestPool_ActivePerAgent_DeletesZeroEntries(t *testing.T) {
+	store := testStore(t)
+	runner := &mockRunner{}
+	runners := map[string]Runner{"claude": runner, "gemini": runner}
+	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError}))
+	pool := NewPool(2, runners, store, logger)
+
+	tk := makeTask("apa-1")
+	store.CreateTask(tk) // Agent.Type = "claude"
+	pool.Submit(context.Background(), tk)
+	<-pool.Results()
+
+	pool.mu.Lock()
+	_, exists := pool.activePerAgent["claude"]
+	pool.mu.Unlock()
+
+	if exists {
+		t.Error("activePerAgent should not have a zero-count entry for claude after task completes")
+	}
+}
+
+func TestPool_RateLimited_StaleEntryCleaned(t *testing.T) {
+	store := testStore(t)
+	runner := &mockRunner{}
+	runners := map[string]Runner{"claude": runner}
+	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelError}))
+	pool := NewPool(2, runners, store, logger)
+
+	// Inject a stale rate-limit entry (deadline already passed).
+	pool.mu.Lock()
+	pool.rateLimited["claude"] = time.Now().Add(-1 * time.Minute)
+	pool.mu.Unlock()
+
+	// Submit a task — the execute() path reads rateLimited during classification.
+	tk := makeTask("rl-stale-1")
+	store.CreateTask(tk)
+	pool.Submit(context.Background(), tk)
+	<-pool.Results()
+
+	pool.mu.Lock()
+	_, exists := pool.rateLimited["claude"]
+	pool.mu.Unlock()
+
+	if exists {
+		t.Error("stale rate-limit entry should be deleted after deadline passes")
+	}
+}
+
 func TestPool_UnsupportedAgent(t *testing.T) {
 	store := testStore(t)
 	runners := map[string]Runner{"claude": &mockRunner{}}