commit 49edc92f95cab092a7ee62c350c6e69275b50cc8
author Philip Zeyliger <philip@bold.dev> Wed May 14 09:45:45 2025 -0700
committer Autoformatter <bot@sketch.dev> Wed May 14 16:46:49 2025 +0000
tree 946b8359f6187ed630c4d08fa05e91fe1bc5a48d
parent 52eeb15cf2f70caaadc4e0722a3b687ad9a91981

agent: move "sketch-base" into git

The agent's notion of "initial commit" is kind of special, in that it
is used as the "base" for a bunch of git operations. It's hard for
the user to change (we only provide a workflow via restart), yet
sometimes you want to do just that.

So, instead we put it as data inside of it, named as a tag sketch-base.
It's abusing tags, but branches are no better.

termui/termui.go

diff --git a/termui/termui.go b/termui/termui.go
index 1575473..6dc5f87 100644
--- a/termui/termui.go
+++ b/termui/termui.go
@@ -262,10 +262,11 @@
 					branches = append(branches, branch)
 				}
 
-				initialCommitRef := getShortSHA(ui.agent.InitialCommit())
+				initialCommitRef := getShortSHA(ui.agent.SketchGitBase())
 				if len(branches) == 1 {
 					ui.AppendSystemMessage("\n🔄 Branch pushed during session: %s", branches[0])
 					ui.AppendSystemMessage("🍒 To add those changes to your branch: git cherry-pick %s..%s", initialCommitRef, branches[0])
+					ui.AppendSystemMessage("🔀                                   or git merge %s", branches[0])
 				} else {
 					ui.AppendSystemMessage("\n🔄 Branches pushed during session:")
 					for _, branch := range branches {
@@ -275,6 +276,14 @@
 					for _, branch := range branches {
 						ui.AppendSystemMessage("git cherry-pick %s..%s", initialCommitRef, branch)
 					}
+					ui.AppendSystemMessage("\n🍒 To add all those changes to your branch:")
+					for _, branch := range branches {
+						ui.AppendSystemMessage("git cherry-pick %s..%s", initialCommitRef, branch)
+					}
+					ui.AppendSystemMessage("\n🔀                              or:")
+					for _, branch := range branches {
+						ui.AppendSystemMessage("git merge %s", branch)
+					}
 				}
 			}
 			ui.mu.Unlock()