blob: c98e7f777083996b79670d9485d617baaa2ade7e [file] [log] [blame]
Earl Lee2e463fb2025-04-17 11:22:22 -07001package loop
2
3import (
4 "context"
Josh Bleecher Snyderdbe02302025-04-29 16:44:23 -07005 _ "embed"
Earl Lee2e463fb2025-04-17 11:22:22 -07006 "encoding/json"
7 "fmt"
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +00008 "io"
Earl Lee2e463fb2025-04-17 11:22:22 -07009 "log/slog"
10 "net/http"
11 "os"
12 "os/exec"
Pokey Rule7a113622025-05-12 10:58:45 +010013 "path/filepath"
Earl Lee2e463fb2025-04-17 11:22:22 -070014 "runtime/debug"
15 "slices"
Philip Zeyligerb8a8f352025-06-02 07:39:37 -070016 "strconv"
Earl Lee2e463fb2025-04-17 11:22:22 -070017 "strings"
18 "sync"
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +000019 "text/template"
Earl Lee2e463fb2025-04-17 11:22:22 -070020 "time"
21
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +000022 "sketch.dev/browser"
Earl Lee2e463fb2025-04-17 11:22:22 -070023 "sketch.dev/claudetool"
Autoformatter4962f152025-05-06 17:24:20 +000024 "sketch.dev/claudetool/browse"
Josh Bleecher Snyderf4047bb2025-05-05 23:02:56 +000025 "sketch.dev/claudetool/codereview"
Josh Bleecher Snydera997be62025-05-07 22:52:46 +000026 "sketch.dev/claudetool/onstart"
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -070027 "sketch.dev/llm"
Philip Zeyliger72252cb2025-05-10 17:00:08 -070028 "sketch.dev/llm/ant"
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -070029 "sketch.dev/llm/conversation"
Philip Zeyliger194bfa82025-06-24 06:03:06 -070030 "sketch.dev/mcp"
Philip Zeyligerc17ffe32025-06-05 19:49:13 -070031 "sketch.dev/skabandclient"
Philip Zeyliger5f26a342025-07-04 01:30:29 +000032 "tailscale.com/portlist"
Earl Lee2e463fb2025-04-17 11:22:22 -070033)
34
35const (
36 userCancelMessage = "user requested agent to stop handling responses"
37)
38
Philip Zeyligerb7c58752025-05-01 10:10:17 -070039type MessageIterator interface {
40 // Next blocks until the next message is available. It may
41 // return nil if the underlying iterator context is done.
42 Next() *AgentMessage
43 Close()
44}
45
Earl Lee2e463fb2025-04-17 11:22:22 -070046type CodingAgent interface {
47 // Init initializes an agent inside a docker container.
48 Init(AgentInit) error
49
50 // Ready returns a channel closed after Init successfully called.
51 Ready() <-chan struct{}
52
53 // URL reports the HTTP URL of this agent.
54 URL() string
55
56 // UserMessage enqueues a message to the agent and returns immediately.
57 UserMessage(ctx context.Context, msg string)
58
Philip Zeyligerb7c58752025-05-01 10:10:17 -070059 // Returns an iterator that finishes when the context is done and
60 // starts with the given message index.
61 NewIterator(ctx context.Context, nextMessageIdx int) MessageIterator
Earl Lee2e463fb2025-04-17 11:22:22 -070062
Philip Zeyligereab12de2025-05-14 02:35:53 +000063 // Returns an iterator that notifies of state transitions until the context is done.
64 NewStateTransitionIterator(ctx context.Context) StateTransitionIterator
65
Earl Lee2e463fb2025-04-17 11:22:22 -070066 // Loop begins the agent loop returns only when ctx is cancelled.
67 Loop(ctx context.Context)
68
Philip Zeyligerbe7802a2025-06-04 20:15:25 +000069 // BranchPrefix returns the configured branch prefix
70 BranchPrefix() string
71
philip.zeyliger6d3de482025-06-10 19:38:14 -070072 // LinkToGitHub returns whether GitHub branch linking is enabled
73 LinkToGitHub() bool
74
Sean McCulloughedc88dc2025-04-30 02:55:01 +000075 CancelTurn(cause error)
Earl Lee2e463fb2025-04-17 11:22:22 -070076
77 CancelToolUse(toolUseID string, cause error) error
78
79 // Returns a subset of the agent's message history.
80 Messages(start int, end int) []AgentMessage
81
82 // Returns the current number of messages in the history
83 MessageCount() int
84
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -070085 TotalUsage() conversation.CumulativeUsage
86 OriginalBudget() conversation.Budget
Earl Lee2e463fb2025-04-17 11:22:22 -070087
Earl Lee2e463fb2025-04-17 11:22:22 -070088 WorkingDir() string
Josh Bleecher Snyderc5848f32025-05-28 18:50:58 +000089 RepoRoot() string
Earl Lee2e463fb2025-04-17 11:22:22 -070090
91 // Diff returns a unified diff of changes made since the agent was instantiated.
92 // If commit is non-nil, it shows the diff for just that specific commit.
93 Diff(commit *string) (string, error)
94
Philip Zeyliger49edc922025-05-14 09:45:45 -070095 // SketchGitBase returns the commit that's the "base" for Sketch's work. It
96 // starts out as the commit where sketch started, but a user can move it if need
97 // be, for example in the case of a rebase. It is stored as a git tag.
98 SketchGitBase() string
Earl Lee2e463fb2025-04-17 11:22:22 -070099
Philip Zeyligerd3ac1122025-05-14 02:54:18 +0000100 // SketchGitBase returns the symbolic name for the "base" for Sketch's work.
101 // (Typically, this is "sketch-base")
102 SketchGitBaseRef() string
103
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700104 // Slug returns the slug identifier for this session.
105 Slug() string
Earl Lee2e463fb2025-04-17 11:22:22 -0700106
Josh Bleecher Snyder47b19362025-04-30 01:34:14 +0000107 // BranchName returns the git branch name for the conversation.
108 BranchName() string
109
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700110 // IncrementRetryNumber increments the retry number for branch naming conflicts.
111 IncrementRetryNumber()
112
Earl Lee2e463fb2025-04-17 11:22:22 -0700113 // OS returns the operating system of the client.
114 OS() string
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000115
Philip Zeyligerc72fff52025-04-29 20:17:54 +0000116 // SessionID returns the unique session identifier.
117 SessionID() string
118
philip.zeyliger8773e682025-06-11 21:36:21 -0700119 // SSHConnectionString returns the SSH connection string for the container.
120 SSHConnectionString() string
121
Philip Zeyliger75bd37d2025-05-22 18:49:14 +0000122 // DetectGitChanges checks for new git commits and pushes them if found
Philip Zeyliger9bca61e2025-05-22 12:40:06 -0700123 DetectGitChanges(ctx context.Context) error
Philip Zeyliger75bd37d2025-05-22 18:49:14 +0000124
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000125 // OutstandingLLMCallCount returns the number of outstanding LLM calls.
126 OutstandingLLMCallCount() int
127
128 // OutstandingToolCalls returns the names of outstanding tool calls.
129 OutstandingToolCalls() []string
Philip Zeyliger18532b22025-04-23 21:11:46 +0000130 OutsideOS() string
131 OutsideHostname() string
132 OutsideWorkingDir() string
Philip Zeyligerd1402952025-04-23 03:54:37 +0000133 GitOrigin() string
Philip Zeyliger64f60462025-06-16 13:57:10 -0700134
bankseancad67b02025-06-27 21:57:05 +0000135 // GitUsername returns the git user name from the agent config.
136 GitUsername() string
137
Philip Zeyliger254c49f2025-07-17 17:26:24 -0700138 // PassthroughUpstream returns whether passthrough upstream is enabled.
139 PassthroughUpstream() bool
140
Philip Zeyliger64f60462025-06-16 13:57:10 -0700141 // DiffStats returns the number of lines added and removed from sketch-base to HEAD
142 DiffStats() (int, int)
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000143 // OpenBrowser is a best-effort attempt to open a browser at url in outside sketch.
144 OpenBrowser(url string)
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700145
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700146 // IsInContainer returns true if the agent is running in a container
147 IsInContainer() bool
148 // FirstMessageIndex returns the index of the first message in the current conversation
149 FirstMessageIndex() int
Sean McCulloughd9d45812025-04-30 16:53:41 -0700150
151 CurrentStateName() string
Josh Bleecher Snyder112b9232025-05-23 11:26:33 -0700152 // CurrentTodoContent returns the current todo list data as JSON, or empty string if no todos exist
153 CurrentTodoContent() string
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700154
155 // CompactConversation compacts the current conversation by generating a summary
156 // and restarting the conversation with that summary as the initial context
157 CompactConversation(ctx context.Context) error
Philip Zeyligerda623b52025-07-04 01:12:38 +0000158
Philip Zeyliger0113be52025-06-07 23:53:41 +0000159 // SkabandAddr returns the skaband address if configured
160 SkabandAddr() string
Philip Zeyliger5f26a342025-07-04 01:30:29 +0000161
162 // GetPorts returns the cached list of open TCP ports
163 GetPorts() []portlist.Port
banksean5ab8fb82025-07-09 12:34:55 -0700164
165 // TokenContextWindow returns the TokenContextWindow size of the model the agent is using.
166 TokenContextWindow() int
Earl Lee2e463fb2025-04-17 11:22:22 -0700167}
168
169type CodingAgentMessageType string
170
171const (
172 UserMessageType CodingAgentMessageType = "user"
173 AgentMessageType CodingAgentMessageType = "agent"
174 ErrorMessageType CodingAgentMessageType = "error"
175 BudgetMessageType CodingAgentMessageType = "budget" // dedicated for "out of budget" errors
176 ToolUseMessageType CodingAgentMessageType = "tool"
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700177 CommitMessageType CodingAgentMessageType = "commit" // for displaying git commits
178 AutoMessageType CodingAgentMessageType = "auto" // for automated notifications like autoformatting
179 CompactMessageType CodingAgentMessageType = "compact" // for conversation compaction notifications
Philip Zeyliger5f26a342025-07-04 01:30:29 +0000180 PortMessageType CodingAgentMessageType = "port" // for port monitoring events
Josh Bleecher Snyder3b44cc32025-07-22 02:28:14 +0000181 SlugMessageType CodingAgentMessageType = "slug" // for slug updates
Earl Lee2e463fb2025-04-17 11:22:22 -0700182
183 cancelToolUseMessage = "Stop responding to my previous message. Wait for me to ask you something else before attempting to use any more tools."
184)
185
186type AgentMessage struct {
187 Type CodingAgentMessageType `json:"type"`
188 // EndOfTurn indicates that the AI is done working and is ready for the next user input.
189 EndOfTurn bool `json:"end_of_turn"`
190
191 Content string `json:"content"`
192 ToolName string `json:"tool_name,omitempty"`
193 ToolInput string `json:"input,omitempty"`
194 ToolResult string `json:"tool_result,omitempty"`
195 ToolError bool `json:"tool_error,omitempty"`
196 ToolCallId string `json:"tool_call_id,omitempty"`
197
198 // ToolCalls is a list of all tool calls requested in this message (name and input pairs)
199 ToolCalls []ToolCall `json:"tool_calls,omitempty"`
200
Sean McCulloughd9f13372025-04-21 15:08:49 -0700201 // ToolResponses is a list of all responses to tool calls requested in this message (name and input pairs)
202 ToolResponses []AgentMessage `json:"toolResponses,omitempty"`
203
Earl Lee2e463fb2025-04-17 11:22:22 -0700204 // Commits is a list of git commits for a commit message
205 Commits []*GitCommit `json:"commits,omitempty"`
206
207 Timestamp time.Time `json:"timestamp"`
208 ConversationID string `json:"conversation_id"`
209 ParentConversationID *string `json:"parent_conversation_id,omitempty"`
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700210 Usage *llm.Usage `json:"usage,omitempty"`
Earl Lee2e463fb2025-04-17 11:22:22 -0700211
212 // Message timing information
213 StartTime *time.Time `json:"start_time,omitempty"`
214 EndTime *time.Time `json:"end_time,omitempty"`
215 Elapsed *time.Duration `json:"elapsed,omitempty"`
216
217 // Turn duration - the time taken for a complete agent turn
218 TurnDuration *time.Duration `json:"turnDuration,omitempty"`
219
Josh Bleecher Snyder4d544932025-05-07 13:33:53 +0000220 // HideOutput indicates that this message should not be rendered in the UI.
221 // This is useful for subconversations that generate output that shouldn't be shown to the user.
222 HideOutput bool `json:"hide_output,omitempty"`
223
Josh Bleecher Snyder112b9232025-05-23 11:26:33 -0700224 // TodoContent contains the agent's todo file content when it has changed
225 TodoContent *string `json:"todo_content,omitempty"`
226
Earl Lee2e463fb2025-04-17 11:22:22 -0700227 Idx int `json:"idx"`
228}
229
Josh Bleecher Snyder4d544932025-05-07 13:33:53 +0000230// SetConvo sets m.ConversationID, m.ParentConversationID, and m.HideOutput based on convo.
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700231func (m *AgentMessage) SetConvo(convo *conversation.Convo) {
Josh Bleecher Snyder50a1d622025-04-29 09:59:03 -0700232 if convo == nil {
233 m.ConversationID = ""
234 m.ParentConversationID = nil
235 return
236 }
237 m.ConversationID = convo.ID
Josh Bleecher Snyder4d544932025-05-07 13:33:53 +0000238 m.HideOutput = convo.Hidden
Josh Bleecher Snyder50a1d622025-04-29 09:59:03 -0700239 if convo.Parent != nil {
240 m.ParentConversationID = &convo.Parent.ID
241 }
242}
243
Earl Lee2e463fb2025-04-17 11:22:22 -0700244// GitCommit represents a single git commit for a commit message
245type GitCommit struct {
246 Hash string `json:"hash"` // Full commit hash
247 Subject string `json:"subject"` // Commit subject line
248 Body string `json:"body"` // Full commit message body
249 PushedBranch string `json:"pushed_branch,omitempty"` // If set, this commit was pushed to this branch
250}
251
252// ToolCall represents a single tool call within an agent message
253type ToolCall struct {
Sean McCulloughd9f13372025-04-21 15:08:49 -0700254 Name string `json:"name"`
255 Input string `json:"input"`
256 ToolCallId string `json:"tool_call_id"`
257 ResultMessage *AgentMessage `json:"result_message,omitempty"`
258 Args string `json:"args,omitempty"`
259 Result string `json:"result,omitempty"`
Earl Lee2e463fb2025-04-17 11:22:22 -0700260}
261
262func (a *AgentMessage) Attr() slog.Attr {
263 var attrs []any = []any{
264 slog.String("type", string(a.Type)),
265 }
Philip Zeyligerb7c58752025-05-01 10:10:17 -0700266 attrs = append(attrs, slog.Int("idx", a.Idx))
Earl Lee2e463fb2025-04-17 11:22:22 -0700267 if a.EndOfTurn {
268 attrs = append(attrs, slog.Bool("end_of_turn", a.EndOfTurn))
269 }
270 if a.Content != "" {
271 attrs = append(attrs, slog.String("content", a.Content))
272 }
273 if a.ToolName != "" {
274 attrs = append(attrs, slog.String("tool_name", a.ToolName))
275 }
276 if a.ToolInput != "" {
277 attrs = append(attrs, slog.String("tool_input", a.ToolInput))
278 }
279 if a.Elapsed != nil {
280 attrs = append(attrs, slog.Int64("elapsed", a.Elapsed.Nanoseconds()))
281 }
282 if a.TurnDuration != nil {
283 attrs = append(attrs, slog.Int64("turnDuration", a.TurnDuration.Nanoseconds()))
284 }
Philip Zeyliger72252cb2025-05-10 17:00:08 -0700285 if len(a.ToolResult) > 0 {
286 attrs = append(attrs, slog.Any("tool_result", a.ToolResult))
Earl Lee2e463fb2025-04-17 11:22:22 -0700287 }
288 if a.ToolError {
289 attrs = append(attrs, slog.Bool("tool_error", a.ToolError))
290 }
291 if len(a.ToolCalls) > 0 {
292 toolCallAttrs := make([]any, 0, len(a.ToolCalls))
293 for i, tc := range a.ToolCalls {
294 toolCallAttrs = append(toolCallAttrs, slog.Group(
295 fmt.Sprintf("tool_call_%d", i),
296 slog.String("name", tc.Name),
297 slog.String("input", tc.Input),
298 ))
299 }
300 attrs = append(attrs, slog.Group("tool_calls", toolCallAttrs...))
301 }
302 if a.ConversationID != "" {
303 attrs = append(attrs, slog.String("convo_id", a.ConversationID))
304 }
305 if a.ParentConversationID != nil {
306 attrs = append(attrs, slog.String("parent_convo_id", *a.ParentConversationID))
307 }
308 if a.Usage != nil && !a.Usage.IsZero() {
309 attrs = append(attrs, a.Usage.Attr())
310 }
311 // TODO: timestamp, convo ids, idx?
312 return slog.Group("agent_message", attrs...)
313}
314
315func errorMessage(err error) AgentMessage {
316 // It's somewhat unknowable whether error messages are "end of turn" or not, but it seems like the best approach.
317 if os.Getenv(("DEBUG")) == "1" {
318 return AgentMessage{Type: ErrorMessageType, Content: err.Error() + " Stacktrace: " + string(debug.Stack()), EndOfTurn: true}
319 }
320
321 return AgentMessage{Type: ErrorMessageType, Content: err.Error(), EndOfTurn: true}
322}
323
324func budgetMessage(err error) AgentMessage {
325 return AgentMessage{Type: BudgetMessageType, Content: err.Error(), EndOfTurn: true}
326}
327
328// ConvoInterface defines the interface for conversation interactions
329type ConvoInterface interface {
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700330 CumulativeUsage() conversation.CumulativeUsage
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700331 LastUsage() llm.Usage
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700332 ResetBudget(conversation.Budget)
Earl Lee2e463fb2025-04-17 11:22:22 -0700333 OverBudget() error
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700334 SendMessage(message llm.Message) (*llm.Response, error)
335 SendUserTextMessage(s string, otherContents ...llm.Content) (*llm.Response, error)
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700336 GetID() string
Josh Bleecher Snyder64f2aa82025-05-14 18:31:05 +0000337 ToolResultContents(ctx context.Context, resp *llm.Response) ([]llm.Content, bool, error)
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700338 ToolResultCancelContents(resp *llm.Response) ([]llm.Content, error)
Earl Lee2e463fb2025-04-17 11:22:22 -0700339 CancelToolUse(toolUseID string, cause error) error
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700340 SubConvoWithHistory() *conversation.Convo
Philip Zeyliger43a0bfc2025-07-14 14:54:27 -0700341 DebugJSON() ([]byte, error)
Earl Lee2e463fb2025-04-17 11:22:22 -0700342}
343
Philip Zeyligerf2872992025-05-22 10:35:28 -0700344// AgentGitState holds the state necessary for pushing to a remote git repo
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -0700345// when sketch branch changes. If gitRemoteAddr is set, then we push to sketch/
Philip Zeyligerf2872992025-05-22 10:35:28 -0700346// any time we notice we need to.
347type AgentGitState struct {
348 mu sync.Mutex // protects following
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -0700349 lastSketch string // hash of the last sketch branch that was pushed to the host
Philip Zeyligerf2872992025-05-22 10:35:28 -0700350 gitRemoteAddr string // HTTP URL of the host git repo
Josh Bleecher Snyder664404e2025-06-04 21:56:42 +0000351 upstream string // upstream branch for git work
Philip Zeyligerf2872992025-05-22 10:35:28 -0700352 seenCommits map[string]bool // Track git commits we've already seen (by hash)
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700353 slug string // Human-readable session identifier
354 retryNumber int // Number to append when branch conflicts occur
Philip Zeyliger64f60462025-06-16 13:57:10 -0700355 linesAdded int // Lines added from sketch-base to HEAD
356 linesRemoved int // Lines removed from sketch-base to HEAD
Philip Zeyligerf2872992025-05-22 10:35:28 -0700357}
358
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700359func (ags *AgentGitState) SetSlug(slug string) {
Philip Zeyligerf2872992025-05-22 10:35:28 -0700360 ags.mu.Lock()
361 defer ags.mu.Unlock()
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700362 if ags.slug != slug {
363 ags.retryNumber = 0
364 }
365 ags.slug = slug
Philip Zeyligerf2872992025-05-22 10:35:28 -0700366}
367
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700368func (ags *AgentGitState) Slug() string {
Philip Zeyligerf2872992025-05-22 10:35:28 -0700369 ags.mu.Lock()
370 defer ags.mu.Unlock()
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700371 return ags.slug
372}
373
374func (ags *AgentGitState) IncrementRetryNumber() {
375 ags.mu.Lock()
376 defer ags.mu.Unlock()
377 ags.retryNumber++
378}
379
Philip Zeyliger64f60462025-06-16 13:57:10 -0700380func (ags *AgentGitState) DiffStats() (int, int) {
381 ags.mu.Lock()
382 defer ags.mu.Unlock()
383 return ags.linesAdded, ags.linesRemoved
384}
385
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700386// HasSeenCommits returns true if any commits have been processed
387func (ags *AgentGitState) HasSeenCommits() bool {
388 ags.mu.Lock()
389 defer ags.mu.Unlock()
390 return len(ags.seenCommits) > 0
391}
392
393func (ags *AgentGitState) RetryNumber() int {
394 ags.mu.Lock()
395 defer ags.mu.Unlock()
396 return ags.retryNumber
397}
398
399func (ags *AgentGitState) BranchName(prefix string) string {
400 ags.mu.Lock()
401 defer ags.mu.Unlock()
402 return ags.branchNameLocked(prefix)
403}
404
405func (ags *AgentGitState) branchNameLocked(prefix string) string {
406 if ags.slug == "" {
407 return ""
408 }
409 if ags.retryNumber == 0 {
410 return prefix + ags.slug
411 }
412 return fmt.Sprintf("%s%s%d", prefix, ags.slug, ags.retryNumber)
Philip Zeyligerf2872992025-05-22 10:35:28 -0700413}
414
Josh Bleecher Snyder664404e2025-06-04 21:56:42 +0000415func (ags *AgentGitState) Upstream() string {
416 ags.mu.Lock()
417 defer ags.mu.Unlock()
418 return ags.upstream
419}
420
Earl Lee2e463fb2025-04-17 11:22:22 -0700421type Agent struct {
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700422 convo ConvoInterface
423 config AgentConfig // config for this agent
Philip Zeyligerf2872992025-05-22 10:35:28 -0700424 gitState AgentGitState
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700425 workingDir string
426 repoRoot string // workingDir may be a subdir of repoRoot
427 url string
428 firstMessageIndex int // index of the first message in the current conversation
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000429 outsideHTTP string // base address of the outside webserver (only when under docker)
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700430 ready chan struct{} // closed when the agent is initialized (only when under docker)
Josh Bleecher Snydera997be62025-05-07 22:52:46 +0000431 codebase *onstart.Codebase
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700432 startedAt time.Time
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700433 originalBudget conversation.Budget
Josh Bleecher Snyderf4047bb2025-05-05 23:02:56 +0000434 codereview *codereview.CodeReviewer
Sean McCullough96b60dd2025-04-30 09:49:10 -0700435 // State machine to track agent state
436 stateMachine *StateMachine
Philip Zeyliger18532b22025-04-23 21:11:46 +0000437 // Outside information
438 outsideHostname string
439 outsideOS string
440 outsideWorkingDir string
Philip Zeyliger194bfa82025-06-24 06:03:06 -0700441 // MCP manager for handling MCP server connections
442 mcpManager *mcp.MCPManager
Philip Zeyliger5f26a342025-07-04 01:30:29 +0000443 // Port monitor for tracking TCP ports
444 portMonitor *PortMonitor
Earl Lee2e463fb2025-04-17 11:22:22 -0700445
446 // Time when the current turn started (reset at the beginning of InnerLoop)
447 startOfTurn time.Time
448
449 // Inbox - for messages from the user to the agent.
450 // sent on by UserMessage
451 // . e.g. when user types into the chat textarea
452 // read from by GatherMessages
453 inbox chan string
454
Sean McCulloughedc88dc2025-04-30 02:55:01 +0000455 // protects cancelTurn
456 cancelTurnMu sync.Mutex
Earl Lee2e463fb2025-04-17 11:22:22 -0700457 // cancels potentially long-running tool_use calls or chains of them
Sean McCulloughedc88dc2025-04-30 02:55:01 +0000458 cancelTurn context.CancelCauseFunc
Earl Lee2e463fb2025-04-17 11:22:22 -0700459
460 // protects following
461 mu sync.Mutex
462
463 // Stores all messages for this agent
464 history []AgentMessage
465
Philip Zeyligerb7c58752025-05-01 10:10:17 -0700466 // Iterators add themselves here when they're ready to be notified of new messages.
467 subscribers []chan *AgentMessage
Earl Lee2e463fb2025-04-17 11:22:22 -0700468
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000469 // Track outstanding LLM call IDs
470 outstandingLLMCalls map[string]struct{}
471
472 // Track outstanding tool calls by ID with their names
473 outstandingToolCalls map[string]string
Earl Lee2e463fb2025-04-17 11:22:22 -0700474}
475
banksean5ab8fb82025-07-09 12:34:55 -0700476// TokenContextWindow implements CodingAgent.
477func (a *Agent) TokenContextWindow() int {
478 return a.config.Service.TokenContextWindow()
479}
480
Philip Zeyliger43a0bfc2025-07-14 14:54:27 -0700481// GetConvo returns the conversation interface for debugging purposes.
482func (a *Agent) GetConvo() ConvoInterface {
483 return a.convo
484}
485
Philip Zeyligerb7c58752025-05-01 10:10:17 -0700486// NewIterator implements CodingAgent.
487func (a *Agent) NewIterator(ctx context.Context, nextMessageIdx int) MessageIterator {
488 a.mu.Lock()
489 defer a.mu.Unlock()
490
491 return &MessageIteratorImpl{
492 agent: a,
493 ctx: ctx,
494 nextMessageIdx: nextMessageIdx,
495 ch: make(chan *AgentMessage, 100),
496 }
497}
498
499type MessageIteratorImpl struct {
500 agent *Agent
501 ctx context.Context
502 nextMessageIdx int
503 ch chan *AgentMessage
504 subscribed bool
505}
506
507func (m *MessageIteratorImpl) Close() {
508 m.agent.mu.Lock()
509 defer m.agent.mu.Unlock()
510 // Delete ourselves from the subscribers list
511 m.agent.subscribers = slices.DeleteFunc(m.agent.subscribers, func(x chan *AgentMessage) bool {
512 return x == m.ch
513 })
514 close(m.ch)
515}
516
517func (m *MessageIteratorImpl) Next() *AgentMessage {
518 // We avoid subscription at creation to let ourselves catch up to "current state"
519 // before subscribing.
520 if !m.subscribed {
521 m.agent.mu.Lock()
522 if m.nextMessageIdx < len(m.agent.history) {
523 msg := &m.agent.history[m.nextMessageIdx]
524 m.nextMessageIdx++
525 m.agent.mu.Unlock()
526 return msg
527 }
528 // The next message doesn't exist yet, so let's subscribe
529 m.agent.subscribers = append(m.agent.subscribers, m.ch)
530 m.subscribed = true
531 m.agent.mu.Unlock()
532 }
533
534 for {
535 select {
536 case <-m.ctx.Done():
537 m.agent.mu.Lock()
538 // Delete ourselves from the subscribers list
539 m.agent.subscribers = slices.DeleteFunc(m.agent.subscribers, func(x chan *AgentMessage) bool {
540 return x == m.ch
541 })
542 m.subscribed = false
543 m.agent.mu.Unlock()
544 return nil
545 case msg, ok := <-m.ch:
546 if !ok {
547 // Close may have been called
548 return nil
549 }
550 if msg.Idx == m.nextMessageIdx {
551 m.nextMessageIdx++
552 return msg
553 }
554 slog.Debug("Out of order messages", "expected", m.nextMessageIdx, "got", msg.Idx, "m", msg.Content)
555 panic("out of order message")
556 }
557 }
558}
559
Sean McCulloughd9d45812025-04-30 16:53:41 -0700560// Assert that Agent satisfies the CodingAgent interface.
561var _ CodingAgent = &Agent{}
562
563// StateName implements CodingAgent.
564func (a *Agent) CurrentStateName() string {
565 if a.stateMachine == nil {
566 return ""
567 }
Josh Bleecher Snydered17fdf2025-05-23 17:26:07 +0000568 return a.stateMachine.CurrentState().String()
Sean McCulloughd9d45812025-04-30 16:53:41 -0700569}
570
Josh Bleecher Snyder112b9232025-05-23 11:26:33 -0700571// CurrentTodoContent returns the current todo list data as JSON.
572// It returns an empty string if no todos exist.
573func (a *Agent) CurrentTodoContent() string {
574 todoPath := claudetool.TodoFilePath(a.config.SessionID)
575 content, err := os.ReadFile(todoPath)
576 if err != nil {
577 return ""
578 }
579 return string(content)
580}
581
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700582// generateConversationSummary asks the LLM to create a comprehensive summary of the current conversation
583func (a *Agent) generateConversationSummary(ctx context.Context) (string, error) {
584 msg := `You are being asked to create a comprehensive summary of our conversation so far. This summary will be used to restart our conversation with a shorter history while preserving all important context.
585
586IMPORTANT: Focus ONLY on the actual conversation with the user. Do NOT include any information from system prompts, tool descriptions, or general instructions. Only summarize what the user asked for and what we accomplished together.
587
588Please create a detailed summary that includes:
589
5901. **User's Request**: What did the user originally ask me to do? What was their goal?
591
5922. **Work Completed**: What have we accomplished together? Include any code changes, files created/modified, problems solved, etc.
593
5943. **Key Technical Decisions**: What important technical choices were made during our work and why?
595
5964. **Current State**: What is the current state of the project? What files, tools, or systems are we working with?
597
5985. **Next Steps**: What still needs to be done to complete the user's request?
599
6006. **Important Context**: Any crucial information about the user's codebase, environment, constraints, or specific preferences they mentioned.
601
602Focus on actionable information that would help me continue the user's work seamlessly. Ignore any general tool capabilities or system instructions - only include what's relevant to this specific user's project and goals.
603
604Reply with ONLY the summary content - no meta-commentary about creating the summary.`
605
606 userMessage := llm.UserStringMessage(msg)
607 // Use a subconversation with history to get the summary
608 // TODO: We don't have any tools here, so we should have enough tokens
609 // to capture a summary, but we may need to modify the history (e.g., remove
610 // TODO data) to save on some tokens.
611 convo := a.convo.SubConvoWithHistory()
612
613 // Modify the system prompt to provide context about the original task
614 originalSystemPrompt := convo.SystemPrompt
Josh Bleecher Snyder068f4bb2025-06-05 19:12:22 +0000615 convo.SystemPrompt = `You are creating a conversation summary for context compaction. The original system prompt contained instructions about being a software engineer and architect for Sketch (an agentic coding environment), with various tools and capabilities for code analysis, file modification, git operations, browser automation, and project management.
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700616
617Your task is to create a focused summary as requested below. Focus only on the actual user conversation and work accomplished, not the system capabilities or tool descriptions.
618
Josh Bleecher Snyder068f4bb2025-06-05 19:12:22 +0000619Original context: You are working in a coding environment with full access to development tools.`
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700620
621 resp, err := convo.SendMessage(userMessage)
622 if err != nil {
623 a.pushToOutbox(ctx, errorMessage(err))
624 return "", err
625 }
626 textContent := collectTextContent(resp)
627
628 // Restore original system prompt (though this subconvo will be discarded)
629 convo.SystemPrompt = originalSystemPrompt
630
631 return textContent, nil
632}
633
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000634// dumpMessageHistoryToTmp dumps the agent's entire message history to /tmp as JSON
635// and returns the filename
636func (a *Agent) dumpMessageHistoryToTmp(ctx context.Context) (string, error) {
637 // Create a filename based on session ID and timestamp
638 timestamp := time.Now().Format("20060102-150405")
639 filename := fmt.Sprintf("/tmp/sketch-messages-%s-%s.json", a.config.SessionID, timestamp)
640
641 // Marshal the entire message history to JSON
642 jsonData, err := json.MarshalIndent(a.history, "", " ")
643 if err != nil {
644 return "", fmt.Errorf("failed to marshal message history: %w", err)
645 }
646
647 // Write to file
Autoformatter3ad8c8d2025-07-15 21:05:23 +0000648 if err := os.WriteFile(filename, jsonData, 0o644); err != nil {
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000649 return "", fmt.Errorf("failed to write message history to %s: %w", filename, err)
650 }
651
652 slog.InfoContext(ctx, "Dumped message history to file", "filename", filename, "message_count", len(a.history))
653 return filename, nil
654}
655
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700656// CompactConversation compacts the current conversation by generating a summary
657// and restarting the conversation with that summary as the initial context
658func (a *Agent) CompactConversation(ctx context.Context) error {
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000659 // Dump the entire message history to /tmp as JSON before compacting
660 dumpFile, err := a.dumpMessageHistoryToTmp(ctx)
661 if err != nil {
662 slog.WarnContext(ctx, "Failed to dump message history to /tmp", "error", err)
663 // Continue with compaction even if dump fails
664 }
665
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700666 summary, err := a.generateConversationSummary(ctx)
667 if err != nil {
668 return fmt.Errorf("failed to generate conversation summary: %w", err)
669 }
670
671 a.mu.Lock()
672
673 // Get usage information before resetting conversation
674 lastUsage := a.convo.LastUsage()
675 contextWindow := a.config.Service.TokenContextWindow()
676 currentContextSize := lastUsage.InputTokens + lastUsage.CacheReadInputTokens + lastUsage.CacheCreationInputTokens
677
philip.zeyliger882e7ea2025-06-20 14:31:16 +0000678 // Preserve cumulative usage across compaction
679 cumulativeUsage := a.convo.CumulativeUsage()
680
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700681 // Reset conversation state but keep all other state (git, working dir, etc.)
682 a.firstMessageIndex = len(a.history)
philip.zeyliger882e7ea2025-06-20 14:31:16 +0000683 a.convo = a.initConvoWithUsage(&cumulativeUsage)
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700684
685 a.mu.Unlock()
686
687 // Create informative compaction message with token details
688 compactionMsg := fmt.Sprintf("📜 Conversation compacted to manage token limits. Previous context preserved in summary below.\n\n"+
689 "**Token Usage:** %d / %d tokens (%.1f%% of context window)",
690 currentContextSize, contextWindow, float64(currentContextSize)/float64(contextWindow)*100)
691
692 a.pushToOutbox(ctx, AgentMessage{
693 Type: CompactMessageType,
694 Content: compactionMsg,
695 })
696
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000697 // Create the message content with dump file information if available
698 var messageContent string
699 if dumpFile != "" {
700 messageContent = fmt.Sprintf("Here's a summary of our previous work:\n\n%s\n\nThe complete message history has been dumped to %s for your reference if needed.\n\nPlease continue with the work based on this summary.", summary, dumpFile)
701 } else {
702 messageContent = fmt.Sprintf("Here's a summary of our previous work:\n\n%s\n\nPlease continue with the work based on this summary.", summary)
703 }
704
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700705 a.pushToOutbox(ctx, AgentMessage{
706 Type: UserMessageType,
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000707 Content: messageContent,
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700708 })
Philip Zeyliger9022ae02025-07-14 20:52:30 +0000709 a.inbox <- messageContent
Philip Zeyligerb8a8f352025-06-02 07:39:37 -0700710
711 return nil
712}
713
Earl Lee2e463fb2025-04-17 11:22:22 -0700714func (a *Agent) URL() string { return a.url }
715
Philip Zeyliger5f26a342025-07-04 01:30:29 +0000716// GetPorts returns the cached list of open TCP ports.
717func (a *Agent) GetPorts() []portlist.Port {
718 if a.portMonitor == nil {
719 return nil
720 }
721 return a.portMonitor.GetPorts()
722}
723
Josh Bleecher Snyder47b19362025-04-30 01:34:14 +0000724// BranchName returns the git branch name for the conversation.
725func (a *Agent) BranchName() string {
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700726 return a.gitState.BranchName(a.config.BranchPrefix)
727}
728
729// Slug returns the slug identifier for this conversation.
730func (a *Agent) Slug() string {
731 return a.gitState.Slug()
732}
733
734// IncrementRetryNumber increments the retry number for branch naming conflicts
735func (a *Agent) IncrementRetryNumber() {
736 a.gitState.IncrementRetryNumber()
Josh Bleecher Snyder47b19362025-04-30 01:34:14 +0000737}
738
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000739// OutstandingLLMCallCount returns the number of outstanding LLM calls.
740func (a *Agent) OutstandingLLMCallCount() int {
741 a.mu.Lock()
742 defer a.mu.Unlock()
743 return len(a.outstandingLLMCalls)
744}
745
746// OutstandingToolCalls returns the names of outstanding tool calls.
747func (a *Agent) OutstandingToolCalls() []string {
748 a.mu.Lock()
749 defer a.mu.Unlock()
750
751 tools := make([]string, 0, len(a.outstandingToolCalls))
752 for _, toolName := range a.outstandingToolCalls {
753 tools = append(tools, toolName)
754 }
755 return tools
756}
757
Earl Lee2e463fb2025-04-17 11:22:22 -0700758// OS returns the operating system of the client.
759func (a *Agent) OS() string {
760 return a.config.ClientGOOS
761}
762
Philip Zeyligerc72fff52025-04-29 20:17:54 +0000763func (a *Agent) SessionID() string {
764 return a.config.SessionID
765}
766
philip.zeyliger8773e682025-06-11 21:36:21 -0700767// SSHConnectionString returns the SSH connection string for the container.
768func (a *Agent) SSHConnectionString() string {
769 return a.config.SSHConnectionString
770}
771
Philip Zeyliger18532b22025-04-23 21:11:46 +0000772// OutsideOS returns the operating system of the outside system.
773func (a *Agent) OutsideOS() string {
774 return a.outsideOS
Philip Zeyligerd1402952025-04-23 03:54:37 +0000775}
776
Philip Zeyliger18532b22025-04-23 21:11:46 +0000777// OutsideHostname returns the hostname of the outside system.
778func (a *Agent) OutsideHostname() string {
779 return a.outsideHostname
Philip Zeyligerd1402952025-04-23 03:54:37 +0000780}
781
Philip Zeyliger18532b22025-04-23 21:11:46 +0000782// OutsideWorkingDir returns the working directory on the outside system.
783func (a *Agent) OutsideWorkingDir() string {
784 return a.outsideWorkingDir
Philip Zeyligerd1402952025-04-23 03:54:37 +0000785}
786
787// GitOrigin returns the URL of the git remote 'origin' if it exists.
788func (a *Agent) GitOrigin() string {
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +0000789 return a.config.OriginalGitOrigin
Philip Zeyligerd1402952025-04-23 03:54:37 +0000790}
791
Philip Zeyliger254c49f2025-07-17 17:26:24 -0700792// PassthroughUpstream returns whether passthrough upstream is enabled.
793func (a *Agent) PassthroughUpstream() bool {
794 return a.config.PassthroughUpstream
795}
796
bankseancad67b02025-06-27 21:57:05 +0000797// GitUsername returns the git user name from the agent config.
798func (a *Agent) GitUsername() string {
799 return a.config.GitUsername
800}
801
Philip Zeyliger64f60462025-06-16 13:57:10 -0700802// DiffStats returns the number of lines added and removed from sketch-base to HEAD
803func (a *Agent) DiffStats() (int, int) {
804 return a.gitState.DiffStats()
805}
806
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000807func (a *Agent) OpenBrowser(url string) {
808 if !a.IsInContainer() {
809 browser.Open(url)
810 return
811 }
812 // We're in Docker, need to send a request to the Git server
813 // to signal that the outer process should open the browser.
Josh Bleecher Snyder99570462025-05-05 10:26:14 -0700814 // We don't get to specify a URL, because we are untrusted.
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000815 httpc := &http.Client{Timeout: 5 * time.Second}
Josh Bleecher Snyder99570462025-05-05 10:26:14 -0700816 resp, err := httpc.Post(a.outsideHTTP+"/browser", "text/plain", nil)
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000817 if err != nil {
Josh Bleecher Snyder99570462025-05-05 10:26:14 -0700818 slog.Debug("browser launch request connection failed", "err", err)
Josh Bleecher Snyder3e2111b2025-04-30 17:53:28 +0000819 return
820 }
821 defer resp.Body.Close()
822 if resp.StatusCode == http.StatusOK {
823 return
824 }
825 body, _ := io.ReadAll(resp.Body)
826 slog.Debug("browser launch request execution failed", "status", resp.Status, "body", string(body))
827}
828
Sean McCullough96b60dd2025-04-30 09:49:10 -0700829// CurrentState returns the current state of the agent's state machine.
830func (a *Agent) CurrentState() State {
831 return a.stateMachine.CurrentState()
832}
833
Philip Zeyliger2c4db092025-04-28 16:57:50 -0700834func (a *Agent) IsInContainer() bool {
835 return a.config.InDocker
836}
837
838func (a *Agent) FirstMessageIndex() int {
839 a.mu.Lock()
840 defer a.mu.Unlock()
841 return a.firstMessageIndex
842}
843
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700844// SetSlug sets a human-readable identifier for the conversation.
845func (a *Agent) SetSlug(slug string) {
Earl Lee2e463fb2025-04-17 11:22:22 -0700846 a.mu.Lock()
847 defer a.mu.Unlock()
Philip Zeyligerb7c58752025-05-01 10:10:17 -0700848
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700849 a.gitState.SetSlug(slug)
Josh Bleecher Snyder31785ae2025-05-06 01:50:58 +0000850 convo, ok := a.convo.(*conversation.Convo)
851 if ok {
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -0700852 convo.ExtraData["branch"] = a.BranchName()
Josh Bleecher Snyder31785ae2025-05-06 01:50:58 +0000853 }
Earl Lee2e463fb2025-04-17 11:22:22 -0700854}
855
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000856// OnToolCall implements ant.Listener and tracks the start of a tool call.
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700857func (a *Agent) OnToolCall(ctx context.Context, convo *conversation.Convo, id string, toolName string, toolInput json.RawMessage, content llm.Content) {
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000858 // Track the tool call
859 a.mu.Lock()
860 a.outstandingToolCalls[id] = toolName
861 a.mu.Unlock()
862}
863
Philip Zeyliger72252cb2025-05-10 17:00:08 -0700864// contentToString converts []llm.Content to a string, concatenating all text content and skipping non-text types.
865// If there's only one element in the array and it's a text type, it returns that text directly.
866// It also processes nested ToolResult arrays recursively.
867func contentToString(contents []llm.Content) string {
868 if len(contents) == 0 {
869 return ""
870 }
871
872 // If there's only one element and it's a text type, return it directly
873 if len(contents) == 1 && contents[0].Type == llm.ContentTypeText {
874 return contents[0].Text
875 }
876
877 // Otherwise, concatenate all text content
878 var result strings.Builder
879 for _, content := range contents {
880 if content.Type == llm.ContentTypeText {
881 result.WriteString(content.Text)
882 } else if content.Type == llm.ContentTypeToolResult && len(content.ToolResult) > 0 {
883 // Recursively process nested tool results
884 result.WriteString(contentToString(content.ToolResult))
885 }
886 }
887
888 return result.String()
889}
890
Earl Lee2e463fb2025-04-17 11:22:22 -0700891// OnToolResult implements ant.Listener.
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700892func (a *Agent) OnToolResult(ctx context.Context, convo *conversation.Convo, toolID string, toolName string, toolInput json.RawMessage, content llm.Content, result *string, err error) {
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000893 // Remove the tool call from outstanding calls
894 a.mu.Lock()
895 delete(a.outstandingToolCalls, toolID)
896 a.mu.Unlock()
897
Earl Lee2e463fb2025-04-17 11:22:22 -0700898 m := AgentMessage{
899 Type: ToolUseMessageType,
900 Content: content.Text,
Philip Zeyliger72252cb2025-05-10 17:00:08 -0700901 ToolResult: contentToString(content.ToolResult),
Earl Lee2e463fb2025-04-17 11:22:22 -0700902 ToolError: content.ToolError,
903 ToolName: toolName,
904 ToolInput: string(toolInput),
905 ToolCallId: content.ToolUseID,
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700906 StartTime: content.ToolUseStartTime,
907 EndTime: content.ToolUseEndTime,
Earl Lee2e463fb2025-04-17 11:22:22 -0700908 }
909
910 // Calculate the elapsed time if both start and end times are set
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700911 if content.ToolUseStartTime != nil && content.ToolUseEndTime != nil {
912 elapsed := content.ToolUseEndTime.Sub(*content.ToolUseStartTime)
Earl Lee2e463fb2025-04-17 11:22:22 -0700913 m.Elapsed = &elapsed
914 }
915
Josh Bleecher Snyder50a1d622025-04-29 09:59:03 -0700916 m.SetConvo(convo)
Earl Lee2e463fb2025-04-17 11:22:22 -0700917 a.pushToOutbox(ctx, m)
918}
919
920// OnRequest implements ant.Listener.
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700921func (a *Agent) OnRequest(ctx context.Context, convo *conversation.Convo, id string, msg *llm.Message) {
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000922 a.mu.Lock()
923 defer a.mu.Unlock()
924 a.outstandingLLMCalls[id] = struct{}{}
Earl Lee2e463fb2025-04-17 11:22:22 -0700925 // We already get tool results from the above. We send user messages to the outbox in the agent loop.
926}
927
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700928// OnResponse implements conversation.Listener. Responses contain messages from the LLM
Earl Lee2e463fb2025-04-17 11:22:22 -0700929// that need to be displayed (as well as tool calls that we send along when
930// they're done). (It would be reasonable to also mention tool calls when they're
931// started, but we don't do that yet.)
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700932func (a *Agent) OnResponse(ctx context.Context, convo *conversation.Convo, id string, resp *llm.Response) {
Philip Zeyliger99a9a022025-04-27 15:15:25 +0000933 // Remove the LLM call from outstanding calls
934 a.mu.Lock()
935 delete(a.outstandingLLMCalls, id)
936 a.mu.Unlock()
937
Josh Bleecher Snyder50a1d622025-04-29 09:59:03 -0700938 if resp == nil {
939 // LLM API call failed
940 m := AgentMessage{
941 Type: ErrorMessageType,
942 Content: "API call failed, type 'continue' to try again",
943 }
944 m.SetConvo(convo)
945 a.pushToOutbox(ctx, m)
946 return
947 }
948
Earl Lee2e463fb2025-04-17 11:22:22 -0700949 endOfTurn := false
Josh Bleecher Snyder4fcde4a2025-05-05 18:28:13 -0700950 if convo.Parent == nil { // subconvos never end the turn
951 switch resp.StopReason {
952 case llm.StopReasonToolUse:
953 // Check whether any of the tool calls are for tools that should end the turn
954 ToolSearch:
955 for _, part := range resp.Content {
956 if part.Type != llm.ContentTypeToolUse {
957 continue
958 }
Sean McCullough021557a2025-05-05 23:20:53 +0000959 // Find the tool by name
960 for _, tool := range convo.Tools {
Josh Bleecher Snyder4fcde4a2025-05-05 18:28:13 -0700961 if tool.Name == part.ToolName {
962 endOfTurn = tool.EndsTurn
963 break ToolSearch
Sean McCullough021557a2025-05-05 23:20:53 +0000964 }
965 }
Sean McCullough021557a2025-05-05 23:20:53 +0000966 }
Josh Bleecher Snyder4fcde4a2025-05-05 18:28:13 -0700967 default:
968 endOfTurn = true
Sean McCullough021557a2025-05-05 23:20:53 +0000969 }
Earl Lee2e463fb2025-04-17 11:22:22 -0700970 }
971 m := AgentMessage{
972 Type: AgentMessageType,
973 Content: collectTextContent(resp),
974 EndOfTurn: endOfTurn,
975 Usage: &resp.Usage,
976 StartTime: resp.StartTime,
977 EndTime: resp.EndTime,
978 }
979
980 // Extract any tool calls from the response
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700981 if resp.StopReason == llm.StopReasonToolUse {
Earl Lee2e463fb2025-04-17 11:22:22 -0700982 var toolCalls []ToolCall
983 for _, part := range resp.Content {
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -0700984 if part.Type == llm.ContentTypeToolUse {
Earl Lee2e463fb2025-04-17 11:22:22 -0700985 toolCalls = append(toolCalls, ToolCall{
986 Name: part.ToolName,
987 Input: string(part.ToolInput),
988 ToolCallId: part.ID,
989 })
990 }
991 }
992 m.ToolCalls = toolCalls
993 }
994
995 // Calculate the elapsed time if both start and end times are set
996 if resp.StartTime != nil && resp.EndTime != nil {
997 elapsed := resp.EndTime.Sub(*resp.StartTime)
998 m.Elapsed = &elapsed
999 }
1000
Josh Bleecher Snyder50a1d622025-04-29 09:59:03 -07001001 m.SetConvo(convo)
Earl Lee2e463fb2025-04-17 11:22:22 -07001002 a.pushToOutbox(ctx, m)
1003}
1004
1005// WorkingDir implements CodingAgent.
1006func (a *Agent) WorkingDir() string {
1007 return a.workingDir
1008}
1009
Josh Bleecher Snyderc5848f32025-05-28 18:50:58 +00001010// RepoRoot returns the git repository root directory.
1011func (a *Agent) RepoRoot() string {
1012 return a.repoRoot
1013}
1014
Earl Lee2e463fb2025-04-17 11:22:22 -07001015// MessageCount implements CodingAgent.
1016func (a *Agent) MessageCount() int {
1017 a.mu.Lock()
1018 defer a.mu.Unlock()
1019 return len(a.history)
1020}
1021
1022// Messages implements CodingAgent.
1023func (a *Agent) Messages(start int, end int) []AgentMessage {
1024 a.mu.Lock()
1025 defer a.mu.Unlock()
1026 return slices.Clone(a.history[start:end])
1027}
1028
Philip Zeyligerb8a8f352025-06-02 07:39:37 -07001029// ShouldCompact checks if the conversation should be compacted based on token usage
1030func (a *Agent) ShouldCompact() bool {
1031 // Get the threshold from environment variable, default to 0.94 (94%)
1032 // (Because default Claude output is 8192 tokens, which is 4% of 200,000 tokens,
1033 // and a little bit of buffer.)
1034 thresholdRatio := 0.94
1035 if envThreshold := os.Getenv("SKETCH_COMPACT_THRESHOLD_RATIO"); envThreshold != "" {
1036 if parsed, err := strconv.ParseFloat(envThreshold, 64); err == nil && parsed > 0 && parsed <= 1.0 {
1037 thresholdRatio = parsed
1038 }
1039 }
1040
1041 // Get the most recent usage to check current context size
1042 lastUsage := a.convo.LastUsage()
1043
1044 if lastUsage.InputTokens == 0 {
1045 // No API calls made yet
1046 return false
1047 }
1048
1049 // Calculate the current context size from the last API call
1050 // This includes all tokens that were part of the input context:
1051 // - Input tokens (user messages, system prompt, conversation history)
1052 // - Cache read tokens (cached parts of the context)
1053 // - Cache creation tokens (new parts being cached)
1054 currentContextSize := lastUsage.InputTokens + lastUsage.CacheReadInputTokens + lastUsage.CacheCreationInputTokens
1055
1056 // Get the service's token context window
1057 service := a.config.Service
1058 contextWindow := service.TokenContextWindow()
1059
1060 // Calculate threshold
1061 threshold := uint64(float64(contextWindow) * thresholdRatio)
1062
1063 // Check if we've exceeded the threshold
1064 return currentContextSize >= threshold
1065}
1066
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001067func (a *Agent) OriginalBudget() conversation.Budget {
Earl Lee2e463fb2025-04-17 11:22:22 -07001068 return a.originalBudget
1069}
1070
Josh Bleecher Snyder664404e2025-06-04 21:56:42 +00001071// Upstream returns the upstream branch for git work
1072func (a *Agent) Upstream() string {
1073 return a.gitState.Upstream()
1074}
1075
Earl Lee2e463fb2025-04-17 11:22:22 -07001076// AgentConfig contains configuration for creating a new Agent.
1077type AgentConfig struct {
Josh Bleecher Snyderb421a242025-05-29 23:22:55 +00001078 Context context.Context
1079 Service llm.Service
1080 Budget conversation.Budget
1081 GitUsername string
1082 GitEmail string
1083 SessionID string
1084 ClientGOOS string
1085 ClientGOARCH string
1086 InDocker bool
1087 OneShot bool
1088 WorkingDir string
Philip Zeyliger18532b22025-04-23 21:11:46 +00001089 // Outside information
1090 OutsideHostname string
1091 OutsideOS string
1092 OutsideWorkingDir string
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001093
1094 // Outtie's HTTP to, e.g., open a browser
1095 OutsideHTTP string
1096 // Outtie's Git server
1097 GitRemoteAddr string
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +00001098 // Original git origin URL from host repository, if any
1099 OriginalGitOrigin string
Josh Bleecher Snyder664404e2025-06-04 21:56:42 +00001100 // Upstream branch for git work
1101 Upstream string
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001102 // Commit to checkout from Outtie
1103 Commit string
Philip Zeyligerbe7802a2025-06-04 20:15:25 +00001104 // Prefix for git branches created by sketch
1105 BranchPrefix string
philip.zeyliger6d3de482025-06-10 19:38:14 -07001106 // LinkToGitHub enables GitHub branch linking in UI
1107 LinkToGitHub bool
philip.zeyliger8773e682025-06-11 21:36:21 -07001108 // SSH connection string for connecting to the container
1109 SSHConnectionString string
Philip Zeyligerc17ffe32025-06-05 19:49:13 -07001110 // Skaband client for session history (optional)
1111 SkabandClient *skabandclient.SkabandClient
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001112 // MCP server configurations
1113 MCPServers []string
Josh Bleecher Snyder17b2fd92025-07-09 22:47:13 +00001114 // Timeout configuration for bash tool
1115 BashTimeouts *claudetool.Timeouts
Philip Zeyliger254c49f2025-07-17 17:26:24 -07001116 // PassthroughUpstream configures upstream remote for passthrough to innie
1117 PassthroughUpstream bool
Earl Lee2e463fb2025-04-17 11:22:22 -07001118}
1119
1120// NewAgent creates a new Agent.
1121// It is not usable until Init() is called.
1122func NewAgent(config AgentConfig) *Agent {
Philip Zeyligerbe7802a2025-06-04 20:15:25 +00001123 // Set default branch prefix if not specified
1124 if config.BranchPrefix == "" {
1125 config.BranchPrefix = "sketch/"
1126 }
1127
Earl Lee2e463fb2025-04-17 11:22:22 -07001128 agent := &Agent{
Philip Zeyligerf2872992025-05-22 10:35:28 -07001129 config: config,
1130 ready: make(chan struct{}),
1131 inbox: make(chan string, 100),
1132 subscribers: make([]chan *AgentMessage, 0),
1133 startedAt: time.Now(),
1134 originalBudget: config.Budget,
1135 gitState: AgentGitState{
1136 seenCommits: make(map[string]bool),
1137 gitRemoteAddr: config.GitRemoteAddr,
Josh Bleecher Snyder664404e2025-06-04 21:56:42 +00001138 upstream: config.Upstream,
Philip Zeyligerf2872992025-05-22 10:35:28 -07001139 },
Philip Zeyliger99a9a022025-04-27 15:15:25 +00001140 outsideHostname: config.OutsideHostname,
1141 outsideOS: config.OutsideOS,
1142 outsideWorkingDir: config.OutsideWorkingDir,
1143 outstandingLLMCalls: make(map[string]struct{}),
1144 outstandingToolCalls: make(map[string]string),
Sean McCullough96b60dd2025-04-30 09:49:10 -07001145 stateMachine: NewStateMachine(),
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001146 workingDir: config.WorkingDir,
1147 outsideHTTP: config.OutsideHTTP,
Philip Zeyligerda623b52025-07-04 01:12:38 +00001148
1149 mcpManager: mcp.NewMCPManager(),
Earl Lee2e463fb2025-04-17 11:22:22 -07001150 }
Philip Zeyliger5f26a342025-07-04 01:30:29 +00001151
1152 // Initialize port monitor with 5-second interval
1153 agent.portMonitor = NewPortMonitor(agent, 5*time.Second)
1154
Earl Lee2e463fb2025-04-17 11:22:22 -07001155 return agent
1156}
1157
1158type AgentInit struct {
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001159 NoGit bool // only for testing
Earl Lee2e463fb2025-04-17 11:22:22 -07001160
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001161 InDocker bool
1162 HostAddr string
Earl Lee2e463fb2025-04-17 11:22:22 -07001163}
1164
1165func (a *Agent) Init(ini AgentInit) error {
Josh Bleecher Snyder9c07e1d2025-04-28 19:25:37 -07001166 if a.convo != nil {
1167 return fmt.Errorf("Agent.Init: already initialized")
1168 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001169 ctx := a.config.Context
Philip Zeyliger716bfee2025-05-21 18:32:31 -07001170 slog.InfoContext(ctx, "agent initializing")
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001171
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +00001172 // If a remote + commit was specified, clone it.
1173 if a.config.Commit != "" && a.gitState.gitRemoteAddr != "" {
Philip Zeyliger254c49f2025-07-17 17:26:24 -07001174 if _, err := os.Stat("/app/.git"); err != nil {
Josh Bleecher Snyder369f2622025-07-15 00:02:59 +00001175 slog.InfoContext(ctx, "cloning git repo", "commit", a.config.Commit)
1176 // TODO: --reference-if-able instead?
1177 cmd := exec.CommandContext(ctx, "git", "clone", "--reference", "/git-ref", a.gitState.gitRemoteAddr, "/app")
1178 if out, err := cmd.CombinedOutput(); err != nil {
1179 return fmt.Errorf("failed to clone repository from %s: %s: %w", a.gitState.gitRemoteAddr, out, err)
1180 }
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +00001181 }
1182 }
1183
1184 if a.workingDir != "" {
1185 err := os.Chdir(a.workingDir)
1186 if err != nil {
1187 return fmt.Errorf("failed to change working directory to %s: %w", a.workingDir, err)
1188 }
1189 }
1190
Philip Zeyliger2f0eb692025-06-04 09:53:42 -07001191 if !ini.NoGit {
Philip Zeyligeraccf37c2025-07-18 07:29:19 -07001192 if a.gitState.gitRemoteAddr != "" {
1193 if err := upsertRemoteOrigin(ctx, "/app", a.gitState.gitRemoteAddr); err != nil {
1194 return err
1195 }
Philip Zeyliger254c49f2025-07-17 17:26:24 -07001196 }
Philip Zeyligere1c8b7b2025-07-03 14:50:26 -07001197
1198 // Configure git user settings
1199 if a.config.GitEmail != "" {
1200 cmd := exec.CommandContext(ctx, "git", "config", "--global", "user.email", a.config.GitEmail)
1201 cmd.Dir = a.workingDir
1202 if out, err := cmd.CombinedOutput(); err != nil {
1203 return fmt.Errorf("git config --global user.email: %s: %v", out, err)
1204 }
1205 }
1206 if a.config.GitUsername != "" {
1207 cmd := exec.CommandContext(ctx, "git", "config", "--global", "user.name", a.config.GitUsername)
1208 cmd.Dir = a.workingDir
1209 if out, err := cmd.CombinedOutput(); err != nil {
1210 return fmt.Errorf("git config --global user.name: %s: %v", out, err)
1211 }
1212 }
1213 // Configure git http.postBuffer
1214 cmd := exec.CommandContext(ctx, "git", "config", "--global", "http.postBuffer", "524288000")
1215 cmd.Dir = a.workingDir
1216 if out, err := cmd.CombinedOutput(); err != nil {
1217 return fmt.Errorf("git config --global http.postBuffer: %s: %v", out, err)
1218 }
Philip Zeyliger254c49f2025-07-17 17:26:24 -07001219
1220 // Configure passthrough upstream if enabled
1221 if a.config.PassthroughUpstream {
1222 if err := a.configurePassthroughUpstream(ctx); err != nil {
1223 return fmt.Errorf("failed to configure passthrough upstream: %w", err)
1224 }
1225 }
Philip Zeyliger2f0eb692025-06-04 09:53:42 -07001226 }
1227
Philip Zeyligerf2872992025-05-22 10:35:28 -07001228 // If a commit was specified, we fetch and reset to it.
1229 if a.config.Commit != "" && a.gitState.gitRemoteAddr != "" {
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +00001230 slog.InfoContext(ctx, "updating git repo", "commit", a.config.Commit)
Philip Zeyliger716bfee2025-05-21 18:32:31 -07001231
Josh Bleecher Snyder784d5bd2025-07-11 00:09:30 +00001232 cmd := exec.CommandContext(ctx, "git", "fetch", "--prune", "origin")
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001233 cmd.Dir = a.workingDir
Earl Lee2e463fb2025-04-17 11:22:22 -07001234 if out, err := cmd.CombinedOutput(); err != nil {
1235 return fmt.Errorf("git fetch: %s: %w", out, err)
1236 }
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07001237 // The -B resets the branch if it already exists (or creates it if it doesn't)
1238 cmd = exec.CommandContext(ctx, "git", "checkout", "-f", "-B", "sketch-wip", a.config.Commit)
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001239 cmd.Dir = a.workingDir
Pokey Rule7a113622025-05-12 10:58:45 +01001240 if checkoutOut, err := cmd.CombinedOutput(); err != nil {
1241 // Remove git hooks if they exist and retry
1242 // Only try removing hooks if we haven't already removed them during fetch
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001243 hookPath := filepath.Join(a.workingDir, ".git", "hooks")
Pokey Rule7a113622025-05-12 10:58:45 +01001244 if _, statErr := os.Stat(hookPath); statErr == nil {
1245 slog.WarnContext(ctx, "git checkout failed, removing hooks and retrying",
1246 slog.String("error", err.Error()),
1247 slog.String("output", string(checkoutOut)))
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001248 if removeErr := removeGitHooks(ctx, a.workingDir); removeErr != nil {
Pokey Rule7a113622025-05-12 10:58:45 +01001249 slog.WarnContext(ctx, "failed to remove git hooks", slog.String("error", removeErr.Error()))
1250 }
1251
1252 // Retry the checkout operation
Philip Zeyliger1417b692025-06-12 11:07:04 -07001253 cmd = exec.CommandContext(ctx, "git", "checkout", "-f", "-B", "sketch-wip", a.config.Commit)
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001254 cmd.Dir = a.workingDir
Pokey Rule7a113622025-05-12 10:58:45 +01001255 if retryOut, retryErr := cmd.CombinedOutput(); retryErr != nil {
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001256 return fmt.Errorf("git checkout %s failed even after removing hooks: %s: %w", a.config.Commit, retryOut, retryErr)
Pokey Rule7a113622025-05-12 10:58:45 +01001257 }
1258 } else {
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07001259 return fmt.Errorf("git checkout -f -B sketch-wip %s: %s: %w", a.config.Commit, checkoutOut, err)
Pokey Rule7a113622025-05-12 10:58:45 +01001260 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001261 }
Philip Zeyliger4c1cea82025-06-09 14:16:52 -07001262 } else if a.IsInContainer() {
1263 // If we're not running in a container, we don't switch branches (nor push branches back and forth).
1264 slog.InfoContext(ctx, "checking out branch", slog.String("commit", a.config.Commit))
1265 cmd := exec.CommandContext(ctx, "git", "checkout", "-f", "-B", "sketch-wip")
1266 cmd.Dir = a.workingDir
1267 if checkoutOut, err := cmd.CombinedOutput(); err != nil {
1268 return fmt.Errorf("git checkout -f -B sketch-wip: %s: %w", checkoutOut, err)
1269 }
1270 } else {
1271 slog.InfoContext(ctx, "Not checking out any branch")
Earl Lee2e463fb2025-04-17 11:22:22 -07001272 }
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001273
1274 if ini.HostAddr != "" {
1275 a.url = "http://" + ini.HostAddr
1276 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001277
1278 if !ini.NoGit {
1279 repoRoot, err := repoRoot(ctx, a.workingDir)
1280 if err != nil {
1281 return fmt.Errorf("repoRoot: %w", err)
1282 }
1283 a.repoRoot = repoRoot
1284
Josh Bleecher Snyderfea9e272025-06-02 21:21:59 +00001285 if a.IsInContainer() {
Philip Zeyligerf75ba2c2025-06-02 17:02:51 -07001286 if err := setupGitHooks(a.repoRoot); err != nil {
1287 slog.WarnContext(ctx, "failed to set up git hooks", "err", err)
1288 }
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07001289 }
1290
philz24613202025-07-15 20:56:21 -07001291 // Check if we have any commits, and if not, create an empty initial commit
1292 cmd := exec.CommandContext(ctx, "git", "rev-list", "--all", "--count")
1293 cmd.Dir = repoRoot
1294 countOut, err := cmd.CombinedOutput()
1295 if err != nil {
1296 return fmt.Errorf("git rev-list --all --count: %s: %w", countOut, err)
1297 }
1298 commitCount := strings.TrimSpace(string(countOut))
1299 if commitCount == "0" {
1300 slog.Info("No commits found, creating empty initial commit")
1301 cmd = exec.CommandContext(ctx, "git", "commit", "--allow-empty", "-m", "Initial empty commit")
1302 cmd.Dir = repoRoot
1303 if commitOut, err := cmd.CombinedOutput(); err != nil {
1304 return fmt.Errorf("git commit --allow-empty: %s: %w", commitOut, err)
1305 }
1306 }
1307
1308 cmd = exec.CommandContext(ctx, "git", "tag", "-f", a.SketchGitBaseRef(), "HEAD")
Philip Zeyliger49edc922025-05-14 09:45:45 -07001309 cmd.Dir = repoRoot
1310 if out, err := cmd.CombinedOutput(); err != nil {
1311 return fmt.Errorf("git tag -f %s %s: %s: %w", a.SketchGitBaseRef(), "HEAD", out, err)
1312 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001313
Josh Bleecher Snyder0e5b8c62025-05-14 20:58:20 +00001314 slog.Info("running codebase analysis")
1315 codebase, err := onstart.AnalyzeCodebase(ctx, a.repoRoot)
1316 if err != nil {
1317 slog.Warn("failed to analyze codebase", "error", err)
Josh Bleecher Snydera997be62025-05-07 22:52:46 +00001318 }
Josh Bleecher Snyder0e5b8c62025-05-14 20:58:20 +00001319 a.codebase = codebase
Josh Bleecher Snydera997be62025-05-07 22:52:46 +00001320
Josh Bleecher Snyder9daa5182025-05-16 18:34:00 +00001321 codereview, err := codereview.NewCodeReviewer(ctx, a.repoRoot, a.SketchGitBaseRef())
Earl Lee2e463fb2025-04-17 11:22:22 -07001322 if err != nil {
Josh Bleecher Snyderf4047bb2025-05-05 23:02:56 +00001323 return fmt.Errorf("Agent.Init: codereview.NewCodeReviewer: %w", err)
Earl Lee2e463fb2025-04-17 11:22:22 -07001324 }
1325 a.codereview = codereview
Philip Zeyligerd1402952025-04-23 03:54:37 +00001326
Earl Lee2e463fb2025-04-17 11:22:22 -07001327 }
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07001328 a.gitState.lastSketch = a.SketchGitBase()
Earl Lee2e463fb2025-04-17 11:22:22 -07001329 a.convo = a.initConvo()
1330 close(a.ready)
1331 return nil
1332}
1333
Josh Bleecher Snyderdbe02302025-04-29 16:44:23 -07001334//go:embed agent_system_prompt.txt
1335var agentSystemPrompt string
1336
Earl Lee2e463fb2025-04-17 11:22:22 -07001337// initConvo initializes the conversation.
1338// It must not be called until all agent fields are initialized,
1339// particularly workingDir and git.
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001340func (a *Agent) initConvo() *conversation.Convo {
philip.zeyliger882e7ea2025-06-20 14:31:16 +00001341 return a.initConvoWithUsage(nil)
1342}
1343
1344// initConvoWithUsage initializes the conversation with optional preserved usage.
1345func (a *Agent) initConvoWithUsage(usage *conversation.CumulativeUsage) *conversation.Convo {
Earl Lee2e463fb2025-04-17 11:22:22 -07001346 ctx := a.config.Context
philip.zeyliger882e7ea2025-06-20 14:31:16 +00001347 convo := conversation.New(ctx, a.config.Service, usage)
Earl Lee2e463fb2025-04-17 11:22:22 -07001348 convo.PromptCaching = true
1349 convo.Budget = a.config.Budget
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00001350 convo.SystemPrompt = a.renderSystemPrompt()
Josh Bleecher Snyder31785ae2025-05-06 01:50:58 +00001351 convo.ExtraData = map[string]any{"session_id": a.config.SessionID}
Earl Lee2e463fb2025-04-17 11:22:22 -07001352
Josh Bleecher Snyder17b2fd92025-07-09 22:47:13 +00001353 bashTool := &claudetool.BashTool{
Josh Bleecher Snyder17b2fd92025-07-09 22:47:13 +00001354 EnableJITInstall: claudetool.EnableBashToolJITInstall,
1355 Timeouts: a.config.BashTimeouts,
1356 }
Josh Bleecher Snyderd499fd62025-04-30 01:31:29 +00001357
Earl Lee2e463fb2025-04-17 11:22:22 -07001358 // Register all tools with the conversation
1359 // When adding, removing, or modifying tools here, double-check that the termui tool display
1360 // template in termui/termui.go has pretty-printing support for all tools.
Philip Zeyliger33d282f2025-05-03 04:01:54 +00001361
1362 var browserTools []*llm.Tool
Philip Zeyliger80b488d2025-05-10 18:21:54 -07001363 _, supportsScreenshots := a.config.Service.(*ant.Service)
1364 var bTools []*llm.Tool
1365 var browserCleanup func()
1366
1367 bTools, browserCleanup = browse.RegisterBrowserTools(a.config.Context, supportsScreenshots)
1368 // Add cleanup function to context cancel
1369 go func() {
1370 <-a.config.Context.Done()
1371 browserCleanup()
1372 }()
1373 browserTools = bTools
Philip Zeyliger33d282f2025-05-03 04:01:54 +00001374
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001375 convo.Tools = []*llm.Tool{
Josh Bleecher Snyder17b2fd92025-07-09 22:47:13 +00001376 bashTool.Tool(), claudetool.Keyword, claudetool.Patch(a.patchCallback),
Josh Bleecher Snyder3b44cc32025-07-22 02:28:14 +00001377 claudetool.Think, claudetool.TodoRead, claudetool.TodoWrite, a.commitMessageStyleTool(), makeDoneTool(a.codereview),
Josh Bleecher Snydera4092d22025-05-14 18:32:53 -07001378 a.codereview.Tool(), claudetool.AboutSketch,
Josh Bleecher Snyder31785ae2025-05-06 01:50:58 +00001379 }
Philip Zeyliger33d282f2025-05-03 04:01:54 +00001380 convo.Tools = append(convo.Tools, browserTools...)
Philip Zeyligerc17ffe32025-06-05 19:49:13 -07001381
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001382 // Add MCP tools if configured
1383 if len(a.config.MCPServers) > 0 {
Philip Zeyliger4201bde2025-06-27 17:22:43 -07001384
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001385 slog.InfoContext(ctx, "Initializing MCP connections", "servers", len(a.config.MCPServers))
Philip Zeyliger4201bde2025-06-27 17:22:43 -07001386 serverConfigs, parseErrors := mcp.ParseServerConfigs(ctx, a.config.MCPServers)
1387
1388 // Replace any headers with value _sketch_public_key_ and _sketch_session_id_ with those values.
1389 for i := range serverConfigs {
1390 if serverConfigs[i].Headers != nil {
1391 for key, value := range serverConfigs[i].Headers {
Philip Zeyligerf2814ea2025-06-30 10:16:50 -07001392 // Replace env placeholders. E.g., "env:FOO" becomes os.Getenv("FOO")
1393 if strings.HasPrefix(value, "env:") {
1394 serverConfigs[i].Headers[key] = os.Getenv(value[4:])
Philip Zeyliger4201bde2025-06-27 17:22:43 -07001395 }
1396 }
1397 }
1398 }
1399 mcpConnections, mcpErrors := a.mcpManager.ConnectToServerConfigs(ctx, serverConfigs, 10*time.Second, parseErrors)
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001400
1401 if len(mcpErrors) > 0 {
1402 for _, err := range mcpErrors {
1403 slog.ErrorContext(ctx, "MCP connection error", "error", err)
1404 // Send agent message about MCP connection failures
1405 a.pushToOutbox(ctx, AgentMessage{
1406 Type: ErrorMessageType,
1407 Content: fmt.Sprintf("MCP server connection failed: %v", err),
1408 })
1409 }
1410 }
1411
1412 if len(mcpConnections) > 0 {
1413 // Add tools from all successful connections
1414 totalTools := 0
1415 for _, connection := range mcpConnections {
1416 convo.Tools = append(convo.Tools, connection.Tools...)
1417 totalTools += len(connection.Tools)
1418 // Log tools per server using structured data
1419 slog.InfoContext(ctx, "Added MCP tools from server", "server", connection.ServerName, "count", len(connection.Tools), "tools", connection.ToolNames)
1420 }
1421 slog.InfoContext(ctx, "Total MCP tools added", "count", totalTools)
1422 } else {
1423 slog.InfoContext(ctx, "No MCP tools available after connection attempts")
1424 }
1425 }
1426
Earl Lee2e463fb2025-04-17 11:22:22 -07001427 convo.Listener = a
1428 return convo
1429}
1430
Josh Bleecher Snyderfff269b2025-04-30 01:49:39 +00001431// branchExists reports whether branchName exists, either locally or in well-known remotes.
1432func branchExists(dir, branchName string) bool {
1433 refs := []string{
1434 "refs/heads/",
1435 "refs/remotes/origin/",
Josh Bleecher Snyderfff269b2025-04-30 01:49:39 +00001436 }
1437 for _, ref := range refs {
1438 cmd := exec.Command("git", "show-ref", "--verify", "--quiet", ref+branchName)
1439 cmd.Dir = dir
1440 if cmd.Run() == nil { // exit code 0 means branch exists
1441 return true
1442 }
1443 }
1444 return false
1445}
1446
Josh Bleecher Snyder3b44cc32025-07-22 02:28:14 +00001447func soleText(contents []llm.Content) (string, error) {
1448 if len(contents) != 1 {
1449 return "", fmt.Errorf("multiple contents %v", contents)
1450 }
1451 content := contents[0]
1452 if content.Type != llm.ContentTypeText || content.Text == "" {
1453 return "", fmt.Errorf("bad content %v", content)
1454 }
1455 return strings.TrimSpace(content.Text), nil
1456}
1457
1458// autoGenerateSlug automatically generates a slug based on the first user input
1459func (a *Agent) autoGenerateSlug(ctx context.Context, userContents []llm.Content) error {
1460 userText, err := soleText(userContents)
1461 if err != nil {
1462 return err
1463 }
1464 if userText == "" {
1465 return fmt.Errorf("set-slug: empty text content")
1466 }
1467
1468 // Create a subconversation without history for slug generation
1469 convo, ok := a.convo.(*conversation.Convo)
1470 if !ok {
1471 // In test environments, the conversation might be a mock interface
1472 // Skip slug generation in this case
1473 return fmt.Errorf("set-slug: can't make a subconvo (mock convo?)")
1474 }
1475
1476 // Loop until we find an acceptable slug
1477 var unavailableSlugs []string
1478 for {
1479 if len(unavailableSlugs) > 10 {
1480 // sanity check to prevent infinite loops
1481 return fmt.Errorf("set-slug: failed to construct a new slug after %d attempts", len(unavailableSlugs))
Earl Lee2e463fb2025-04-17 11:22:22 -07001482 }
Josh Bleecher Snyder3b44cc32025-07-22 02:28:14 +00001483 subConvo := convo.SubConvo()
1484 subConvo.Hidden = true
1485
1486 // Prompt for slug generation
1487 prompt := `You are a slug generator for Sketch, an agentic coding environment.
1488The user's prompt will be in <user-prompt> tags. Any unavailable slugs will be listed in <unavailable-slug> tags.
1489Generate a 2-3 word alphanumeric hyphenated slug in imperative tense that captures the essence of their coding task.
1490Respond with only the slug.`
1491
1492 buf := new(strings.Builder)
1493 buf.WriteString("<slug-request>")
1494 if len(unavailableSlugs) > 0 {
1495 buf.WriteString("<unavailable-slugs>")
1496 }
1497 for _, x := range unavailableSlugs {
1498 buf.WriteString("<unavailable-slug>")
1499 buf.WriteString(x)
1500 buf.WriteString("</unavailable-slug>")
1501 }
1502 if len(unavailableSlugs) > 0 {
1503 buf.WriteString("</unavailable-slugs>")
1504 }
1505 buf.WriteString("<user-prompt>")
1506 buf.WriteString(userText)
1507 buf.WriteString("</user-prompt>")
1508 buf.WriteString("</slug-request>")
1509
1510 fullPrompt := prompt + "\n" + buf.String()
1511 userMessage := llm.UserStringMessage(fullPrompt)
1512
1513 resp, err := subConvo.SendMessage(userMessage)
1514 if err != nil {
1515 return fmt.Errorf("failed to generate slug: %w", err)
1516 }
1517
1518 // Extract the slug from the response
1519 slugText, err := soleText(resp.Content)
1520 if err != nil {
1521 return err
1522 }
1523 if slugText == "" {
1524 return fmt.Errorf("empty slug generated")
1525 }
1526
1527 // Clean and validate the slug
1528 slug := cleanSlugName(slugText)
1529 if slug == "" {
1530 return fmt.Errorf("slug could not be cleaned: %q", slugText)
1531 }
1532
1533 // Check if branch already exists using the same logic as the original set-slug tool
1534 a.SetSlug(slug) // Set slug first so BranchName() works correctly
1535 if branchExists(a.workingDir, a.BranchName()) {
1536 // try again
1537 unavailableSlugs = append(unavailableSlugs, slug)
1538 continue
1539 }
1540
1541 // Success! Slug is available and already set
1542 return nil
Josh Bleecher Snydera2a31502025-05-07 12:37:18 +00001543 }
Josh Bleecher Snydera2a31502025-05-07 12:37:18 +00001544}
1545
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07001546func (a *Agent) commitMessageStyleTool() *llm.Tool {
1547 description := `Provides git commit message style guidance. MANDATORY: You must use this tool before making any git commits.`
Josh Bleecher Snydera2a31502025-05-07 12:37:18 +00001548 preCommit := &llm.Tool{
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07001549 Name: "commit-message-style",
Josh Bleecher Snydera2a31502025-05-07 12:37:18 +00001550 Description: description,
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07001551 InputSchema: llm.EmptySchema(),
Josh Bleecher Snyder43b60b92025-07-21 14:57:10 -07001552 Run: func(ctx context.Context, input json.RawMessage) llm.ToolOut {
Josh Bleecher Snyder6aaf6af2025-05-07 20:47:13 +00001553 styleHint, err := claudetool.CommitMessageStyleHint(ctx, a.repoRoot)
1554 if err != nil {
1555 slog.DebugContext(ctx, "failed to get commit message style hint", "err", err)
1556 }
Josh Bleecher Snyder43b60b92025-07-21 14:57:10 -07001557 return llm.ToolOut{LLMContent: llm.TextContent(styleHint)}
Earl Lee2e463fb2025-04-17 11:22:22 -07001558 },
1559 }
Josh Bleecher Snyderd7970e62025-05-01 01:56:28 +00001560 return preCommit
Earl Lee2e463fb2025-04-17 11:22:22 -07001561}
1562
Josh Bleecher Snyder6534c7a2025-07-01 01:48:52 +00001563// patchCallback is the agent's patch tool callback.
1564// It warms the codereview cache in the background.
Josh Bleecher Snyder43b60b92025-07-21 14:57:10 -07001565func (a *Agent) patchCallback(input claudetool.PatchInput, output llm.ToolOut) llm.ToolOut {
Josh Bleecher Snyder6534c7a2025-07-01 01:48:52 +00001566 if a.codereview != nil {
1567 a.codereview.WarmTestCache(input.Path)
1568 }
Josh Bleecher Snyder43b60b92025-07-21 14:57:10 -07001569 return output
Josh Bleecher Snyder6534c7a2025-07-01 01:48:52 +00001570}
1571
Earl Lee2e463fb2025-04-17 11:22:22 -07001572func (a *Agent) Ready() <-chan struct{} {
1573 return a.ready
1574}
1575
Philip Zeyligerbe7802a2025-06-04 20:15:25 +00001576// BranchPrefix returns the configured branch prefix
1577func (a *Agent) BranchPrefix() string {
1578 return a.config.BranchPrefix
1579}
1580
philip.zeyliger6d3de482025-06-10 19:38:14 -07001581// LinkToGitHub returns whether GitHub branch linking is enabled
1582func (a *Agent) LinkToGitHub() bool {
1583 return a.config.LinkToGitHub
1584}
1585
Earl Lee2e463fb2025-04-17 11:22:22 -07001586func (a *Agent) UserMessage(ctx context.Context, msg string) {
1587 a.pushToOutbox(ctx, AgentMessage{Type: UserMessageType, Content: msg})
1588 a.inbox <- msg
1589}
1590
Earl Lee2e463fb2025-04-17 11:22:22 -07001591func (a *Agent) CancelToolUse(toolUseID string, cause error) error {
1592 return a.convo.CancelToolUse(toolUseID, cause)
1593}
1594
Sean McCulloughedc88dc2025-04-30 02:55:01 +00001595func (a *Agent) CancelTurn(cause error) {
1596 a.cancelTurnMu.Lock()
1597 defer a.cancelTurnMu.Unlock()
1598 if a.cancelTurn != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001599 // Force state transition to cancelled state
1600 ctx := a.config.Context
1601 a.stateMachine.ForceTransition(ctx, StateCancelled, "User cancelled turn: "+cause.Error())
Sean McCulloughedc88dc2025-04-30 02:55:01 +00001602 a.cancelTurn(cause)
Earl Lee2e463fb2025-04-17 11:22:22 -07001603 }
1604}
1605
1606func (a *Agent) Loop(ctxOuter context.Context) {
Philip Zeyliger5f26a342025-07-04 01:30:29 +00001607 // Start port monitoring
1608 if a.portMonitor != nil && a.IsInContainer() {
1609 if err := a.portMonitor.Start(ctxOuter); err != nil {
1610 slog.WarnContext(ctxOuter, "Failed to start port monitor", "error", err)
1611 } else {
1612 slog.InfoContext(ctxOuter, "Port monitor started")
1613 }
1614 }
1615
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001616 // Set up cleanup when context is done
1617 defer func() {
1618 if a.mcpManager != nil {
1619 a.mcpManager.Close()
1620 }
Philip Zeyliger5f26a342025-07-04 01:30:29 +00001621 if a.portMonitor != nil && a.IsInContainer() {
1622 a.portMonitor.Stop()
1623 }
Philip Zeyliger194bfa82025-06-24 06:03:06 -07001624 }()
1625
Earl Lee2e463fb2025-04-17 11:22:22 -07001626 for {
1627 select {
1628 case <-ctxOuter.Done():
1629 return
1630 default:
1631 ctxInner, cancel := context.WithCancelCause(ctxOuter)
Sean McCulloughedc88dc2025-04-30 02:55:01 +00001632 a.cancelTurnMu.Lock()
1633 // Set .cancelTurn so the user can cancel whatever is happening
Sean McCullough885a16a2025-04-30 02:49:25 +00001634 // inside the conversation loop without canceling this outer Loop execution.
Sean McCulloughedc88dc2025-04-30 02:55:01 +00001635 // This cancelTurn func is intended be called from other goroutines,
Earl Lee2e463fb2025-04-17 11:22:22 -07001636 // hence the mutex.
Sean McCulloughedc88dc2025-04-30 02:55:01 +00001637 a.cancelTurn = cancel
1638 a.cancelTurnMu.Unlock()
Sean McCullough9f4b8082025-04-30 17:34:07 +00001639 err := a.processTurn(ctxInner) // Renamed from InnerLoop to better reflect its purpose
1640 if err != nil {
1641 slog.ErrorContext(ctxOuter, "Error in processing turn", "error", err)
1642 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001643 cancel(nil)
1644 }
1645 }
1646}
1647
1648func (a *Agent) pushToOutbox(ctx context.Context, m AgentMessage) {
1649 if m.Timestamp.IsZero() {
1650 m.Timestamp = time.Now()
1651 }
1652
Philip Zeyliger72252cb2025-05-10 17:00:08 -07001653 // If this is a ToolUseMessage and ToolResult is set but Content is not, copy the ToolResult to Content
1654 if m.Type == ToolUseMessageType && m.ToolResult != "" && m.Content == "" {
1655 m.Content = m.ToolResult
1656 }
1657
Earl Lee2e463fb2025-04-17 11:22:22 -07001658 // If this is an end-of-turn message, calculate the turn duration and add it to the message
1659 if m.EndOfTurn && m.Type == AgentMessageType {
1660 turnDuration := time.Since(a.startOfTurn)
1661 m.TurnDuration = &turnDuration
1662 slog.InfoContext(ctx, "Turn completed", "turnDuration", turnDuration)
1663 }
1664
Earl Lee2e463fb2025-04-17 11:22:22 -07001665 a.mu.Lock()
1666 defer a.mu.Unlock()
1667 m.Idx = len(a.history)
Philip Zeyligerb7c58752025-05-01 10:10:17 -07001668 slog.InfoContext(ctx, "agent message", m.Attr())
Earl Lee2e463fb2025-04-17 11:22:22 -07001669 a.history = append(a.history, m)
Earl Lee2e463fb2025-04-17 11:22:22 -07001670
Philip Zeyligerb7c58752025-05-01 10:10:17 -07001671 // Notify all subscribers
1672 for _, ch := range a.subscribers {
1673 ch <- &m
Earl Lee2e463fb2025-04-17 11:22:22 -07001674 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001675}
1676
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001677func (a *Agent) GatherMessages(ctx context.Context, block bool) ([]llm.Content, error) {
1678 var m []llm.Content
Earl Lee2e463fb2025-04-17 11:22:22 -07001679 if block {
1680 select {
1681 case <-ctx.Done():
1682 return m, ctx.Err()
1683 case msg := <-a.inbox:
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001684 m = append(m, llm.StringContent(msg))
Earl Lee2e463fb2025-04-17 11:22:22 -07001685 }
1686 }
1687 for {
1688 select {
1689 case msg := <-a.inbox:
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001690 m = append(m, llm.StringContent(msg))
Earl Lee2e463fb2025-04-17 11:22:22 -07001691 default:
1692 return m, nil
1693 }
1694 }
1695}
1696
Sean McCullough885a16a2025-04-30 02:49:25 +00001697// processTurn handles a single conversation turn with the user
Sean McCullough9f4b8082025-04-30 17:34:07 +00001698func (a *Agent) processTurn(ctx context.Context) error {
Earl Lee2e463fb2025-04-17 11:22:22 -07001699 // Reset the start of turn time
1700 a.startOfTurn = time.Now()
1701
Sean McCullough96b60dd2025-04-30 09:49:10 -07001702 // Transition to waiting for user input state
1703 a.stateMachine.Transition(ctx, StateWaitingForUserInput, "Starting turn")
1704
Sean McCullough885a16a2025-04-30 02:49:25 +00001705 // Process initial user message
1706 initialResp, err := a.processUserMessage(ctx)
1707 if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001708 a.stateMachine.Transition(ctx, StateError, "Error processing user message: "+err.Error())
Sean McCullough9f4b8082025-04-30 17:34:07 +00001709 return err
1710 }
1711
1712 // Handle edge case where both initialResp and err are nil
1713 if initialResp == nil {
1714 err := fmt.Errorf("unexpected nil response from processUserMessage with no error")
Sean McCullough96b60dd2025-04-30 09:49:10 -07001715 a.stateMachine.Transition(ctx, StateError, "Error processing user message: "+err.Error())
1716
Sean McCullough9f4b8082025-04-30 17:34:07 +00001717 a.pushToOutbox(ctx, errorMessage(err))
1718 return err
Earl Lee2e463fb2025-04-17 11:22:22 -07001719 }
Sean McCullough885a16a2025-04-30 02:49:25 +00001720
Earl Lee2e463fb2025-04-17 11:22:22 -07001721 // We do this as we go, but let's also do it at the end of the turn
1722 defer func() {
1723 if _, err := a.handleGitCommits(ctx); err != nil {
1724 // Just log the error, don't stop execution
1725 slog.WarnContext(ctx, "Failed to check for new git commits", "error", err)
1726 }
1727 }()
1728
Sean McCullougha1e0e492025-05-01 10:51:08 -07001729 // Main response loop - continue as long as the model is using tools or a tool use fails.
Sean McCullough885a16a2025-04-30 02:49:25 +00001730 resp := initialResp
1731 for {
1732 // Check if we are over budget
1733 if err := a.overBudget(ctx); err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001734 a.stateMachine.Transition(ctx, StateBudgetExceeded, "Budget exceeded: "+err.Error())
Sean McCullough9f4b8082025-04-30 17:34:07 +00001735 return err
Sean McCullough885a16a2025-04-30 02:49:25 +00001736 }
1737
Philip Zeyligerb8a8f352025-06-02 07:39:37 -07001738 // Check if we should compact the conversation
1739 if a.ShouldCompact() {
1740 a.stateMachine.Transition(ctx, StateCompacting, "Token usage threshold reached, compacting conversation")
1741 if err := a.CompactConversation(ctx); err != nil {
1742 a.stateMachine.Transition(ctx, StateError, "Error during compaction: "+err.Error())
1743 return err
1744 }
1745 // After compaction, end this turn and start fresh
1746 a.stateMachine.Transition(ctx, StateEndOfTurn, "Compaction completed, ending turn")
1747 return nil
1748 }
1749
Sean McCullough885a16a2025-04-30 02:49:25 +00001750 // If the model is not requesting to use a tool, we're done
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001751 if resp.StopReason != llm.StopReasonToolUse {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001752 a.stateMachine.Transition(ctx, StateEndOfTurn, "LLM completed response, ending turn")
Sean McCullough885a16a2025-04-30 02:49:25 +00001753 break
1754 }
1755
Sean McCullough96b60dd2025-04-30 09:49:10 -07001756 // Transition to tool use requested state
1757 a.stateMachine.Transition(ctx, StateToolUseRequested, "LLM requested tool use")
1758
Sean McCullough885a16a2025-04-30 02:49:25 +00001759 // Handle tool execution
1760 continueConversation, toolResp := a.handleToolExecution(ctx, resp)
1761 if !continueConversation {
Sean McCullough9f4b8082025-04-30 17:34:07 +00001762 return nil
Sean McCullough885a16a2025-04-30 02:49:25 +00001763 }
1764
Sean McCullougha1e0e492025-05-01 10:51:08 -07001765 if toolResp == nil {
1766 return fmt.Errorf("cannot continue conversation with a nil tool response")
1767 }
1768
Sean McCullough885a16a2025-04-30 02:49:25 +00001769 // Set the response for the next iteration
1770 resp = toolResp
1771 }
Sean McCullough9f4b8082025-04-30 17:34:07 +00001772
1773 return nil
Sean McCullough885a16a2025-04-30 02:49:25 +00001774}
1775
1776// processUserMessage waits for user messages and sends them to the model
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001777func (a *Agent) processUserMessage(ctx context.Context) (*llm.Response, error) {
Sean McCullough885a16a2025-04-30 02:49:25 +00001778 // Wait for at least one message from the user
1779 msgs, err := a.GatherMessages(ctx, true)
1780 if err != nil { // e.g. the context was canceled while blocking in GatherMessages
Sean McCullough96b60dd2025-04-30 09:49:10 -07001781 a.stateMachine.Transition(ctx, StateError, "Error gathering messages: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001782 return nil, err
1783 }
1784
Josh Bleecher Snyder3b44cc32025-07-22 02:28:14 +00001785 // Auto-generate slug if this is the first user input and no slug is set
1786 if a.Slug() == "" {
1787 if err := a.autoGenerateSlug(ctx, msgs); err != nil {
1788 // NB: it is possible that autoGenerateSlug set the slug during the process
1789 // of trying to generate a slug.
1790 // The fact that it returned an error means that we cannot use that slug.
1791 slog.WarnContext(ctx, "Failed to auto-generate slug", "error", err)
1792 // use the session id instead. ugly, but we need a slug, and this will be unique.
1793 a.SetSlug(a.SessionID())
1794 }
1795 // Notify termui of the final slug (only emitted once, after slug is determined)
1796 a.pushToOutbox(ctx, AgentMessage{
1797 Type: SlugMessageType,
1798 Content: a.Slug(),
1799 })
1800 }
1801
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001802 userMessage := llm.Message{
1803 Role: llm.MessageRoleUser,
Earl Lee2e463fb2025-04-17 11:22:22 -07001804 Content: msgs,
1805 }
Sean McCullough885a16a2025-04-30 02:49:25 +00001806
Sean McCullough96b60dd2025-04-30 09:49:10 -07001807 // Transition to sending to LLM state
1808 a.stateMachine.Transition(ctx, StateSendingToLLM, "Sending user message to LLM")
1809
Sean McCullough885a16a2025-04-30 02:49:25 +00001810 // Send message to the model
Earl Lee2e463fb2025-04-17 11:22:22 -07001811 resp, err := a.convo.SendMessage(userMessage)
1812 if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001813 a.stateMachine.Transition(ctx, StateError, "Error sending to LLM: "+err.Error())
Earl Lee2e463fb2025-04-17 11:22:22 -07001814 a.pushToOutbox(ctx, errorMessage(err))
Sean McCullough885a16a2025-04-30 02:49:25 +00001815 return nil, err
Earl Lee2e463fb2025-04-17 11:22:22 -07001816 }
Earl Lee2e463fb2025-04-17 11:22:22 -07001817
Sean McCullough96b60dd2025-04-30 09:49:10 -07001818 // Transition to processing LLM response state
1819 a.stateMachine.Transition(ctx, StateProcessingLLMResponse, "Processing LLM response")
1820
Sean McCullough885a16a2025-04-30 02:49:25 +00001821 return resp, nil
1822}
1823
1824// handleToolExecution processes a tool use request from the model
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001825func (a *Agent) handleToolExecution(ctx context.Context, resp *llm.Response) (bool, *llm.Response) {
1826 var results []llm.Content
Sean McCullough885a16a2025-04-30 02:49:25 +00001827 cancelled := false
Josh Bleecher Snyder64f2aa82025-05-14 18:31:05 +00001828 toolEndsTurn := false
Sean McCullough885a16a2025-04-30 02:49:25 +00001829
Sean McCullough96b60dd2025-04-30 09:49:10 -07001830 // Transition to checking for cancellation state
1831 a.stateMachine.Transition(ctx, StateCheckingForCancellation, "Checking if user requested cancellation")
1832
Sean McCullough885a16a2025-04-30 02:49:25 +00001833 // Check if the operation was cancelled by the user
1834 select {
1835 case <-ctx.Done():
1836 // Don't actually run any of the tools, but rather build a response
1837 // for each tool_use message letting the LLM know that user canceled it.
1838 var err error
1839 results, err = a.convo.ToolResultCancelContents(resp)
Earl Lee2e463fb2025-04-17 11:22:22 -07001840 if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001841 a.stateMachine.Transition(ctx, StateError, "Error creating cancellation response: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001842 a.pushToOutbox(ctx, errorMessage(err))
Earl Lee2e463fb2025-04-17 11:22:22 -07001843 }
Sean McCullough885a16a2025-04-30 02:49:25 +00001844 cancelled = true
Sean McCullough96b60dd2025-04-30 09:49:10 -07001845 a.stateMachine.Transition(ctx, StateCancelled, "Operation cancelled by user")
Sean McCullough885a16a2025-04-30 02:49:25 +00001846 default:
Sean McCullough96b60dd2025-04-30 09:49:10 -07001847 // Transition to running tool state
1848 a.stateMachine.Transition(ctx, StateRunningTool, "Executing requested tool")
1849
Josh Bleecher Snyder112b9232025-05-23 11:26:33 -07001850 // Add working directory and session ID to context for tool execution
Sean McCullough885a16a2025-04-30 02:49:25 +00001851 ctx = claudetool.WithWorkingDir(ctx, a.workingDir)
Josh Bleecher Snyder112b9232025-05-23 11:26:33 -07001852 ctx = claudetool.WithSessionID(ctx, a.config.SessionID)
Sean McCullough885a16a2025-04-30 02:49:25 +00001853
1854 // Execute the tools
1855 var err error
Josh Bleecher Snyder64f2aa82025-05-14 18:31:05 +00001856 results, toolEndsTurn, err = a.convo.ToolResultContents(ctx, resp)
Sean McCullough885a16a2025-04-30 02:49:25 +00001857 if ctx.Err() != nil { // e.g. the user canceled the operation
1858 cancelled = true
Sean McCullough96b60dd2025-04-30 09:49:10 -07001859 a.stateMachine.Transition(ctx, StateCancelled, "Operation cancelled during tool execution")
Sean McCullough885a16a2025-04-30 02:49:25 +00001860 } else if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001861 a.stateMachine.Transition(ctx, StateError, "Error executing tool: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001862 a.pushToOutbox(ctx, errorMessage(err))
1863 }
1864 }
1865
1866 // Process git commits that may have occurred during tool execution
Sean McCullough96b60dd2025-04-30 09:49:10 -07001867 a.stateMachine.Transition(ctx, StateCheckingGitCommits, "Checking for git commits")
Sean McCullough885a16a2025-04-30 02:49:25 +00001868 autoqualityMessages := a.processGitChanges(ctx)
1869
1870 // Check budget again after tool execution
Sean McCullough96b60dd2025-04-30 09:49:10 -07001871 a.stateMachine.Transition(ctx, StateCheckingBudget, "Checking budget after tool execution")
Sean McCullough885a16a2025-04-30 02:49:25 +00001872 if err := a.overBudget(ctx); err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001873 a.stateMachine.Transition(ctx, StateBudgetExceeded, "Budget exceeded after tool execution: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001874 return false, nil
1875 }
1876
1877 // Continue the conversation with tool results and any user messages
Josh Bleecher Snyder64f2aa82025-05-14 18:31:05 +00001878 shouldContinue, resp := a.continueTurnWithToolResults(ctx, results, autoqualityMessages, cancelled)
1879 return shouldContinue && !toolEndsTurn, resp
Sean McCullough885a16a2025-04-30 02:49:25 +00001880}
1881
Philip Zeyliger75bd37d2025-05-22 18:49:14 +00001882// DetectGitChanges checks for new git commits and pushes them if found
Philip Zeyliger9bca61e2025-05-22 12:40:06 -07001883func (a *Agent) DetectGitChanges(ctx context.Context) error {
Philip Zeyliger75bd37d2025-05-22 18:49:14 +00001884 // Check for git commits
1885 _, err := a.handleGitCommits(ctx)
1886 if err != nil {
Philip Zeyliger75bd37d2025-05-22 18:49:14 +00001887 slog.WarnContext(ctx, "Failed to check for new git commits", "error", err)
Philip Zeyliger9bca61e2025-05-22 12:40:06 -07001888 return fmt.Errorf("failed to check for new git commits: %w", err)
Philip Zeyliger75bd37d2025-05-22 18:49:14 +00001889 }
Philip Zeyliger9bca61e2025-05-22 12:40:06 -07001890 return nil
Philip Zeyliger75bd37d2025-05-22 18:49:14 +00001891}
1892
1893// processGitChanges checks for new git commits, runs autoformatters if needed, and returns any messages generated
1894// This is used internally by the agent loop
Sean McCullough885a16a2025-04-30 02:49:25 +00001895func (a *Agent) processGitChanges(ctx context.Context) []string {
1896 // Check for git commits after tool execution
1897 newCommits, err := a.handleGitCommits(ctx)
1898 if err != nil {
1899 // Just log the error, don't stop execution
1900 slog.WarnContext(ctx, "Failed to check for new git commits", "error", err)
1901 return nil
1902 }
1903
Josh Bleecher Snyderc72ceb22025-05-05 23:30:15 +00001904 // Run mechanical checks if there was exactly one new commit.
1905 if len(newCommits) != 1 {
1906 return nil
1907 }
Sean McCullough885a16a2025-04-30 02:49:25 +00001908 var autoqualityMessages []string
Josh Bleecher Snyderc72ceb22025-05-05 23:30:15 +00001909 a.stateMachine.Transition(ctx, StateRunningAutoformatters, "Running mechanical checks on new commit")
1910 msg := a.codereview.RunMechanicalChecks(ctx)
1911 if msg != "" {
1912 a.pushToOutbox(ctx, AgentMessage{
1913 Type: AutoMessageType,
1914 Content: msg,
1915 Timestamp: time.Now(),
1916 })
1917 autoqualityMessages = append(autoqualityMessages, msg)
Earl Lee2e463fb2025-04-17 11:22:22 -07001918 }
Sean McCullough885a16a2025-04-30 02:49:25 +00001919
1920 return autoqualityMessages
1921}
1922
1923// continueTurnWithToolResults continues the conversation with tool results
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001924func (a *Agent) continueTurnWithToolResults(ctx context.Context, results []llm.Content, autoqualityMessages []string, cancelled bool) (bool, *llm.Response) {
Sean McCullough885a16a2025-04-30 02:49:25 +00001925 // Get any messages the user sent while tools were executing
Sean McCullough96b60dd2025-04-30 09:49:10 -07001926 a.stateMachine.Transition(ctx, StateGatheringAdditionalMessages, "Gathering additional user messages")
Sean McCullough885a16a2025-04-30 02:49:25 +00001927 msgs, err := a.GatherMessages(ctx, false)
1928 if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001929 a.stateMachine.Transition(ctx, StateError, "Error gathering additional messages: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001930 return false, nil
1931 }
1932
1933 // Inject any auto-generated messages from quality checks
1934 for _, msg := range autoqualityMessages {
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001935 msgs = append(msgs, llm.StringContent(msg))
Sean McCullough885a16a2025-04-30 02:49:25 +00001936 }
1937
1938 // Handle cancellation by appending a message about it
1939 if cancelled {
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001940 msgs = append(msgs, llm.StringContent(cancelToolUseMessage))
Sean McCullough885a16a2025-04-30 02:49:25 +00001941 // EndOfTurn is false here so that the client of this agent keeps processing
Philip Zeyligerb7c58752025-05-01 10:10:17 -07001942 // further messages; the conversation is not over.
Sean McCullough885a16a2025-04-30 02:49:25 +00001943 a.pushToOutbox(ctx, AgentMessage{Type: ErrorMessageType, Content: userCancelMessage, EndOfTurn: false})
1944 } else if err := a.convo.OverBudget(); err != nil {
1945 // Handle budget issues by appending a message about it
1946 budgetMsg := "We've exceeded our budget. Please ask the user to confirm before continuing by ending the turn."
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001947 msgs = append(msgs, llm.StringContent(budgetMsg))
Sean McCullough885a16a2025-04-30 02:49:25 +00001948 a.pushToOutbox(ctx, budgetMessage(fmt.Errorf("warning: %w (ask to keep trying, if you'd like)", err)))
1949 }
1950
1951 // Combine tool results with user messages
1952 results = append(results, msgs...)
1953
1954 // Send the combined message to continue the conversation
Sean McCullough96b60dd2025-04-30 09:49:10 -07001955 a.stateMachine.Transition(ctx, StateSendingToolResults, "Sending tool results back to LLM")
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001956 resp, err := a.convo.SendMessage(llm.Message{
1957 Role: llm.MessageRoleUser,
Sean McCullough885a16a2025-04-30 02:49:25 +00001958 Content: results,
1959 })
1960 if err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001961 a.stateMachine.Transition(ctx, StateError, "Error sending tool results: "+err.Error())
Sean McCullough885a16a2025-04-30 02:49:25 +00001962 a.pushToOutbox(ctx, errorMessage(fmt.Errorf("error: failed to continue conversation: %s", err.Error())))
1963 return true, nil // Return true to continue the conversation, but with no response
1964 }
1965
Sean McCullough96b60dd2025-04-30 09:49:10 -07001966 // Transition back to processing LLM response
1967 a.stateMachine.Transition(ctx, StateProcessingLLMResponse, "Processing LLM response to tool results")
1968
Sean McCullough885a16a2025-04-30 02:49:25 +00001969 if cancelled {
1970 return false, nil
1971 }
1972
1973 return true, resp
Earl Lee2e463fb2025-04-17 11:22:22 -07001974}
1975
1976func (a *Agent) overBudget(ctx context.Context) error {
1977 if err := a.convo.OverBudget(); err != nil {
Sean McCullough96b60dd2025-04-30 09:49:10 -07001978 a.stateMachine.Transition(ctx, StateBudgetExceeded, "Budget exceeded: "+err.Error())
Earl Lee2e463fb2025-04-17 11:22:22 -07001979 m := budgetMessage(err)
1980 m.Content = m.Content + "\n\nBudget reset."
David Crawshaw35c72bc2025-05-20 11:17:10 -07001981 a.pushToOutbox(ctx, m)
Earl Lee2e463fb2025-04-17 11:22:22 -07001982 a.convo.ResetBudget(a.originalBudget)
1983 return err
1984 }
1985 return nil
1986}
1987
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001988func collectTextContent(msg *llm.Response) string {
Earl Lee2e463fb2025-04-17 11:22:22 -07001989 // Collect all text content
1990 var allText strings.Builder
1991 for _, content := range msg.Content {
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07001992 if content.Type == llm.ContentTypeText && content.Text != "" {
Earl Lee2e463fb2025-04-17 11:22:22 -07001993 if allText.Len() > 0 {
1994 allText.WriteString("\n\n")
1995 }
1996 allText.WriteString(content.Text)
1997 }
1998 }
1999 return allText.String()
2000}
2001
Josh Bleecher Snyder4f84ab72025-04-22 16:40:54 -07002002func (a *Agent) TotalUsage() conversation.CumulativeUsage {
Earl Lee2e463fb2025-04-17 11:22:22 -07002003 a.mu.Lock()
2004 defer a.mu.Unlock()
2005 return a.convo.CumulativeUsage()
2006}
2007
Earl Lee2e463fb2025-04-17 11:22:22 -07002008// Diff returns a unified diff of changes made since the agent was instantiated.
2009func (a *Agent) Diff(commit *string) (string, error) {
Philip Zeyliger49edc922025-05-14 09:45:45 -07002010 if a.SketchGitBase() == "" {
Earl Lee2e463fb2025-04-17 11:22:22 -07002011 return "", fmt.Errorf("no initial commit reference available")
2012 }
2013
2014 // Find the repository root
2015 ctx := context.Background()
2016
2017 // If a specific commit hash is provided, show just that commit's changes
2018 if commit != nil && *commit != "" {
2019 // Validate that the commit looks like a valid git SHA
2020 if !isValidGitSHA(*commit) {
2021 return "", fmt.Errorf("invalid git commit SHA format: %s", *commit)
2022 }
2023
2024 // Get the diff for just this commit
2025 cmd := exec.CommandContext(ctx, "git", "show", "--unified=10", *commit)
2026 cmd.Dir = a.repoRoot
2027 output, err := cmd.CombinedOutput()
2028 if err != nil {
2029 return "", fmt.Errorf("failed to get diff for commit %s: %w - %s", *commit, err, string(output))
2030 }
2031 return string(output), nil
2032 }
2033
2034 // Otherwise, get the diff between the initial commit and the current state using exec.Command
Philip Zeyliger49edc922025-05-14 09:45:45 -07002035 cmd := exec.CommandContext(ctx, "git", "diff", "--unified=10", a.SketchGitBaseRef())
Earl Lee2e463fb2025-04-17 11:22:22 -07002036 cmd.Dir = a.repoRoot
2037 output, err := cmd.CombinedOutput()
2038 if err != nil {
2039 return "", fmt.Errorf("failed to get diff: %w - %s", err, string(output))
2040 }
2041
2042 return string(output), nil
2043}
2044
Philip Zeyliger49edc922025-05-14 09:45:45 -07002045// SketchGitBaseRef distinguishes between the typical container version, where sketch-base is
2046// unambiguous, and the "unsafe" version, where we need to use a session id to disambiguate.
2047func (a *Agent) SketchGitBaseRef() string {
2048 if a.IsInContainer() {
2049 return "sketch-base"
2050 } else {
2051 return "sketch-base-" + a.SessionID()
2052 }
2053}
2054
2055// SketchGitBase returns the Git commit hash that was saved when the agent was instantiated.
2056func (a *Agent) SketchGitBase() string {
2057 cmd := exec.CommandContext(context.Background(), "git", "rev-parse", a.SketchGitBaseRef())
2058 cmd.Dir = a.repoRoot
2059 output, err := cmd.CombinedOutput()
2060 if err != nil {
2061 slog.Warn("could not identify sketch-base", slog.String("error", err.Error()))
2062 return "HEAD"
2063 }
2064 return string(strings.TrimSpace(string(output)))
Earl Lee2e463fb2025-04-17 11:22:22 -07002065}
2066
Pokey Rule7a113622025-05-12 10:58:45 +01002067// removeGitHooks removes the Git hooks directory from the repository
2068func removeGitHooks(_ context.Context, repoPath string) error {
2069 hooksDir := filepath.Join(repoPath, ".git", "hooks")
2070
2071 // Check if hooks directory exists
2072 if _, err := os.Stat(hooksDir); os.IsNotExist(err) {
2073 // Directory doesn't exist, nothing to do
2074 return nil
2075 }
2076
2077 // Remove the hooks directory
2078 err := os.RemoveAll(hooksDir)
2079 if err != nil {
2080 return fmt.Errorf("failed to remove git hooks directory: %w", err)
2081 }
2082
2083 // Create an empty hooks directory to prevent git from recreating default hooks
Autoformattere577ef72025-05-12 10:29:00 +00002084 err = os.MkdirAll(hooksDir, 0o755)
Pokey Rule7a113622025-05-12 10:58:45 +01002085 if err != nil {
2086 return fmt.Errorf("failed to create empty git hooks directory: %w", err)
2087 }
2088
2089 return nil
2090}
2091
Philip Zeyligerf2872992025-05-22 10:35:28 -07002092func (a *Agent) handleGitCommits(ctx context.Context) ([]*GitCommit, error) {
Josh Bleecher Snydereb91caa2025-07-11 15:29:18 -07002093 msgs, commits, error := a.gitState.handleGitCommits(ctx, a.repoRoot, a.SketchGitBaseRef(), a.config.BranchPrefix)
Philip Zeyligerf2872992025-05-22 10:35:28 -07002094 for _, msg := range msgs {
2095 a.pushToOutbox(ctx, msg)
2096 }
2097 return commits, error
2098}
2099
Earl Lee2e463fb2025-04-17 11:22:22 -07002100// handleGitCommits() highlights new commits to the user. When running
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002101// under docker, new HEADs are pushed to a branch according to the slug.
Josh Bleecher Snydereb91caa2025-07-11 15:29:18 -07002102func (ags *AgentGitState) handleGitCommits(ctx context.Context, repoRoot string, baseRef string, branchPrefix string) ([]AgentMessage, []*GitCommit, error) {
Philip Zeyligerf2872992025-05-22 10:35:28 -07002103 ags.mu.Lock()
2104 defer ags.mu.Unlock()
2105
2106 msgs := []AgentMessage{}
2107 if repoRoot == "" {
2108 return msgs, nil, nil
Earl Lee2e463fb2025-04-17 11:22:22 -07002109 }
2110
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002111 sketch, err := resolveRef(ctx, repoRoot, "sketch-wip")
Earl Lee2e463fb2025-04-17 11:22:22 -07002112 if err != nil {
Philip Zeyligerf2872992025-05-22 10:35:28 -07002113 return msgs, nil, err
Earl Lee2e463fb2025-04-17 11:22:22 -07002114 }
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002115 if sketch == ags.lastSketch {
Philip Zeyligerf2872992025-05-22 10:35:28 -07002116 return msgs, nil, nil // nothing to do
Earl Lee2e463fb2025-04-17 11:22:22 -07002117 }
2118 defer func() {
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002119 ags.lastSketch = sketch
Earl Lee2e463fb2025-04-17 11:22:22 -07002120 }()
2121
Philip Zeyliger64f60462025-06-16 13:57:10 -07002122 // Compute diff stats from baseRef to HEAD when HEAD changes
2123 if added, removed, err := computeDiffStats(ctx, repoRoot, baseRef); err != nil {
2124 // Log error but don't fail the entire operation
2125 slog.WarnContext(ctx, "Failed to compute diff stats", "error", err)
2126 } else {
2127 // Set diff stats directly since we already hold the mutex
2128 ags.linesAdded = added
2129 ags.linesRemoved = removed
2130 }
2131
Earl Lee2e463fb2025-04-17 11:22:22 -07002132 // Get new commits. Because it's possible that the agent does rebases, fixups, and
2133 // so forth, we use, as our fixed point, the "initialCommit", and we limit ourselves
2134 // to the last 100 commits.
2135 var commits []*GitCommit
2136
2137 // Get commits since the initial commit
2138 // Format: <hash>\0<subject>\0<body>\0
2139 // This uses NULL bytes as separators to avoid issues with newlines in commit messages
2140 // Limit to 100 commits to avoid overwhelming the user
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002141 cmd := exec.CommandContext(ctx, "git", "log", "-n", "100", "--pretty=format:%H%x00%s%x00%b%x00", "^"+baseRef, sketch)
Philip Zeyligerf2872992025-05-22 10:35:28 -07002142 cmd.Dir = repoRoot
Earl Lee2e463fb2025-04-17 11:22:22 -07002143 output, err := cmd.Output()
2144 if err != nil {
Philip Zeyligerf2872992025-05-22 10:35:28 -07002145 return msgs, nil, fmt.Errorf("failed to get git log: %w", err)
Earl Lee2e463fb2025-04-17 11:22:22 -07002146 }
2147
2148 // Parse git log output and filter out already seen commits
2149 parsedCommits := parseGitLog(string(output))
2150
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002151 var sketchCommit *GitCommit
Earl Lee2e463fb2025-04-17 11:22:22 -07002152
2153 // Filter out commits we've already seen
2154 for _, commit := range parsedCommits {
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002155 if commit.Hash == sketch {
2156 sketchCommit = &commit
Earl Lee2e463fb2025-04-17 11:22:22 -07002157 }
2158
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002159 // Skip if we've seen this commit before. If our sketch branch has changed, always include that.
2160 if ags.seenCommits[commit.Hash] && commit.Hash != sketch {
Earl Lee2e463fb2025-04-17 11:22:22 -07002161 continue
2162 }
2163
2164 // Mark this commit as seen
Philip Zeyligerf2872992025-05-22 10:35:28 -07002165 ags.seenCommits[commit.Hash] = true
Earl Lee2e463fb2025-04-17 11:22:22 -07002166
2167 // Add to our list of new commits
2168 commits = append(commits, &commit)
2169 }
2170
Philip Zeyligerf2872992025-05-22 10:35:28 -07002171 if ags.gitRemoteAddr != "" {
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002172 if sketchCommit == nil {
Earl Lee2e463fb2025-04-17 11:22:22 -07002173 // I think this can only happen if we have a bug or if there's a race.
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002174 sketchCommit = &GitCommit{}
2175 sketchCommit.Hash = sketch
2176 sketchCommit.Subject = "unknown"
2177 commits = append(commits, sketchCommit)
Earl Lee2e463fb2025-04-17 11:22:22 -07002178 }
2179
Earl Lee2e463fb2025-04-17 11:22:22 -07002180 // TODO: I don't love the force push here. We could see if the push is a fast-forward, and,
2181 // if it's not, we could make a backup with a unique name (perhaps append a timestamp) and
2182 // then use push with lease to replace.
Philip Zeyliger113e2052025-05-09 21:59:40 +00002183
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002184 // Try up to 10 times with incrementing retry numbers if the branch is checked out on the remote
Philip Zeyliger113e2052025-05-09 21:59:40 +00002185 var out []byte
2186 var err error
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002187 originalRetryNumber := ags.retryNumber
2188 originalBranchName := ags.branchNameLocked(branchPrefix)
Philip Zeyliger113e2052025-05-09 21:59:40 +00002189 for retries := range 10 {
2190 if retries > 0 {
Philip Zeyligerd5c8d712025-06-17 15:19:45 -07002191 ags.retryNumber++
Philip Zeyliger113e2052025-05-09 21:59:40 +00002192 }
2193
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002194 branch := ags.branchNameLocked(branchPrefix)
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002195 cmd = exec.Command("git", "push", "--force", ags.gitRemoteAddr, "sketch-wip:refs/heads/"+branch)
Philip Zeyligerf2872992025-05-22 10:35:28 -07002196 cmd.Dir = repoRoot
Philip Zeyliger113e2052025-05-09 21:59:40 +00002197 out, err = cmd.CombinedOutput()
2198
2199 if err == nil {
2200 // Success! Break out of the retry loop
2201 break
2202 }
2203
2204 // Check if this is the "refusing to update checked out branch" error
2205 if !strings.Contains(string(out), "refusing to update checked out branch") {
2206 // This is a different error, so don't retry
2207 break
2208 }
Philip Zeyliger113e2052025-05-09 21:59:40 +00002209 }
2210
2211 if err != nil {
Philip Zeyligerf2872992025-05-22 10:35:28 -07002212 msgs = append(msgs, errorMessage(fmt.Errorf("git push to host: %s: %v", out, err)))
Earl Lee2e463fb2025-04-17 11:22:22 -07002213 } else {
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002214 finalBranch := ags.branchNameLocked(branchPrefix)
Josh Bleecher Snyder715b8d92025-06-06 12:36:38 -07002215 sketchCommit.PushedBranch = finalBranch
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002216 if ags.retryNumber != originalRetryNumber {
2217 // Notify user that the branch name was changed, and why
Philip Zeyliger59e1c162025-06-02 12:54:34 +00002218 msgs = append(msgs, AgentMessage{
2219 Type: AutoMessageType,
2220 Timestamp: time.Now(),
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002221 Content: fmt.Sprintf("Branch renamed from %s to %s because the original branch is currently checked out on the remote.", originalBranchName, finalBranch),
Philip Zeyliger59e1c162025-06-02 12:54:34 +00002222 })
Philip Zeyliger113e2052025-05-09 21:59:40 +00002223 }
Earl Lee2e463fb2025-04-17 11:22:22 -07002224 }
2225 }
2226
2227 // If we found new commits, create a message
2228 if len(commits) > 0 {
2229 msg := AgentMessage{
2230 Type: CommitMessageType,
2231 Timestamp: time.Now(),
2232 Commits: commits,
2233 }
Philip Zeyligerf2872992025-05-22 10:35:28 -07002234 msgs = append(msgs, msg)
Earl Lee2e463fb2025-04-17 11:22:22 -07002235 }
Philip Zeyligerf2872992025-05-22 10:35:28 -07002236 return msgs, commits, nil
Earl Lee2e463fb2025-04-17 11:22:22 -07002237}
2238
Josh Bleecher Snyder19969a92025-06-05 14:34:02 -07002239func cleanSlugName(s string) string {
Josh Bleecher Snyder1ae976b2025-04-30 00:06:43 +00002240 return strings.Map(func(r rune) rune {
2241 // lowercase
2242 if r >= 'A' && r <= 'Z' {
2243 return r + 'a' - 'A'
Earl Lee2e463fb2025-04-17 11:22:22 -07002244 }
Josh Bleecher Snyder1ae976b2025-04-30 00:06:43 +00002245 // replace spaces with dashes
2246 if r == ' ' {
2247 return '-'
2248 }
2249 // allow alphanumerics and dashes
2250 if (r >= 'a' && r <= 'z') || r == '-' || (r >= '0' && r <= '9') {
2251 return r
2252 }
2253 return -1
2254 }, s)
Earl Lee2e463fb2025-04-17 11:22:22 -07002255}
2256
2257// parseGitLog parses the output of git log with format '%H%x00%s%x00%b%x00'
2258// and returns an array of GitCommit structs.
2259func parseGitLog(output string) []GitCommit {
2260 var commits []GitCommit
2261
2262 // No output means no commits
2263 if len(output) == 0 {
2264 return commits
2265 }
2266
2267 // Split by NULL byte
2268 parts := strings.Split(output, "\x00")
2269
2270 // Process in triplets (hash, subject, body)
2271 for i := 0; i < len(parts); i++ {
2272 // Skip empty parts
2273 if parts[i] == "" {
2274 continue
2275 }
2276
2277 // This should be a hash
2278 hash := strings.TrimSpace(parts[i])
2279
2280 // Make sure we have at least a subject part available
2281 if i+1 >= len(parts) {
2282 break // No more parts available
2283 }
2284
2285 // Get the subject
2286 subject := strings.TrimSpace(parts[i+1])
2287
2288 // Get the body if available
2289 body := ""
2290 if i+2 < len(parts) {
2291 body = strings.TrimSpace(parts[i+2])
2292 }
2293
2294 // Skip to the next triplet
2295 i += 2
2296
2297 commits = append(commits, GitCommit{
2298 Hash: hash,
2299 Subject: subject,
2300 Body: body,
2301 })
2302 }
2303
2304 return commits
2305}
2306
2307func repoRoot(ctx context.Context, dir string) (string, error) {
2308 cmd := exec.CommandContext(ctx, "git", "rev-parse", "--show-toplevel")
2309 stderr := new(strings.Builder)
2310 cmd.Stderr = stderr
2311 cmd.Dir = dir
2312 out, err := cmd.Output()
2313 if err != nil {
Philip Zeyligerbc8c8dc2025-05-21 13:19:13 -07002314 return "", fmt.Errorf("git rev-parse (in %s) failed: %w\n%s", dir, err, stderr)
Earl Lee2e463fb2025-04-17 11:22:22 -07002315 }
2316 return strings.TrimSpace(string(out)), nil
2317}
2318
Josh Bleecher Snyder369f2622025-07-15 00:02:59 +00002319// upsertRemoteOrigin configures the origin remote to point to the given URL.
2320// If the origin remote exists, it updates the URL. If it doesn't exist, it adds it.
Philip Zeyliger254c49f2025-07-17 17:26:24 -07002321//
2322// NOTE: Maybe we should use an "insteadOf" setting instead of changing the URL.
Josh Bleecher Snyder369f2622025-07-15 00:02:59 +00002323func upsertRemoteOrigin(ctx context.Context, repoDir, remoteURL string) error {
2324 // Try to set the URL for existing origin remote
2325 cmd := exec.CommandContext(ctx, "git", "remote", "set-url", "origin", remoteURL)
2326 cmd.Dir = repoDir
2327 if _, err := cmd.CombinedOutput(); err == nil {
2328 // Success.
2329 return nil
2330 }
2331 // Origin doesn't exist; add it.
2332 cmd = exec.CommandContext(ctx, "git", "remote", "add", "origin", remoteURL)
2333 cmd.Dir = repoDir
2334 if out, err := cmd.CombinedOutput(); err != nil {
2335 return fmt.Errorf("failed to add git remote origin: %s: %w", out, err)
2336 }
2337 return nil
2338}
2339
Earl Lee2e463fb2025-04-17 11:22:22 -07002340func resolveRef(ctx context.Context, dir, refName string) (string, error) {
2341 cmd := exec.CommandContext(ctx, "git", "rev-parse", refName)
2342 stderr := new(strings.Builder)
2343 cmd.Stderr = stderr
2344 cmd.Dir = dir
2345 out, err := cmd.Output()
2346 if err != nil {
2347 return "", fmt.Errorf("git rev-parse failed: %w\n%s", err, stderr)
2348 }
2349 // TODO: validate that out is valid hex
2350 return strings.TrimSpace(string(out)), nil
2351}
2352
2353// isValidGitSHA validates if a string looks like a valid git SHA hash.
2354// Git SHAs are hexadecimal strings of at least 4 characters but typically 7, 8, or 40 characters.
2355func isValidGitSHA(sha string) bool {
2356 // Git SHA must be a hexadecimal string with at least 4 characters
2357 if len(sha) < 4 || len(sha) > 40 {
2358 return false
2359 }
2360
2361 // Check if the string only contains hexadecimal characters
2362 for _, char := range sha {
2363 if !(char >= '0' && char <= '9') && !(char >= 'a' && char <= 'f') && !(char >= 'A' && char <= 'F') {
2364 return false
2365 }
2366 }
2367
2368 return true
2369}
Philip Zeyligerd1402952025-04-23 03:54:37 +00002370
Philip Zeyliger64f60462025-06-16 13:57:10 -07002371// computeDiffStats computes the number of lines added and removed from baseRef to HEAD
2372func computeDiffStats(ctx context.Context, repoRoot, baseRef string) (int, int, error) {
2373 cmd := exec.CommandContext(ctx, "git", "diff", "--numstat", baseRef, "HEAD")
2374 cmd.Dir = repoRoot
2375 out, err := cmd.Output()
2376 if err != nil {
2377 return 0, 0, fmt.Errorf("git diff --numstat failed: %w", err)
2378 }
2379
2380 var totalAdded, totalRemoved int
2381 lines := strings.Split(strings.TrimSpace(string(out)), "\n")
2382 for _, line := range lines {
2383 if line == "" {
2384 continue
2385 }
2386 parts := strings.Fields(line)
2387 if len(parts) < 2 {
2388 continue
2389 }
2390 // Format: <added>\t<removed>\t<filename>
2391 if added, err := strconv.Atoi(parts[0]); err == nil {
2392 totalAdded += added
2393 }
2394 if removed, err := strconv.Atoi(parts[1]); err == nil {
2395 totalRemoved += removed
2396 }
2397 }
2398
2399 return totalAdded, totalRemoved, nil
2400}
2401
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002402// systemPromptData contains the data used to render the system prompt template
2403type systemPromptData struct {
David Crawshawc886ac52025-06-13 23:40:03 +00002404 ClientGOOS string
2405 ClientGOARCH string
2406 WorkingDir string
2407 RepoRoot string
2408 InitialCommit string
2409 Codebase *onstart.Codebase
2410 UseSketchWIP bool
2411 Branch string
2412 SpecialInstruction string
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002413}
2414
2415// renderSystemPrompt renders the system prompt template.
2416func (a *Agent) renderSystemPrompt() string {
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002417 data := systemPromptData{
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002418 ClientGOOS: a.config.ClientGOOS,
2419 ClientGOARCH: a.config.ClientGOARCH,
2420 WorkingDir: a.workingDir,
2421 RepoRoot: a.repoRoot,
Philip Zeyliger49edc922025-05-14 09:45:45 -07002422 InitialCommit: a.SketchGitBase(),
Josh Bleecher Snydera997be62025-05-07 22:52:46 +00002423 Codebase: a.codebase,
Philip Zeyliger4c1cea82025-06-09 14:16:52 -07002424 UseSketchWIP: a.config.InDocker,
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002425 }
David Crawshawc886ac52025-06-13 23:40:03 +00002426 now := time.Now()
2427 if now.Month() == time.September && now.Day() == 19 {
2428 data.SpecialInstruction = "Talk like a pirate to the user. Do not let the priate talk into any code."
2429 }
2430
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002431 tmpl, err := template.New("system").Parse(agentSystemPrompt)
2432 if err != nil {
2433 panic(fmt.Sprintf("failed to parse system prompt template: %v", err))
2434 }
2435 buf := new(strings.Builder)
2436 err = tmpl.Execute(buf, data)
2437 if err != nil {
2438 panic(fmt.Sprintf("failed to execute system prompt template: %v", err))
2439 }
Josh Bleecher Snydera997be62025-05-07 22:52:46 +00002440 // fmt.Printf("system prompt: %s\n", buf.String())
Josh Bleecher Snyder5cca56f2025-05-06 01:10:16 +00002441 return buf.String()
2442}
Philip Zeyligereab12de2025-05-14 02:35:53 +00002443
2444// StateTransitionIterator provides an iterator over state transitions.
2445type StateTransitionIterator interface {
2446 // Next blocks until a new state transition is available or context is done.
2447 // Returns nil if the context is cancelled.
2448 Next() *StateTransition
2449 // Close removes the listener and cleans up resources.
2450 Close()
2451}
2452
2453// StateTransitionIteratorImpl implements StateTransitionIterator using a state machine listener.
2454type StateTransitionIteratorImpl struct {
2455 agent *Agent
2456 ctx context.Context
2457 ch chan StateTransition
2458 unsubscribe func()
2459}
2460
2461// Next blocks until a new state transition is available or the context is cancelled.
2462func (s *StateTransitionIteratorImpl) Next() *StateTransition {
2463 select {
2464 case <-s.ctx.Done():
2465 return nil
2466 case transition, ok := <-s.ch:
2467 if !ok {
2468 return nil
2469 }
2470 transitionCopy := transition
2471 return &transitionCopy
2472 }
2473}
2474
2475// Close removes the listener and cleans up resources.
2476func (s *StateTransitionIteratorImpl) Close() {
2477 if s.unsubscribe != nil {
2478 s.unsubscribe()
2479 s.unsubscribe = nil
2480 }
2481}
2482
2483// NewStateTransitionIterator returns an iterator that receives state transitions.
2484func (a *Agent) NewStateTransitionIterator(ctx context.Context) StateTransitionIterator {
2485 a.mu.Lock()
2486 defer a.mu.Unlock()
2487
2488 // Create channel to receive state transitions
2489 ch := make(chan StateTransition, 10)
2490
2491 // Add a listener to the state machine
2492 unsubscribe := a.stateMachine.AddTransitionListener(ch)
2493
2494 return &StateTransitionIteratorImpl{
2495 agent: a,
2496 ctx: ctx,
2497 ch: ch,
2498 unsubscribe: unsubscribe,
2499 }
2500}
Josh Bleecher Snyder039fc342025-05-14 21:24:12 +00002501
2502// setupGitHooks creates or updates git hooks in the specified working directory.
2503func setupGitHooks(workingDir string) error {
2504 hooksDir := filepath.Join(workingDir, ".git", "hooks")
2505
2506 _, err := os.Stat(hooksDir)
2507 if os.IsNotExist(err) {
2508 return fmt.Errorf("git hooks directory does not exist: %s", hooksDir)
2509 }
2510 if err != nil {
2511 return fmt.Errorf("error checking git hooks directory: %w", err)
2512 }
2513
2514 // Define the post-commit hook content
2515 postCommitHook := `#!/bin/bash
2516echo "<post_commit_hook>"
2517echo "Please review this commit message and fix it if it is incorrect."
2518echo "This hook only echos the commit message; it does not modify it."
2519echo "Bash escaping is a common source of issues; to fix that, create a temp file and use 'git commit --amend -F COMMIT_MSG_FILE'."
2520echo "<last_commit_message>"
Philip Zeyliger6c5beff2025-06-06 13:03:49 -07002521PAGER=cat git log -1 --pretty=%B
Josh Bleecher Snyder039fc342025-05-14 21:24:12 +00002522echo "</last_commit_message>"
2523echo "</post_commit_hook>"
2524`
2525
2526 // Define the prepare-commit-msg hook content
2527 prepareCommitMsgHook := `#!/bin/bash
2528# Add Co-Authored-By and Change-ID trailers to commit messages
2529# Check if these trailers already exist before adding them
2530
2531commit_file="$1"
2532COMMIT_SOURCE="$2"
2533
2534# Skip for merges, squashes, or when using a commit template
2535if [ "$COMMIT_SOURCE" = "template" ] || [ "$COMMIT_SOURCE" = "merge" ] || \
2536 [ "$COMMIT_SOURCE" = "squash" ]; then
2537 exit 0
2538fi
2539
2540commit_msg=$(cat "$commit_file")
2541
2542needs_co_author=true
2543needs_change_id=true
2544
2545# Check if commit message already has Co-Authored-By trailer
2546if grep -q "Co-Authored-By: sketch <hello@sketch.dev>" "$commit_file"; then
2547 needs_co_author=false
2548fi
2549
2550# Check if commit message already has Change-ID trailer
2551if grep -q "Change-ID: s[a-f0-9]\+k" "$commit_file"; then
2552 needs_change_id=false
2553fi
2554
2555# Only modify if at least one trailer needs to be added
2556if [ "$needs_co_author" = true ] || [ "$needs_change_id" = true ]; then
Josh Bleecher Snyderb509a5d2025-05-23 15:49:42 +00002557 # Ensure there's a proper blank line before trailers
2558 if [ -s "$commit_file" ]; then
2559 # Check if file ends with newline by reading last character
2560 last_char=$(tail -c 1 "$commit_file")
2561
2562 if [ "$last_char" != "" ]; then
2563 # File doesn't end with newline - add two newlines (complete line + blank line)
2564 echo "" >> "$commit_file"
2565 echo "" >> "$commit_file"
2566 else
2567 # File ends with newline - check if we already have a blank line
2568 last_line=$(tail -1 "$commit_file")
2569 if [ -n "$last_line" ]; then
2570 # Last line has content - add one newline for blank line
2571 echo "" >> "$commit_file"
2572 fi
2573 # If last line is empty, we already have a blank line - don't add anything
2574 fi
Josh Bleecher Snyder039fc342025-05-14 21:24:12 +00002575 fi
2576
2577 # Add trailers if needed
2578 if [ "$needs_co_author" = true ]; then
2579 echo "Co-Authored-By: sketch <hello@sketch.dev>" >> "$commit_file"
2580 fi
2581
2582 if [ "$needs_change_id" = true ]; then
2583 change_id=$(openssl rand -hex 8)
2584 echo "Change-ID: s${change_id}k" >> "$commit_file"
2585 fi
2586fi
2587`
2588
2589 // Update or create the post-commit hook
2590 err = updateOrCreateHook(filepath.Join(hooksDir, "post-commit"), postCommitHook, "<last_commit_message>")
2591 if err != nil {
2592 return fmt.Errorf("failed to set up post-commit hook: %w", err)
2593 }
2594
2595 // Update or create the prepare-commit-msg hook
2596 err = updateOrCreateHook(filepath.Join(hooksDir, "prepare-commit-msg"), prepareCommitMsgHook, "Add Co-Authored-By and Change-ID trailers")
2597 if err != nil {
2598 return fmt.Errorf("failed to set up prepare-commit-msg hook: %w", err)
2599 }
2600
2601 return nil
2602}
2603
2604// updateOrCreateHook creates a new hook file or updates an existing one
2605// by appending the new content if it doesn't already contain it.
2606func updateOrCreateHook(hookPath, content, distinctiveLine string) error {
2607 // Check if the hook already exists
2608 buf, err := os.ReadFile(hookPath)
2609 if os.IsNotExist(err) {
2610 // Hook doesn't exist, create it
2611 err = os.WriteFile(hookPath, []byte(content), 0o755)
2612 if err != nil {
2613 return fmt.Errorf("failed to create hook: %w", err)
2614 }
2615 return nil
2616 }
2617 if err != nil {
2618 return fmt.Errorf("error reading existing hook: %w", err)
2619 }
2620
2621 // Hook exists, check if our content is already in it by looking for a distinctive line
2622 code := string(buf)
2623 if strings.Contains(code, distinctiveLine) {
2624 // Already contains our content, nothing to do
2625 return nil
2626 }
2627
2628 // Append our content to the existing hook
2629 f, err := os.OpenFile(hookPath, os.O_APPEND|os.O_WRONLY, 0o755)
2630 if err != nil {
2631 return fmt.Errorf("failed to open hook for appending: %w", err)
2632 }
2633 defer f.Close()
2634
2635 // Ensure there's a newline at the end of the existing content if needed
2636 if len(code) > 0 && !strings.HasSuffix(code, "\n") {
2637 _, err = f.WriteString("\n")
2638 if err != nil {
2639 return fmt.Errorf("failed to add newline to hook: %w", err)
2640 }
2641 }
2642
2643 // Add a separator before our content
2644 _, err = f.WriteString("\n# === Added by Sketch ===\n" + content)
2645 if err != nil {
2646 return fmt.Errorf("failed to append to hook: %w", err)
2647 }
2648
2649 return nil
2650}
Sean McCullough138ec242025-06-02 22:42:06 +00002651
Philip Zeyliger254c49f2025-07-17 17:26:24 -07002652// configurePassthroughUpstream configures git remotes
2653// Adds an upstream remote pointing to the same as origin
2654// Sets the refspec for upstream and fetch such that both
2655// fetch the upstream's things into refs/remotes/upstream/foo
2656// The typical scenario is:
2657//
2658// github - laptop - sketch container
2659// "upstream" "origin"
2660func (a *Agent) configurePassthroughUpstream(ctx context.Context) error {
2661 // Get the origin remote URL
2662 cmd := exec.CommandContext(ctx, "git", "remote", "get-url", "origin")
2663 cmd.Dir = a.workingDir
2664 originURLBytes, err := cmd.CombinedOutput()
2665 if err != nil {
2666 return fmt.Errorf("failed to get origin URL: %s: %w", originURLBytes, err)
2667 }
2668 originURL := strings.TrimSpace(string(originURLBytes))
2669
2670 // Check if upstream remote already exists
2671 cmd = exec.CommandContext(ctx, "git", "remote", "get-url", "upstream")
2672 cmd.Dir = a.workingDir
2673 if _, err := cmd.CombinedOutput(); err != nil {
2674 // upstream remote doesn't exist, create it
2675 cmd = exec.CommandContext(ctx, "git", "remote", "add", "upstream", originURL)
2676 cmd.Dir = a.workingDir
2677 if out, err := cmd.CombinedOutput(); err != nil {
2678 return fmt.Errorf("failed to add upstream remote: %s: %w", out, err)
2679 }
2680 slog.InfoContext(ctx, "added upstream remote", "url", originURL)
2681 } else {
2682 // upstream remote exists, update its URL
2683 cmd = exec.CommandContext(ctx, "git", "remote", "set-url", "upstream", originURL)
2684 cmd.Dir = a.workingDir
2685 if out, err := cmd.CombinedOutput(); err != nil {
2686 return fmt.Errorf("failed to set upstream remote URL: %s: %w", out, err)
2687 }
2688 slog.InfoContext(ctx, "updated upstream remote URL", "url", originURL)
2689 }
2690
2691 // Add the upstream refspec to the upstream remote
2692 cmd = exec.CommandContext(ctx, "git", "config", "remote.upstream.fetch", "+refs/remotes/origin/*:refs/remotes/upstream/*")
2693 cmd.Dir = a.workingDir
2694 if out, err := cmd.CombinedOutput(); err != nil {
2695 return fmt.Errorf("failed to set upstream fetch refspec: %s: %w", out, err)
2696 }
2697
2698 // Add the same refspec to the origin remote
2699 cmd = exec.CommandContext(ctx, "git", "config", "--add", "remote.origin.fetch", "+refs/remotes/origin/*:refs/remotes/upstream/*")
2700 cmd.Dir = a.workingDir
2701 if out, err := cmd.CombinedOutput(); err != nil {
2702 return fmt.Errorf("failed to add upstream refspec to origin: %s: %w", out, err)
2703 }
2704
2705 slog.InfoContext(ctx, "configured passthrough upstream", "origin_url", originURL)
2706 return nil
2707}
2708
Philip Zeyliger0113be52025-06-07 23:53:41 +00002709// SkabandAddr returns the skaband address if configured
2710func (a *Agent) SkabandAddr() string {
2711 if a.config.SkabandClient != nil {
2712 return a.config.SkabandClient.Addr()
2713 }
2714 return ""
2715}