feat: add focus tracking to hide cursor when terminal loses focus

cmd/root.go

@@ -22,6 +22,7 @@ import (
 	"github.com/sst/opencode/internal/lsp/discovery"
 	"github.com/sst/opencode/internal/pubsub"
 	"github.com/sst/opencode/internal/tui"
+	"github.com/sst/opencode/internal/tui/util"
 	"github.com/sst/opencode/internal/version"
 )
 
@@ -92,15 +93,15 @@ to assist developers in writing, debugging, and understanding code directly from
 
  // Check if we're in non-interactive mode
  prompt, _ := cmd.Flags().GetString("prompt")
-
+
  // Check for piped input if no prompt was provided via flag
  if prompt == "" {
  pipedInput, hasPipedInput := checkStdinPipe()
  if hasPipedInput {
  prompt = pipedInput
  }
  }
-
+
  // If we have a prompt (either from flag or piped input), run in non-interactive mode
  if prompt != "" {
  outputFormatStr, _ := cmd.Flags().GetString("output-format")
@@ -155,6 +156,14 @@ to assist developers in writing, debugging, and understanding code directly from
  // Setup the subscriptions, this will send services events to the TUI
  ch, cancelSubs := setupSubscriptions(app, ctx)
 
+ // Start focus tracking
+ focusTracker := util.NewFocusTracker(program)
+ if err := focusTracker.Start(ctx); err != nil {
+ slog.Warn("Failed to start focus tracking", "error", err)
+ } else {
+ slog.Info("Started focus tracking")
+ }
+
  // Create a context for the TUI message handler
  tuiCtx, tuiCancel := context.WithCancel(ctx)
  var tuiWg sync.WaitGroup
@@ -332,7 +341,7 @@ func checkStdinPipe() (string, bool) {
  if err != nil {
  return "", false
  }
-
+
  // If we got data, return it
  if len(data) > 0 {
  return string(data), true

cmd/root_test.go

@@ -102,42 +102,42 @@ func TestMockCheckStdinPipe(t *testing.T) {
 	t.Run("WithData", func(t *testing.T) {
  testData := "test data"
  reader := bytes.NewBufferString(testData)
-
+
  data, hasPiped := mockCheckStdinPipe(reader, true)
-
+
  if !hasPiped {
  t.Error("Expected hasPiped to be true, got false")
  }
  if data != testData {
  t.Errorf("Expected data to be %q, got %q", testData, data)
  }
 	})
-
+
 	// Test without data
 	t.Run("WithoutData", func(t *testing.T) {
  reader := bytes.NewBufferString("")
-
+
  data, hasPiped := mockCheckStdinPipe(reader, true)
-
+
  if hasPiped {
  t.Error("Expected hasPiped to be false, got true")
  }
  if data != "" {
  t.Errorf("Expected data to be empty, got %q", data)
  }
 	})
-
+
 	// Test not a pipe
 	t.Run("NotAPipe", func(t *testing.T) {
  reader := bytes.NewBufferString("data that should be ignored")
-
+
  data, hasPiped := mockCheckStdinPipe(reader, false)
-
+
  if hasPiped {
  t.Error("Expected hasPiped to be false, got true")
  }
  if data != "" {
  t.Errorf("Expected data to be empty, got %q", data)
  }
 	})
-}
+}

internal/app/app.go

@@ -40,9 +40,9 @@ type App struct {
 	watcherCancelFuncs []context.CancelFunc
 	cancelFuncsMutex sync.Mutex
 	watcherWG sync.WaitGroup
-
+
 	// UI state
-	filepickerOpen bool
+	filepickerOpen bool
 	completionDialogOpen bool
 }
 

internal/diff/diff_test.go

@@ -65,11 +65,11 @@ func TestApplyHighlighting(t *testing.T) {
  t.Run(tc.name, func(t *testing.T) {
  t.Parallel()
  result := applyHighlighting(tc.content, tc.segments, tc.segmentType, mockHighlightBg)
-
+
  // Verify the result contains the expected sequence
- assert.Contains(t, result, tc.expectContains,
+ assert.Contains(t, result, tc.expectContains,
  "Result should contain full reset sequence")
-
+
  // Print the result for manual inspection if needed
  if t.Failed() {
  fmt.Printf("Original: %q\nResult: %q\n", tc.content, result)
@@ -96,8 +96,8 @@ func TestApplyHighlightingWithMultipleSegments(t *testing.T) {
 	}
 
 	result := applyHighlighting(content, segments, LineAdded, mockHighlightBg)
-
+
 	// Verify the result contains the full reset sequence
-	assert.Contains(t, result, "\x1b[0m",
+	assert.Contains(t, result, "\x1b[0m",
  "Result should contain full reset sequence")
-}
+}

internal/llm/agent/agent.go

@@ -674,7 +674,7 @@ func (a *agent) CompactSession(ctx context.Context, sessionID string, force bool
 	}
 
 	messages := []message.Message{
-message.Message{
+ {
  Role: message.System,
  Parts: []message.ContentPart{
  message.TextContent{

internal/llm/models/anthropic.go

@@ -10,6 +10,7 @@ const (
 	Claude35Haiku ModelID = "claude-3.5-haiku"
 	Claude3Opus ModelID = "claude-3-opus"
 	Claude4Sonnet ModelID = "claude-4-sonnet"
+	Claude4Opus ModelID = "claude-4-opus"
 )
 
 // https://docs.anthropic.com/en/docs/about-claude/models/all-models
@@ -68,6 +69,20 @@ var AnthropicModels = map[ModelID]Model{
  CanReason: true,
  SupportsAttachments: true,
 	},
+	Claude4Opus: {
+ ID: Claude4Opus,
+ Name: "Claude 4 Opus",
+ Provider: ProviderAnthropic,
+ APIModel: "claude-opus-4-20250514",
+ CostPer1MIn: 15.0,
+ CostPer1MInCached: 18.75,
+ CostPer1MOutCached: 1.50,
+ CostPer1MOut: 75.0,
+ ContextWindow: 200000,
+ DefaultMaxTokens: 32000,
+ CanReason: true,
+ SupportsAttachments: true,
+	},
 	Claude35Haiku: {
  ID: Claude35Haiku,
  Name: "Claude 3.5 Haiku",

internal/llm/models/bedrock.go

@@ -5,6 +5,8 @@ const (
 
 	// Models
 	BedrockClaude37Sonnet ModelID = "bedrock.claude-3.7-sonnet"
+	BedrockClaude4Sonnet ModelID = "bedrock.claude-4.0-sonnet"
+	BedrockClaude4Opus ModelID = "bedrock.claude-4.0-opus"
 )
 
 var BedrockModels = map[ModelID]Model{
@@ -22,4 +24,32 @@ var BedrockModels = map[ModelID]Model{
  CanReason: true,
  SupportsAttachments: true,
 	},
+	BedrockClaude4Sonnet: {
+ ID: BedrockClaude4Sonnet,
+ Name: "Bedrock: Claude 4 Sonnet",
+ Provider: ProviderBedrock,
+ APIModel: "anthropic.claude-sonnet-4-20250514-v1:0",
+ CostPer1MIn: 3.0,
+ CostPer1MInCached: 3.75,
+ CostPer1MOutCached: 0.30,
+ CostPer1MOut: 15.0,
+ ContextWindow: 200_000,
+ DefaultMaxTokens: 50_000,
+ CanReason: true,
+ SupportsAttachments: true,
+	},
+	BedrockClaude4Opus: {
+ ID: BedrockClaude4Opus,
+ Name: "Bedrock: Claude 4 Opus",
+ Provider: ProviderBedrock,
+ APIModel: "anthropic.claude-opus-4-20250514-v1:0",
+ CostPer1MIn: 15.0,
+ CostPer1MInCached: 18.75,
+ CostPer1MOutCached: 1.50,
+ CostPer1MOut: 75.0,
+ ContextWindow: 200_000,
+ DefaultMaxTokens: 50_000,
+ CanReason: true,
+ SupportsAttachments: true,
+	},
 }

internal/llm/provider/openai.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log/slog"
 	"github.com/openai/openai-go"
 	"github.com/openai/openai-go/option"
 	"github.com/sst/opencode/internal/llm/models"
 	"github.com/sst/opencode/internal/llm/tools"
 	"github.com/sst/opencode/internal/message"
+	"log/slog"
 )
 
 type openaiOptions struct {
@@ -73,7 +73,6 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
 	return o.streamChatCompletionMessages(ctx, messages, tools)
 }
 
-
 func (o *openaiClient) finishReason(reason string) message.FinishReason {
 	switch reason {
 	case "stop":
@@ -87,7 +86,6 @@ func (o *openaiClient) finishReason(reason string) message.FinishReason {
 	}
 }
 
-
 func (o *openaiClient) shouldRetry(attempts int, err error) (bool, int64, error) {
 	var apierr *openai.Error
 	if !errors.As(err, &apierr) {
@@ -116,7 +114,6 @@ func (o *openaiClient) shouldRetry(attempts int, err error) (bool, int64, error)
 	return true, int64(retryMs), nil
 }
 
-
 func WithOpenAIBaseURL(baseURL string) OpenAIOption {
 	return func(options *openaiOptions) {
  options.baseURL = baseURL

internal/llm/provider/openai_completion.go

@@ -283,7 +283,6 @@ func (o *openaiClient) streamChatCompletionMessages(ctx context.Context, message
 	return eventChan
 }
 
-
 func (o *openaiClient) chatCompletionToolCalls(completion openai.ChatCompletion) []message.ToolCall {
 	var toolCalls []message.ToolCall
 
@@ -314,4 +313,3 @@ func (o *openaiClient) usage(completion openai.ChatCompletion) TokenUsage {
  CacheReadTokens: cachedTokens,
 	}
 }
-

internal/llm/provider/openai_response.go

@@ -1,16 +1,15 @@
 package provider
 
-
 import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"github.com/openai/openai-go"
 	"github.com/openai/openai-go/responses"
 	"github.com/sst/opencode/internal/llm/models"
 	"github.com/sst/opencode/internal/llm/tools"
 	"github.com/sst/opencode/internal/message"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
 	"io"
 	"time"
 
@@ -122,7 +121,6 @@ func (o *openaiClient) convertToResponseTools(tools []tools.BaseTool) []response
 	return outputTools
 }
 
-
 func (o *openaiClient) preparedResponseParams(input responses.ResponseInputParam, tools []responses.ToolUnionParam) responses.ResponseNewParams {
 	params := responses.ResponseNewParams{
  Model: shared.ResponsesModel(o.providerOptions.model.APIModel),
@@ -359,7 +357,6 @@ func (o *openaiClient) streamResponseMessages(ctx context.Context, messages []me
 	return eventChan
 }
 
-
 func (o *openaiClient) responseToolCalls(response responses.Response) []message.ToolCall {
 	var toolCalls []message.ToolCall
 

internal/llm/tools/batch.go

@@ -23,7 +23,7 @@ type BatchToolResult struct {
 	Result json.RawMessage `json:"result"`
 	Error string `json:"error,omitempty"`
 	// Added for better formatting and separation between results
-	Separator string `json:"separator,omitempty"`
+	Separator string `json:"separator,omitempty"`
 }
 
 type BatchResult struct {
@@ -155,7 +155,7 @@ func (b *batchTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error
  if err := json.Unmarshal([]byte(response.Metadata), &metadata); err == nil {
  // Add tool name to metadata for better context
  metadata["tool"] = tc.Name
-
+
  // Re-marshal with consistent formatting
  if metadataBytes, err := json.MarshalIndent(metadata, "", " "); err == nil {
  response.Metadata = string(metadataBytes)
@@ -188,4 +188,4 @@ func (b *batchTool) Run(ctx context.Context, call ToolCall) (ToolResponse, error
 	}
 
 	return NewTextResponse(string(resultJSON)), nil
-}
+}

internal/llm/tools/batch_test.go

@@ -221,4 +221,4 @@ func TestBatchTool(t *testing.T) {
  assert.True(t, response.IsError)
  assert.Contains(t, response.Content, "error parsing parameters")
 	})
-}
+}