Merge pull request #452 from bborn/task/1185-fix-executor-status-message-accuracy

Fix executor status message accuracy

Author: bborn

.devcontainer/README.md

@@ -0,0 +1,29 @@
+# Development Container Configuration
+
+This directory contains configuration for cloud development environments (VS Code Dev Containers, GitHub Codespaces, etc.).
+
+## Features
+
+- Automatically installs Claude CLI on container creation
+- Pre-configured Go development environment
+- VS Code extensions for Go development
+
+## Manual Installation
+
+If you're not using a devcontainer-compatible environment, you can manually install Claude CLI:
+
+```bash
+curl -fsSL https://claude.ai/install.sh | bash
+```
+
+After installation, authenticate with:
+
+```bash
+claude login
+```
+
+## Supported Platforms
+
+- VS Code Dev Containers
+- GitHub Codespaces
+- Any Docker-based development environment that supports devcontainer.json

.devcontainer/devcontainer.json

@@ -0,0 +1,13 @@
+{
+  "name": "Workflow Development",
+  "image": "mcr.microsoft.com/devcontainers/go:1-1.21-bullseye",
+  "features": {},
+  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "golang.go"
+      ]
+    }
+  }
+}

.devcontainer/post-create.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+echo "Installing Claude CLI..."
+curl -fsSL https://claude.ai/install.sh | bash
+
+echo "Claude CLI installation complete!"
+claude --version || echo "Claude installed - you may need to run 'claude login' to authenticate"

internal/ui/app.go

@@ -816,7 +816,12 @@ func (m *AppModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			if prompt := m.latestPermissionPrompt(t.ID); prompt != "" {
 				m.tasksNeedingInput[t.ID] = true
-				m.executorPrompts[t.ID] = prompt
+				// Extract just the meaningful part after "Waiting for permission: "
+				displayPrompt := prompt
+				if strings.HasPrefix(prompt, "Waiting for permission: ") {
+					displayPrompt = strings.TrimPrefix(prompt, "Waiting for permission: ")
+				}
+				m.executorPrompts[t.ID] = displayPrompt
 			}
 		}
 

internal/ui/app_test.go

@@ -1175,6 +1175,117 @@ func containsSubstr(s, substr string) bool {
 	return false
 }
 
+func TestLatestPermissionPrompt_PermissionMessage(t *testing.T) {
+	database, err := db.Open(":memory:")
+	if err != nil {
+		t.Fatalf("Failed to create test database: %v", err)
+	}
+	defer database.Close()
+
+	m := &AppModel{db: database}
+
+	// Create a task
+	task := &db.Task{Title: "Test task", Status: db.StatusBlocked}
+	if err := database.CreateTask(task); err != nil {
+		t.Fatalf("Failed to create task: %v", err)
+	}
+
+	// Log a permission message (as the notification hook would)
+	database.AppendTaskLog(task.ID, "system", "Waiting for permission: Edit(src/models/offer.rb)")
+
+	// Should return the full permission message
+	result := m.latestPermissionPrompt(task.ID)
+	if result != "Waiting for permission: Edit(src/models/offer.rb)" {
+		t.Errorf("expected 'Waiting for permission: Edit(src/models/offer.rb)', got '%s'", result)
+	}
+}
+
+func TestLatestPermissionPrompt_GenericWaiting(t *testing.T) {
+	database, err := db.Open(":memory:")
+	if err != nil {
+		t.Fatalf("Failed to create test database: %v", err)
+	}
+	defer database.Close()
+
+	m := &AppModel{db: database}
+
+	task := &db.Task{Title: "Test task", Status: db.StatusBlocked}
+	if err := database.CreateTask(task); err != nil {
+		t.Fatalf("Failed to create task: %v", err)
+	}
+
+	// Log a generic waiting message (no specific message from hook)
+	database.AppendTaskLog(task.ID, "system", "Waiting for permission")
+
+	result := m.latestPermissionPrompt(task.ID)
+	if result != "Waiting for permission" {
+		t.Errorf("expected 'Waiting for permission', got '%s'", result)
+	}
+}
+
+func TestLatestPermissionPrompt_ResumedClears(t *testing.T) {
+	database, err := db.Open(":memory:")
+	if err != nil {
+		t.Fatalf("Failed to create test database: %v", err)
+	}
+	defer database.Close()
+
+	m := &AppModel{db: database}
+
+	task := &db.Task{Title: "Test task", Status: db.StatusBlocked}
+	if err := database.CreateTask(task); err != nil {
+		t.Fatalf("Failed to create task: %v", err)
+	}
+
+	// Log a permission message, then a resumed message
+	database.AppendTaskLog(task.ID, "system", "Waiting for permission: Edit(file.go)")
+	database.AppendTaskLog(task.ID, "system", "Claude resumed working")
+
+	// Should return empty since Claude resumed
+	result := m.latestPermissionPrompt(task.ID)
+	if result != "" {
+		t.Errorf("expected empty string after resume, got '%s'", result)
+	}
+}
+
+func TestLatestPermissionPrompt_NoLogs(t *testing.T) {
+	database, err := db.Open(":memory:")
+	if err != nil {
+		t.Fatalf("Failed to create test database: %v", err)
+	}
+	defer database.Close()
+
+	m := &AppModel{db: database}
+
+	// No task or logs - should return empty
+	result := m.latestPermissionPrompt(999)
+	if result != "" {
+		t.Errorf("expected empty string for nonexistent task, got '%s'", result)
+	}
+}
+
+func TestLatestPermissionPrompt_UserInputMessage(t *testing.T) {
+	database, err := db.Open(":memory:")
+	if err != nil {
+		t.Fatalf("Failed to create test database: %v", err)
+	}
+	defer database.Close()
+
+	m := &AppModel{db: database}
+
+	task := &db.Task{Title: "Test task", Status: db.StatusBlocked}
+	if err := database.CreateTask(task); err != nil {
+		t.Fatalf("Failed to create task: %v", err)
+	}
+
+	database.AppendTaskLog(task.ID, "system", "Waiting for user input")
+
+	result := m.latestPermissionPrompt(task.ID)
+	if result != "Waiting for user input" {
+		t.Errorf("expected 'Waiting for user input', got '%s'", result)
+	}
+}
+
 func TestJumpToNotificationKey_FocusExecutor(t *testing.T) {
 	// Create app model with kanban board and notification
 	tasks := []*db.Task{