diff --git a/internal/backend/agent/prompt/replay.go b/internal/backend/agent/prompt/replay.go
index baf86f6..4b2eb0c 100644
--- a/internal/backend/agent/prompt/replay.go
+++ b/internal/backend/agent/prompt/replay.go
@@ -62,6 +62,46 @@ func buildUserReplayMessage(text string, selectedContext *agentv1.SelectedContex
}, true
}
+// BuildSelectedCursorCommandsReplayMessage renders command content for new history entries.
+// Keeping this separate from BuildUserMessageReplayMessage prevents old user_message entries
+// from changing their model-visible meaning after a backend upgrade.
+func BuildSelectedCursorCommandsReplayMessage(userMessage *agentv1.UserMessage) (Message, bool) {
+ if userMessage == nil {
+ return Message{}, false
+ }
+ content := buildSelectedCursorCommandsPromptSection(userMessage.GetSelectedContext())
+ if content == "" {
+ return Message{}, false
+ }
+ return Message{Role: "user", Content: content}, true
+}
+
+func buildSelectedCursorCommandsPromptSection(selectedContext *agentv1.SelectedContext) string {
+ if selectedContext == nil || len(selectedContext.GetCursorCommands()) == 0 {
+ return ""
+ }
+ entries := make([]string, 0, len(selectedContext.GetCursorCommands()))
+ for _, command := range selectedContext.GetCursorCommands() {
+ if command == nil {
+ continue
+ }
+ content := strings.TrimSpace(command.GetContent())
+ if content == "" {
+ continue
+ }
+ name := strings.TrimSpace(command.GetName())
+ if name == "" {
+ entries = append(entries, "\n"+content+"\n")
+ continue
+ }
+ entries = append(entries, fmt.Sprintf("\n%s\n", escapePromptXML(name), content))
+ }
+ if len(entries) == 0 {
+ return ""
+ }
+ return "\n" + strings.Join(entries, "\n\n") + "\n"
+}
+
func buildSelectedIDEStatePromptSection(selectedContext *agentv1.SelectedContext) string {
if selectedContext == nil || selectedContext.GetInvocationContext() == nil {
return ""
diff --git a/internal/backend/forwarder/compaction.go b/internal/backend/forwarder/compaction.go
index c3fd67c..f28220c 100644
--- a/internal/backend/forwarder/compaction.go
+++ b/internal/backend/forwarder/compaction.go
@@ -77,7 +77,7 @@ func (service *Service) maybeCompactBeforeProvider(stream *ActiveStream, convers
if service == nil || stream == nil || conversation == nil {
return false, nil
}
- manualInstruction, manual := parseManualCompactionDirective(stream.LatestUserText)
+ manualInstruction, manual := streamManualCompactionDirective(stream)
plan, err := service.buildCompactionPlan(stream, conversation, compiled, manual, manualInstruction)
if err != nil {
return false, err
@@ -827,7 +827,7 @@ func buildFallbackCompactionSummary(plan *PendingCompaction) string {
sections = append(sections, "Compaction note:\n"+truncateCompactionText(plan.HookMessage, 800))
}
if strings.TrimSpace(plan.ManualInstruction) != "" {
- sections = append(sections, "Manual compact instruction:\n"+truncateCompactionText(plan.ManualInstruction, 800))
+ sections = append(sections, "Manual summarize instruction:\n"+truncateCompactionText(plan.ManualInstruction, 800))
}
return strings.TrimSpace(truncateCompactionText(strings.Join(sections, "\n\n"), compactionSummaryMaxChars))
}
@@ -875,13 +875,62 @@ func (service *Service) resolveCompactionReserveTokens(modelID string) int64 {
return compactionAutoReserveTokens
}
+func parseManualCompactionRequest(userMessage *agentv1.UserMessage) (string, bool) {
+ if userMessage == nil {
+ return "", false
+ }
+ userText := strings.TrimSpace(userMessage.GetText())
+ if instruction, ok := parseManualCompactionDirective(userText); ok {
+ return instruction, true
+ }
+ if userText != "" {
+ return "", false
+ }
+ selectedContext := userMessage.GetSelectedContext()
+ if selectedContext == nil {
+ return "", false
+ }
+ for _, command := range selectedContext.GetCursorCommands() {
+ if !isCursorSummarizeCommand(command) {
+ continue
+ }
+ instruction, _ := parseManualCompactionDirective(command.GetContent())
+ return instruction, true
+ }
+ return "", false
+}
+
+func streamManualCompactionDirective(stream *ActiveStream) (string, bool) {
+ if stream == nil {
+ return "", false
+ }
+ stream.mu.Lock()
+ defer stream.mu.Unlock()
+ if stream.ManualCompaction.Requested {
+ return strings.TrimSpace(stream.ManualCompaction.Instruction), true
+ }
+ return parseManualCompactionDirective(stream.LatestUserText)
+}
+
+func isCursorSummarizeCommand(command *agentv1.SelectedCursorCommand) bool {
+ if command == nil {
+ return false
+ }
+ if strings.EqualFold(strings.TrimSpace(command.GetName()), "glass-action-summarize") {
+ return true
+ }
+ _, ok := parseManualCompactionDirective(command.GetContent())
+ return ok
+}
+
func parseManualCompactionDirective(latestUserText string) (string, bool) {
trimmed := strings.TrimSpace(latestUserText)
+ const directive = "/summarize"
switch {
- case trimmed == "/compact":
+ case trimmed == directive:
return "", true
- case strings.HasPrefix(trimmed, "/compact "):
- return strings.TrimSpace(strings.TrimPrefix(trimmed, "/compact")), true
+ case strings.HasPrefix(trimmed, directive+" "):
+ return strings.TrimSpace(strings.TrimPrefix(trimmed, directive)), true
default:
return "", false
}
diff --git a/internal/backend/forwarder/prompt_context.go b/internal/backend/forwarder/prompt_context.go
index 798dcda..f282a04 100644
--- a/internal/backend/forwarder/prompt_context.go
+++ b/internal/backend/forwarder/prompt_context.go
@@ -9,6 +9,8 @@ import (
modeladapter "cursor/internal/backend/agent/model"
)
+const promptContextSourceSelectedCursorCommands = "selected_cursor_commands"
+
func newPromptContextMessage(source string, message modeladapter.Message, persist bool) PromptContextMessage {
context := PromptContextMessage{
Source: strings.TrimSpace(source),
diff --git a/internal/backend/forwarder/prompt_guard.go b/internal/backend/forwarder/prompt_guard.go
index 3545325..a3bcc99 100644
--- a/internal/backend/forwarder/prompt_guard.go
+++ b/internal/backend/forwarder/prompt_guard.go
@@ -18,6 +18,10 @@ const (
promptGuardSelectedFileChars = 16000
promptGuardSelectedFilesTotalChars = 64000
promptGuardSelectedFilesMaxCount = 12
+ promptGuardCursorCommandNameChars = 256
+ promptGuardCursorCommandChars = 12000
+ promptGuardCursorCommandsTotalChars = 32000
+ promptGuardCursorCommandsMaxCount = 8
promptGuardRequestFileChars = 16000
promptGuardRequestFilesTotalChars = 64000
promptGuardRequestFilesMaxCount = 12
@@ -106,11 +110,42 @@ func guardSelectedContext(selectedContext *agentv1.SelectedContext) *agentv1.Sel
return selectedContext
}
cloned.Files = guardSelectedFiles(cloned.GetFiles())
+ cloned.CursorCommands = guardSelectedCursorCommands(cloned.GetCursorCommands())
cloned.SelectedSkills = guardAgentSkills(cloned.GetSelectedSkills())
cloned.ExtraContext = guardStringSlice(cloned.GetExtraContext(), "selected_context.extra_context", promptGuardRealtimeTextChars, promptGuardRealtimeTextChars, promptGuardAgentSkillsMaxCount)
return cloned
}
+func guardSelectedCursorCommands(commands []*agentv1.SelectedCursorCommand) []*agentv1.SelectedCursorCommand {
+ if len(commands) == 0 {
+ return nil
+ }
+ result := make([]*agentv1.SelectedCursorCommand, 0, minInt(len(commands), promptGuardCursorCommandsMaxCount))
+ remaining := promptGuardCursorCommandsTotalChars
+ for _, command := range commands {
+ if command == nil || len(result) >= promptGuardCursorCommandsMaxCount {
+ continue
+ }
+ content := strings.TrimSpace(command.GetContent())
+ if content == "" {
+ continue
+ }
+ limit := minInt(promptGuardCursorCommandChars, remaining)
+ if limit <= 0 {
+ break
+ }
+ cloned, ok := proto.Clone(command).(*agentv1.SelectedCursorCommand)
+ if !ok || cloned == nil {
+ continue
+ }
+ cloned.Name = truncatePromptGuardText("selected_context.cursor_commands.name", strings.TrimSpace(cloned.GetName()), promptGuardCursorCommandNameChars)
+ cloned.Content = truncatePromptGuardText("selected_context.cursor_commands.content", content, limit)
+ remaining -= promptGuardRuneCount(cloned.GetContent())
+ result = append(result, cloned)
+ }
+ return result
+}
+
func guardSelectedFiles(files []*agentv1.SelectedFile) []*agentv1.SelectedFile {
if len(files) == 0 {
return nil
diff --git a/internal/backend/forwarder/service.go b/internal/backend/forwarder/service.go
index d9c265e..09c2a1a 100644
--- a/internal/backend/forwarder/service.go
+++ b/internal/backend/forwarder/service.go
@@ -23,6 +23,7 @@ import (
interactionbridge "cursor/internal/backend/agent/bridge/interaction"
runtimecore "cursor/internal/backend/agent/core"
modeladapter "cursor/internal/backend/agent/model"
+ promptengine "cursor/internal/backend/agent/prompt"
protocol "cursor/internal/backend/agent/protocol"
)
@@ -672,6 +673,7 @@ func (service *Service) decodeInboundIntent(requestID string, message *agentv1.A
default:
return InboundIntent{}, fmt.Errorf("unsupported client message kind: %s", clientKind)
}
+ intent.ManualCompaction = resolveInboundManualCompaction(message, intent.UserMessage)
return intent, nil
}
@@ -751,6 +753,7 @@ func (service *Service) handleRunIntent(intent InboundIntent) error {
stream.mu.Lock()
stream.ThinkingEffort = strings.TrimSpace(intent.ThinkingEffort)
stream.SubagentModelOverrides = cloneSubagentModelOverrides(intent.SubagentModelOverrides)
+ stream.ManualCompaction = intent.ManualCompaction
stream.PendingProviderAction = providerActionNone
stream.PendingCompaction = nil
stream.PendingExecs = make(map[string]runtimecore.PendingExec)
@@ -788,6 +791,7 @@ func (service *Service) handleRunIntent(intent InboundIntent) error {
"subagent_model_override_count": len(intent.SubagentModelOverrides),
"subagent_model_overrides": subagentModelOverrideSummaries(intent.SubagentModelOverrides),
"latest_user_text": userMessageText(intent.UserMessage),
+ "manual_compaction_requested": intent.ManualCompaction.Requested,
})
if err := service.publishCheckpoint(intent.RequestID, intent.ConversationID); err != nil {
return err
@@ -2332,7 +2336,8 @@ func buildRunEntries(intent InboundIntent, effectiveMode agentv1.AgentMode, turn
}
}
if intent.UserMessage != nil {
- payload, err := protojson.Marshal(normalizeUserMessageForStorage(intent.UserMessage))
+ normalized := normalizeUserMessageForStorage(intent.UserMessage)
+ payload, err := protojson.Marshal(normalized)
if err != nil {
return nil, err
}
@@ -2343,6 +2348,13 @@ func buildRunEntries(intent InboundIntent, effectiveMode agentv1.AgentMode, turn
Kind: "user_message",
Payload: payload,
})
+ if commandMessage, ok := promptengine.BuildSelectedCursorCommandsReplayMessage(normalized); ok {
+ entries = append(entries, newPromptContextEntry(turnSeq, intent.RequestID, newPromptContextMessage(
+ promptContextSourceSelectedCursorCommands,
+ modeladapter.Message{Role: commandMessage.Role, Content: commandMessage.Content},
+ true,
+ )))
+ }
}
modeEntry, err := newModeMetadataEntry(turnSeq, intent.RequestID, effectiveMode, intent.HasExplicitMode, intent.ModeSource)
if err != nil {
@@ -2643,6 +2655,38 @@ func conversationActionIsResume(action *agentv1.ConversationAction) bool {
return ok
}
+func inboundConversationAction(message *agentv1.AgentClientMessage) *agentv1.ConversationAction {
+ if message == nil {
+ return nil
+ }
+ if action := message.GetConversationAction(); action != nil {
+ return action
+ }
+ if runRequest := message.GetRunRequest(); runRequest != nil {
+ return runRequest.GetAction()
+ }
+ return nil
+}
+
+func conversationActionIsSummarize(action *agentv1.ConversationAction) bool {
+ if action == nil {
+ return false
+ }
+ _, ok := action.GetAction().(*agentv1.ConversationAction_SummarizeAction)
+ return ok
+}
+
+func resolveInboundManualCompaction(message *agentv1.AgentClientMessage, userMessage *agentv1.UserMessage) manualCompactionDirective {
+ instruction, requested := parseManualCompactionRequest(userMessage)
+ if conversationActionIsSummarize(inboundConversationAction(message)) {
+ requested = true
+ }
+ return manualCompactionDirective{
+ Requested: requested,
+ Instruction: instruction,
+ }
+}
+
func conversationActionStartsRun(action *agentv1.ConversationAction) bool {
if action == nil {
return false
@@ -2650,6 +2694,7 @@ func conversationActionStartsRun(action *agentv1.ConversationAction) bool {
switch action.GetAction().(type) {
case *agentv1.ConversationAction_UserMessageAction,
*agentv1.ConversationAction_ResumeAction,
+ *agentv1.ConversationAction_SummarizeAction,
*agentv1.ConversationAction_StartPlanAction,
*agentv1.ConversationAction_ExecutePlanAction:
return true
diff --git a/internal/backend/forwarder/types.go b/internal/backend/forwarder/types.go
index 4f7111e..c87ef98 100644
--- a/internal/backend/forwarder/types.go
+++ b/internal/backend/forwarder/types.go
@@ -116,6 +116,11 @@ type StreamSubscriber struct {
Signal chan struct{}
}
+type manualCompactionDirective struct {
+ Requested bool
+ Instruction string
+}
+
type ActiveStream struct {
mu sync.Mutex
@@ -126,6 +131,7 @@ type ActiveStream struct {
ModelName string
Mode agentv1.AgentMode
LatestUserText string
+ ManualCompaction manualCompactionDirective
Status StreamStatus
ThinkingEffort string
SubagentModelOverrides map[string]runtimecore.SubagentModelOverrideSelection
@@ -407,6 +413,7 @@ type InboundIntent struct {
HasExplicitMode bool
ModeSource ModeSource
StartsRun bool
+ ManualCompaction manualCompactionDirective
SubagentTypeName string
SubagentModelOverrides map[string]runtimecore.SubagentModelOverrideSelection
ConversationState *agentv1.ConversationStateStructure