add retry logic for connection errors

arp_agent/.env.example

@@ -54,4 +54,18 @@ ARP_MAX_ITERATIONS=10
 # ARP_AGENT_NAME=Dev Assistant
 # ARP_AGENT_SPECIALIZATION=software development and DevOps
 # ARP_AGENT_VALUES=code quality, documentation, and continuous improvement
-# ARP_AGENT_GOALS=help developers ship reliable software efficiently
+# ARP_AGENT_GOALS=help developers ship reliable software efficiently
+
+# LLM Retry Configuration (optional)
+# Maximum number of retry attempts for LLM API calls when connection fails
+# Default: 3
+ARP_LLM_MAX_RETRIES=3
+
+# Initial delay in seconds between retry attempts (doubles each retry)
+# Default: 1
+ARP_LLM_RETRY_DELAY=1
+
+# MCP Reconnection Configuration (optional)
+# Delay in seconds before attempting to reconnect when MCP connection is lost
+# Default: 5
+ARP_MCP_RECONNECT_DELAY=5

arp_agent/config.go

@@ -34,6 +34,13 @@ type Config struct {
 
 	// MCP Configuration
 	MCPConfigPath string
+
+	// LLM Retry Configuration
+	LLMMaxRetries int
+	LLMRetryDelay int // in seconds
+
+	// MCP Reconnection Configuration
+	MCPReconnectDelay int // in seconds
 }
 
 // LoadConfig loads configuration from environment variables
@@ -80,6 +87,13 @@ func LoadConfig() (*Config, error) {
 	// MCP Configuration with default
 	cfg.MCPConfigPath = getEnvWithDefault("MCP_CONFIG_PATH", "")
 
+	// LLM Retry Configuration with defaults
+	cfg.LLMMaxRetries = getEnvIntWithDefault("ARP_LLM_MAX_RETRIES", 3)
+	cfg.LLMRetryDelay = getEnvIntWithDefault("ARP_LLM_RETRY_DELAY", 1)
+
+	// MCP Reconnection Configuration with defaults
+	cfg.MCPReconnectDelay = getEnvIntWithDefault("ARP_MCP_RECONNECT_DELAY", 5)
+
 	return cfg, nil
 }
 

arp_agent/llm.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log"
+	"strings"
+	"time"
 
 	"github.com/sashabaranov/go-openai"
 )
@@ -14,10 +17,18 @@ type LLM struct {
 	model       string
 	temperature float32
 	maxTokens   int
+	// Retry configuration
+	maxRetries int
+	retryDelay time.Duration
 }
 
 // NewLLM creates a new LLM instance
 func NewLLM(apiKey, model string, temperature float32, baseURL string, maxTokens int) *LLM {
+	return NewLLMWithRetry(apiKey, model, temperature, baseURL, maxTokens, 3, 1*time.Second)
+}
+
+// NewLLMWithRetry creates a new LLM instance with custom retry configuration
+func NewLLMWithRetry(apiKey, model string, temperature float32, baseURL string, maxTokens int, maxRetries int, retryDelay time.Duration) *LLM {
 	config := openai.DefaultConfig(apiKey)
 	if baseURL != "" {
 		config.BaseURL = baseURL
@@ -28,6 +39,8 @@ func NewLLM(apiKey, model string, temperature float32, baseURL string, maxTokens
 		model:       model,
 		temperature: temperature,
 		maxTokens:   maxTokens,
+		maxRetries:  maxRetries,
+		retryDelay:  retryDelay,
 	}
 }
 
@@ -42,38 +55,115 @@ type ChatCompletionResponse struct {
 	Message openai.ChatCompletionMessage
 }
 
-// Chat sends a chat completion request
+// Chat sends a chat completion request with retry logic
 func (l *LLM) Chat(ctx context.Context, messages []openai.ChatCompletionMessage, tools []openai.Tool) (*openai.ChatCompletionMessage, error) {
-	req := openai.ChatCompletionRequest{
-		Model:       l.model,
-		Messages:    messages,
-		Temperature: l.temperature,
-		MaxTokens:   l.maxTokens,
+	var lastErr error
+	delay := l.retryDelay
+
+	for attempt := 0; attempt <= l.maxRetries; attempt++ {
+		select {
+		case <-ctx.Done():
+			return nil, fmt.Errorf("context canceled: %w", ctx.Err())
+		default:
+		}
+
+		req := openai.ChatCompletionRequest{
+			Model:       l.model,
+			Messages:    messages,
+			Temperature: l.temperature,
+			MaxTokens:   l.maxTokens,
+		}
+
+		if len(tools) > 0 {
+			req.Tools = tools
+		}
+
+		resp, err := l.client.CreateChatCompletion(ctx, req)
+		if err == nil {
+			if len(resp.Choices) == 0 {
+				return nil, fmt.Errorf("no response choices returned")
+			}
+
+			// Log warning if finish reason indicates an issue
+			choice := resp.Choices[0]
+			if choice.FinishReason == "length" {
+				// Model hit token limit - may have incomplete response
+				// This is common with reasoning models that need more tokens
+				return nil, fmt.Errorf("response truncated: model hit token limit (finish_reason: length). Consider increasing OPENAI_MAX_TOKENS (current: %d). Usage: prompt=%d, completion=%d, total=%d",
+					l.maxTokens, resp.Usage.PromptTokens, resp.Usage.CompletionTokens, resp.Usage.TotalTokens)
+			}
+
+			return &choice.Message, nil
+		}
+
+		lastErr = err
+
+		// Check if this error is retryable
+		if !isRetryableError(err) {
+			return nil, fmt.Errorf("failed to create chat completion: %w", err)
+		}
+
+		// Don't wait after the last attempt
+		if attempt < l.maxRetries {
+			log.Printf("LLM request failed (attempt %d/%d): %v. Retrying in %v...",
+				attempt+1, l.maxRetries, err, delay)
+			select {
+			case <-ctx.Done():
+				return nil, fmt.Errorf("context canceled during retry wait: %w", ctx.Err())
+			case <-time.After(delay):
+			}
+			// Exponential backoff
+			delay *= 2
+		}
 	}
 
-	if len(tools) > 0 {
-		req.Tools = tools
+	return nil, fmt.Errorf("failed to create chat completion after %d retries: %w", l.maxRetries+1, lastErr)
+}
+
+// isRetryableError checks if an error is transient and worth retrying
+func isRetryableError(err error) bool {
+	if err == nil {
+		return false
 	}
 
-	resp, err := l.client.CreateChatCompletion(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create chat completion: %w", err)
+	errStr := err.Error()
+
+	// Context cancellation - retry if not explicitly canceled
+	if strings.Contains(errStr, "context canceled") || strings.Contains(errStr, "context deadline exceeded") {
+		// These can be transient if the context was canceled due to connection issues
+		// But we should check if it's a genuine cancellation vs. a timeout
+		return true
 	}
 
-	if len(resp.Choices) == 0 {
-		return nil, fmt.Errorf("no response choices returned")
+	// Network-related errors
+	retryablePatterns := []string{
+		"connection refused",
+		"connection reset",
+		"connection closed",
+		"network is unreachable",
+		"no route to host",
+		"timeout",
+		"i/o timeout",
+		"temporary failure",
+		"server misbehaving",
+		"service unavailable",
+		"too many requests",
+		"rate limit",
+		"429",
+		"500",
+		"502",
+		"503",
+		"504",
 	}
 
-	// Log warning if finish reason indicates an issue
-	choice := resp.Choices[0]
-	if choice.FinishReason == "length" {
-		// Model hit token limit - may have incomplete response
-		// This is common with reasoning models that need more tokens
-		return nil, fmt.Errorf("response truncated: model hit token limit (finish_reason: length). Consider increasing OPENAI_MAX_TOKENS (current: %d). Usage: prompt=%d, completion=%d, total=%d",
-			l.maxTokens, resp.Usage.PromptTokens, resp.Usage.CompletionTokens, resp.Usage.TotalTokens)
+	lowerErr := strings.ToLower(errStr)
+	for _, pattern := range retryablePatterns {
+		if strings.Contains(lowerErr, strings.ToLower(pattern)) {
+			return true
+		}
 	}
 
-	return &choice.Message, nil
+	return false
 }
 
 // ConvertMCPToolsToOpenAI converts MCP tools to OpenAI tool format

arp_agent/llm_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	"github.com/sashabaranov/go-openai"
@@ -296,3 +297,102 @@ func TestLLM_ToolConversionSnapshot(t *testing.T) {
 	openaiTools := ConvertMCPToolsToOpenAI(mcpTools)
 	testSnapshotResult(t, "converted_tools", openaiTools)
 }
+
+// TestIsRetryableError tests the isRetryableError function
+func TestIsRetryableError(t *testing.T) {
+	tests := []struct {
+		name string
+		err  error
+		want bool
+	}{
+		{
+			name: "nil error",
+			err:  nil,
+			want: false,
+		},
+		{
+			name: "context canceled",
+			err:  fmt.Errorf("context canceled"),
+			want: true,
+		},
+		{
+			name: "context deadline exceeded",
+			err:  fmt.Errorf("context deadline exceeded"),
+			want: true,
+		},
+		{
+			name: "connection refused",
+			err:  fmt.Errorf("dial tcp 127.0.0.1:8080: connect: connection refused"),
+			want: true,
+		},
+		{
+			name: "connection reset",
+			err:  fmt.Errorf("read tcp 127.0.0.1:8080: read: connection reset by peer"),
+			want: true,
+		},
+		{
+			name: "connection closed",
+			err:  fmt.Errorf("connection closed"),
+			want: true,
+		},
+		{
+			name: "timeout",
+			err:  fmt.Errorf("dial tcp 127.0.0.1:8080: i/o timeout"),
+			want: true,
+		},
+		{
+			name: "service unavailable",
+			err:  fmt.Errorf("service unavailable (HTTP 503)"),
+			want: true,
+		},
+		{
+			name: "rate limit",
+			err:  fmt.Errorf("rate limit exceeded (HTTP 429)"),
+			want: true,
+		},
+		{
+			name: "server error 500",
+			err:  fmt.Errorf("internal server error (HTTP 500)"),
+			want: true,
+		},
+		{
+			name: "server error 502",
+			err:  fmt.Errorf("bad gateway (HTTP 502)"),
+			want: true,
+		},
+		{
+			name: "server error 503",
+			err:  fmt.Errorf("service unavailable (HTTP 503)"),
+			want: true,
+		},
+		{
+			name: "server error 504",
+			err:  fmt.Errorf("gateway timeout (HTTP 504)"),
+			want: true,
+		},
+		{
+			name: "invalid API key",
+			err:  fmt.Errorf("invalid API key (HTTP 401)"),
+			want: false,
+		},
+		{
+			name: "bad request",
+			err:  fmt.Errorf("bad request (HTTP 400)"),
+			want: false,
+		},
+		{
+			name: "generic error",
+			err:  fmt.Errorf("something went wrong"),
+			want: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := isRetryableError(tt.err)
+			if got != tt.want {
+				t.Errorf("isRetryableError(%v) = %v, want %v", tt.err, got, tt.want)
+			}
+		})
+	}
+}

arp_agent/main.go

@@ -30,11 +30,12 @@ func main() {
 
 	// Test OpenAI connectivity
 	log.Printf("Testing connectivity to OpenAI API...")
-	llm := NewLLM(cfg.OpenAIKey, cfg.OpenAIModel, float32(cfg.OpenAITemperature), cfg.OpenAIBaseURL, cfg.OpenAIMaxTokens)
+	retryDelay := time.Duration(cfg.LLMRetryDelay) * time.Second
+	llm := NewLLMWithRetry(cfg.OpenAIKey, cfg.OpenAIModel, float32(cfg.OpenAITemperature), cfg.OpenAIBaseURL, cfg.OpenAIMaxTokens, cfg.LLMMaxRetries, retryDelay)
 	if err := llm.TestConnection(context.Background()); err != nil {
 		log.Fatalf("Failed to connect to OpenAI API: %v", err)
 	}
-	log.Printf("✓ Successfully connected to OpenAI API")
+	log.Printf("✓ Successfully connected to OpenAI API (max retries: %d, retry delay: %v)", cfg.LLMMaxRetries, retryDelay)
 
 	// Login to ARP server
 	log.Printf("Connecting to ARP server at %s...", cfg.ARPURL)
@@ -129,10 +130,12 @@ func main() {
 	agent.Start(ctx)
 	defer agent.Stop()
 
-	// Listen for events
+	// Listen for events with reconnection support
 	log.Println()
 	log.Println("Listening for events. Press Ctrl+C to stop.")
 
+	reconnectDelay := time.Duration(cfg.MCPReconnectDelay) * time.Second
+
 	for {
 		select {
 		case <-ctx.Done():
@@ -140,15 +143,59 @@ func main() {
 			return
 		case event, ok := <-mcpManager.Notifications():
 			if !ok {
-				log.Println("Notification channel closed")
-				mcpManager.Close()
-				return
+				// Notification channel closed - attempt to reconnect
+				log.Printf("Notification channel closed, attempting to reconnect in %v...", reconnectDelay)
+
+				select {
+				case <-ctx.Done():
+					mcpManager.Close()
+					return
+				case <-time.After(reconnectDelay):
+					// Try to reconnect
+					if err := reconnectMCP(cfg, mcpManager, &token); err != nil {
+						log.Printf("Reconnection failed: %v. Retrying in %v...", err, reconnectDelay)
+						continue
+					}
+					log.Println("Successfully reconnected to MCP server")
+				}
+				continue
 			}
 			handleNotification(agent, event)
 		}
 	}
 }
 
+// reconnectMCP attempts to reconnect to the MCP server
+func reconnectMCP(cfg *Config, mcpManager *MCPManager, token *string) error {
+	// Close existing connection
+	mcpManager.Close()
+
+	// Re-authenticate
+	newToken, err := login(cfg.ARPURL, cfg.ARPUsername, cfg.ARPPassword)
+	if err != nil {
+		return fmt.Errorf("failed to re-authenticate: %w", err)
+	}
+	*token = newToken
+
+	// Create new MCP client
+	mcpClient := NewMCPClient(cfg.ARPURL, newToken)
+	if err := mcpClient.Connect(); err != nil {
+		return fmt.Errorf("failed to reconnect to MCP: %w", err)
+	}
+
+	// Initialize MCP
+	if _, err := mcpClient.Initialize(); err != nil {
+		mcpClient.Close()
+		return fmt.Errorf("failed to initialize MCP on reconnect: %w", err)
+	}
+
+	// Note: We can't easily replace the mcpManager's internal client
+	// This is a limitation - in a production system we'd need to refactor
+	// the MCPManager to support reconnection
+	log.Println("MCP reconnection requires agent restart - please restart the agent")
+	return fmt.Errorf("MCP reconnection requires agent restart")
+}
+
 // login authenticates with the ARP server and returns a JWT token
 func login(baseURL, username, password string) (string, error) {
 	// Ensure URL has the /query endpoint

arp_cli/cmd/message.go

@@ -7,12 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
+	"gogs.dmsc.dev/arp/arp_cli/client"
 )
 
 // MessageCommand returns the message command
@@ -135,7 +133,7 @@ type Message struct {
 }
 
 func messageList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -143,9 +141,6 @@ func messageList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Messages { messages { id sender { id email } content sentAt receivers receiverObjects { id email } createdAt } }"
 
 	resp, err := c.Query(query, nil)
@@ -206,7 +201,7 @@ func messageList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func messageGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -214,9 +209,6 @@ func messageGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Message($id: ID!) { message(id: $id) { id sender { id email } content sentAt receivers receiverObjects { id email } createdAt updatedAt } }"
 
@@ -273,7 +265,7 @@ func messageGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func messageCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -303,9 +295,6 @@ func messageCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateMessage($input: NewMessage!) { createMessage(input: $input) { id sender { id email } content sentAt receivers createdAt } }`
 
 	input := map[string]interface{}{
@@ -336,7 +325,7 @@ func messageCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func messageUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -355,9 +344,6 @@ func messageUpdate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation UpdateMessage($id: ID!, $input: UpdateMessage!) { updateMessage(id: $id, input: $input) { id sender { id email } content sentAt receivers createdAt updatedAt } }`
 
 	input := map[string]interface{}{}
@@ -391,7 +377,7 @@ func messageUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func messageDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -413,9 +399,6 @@ func messageDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteMessage($id: ID!) { deleteMessage(id: $id) { id } }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})
@@ -440,7 +423,7 @@ func messageDelete(ctx context.Context, cmd *cli.Command) error {
 }
 
 func messageWatch(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	_, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}

arp_cli/cmd/note.go

@@ -6,9 +6,6 @@ import (
 	"fmt"
 	"os"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -149,7 +146,7 @@ type Note struct {
 }
 
 func noteList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -157,9 +154,6 @@ func noteList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Notes { notes { id title content userId user { id email } serviceId createdAt updatedAt } }"
 
 	resp, err := c.Query(query, nil)
@@ -187,7 +181,6 @@ func noteList(ctx context.Context, cmd *cli.Command) error {
 
 	table := tablewriter.NewWriter(os.Stdout)
 	table.Header([]string{"ID", "Title", "User", "Service ID", "Created At"})
-	
 
 	for _, n := range result.Notes {
 		userEmail := ""
@@ -202,7 +195,7 @@ func noteList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func noteGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -210,9 +203,6 @@ func noteGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Note($id: ID!) { note(id: $id) { id title content userId user { id email } serviceId service { id name } createdAt updatedAt } }"
 
@@ -259,7 +249,7 @@ func noteGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func noteCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -300,9 +290,6 @@ func noteCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateNote($input: NewNote!) { createNote(input: $input) { id title content userId user { id email } serviceId createdAt updatedAt } }`
 
 	input := map[string]interface{}{
@@ -336,7 +323,7 @@ func noteCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func noteUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -355,9 +342,6 @@ func noteUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if title != "" {
 		input["title"] = title
@@ -398,7 +382,7 @@ func noteUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func noteDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -424,9 +408,6 @@ func noteDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteNote($id: ID!) { deleteNote(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})

arp_cli/cmd/permission.go

@@ -6,9 +6,6 @@ import (
 	"fmt"
 	"os"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -123,7 +120,7 @@ type PermissionDetail struct {
 }
 
 func permissionList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -131,9 +128,6 @@ func permissionList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Permissions { permissions { id code description } }"
 
 	resp, err := c.Query(query, nil)
@@ -161,7 +155,6 @@ func permissionList(ctx context.Context, cmd *cli.Command) error {
 
 	table := tablewriter.NewWriter(os.Stdout)
 	table.Header([]string{"ID", "Code", "Description"})
-	
 
 	for _, p := range result.Permissions {
 		table.Append([]string{p.ID, p.Code, p.Description})
@@ -172,7 +165,7 @@ func permissionList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func permissionGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -180,9 +173,6 @@ func permissionGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Permission($id: ID!) { permission(id: $id) { id code description } }"
 
@@ -217,7 +207,7 @@ func permissionGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func permissionCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -242,9 +232,6 @@ func permissionCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreatePermission($input: NewPermission!) { createPermission(input: $input) { id code description } }`
 
 	input := map[string]interface{}{
@@ -276,7 +263,7 @@ func permissionCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func permissionUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -293,9 +280,6 @@ func permissionUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if code != "" {
 		input["code"] = code
@@ -330,7 +314,7 @@ func permissionUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func permissionDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -356,9 +340,6 @@ func permissionDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeletePermission($id: ID!) { deletePermission(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})

arp_cli/cmd/repl.go

@@ -4,17 +4,23 @@ import (
 	"bufio"
 	"context"
 	"fmt"
+	"net/url"
 	"os"
 	"strings"
 
+	"gogs.dmsc.dev/arp/arp_cli/config"
+
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/urfave/cli/v3"
 )
 
 // REPL represents a Read-Eval-Print Loop for interactive CLI usage
 type REPL struct {
-	app     *cli.Command
-	prompt  string
-	history []string
+	app       *cli.Command
+	prompt    string
+	history   []string
+	serverURL string // Session-specific server URL
+	token     string // Session-specific token
 }
 
 // NewREPL creates a new REPL instance
@@ -27,12 +33,30 @@ func NewREPL(app *cli.Command) *REPL {
 
 // Run starts the REPL loop
 func (r *REPL) Run(ctx context.Context) error {
-	scanner := bufio.NewScanner(os.Stdin)
+	// Load saved config for defaults
+	cfg, err := config.Load()
+	if err != nil {
+		return fmt.Errorf("failed to load config: %w", err)
+	}
+
+	// Prompt for server URL
+	serverURL, err := r.promptServerURL(cfg)
+	if err != nil {
+		return err
+	}
+	r.serverURL = serverURL
+	r.token = cfg.Token // Use saved token as starting point
+
+	// Update prompt to show connection info
+	r.updatePrompt()
 
 	fmt.Println("ARP CLI - Interactive Mode")
+	fmt.Printf("Connected to: %s\n", r.serverURL)
 	fmt.Println("Type 'help' for available commands, 'exit' or 'quit' to leave.")
 	fmt.Println()
 
+	scanner := bufio.NewScanner(os.Stdin)
+
 	for {
 		// Show prompt
 		fmt.Print(r.prompt)
@@ -65,6 +89,9 @@ func (r *REPL) Run(ctx context.Context) error {
 		// Prepend the app name to match CLI expectations
 		args = append([]string{"arp_cli"}, args...)
 
+		// Inject session URL if not already specified
+		args = r.injectSessionURL(args)
+
 		// Execute the command
 		if err := r.app.Run(ctx, args); err != nil {
 			fmt.Fprintf(os.Stderr, "Error: %v\n", err)
@@ -72,6 +99,9 @@ func (r *REPL) Run(ctx context.Context) error {
 
 		// Store in history
 		r.history = append(r.history, line)
+
+		// Reload config to pick up any token changes from login
+		r.reloadToken()
 	}
 
 	if err := scanner.Err(); err != nil {
@@ -81,6 +111,127 @@ func (r *REPL) Run(ctx context.Context) error {
 	return nil
 }
 
+// promptServerURL prompts the user for a server URL
+func (r *REPL) promptServerURL(cfg *config.Config) (string, error) {
+	// Determine default URL
+	defaultURL := cfg.ServerURL
+	if defaultURL == "" {
+		defaultURL = "http://localhost:8080/query"
+	}
+
+	var serverURL string
+	prompt := &survey.Input{
+		Message: "Server URL",
+		Default: defaultURL,
+		Help:    "The ARP server URL to connect to for this session",
+	}
+	if err := survey.AskOne(prompt, &serverURL); err != nil {
+		return "", err
+	}
+
+	// Ensure URL has the /query endpoint
+	serverURL = ensureQueryEndpoint(serverURL)
+
+	return serverURL, nil
+}
+
+// updatePrompt updates the prompt to show connection info
+func (r *REPL) updatePrompt() {
+	// Extract a short identifier from the URL for the prompt
+	shortName := r.getShortServerName()
+	r.prompt = fmt.Sprintf("arp[%s]> ", shortName)
+}
+
+// getShortServerName extracts a short name from the server URL for the prompt
+func (r *REPL) getShortServerName() string {
+	if r.serverURL == "" {
+		return "local"
+	}
+
+	parsed, err := url.Parse(r.serverURL)
+	if err != nil {
+		return "server"
+	}
+
+	host := parsed.Host
+	// Remove port if present
+	if idx := strings.Index(host, ":"); idx != -1 {
+		host = host[:idx]
+	}
+
+	// Shorten common patterns
+	if host == "localhost" || host == "127.0.0.1" {
+		return "local"
+	}
+
+	// Truncate if too long
+	if len(host) > 15 {
+		host = host[:12] + "..."
+	}
+
+	return host
+}
+
+// injectSessionURL adds the --url flag to commands if not already present
+func (r *REPL) injectSessionURL(args []string) []string {
+	if r.serverURL == "" {
+		return args
+	}
+
+	// Don't inject URL for help commands (help treats args as topics)
+	if len(args) > 1 && args[1] == "help" {
+		return args
+	}
+
+	// Check if --url or -u is already in args
+	for i, arg := range args {
+		if arg == "--url" || arg == "-u" {
+			// URL already specified, don't inject
+			return args
+		}
+		// Check for --url=value format
+		if strings.HasPrefix(arg, "--url=") || strings.HasPrefix(arg, "-u=") {
+			return args
+		}
+		// Also check if previous arg was --url/-u and this is the value
+		if i > 0 && (args[i-1] == "--url" || args[i-1] == "-u") {
+			return args
+		}
+	}
+
+	// Find the position after the command name but before subcommands
+	// For "arp_cli subcommand --flag", insert after "arp_cli"
+	insertPos := 1
+	if len(args) > 1 && !strings.HasPrefix(args[1], "-") {
+		// There's a subcommand, insert URL flag before it
+		// Actually, we want to insert after the subcommand name
+		insertPos = 2
+		if len(args) > 2 && !strings.HasPrefix(args[2], "-") {
+			// There's a nested subcommand (e.g., workflow template list)
+			insertPos = 3
+			if len(args) > 3 && !strings.HasPrefix(args[3], "-") {
+				insertPos = 4
+			}
+		}
+	}
+
+	// Insert --url flag with value
+	newArgs := make([]string, 0, len(args)+2)
+	newArgs = append(newArgs, args[:insertPos]...)
+	newArgs = append(newArgs, "--url", r.serverURL)
+	newArgs = append(newArgs, args[insertPos:]...)
+
+	return newArgs
+}
+
+// reloadToken reloads the token from config (called after commands that might change auth)
+func (r *REPL) reloadToken() {
+	cfg, err := config.Load()
+	if err == nil {
+		r.token = cfg.Token
+	}
+}
+
 // parseArgs parses a command line string into arguments
 // Handles quoted strings and basic escaping
 func parseArgs(line string) ([]string, error) {

arp_cli/cmd/role.go

@@ -7,9 +7,6 @@ import (
 	"os"
 	"strings"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -141,7 +138,7 @@ type Permission struct {
 }
 
 func roleList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -149,9 +146,6 @@ func roleList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Roles { roles { id name description permissions { id code } } }"
 
 	resp, err := c.Query(query, nil)
@@ -179,7 +173,6 @@ func roleList(ctx context.Context, cmd *cli.Command) error {
 
 	table := tablewriter.NewWriter(os.Stdout)
 	table.Header([]string{"ID", "Name", "Description", "Permissions"})
-	
 
 	for _, r := range result.Roles {
 		perms := make([]string, len(r.Permissions))
@@ -194,7 +187,7 @@ func roleList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func roleGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -202,9 +195,6 @@ func roleGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Role($id: ID!) { role(id: $id) { id name description permissions { id code description } } }"
 
@@ -243,7 +233,7 @@ func roleGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func roleCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -280,9 +270,6 @@ func roleCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateRole($input: NewRole!) { createRole(input: $input) { id name description permissions { id code } } }`
 
 	input := map[string]interface{}{
@@ -315,7 +302,7 @@ func roleCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func roleUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -333,9 +320,6 @@ func roleUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if name != "" {
 		input["name"] = name
@@ -373,7 +357,7 @@ func roleUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func roleDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -399,9 +383,6 @@ func roleDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteRole($id: ID!) { deleteRole(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})

arp_cli/cmd/root.go

@@ -28,10 +28,11 @@ var (
 )
 
 // GetClient creates a GraphQL client with the configured URL and token
-func GetClient(ctx context.Context, cmd *cli.Command) (*client.Client, error) {
+// Returns both the client and config for auth checking
+func GetClient(ctx context.Context, cmd *cli.Command) (*client.Client, *config.Config, error) {
 	cfg, err := config.Load()
 	if err != nil {
-		return nil, fmt.Errorf("failed to load config: %w", err)
+		return nil, nil, fmt.Errorf("failed to load config: %w", err)
 	}
 
 	// Command flag takes precedence, then config, then empty
@@ -40,7 +41,7 @@ func GetClient(ctx context.Context, cmd *cli.Command) (*client.Client, error) {
 		serverURL = cfg.ServerURL
 	}
 	if serverURL == "" {
-		return nil, fmt.Errorf("no server URL configured. Use --url flag or run 'arp_cli login' first")
+		return nil, cfg, fmt.Errorf("no server URL configured. Use --url flag or run 'arp_cli login' first")
 	}
 
 	c := client.New(serverURL)
@@ -48,7 +49,7 @@ func GetClient(ctx context.Context, cmd *cli.Command) (*client.Client, error) {
 		c.SetToken(cfg.Token)
 	}
 
-	return c, nil
+	return c, cfg, nil
 }
 
 // RequireAuth ensures the user is authenticated

arp_cli/cmd/service.go

@@ -7,9 +7,6 @@ import (
 	"os"
 	"strings"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -151,7 +148,7 @@ type Service struct {
 }
 
 func serviceList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -159,9 +156,6 @@ func serviceList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Services { services { id name description createdBy { id email } participants { id email } createdAt updatedAt } }"
 
 	resp, err := c.Query(query, nil)
@@ -189,7 +183,6 @@ func serviceList(ctx context.Context, cmd *cli.Command) error {
 
 	table := tablewriter.NewWriter(os.Stdout)
 	table.Header([]string{"ID", "Name", "Description", "Created By", "Participants", "Created At"})
-	
 
 	for _, s := range result.Services {
 		participants := fmt.Sprintf("%d", len(s.Participants))
@@ -201,7 +194,7 @@ func serviceList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func serviceGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -209,9 +202,6 @@ func serviceGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Service($id: ID!) { service(id: $id) { id name description createdBy { id email } participants { id email } createdAt updatedAt } }"
 
@@ -253,7 +243,7 @@ func serviceGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func serviceCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -298,9 +288,6 @@ func serviceCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateService($input: NewService!) { createService(input: $input) { id name description createdBy { id email } participants { id email } createdAt updatedAt } }`
 
 	input := map[string]interface{}{
@@ -334,7 +321,7 @@ func serviceCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func serviceUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -353,9 +340,6 @@ func serviceUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	// Build the input dynamically
 	input := make(map[string]interface{})
 	if name != "" {
@@ -394,7 +378,7 @@ func serviceUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func serviceDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -420,9 +404,6 @@ func serviceDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteService($id: ID!) { deleteService(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})

arp_cli/cmd/task.go

@@ -6,12 +6,10 @@ import (
 	"fmt"
 	"os"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
+	"gogs.dmsc.dev/arp/arp_cli/client"
 )
 
 // TaskCommand returns the task command
@@ -202,7 +200,7 @@ type TaskStatus struct {
 }
 
 func taskList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -210,9 +208,6 @@ func taskList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Tasks { tasks { id title priority createdBy { id email } assignee { id email } status { id code label } dueDate createdAt updatedAt } }"
 
 	resp, err := c.Query(query, nil)
@@ -262,7 +257,7 @@ func taskList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func taskGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -270,9 +265,6 @@ func taskGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query Task($id: ID!) { task(id: $id) { id title content createdBy { id email } assignee { id email } status { id code label } dueDate priority createdAt updatedAt } }"
 
@@ -322,7 +314,7 @@ func taskGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func taskCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -394,9 +386,6 @@ func taskCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateTask($input: NewTask!) { createTask(input: $input) { id title priority createdBy { id email } assignee { id email } status { id code label } dueDate createdAt updatedAt } }`
 
 	input := map[string]interface{}{
@@ -439,7 +428,7 @@ func taskCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func taskUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -460,9 +449,6 @@ func taskUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if title != "" {
 		input["title"] = title
@@ -509,7 +495,7 @@ func taskUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func taskDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -535,9 +521,6 @@ func taskDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteTask($id: ID!) { deleteTask(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})
@@ -562,7 +545,7 @@ func taskDelete(ctx context.Context, cmd *cli.Command) error {
 }
 
 func taskWatch(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	_, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}

arp_cli/cmd/user.go

@@ -7,9 +7,6 @@ import (
 	"os"
 	"strings"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -143,7 +140,7 @@ type Role struct {
 }
 
 func userList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -151,9 +148,6 @@ func userList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := "query Users { users { id email roles { id name } createdAt updatedAt } }"
 
 	resp, err := c.Query(query, nil)
@@ -181,7 +175,6 @@ func userList(ctx context.Context, cmd *cli.Command) error {
 
 	table := tablewriter.NewWriter(os.Stdout)
 	table.Header([]string{"ID", "Email", "Roles", "Created At"})
-	
 
 	for _, u := range result.Users {
 		roles := make([]string, len(u.Roles))
@@ -196,7 +189,7 @@ func userList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func userGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -204,9 +197,6 @@ func userGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := "query User($id: ID!) { user(id: $id) { id email roles { id name description } createdAt updatedAt } }"
 
@@ -246,7 +236,7 @@ func userGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func userCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -283,9 +273,6 @@ func userCreate(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateUser($input: NewUser!) { createUser(input: $input) { id email roles { id name } createdAt updatedAt } }`
 
 	input := map[string]interface{}{
@@ -318,7 +305,7 @@ func userCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func userUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -336,9 +323,6 @@ func userUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if email != "" {
 		input["email"] = email
@@ -376,7 +360,7 @@ func userUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func userDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -402,9 +386,6 @@ func userDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteUser($id: ID!) { deleteUser(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})

arp_cli/cmd/workflow.go

@@ -7,9 +7,6 @@ import (
 	"os"
 	"strings"
 
-	"gogs.dmsc.dev/arp/arp_cli/client"
-	"gogs.dmsc.dev/arp/arp_cli/config"
-
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v3"
@@ -319,7 +316,7 @@ type WorkflowNode struct {
 // WorkflowTemplate CRUD operations
 
 func workflowTemplateList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -327,9 +324,6 @@ func workflowTemplateList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := `query WorkflowTemplates { workflowTemplates { id name description definition isActive createdBy { id email } createdAt updatedAt } }`
 
 	resp, err := c.Query(query, nil)
@@ -379,7 +373,7 @@ func workflowTemplateList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowTemplateGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -387,9 +381,6 @@ func workflowTemplateGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := `query WorkflowTemplate($id: ID!) { workflowTemplate(id: $id) { id name description definition isActive createdBy { id email } createdAt updatedAt } }`
 
@@ -431,7 +422,7 @@ func workflowTemplateGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowTemplateCreate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -466,9 +457,6 @@ func workflowTemplateCreate(ctx context.Context, cmd *cli.Command) error {
 	// Handle file input for definition
 	definition = ReadFileOrString(definition)
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CreateWorkflowTemplate($input: NewWorkflowTemplate!) { createWorkflowTemplate(input: $input) { id name description definition isActive createdBy { id email } createdAt updatedAt } }`
 
 	input := map[string]interface{}{
@@ -502,7 +490,7 @@ func workflowTemplateCreate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowTemplateUpdate(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -527,9 +515,6 @@ func workflowTemplateUpdate(ctx context.Context, cmd *cli.Command) error {
 		return nil
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	input := make(map[string]interface{})
 	if name != "" {
 		input["name"] = name
@@ -570,7 +555,7 @@ func workflowTemplateUpdate(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowTemplateDelete(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -596,9 +581,6 @@ func workflowTemplateDelete(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation DeleteWorkflowTemplate($id: ID!) { deleteWorkflowTemplate(id: $id) }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})
@@ -625,7 +607,7 @@ func workflowTemplateDelete(ctx context.Context, cmd *cli.Command) error {
 // WorkflowInstance operations
 
 func workflowInstanceList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -633,9 +615,6 @@ func workflowInstanceList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	query := `query WorkflowInstances { workflowInstances { id template { id name } status context service { id name } createdAt updatedAt completedAt } }`
 
 	resp, err := c.Query(query, nil)
@@ -681,7 +660,7 @@ func workflowInstanceList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowInstanceGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -689,9 +668,6 @@ func workflowInstanceGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := `query WorkflowInstance($id: ID!) { workflowInstance(id: $id) { id template { id name description } status context service { id name } createdAt updatedAt completedAt } }`
 
@@ -739,7 +715,7 @@ func workflowInstanceGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowInstanceStart(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -751,9 +727,6 @@ func workflowInstanceStart(ctx context.Context, cmd *cli.Command) error {
 	serviceID := cmd.String("service")
 	contextJSON := cmd.String("context")
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation StartWorkflow($templateId: ID!, $input: StartWorkflowInput!) { startWorkflow(templateId: $templateId, input: $input) { id template { id name } status context service { id name } createdAt } }`
 
 	input := make(map[string]interface{})
@@ -791,7 +764,7 @@ func workflowInstanceStart(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowInstanceCancel(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -801,9 +774,6 @@ func workflowInstanceCancel(ctx context.Context, cmd *cli.Command) error {
 
 	id := cmd.String("id")
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation CancelWorkflow($id: ID!) { cancelWorkflow(id: $id) { id status completedAt } }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"id": id})
@@ -832,7 +802,7 @@ func workflowInstanceCancel(ctx context.Context, cmd *cli.Command) error {
 // WorkflowNode operations
 
 func workflowNodeList(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -840,9 +810,6 @@ func workflowNodeList(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	instanceID := cmd.String("instance")
 	query := `query WorkflowInstance($id: ID!) { workflowInstance(id: $id) { id status nodes: workflowNodes { id nodeKey nodeType status task { id title } retryCount createdAt startedAt completedAt } } }`
 
@@ -896,7 +863,7 @@ func workflowNodeList(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowNodeGet(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -904,9 +871,6 @@ func workflowNodeGet(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	id := cmd.String("id")
 	query := `query WorkflowNode($id: ID!) { workflowNode(id: $id) { id nodeKey nodeType status task { id title } inputData outputData retryCount createdAt updatedAt startedAt completedAt } }`
 
@@ -980,7 +944,7 @@ func workflowNodeGet(ctx context.Context, cmd *cli.Command) error {
 }
 
 func workflowNodeRetry(ctx context.Context, cmd *cli.Command) error {
-	cfg, err := config.Load()
+	c, cfg, err := GetClient(ctx, cmd)
 	if err != nil {
 		return err
 	}
@@ -990,9 +954,6 @@ func workflowNodeRetry(ctx context.Context, cmd *cli.Command) error {
 
 	id := cmd.String("id")
 
-	c := client.New(cfg.ServerURL)
-	c.SetToken(cfg.Token)
-
 	mutation := `mutation RetryWorkflowNode($nodeId: ID!) { retryWorkflowNode(nodeId: $nodeId) { id nodeKey status retryCount } }`
 
 	resp, err := c.Mutation(mutation, map[string]interface{}{"nodeId": id})

graph/generated.go

@@ -10208,7 +10208,7 @@ func (ec *executionContext) unmarshalInputUpdateUserInput(ctx context.Context, o
 			it.Password = data
 		case "roles":
 			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("roles"))
-			data, err := ec.unmarshalNID2ᚕstringᚄ(ctx, v)
+			data, err := ec.unmarshalOID2ᚕstringᚄ(ctx, v)
 			if err != nil {
 				return it, err
 			}

graph/model/models_gen.go

@@ -203,7 +203,7 @@ type UpdateTaskStatusInput struct {
 type UpdateUserInput struct {
 	Email    *string  `json:"email,omitempty"`
 	Password *string  `json:"password,omitempty"`
-	Roles    []string `json:"roles"`
+	Roles    []string `json:"roles,omitempty"`
 }
 
 type UpdateWorkflowTemplateInput struct {

graph/schema.graphqls

@@ -261,7 +261,7 @@ input NewUser {
 input UpdateUserInput {
   email: String
   password: String
-  roles: [ID!]!
+  roles: [ID!]
 }
 
 input NewNote {

graph/testutil/fixtures.go

@@ -28,6 +28,10 @@ func SetupTestDB() (*gorm.DB, error) {
 		&models.TaskStatus{},
 		&models.Message{},
 		&models.Note{},
+		&models.WorkflowTemplate{},
+		&models.WorkflowInstance{},
+		&models.WorkflowNode{},
+		&models.WorkflowEdge{},
 	)
 	if err != nil {
 		return nil, err