feat: conversation context actions — session fork, ephemeral side chat, reply annotations #347
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "session_id": "2026-08-17-a1b2c3d4e5f6", | ||
| "title": "Source title" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,225 @@ | ||
| package daemon | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "net/http" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/Kocoro-lab/ShanClaw/internal/agents" | ||
| "github.com/Kocoro-lab/ShanClaw/internal/client" | ||
| "github.com/Kocoro-lab/ShanClaw/internal/session" | ||
| ) | ||
|
|
||
| const maxSideChatHistoryMessages = 100 | ||
|
There was a problem hiding this comment.
This new AGENTS.md reference: AGENTS.md:L31-L34 Useful? React with 👍 / 👎. |
||
|
|
||
| type forkSessionRequest struct { | ||
| Agent string `json:"agent,omitempty"` | ||
| TargetAgent *string `json:"target_agent,omitempty"` | ||
| MessageIndex int `json:"message_index"` | ||
| } | ||
|
|
||
| type forkSessionResponse struct { | ||
| SessionID string `json:"session_id"` | ||
| Title string `json:"title"` | ||
| } | ||
|
|
||
| type sideChatHistoryMessage struct { | ||
| Role string `json:"role"` | ||
| Content string `json:"content"` | ||
| } | ||
|
|
||
| type sideChatRequest struct { | ||
| Agent string `json:"agent,omitempty"` | ||
| MessageIndex int `json:"message_index"` | ||
| Text string `json:"text"` | ||
| History []sideChatHistoryMessage `json:"history,omitempty"` | ||
| } | ||
|
|
||
| func (s *Server) handleForkSession(w http.ResponseWriter, r *http.Request) { | ||
| if s.deps == nil || s.deps.SessionCache == nil { | ||
| writeError(w, http.StatusInternalServerError, "daemon deps not configured") | ||
| return | ||
| } | ||
| id, body, ok := s.decodeConversationContextRequest(w, r) | ||
| if !ok { | ||
| return | ||
| } | ||
| sourceManager := s.deps.SessionCache.GetOrCreateManager(s.deps.SessionCache.SessionsDir(body.Agent)) | ||
| targetAgent := body.Agent | ||
| if body.TargetAgent != nil { | ||
| targetAgent = *body.TargetAgent | ||
| } | ||
| // GetOrCreateManager creates the target session directory, so a typo'd | ||
| // agent would silently file the fork where no UI ever lists it. | ||
| if !s.conversationAgentExists(targetAgent) { | ||
| writeErrorCode(w, http.StatusBadRequest, "agent_not_found", | ||
| fmt.Sprintf("agent not found: %s", targetAgent)) | ||
| return | ||
| } | ||
| targetManager := s.deps.SessionCache.GetOrCreateManager(s.deps.SessionCache.SessionsDir(targetAgent)) | ||
| fork, err := sourceManager.ForkSessionInto(id, body.MessageIndex, targetManager) | ||
| if err != nil { | ||
| writeConversationContextError(w, id, err) | ||
| return | ||
| } | ||
| writeJSON(w, http.StatusCreated, forkSessionResponse{SessionID: fork.ID, Title: fork.Title}) | ||
| } | ||
|
|
||
| func (s *Server) handleSideChat(w http.ResponseWriter, r *http.Request) { | ||
| if s.deps == nil || s.deps.SessionCache == nil { | ||
| writeError(w, http.StatusInternalServerError, "daemon deps not configured") | ||
| return | ||
| } | ||
| id := r.PathValue("id") | ||
| if err := ValidateSessionID(id); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| var body sideChatRequest | ||
| if !decodeBody(w, r, &body) { | ||
| return | ||
| } | ||
| if body.Agent == "default" { | ||
| body.Agent = "" | ||
| } | ||
| if body.Agent != "" { | ||
| if err := agents.ValidateAgentName(body.Agent); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| } | ||
| // The ephemeral run executes AS this agent; failing here beats a late | ||
| // "agent not found" 500 out of RunAgent. | ||
| if !s.conversationAgentExists(body.Agent) { | ||
| writeErrorCode(w, http.StatusBadRequest, "agent_not_found", | ||
| fmt.Sprintf("agent not found: %s", body.Agent)) | ||
| return | ||
| } | ||
| if strings.TrimSpace(body.Text) == "" { | ||
| writeError(w, http.StatusBadRequest, "text is required") | ||
| return | ||
| } | ||
| if len(body.History) > maxSideChatHistoryMessages { | ||
| writeError(w, http.StatusBadRequest, "side chat history is too long") | ||
| return | ||
| } | ||
| mgr := s.deps.SessionCache.GetOrCreateManager(s.deps.SessionCache.SessionsDir(body.Agent)) | ||
| source, err := mgr.Load(id) | ||
| if err != nil { | ||
| writeConversationContextError(w, id, err) | ||
| return | ||
| } | ||
| index := body.MessageIndex | ||
| if index == 0 { | ||
| index = len(source.Messages) | ||
| } | ||
| history, err := mgr.CopyHistoryThrough(id, index) | ||
| if err != nil { | ||
| writeConversationContextError(w, id, err) | ||
| return | ||
| } | ||
| for _, item := range body.History { | ||
| role := strings.TrimSpace(item.Role) | ||
| content := strings.TrimSpace(item.Content) | ||
| if (role != "user" && role != "assistant") || content == "" { | ||
| writeError(w, http.StatusBadRequest, "side chat history must contain non-empty user/assistant messages") | ||
| return | ||
| } | ||
| history = append(history, client.Message{Role: role, Content: client.NewTextContent(content)}) | ||
| } | ||
| // Side chats run with the normal tool registry and permission engine — | ||
| // identical capability to the primary conversation, only the lifecycle is | ||
| // ephemeral. Approvals flow over the per-request SSE stream like any | ||
| // /message run. | ||
| req := RunAgentRequest{ | ||
| Text: body.Text, | ||
| Agent: body.Agent, | ||
| Source: "desktop", | ||
| CWD: source.CWD, | ||
| ProjectID: source.ProjectID, | ||
| NewSession: true, | ||
| Ephemeral: true, | ||
| BypassRouting: true, | ||
| SessionHistory: history, | ||
| SuppressBusEvents: true, | ||
| StickyContext: "This is a temporary side conversation branched from the primary conversation; its transcript is not saved. You have your normal tools — use them when they help answer. Do not modify or claim to modify the primary conversation itself.", | ||
| } | ||
| if err := req.Validate(); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| if strings.Contains(r.Header.Get("Accept"), "text/event-stream") { | ||
| s.handleMessageSSE(w, r, req) | ||
| return | ||
| } | ||
| handler := &httpEventHandler{} | ||
| result, err := RunAgent(r.Context(), s.deps, req, handler) | ||
| if err != nil { | ||
| writeError(w, http.StatusInternalServerError, err.Error()) | ||
| return | ||
| } | ||
| writeJSON(w, http.StatusOK, result) | ||
| } | ||
|
|
||
| func (s *Server) decodeConversationContextRequest(w http.ResponseWriter, r *http.Request) (string, forkSessionRequest, bool) { | ||
| id := r.PathValue("id") | ||
| if err := ValidateSessionID(id); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return "", forkSessionRequest{}, false | ||
| } | ||
| var body forkSessionRequest | ||
| if !decodeBody(w, r, &body) { | ||
| return "", forkSessionRequest{}, false | ||
| } | ||
| if body.Agent == "default" { | ||
| body.Agent = "" | ||
| } | ||
| if body.Agent != "" { | ||
| if err := agents.ValidateAgentName(body.Agent); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return "", forkSessionRequest{}, false | ||
| } | ||
| } | ||
| if body.TargetAgent != nil { | ||
| target := *body.TargetAgent | ||
| if target == "default" { | ||
| target = "" | ||
| } | ||
| if target != "" { | ||
| if err := agents.ValidateAgentName(target); err != nil { | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| return "", forkSessionRequest{}, false | ||
| } | ||
| } | ||
| body.TargetAgent = &target | ||
| } | ||
| return id, body, true | ||
| } | ||
|
|
||
| // conversationAgentExists reports whether a named agent is defined (user dir | ||
| // or _builtin fallback, mirroring agents.LoadAgent's resolution). The empty | ||
| // name is the default agent, which always exists. | ||
| func (s *Server) conversationAgentExists(name string) bool { | ||
| if name == "" { | ||
| return true | ||
| } | ||
| if _, err := os.Stat(filepath.Join(s.deps.AgentsDir, name, "AGENT.md")); err == nil { | ||
| return true | ||
| } | ||
| _, err := os.Stat(filepath.Join(s.deps.AgentsDir, "_builtin", name, "AGENT.md")) | ||
| return err == nil | ||
| } | ||
|
|
||
| func writeConversationContextError(w http.ResponseWriter, id string, err error) { | ||
| switch { | ||
| case errors.Is(err, os.ErrNotExist): | ||
| writeError(w, http.StatusNotFound, fmt.Sprintf("session %q not found", id)) | ||
| case errors.Is(err, session.ErrMessageIndexOutOfRange), errors.Is(err, session.ErrIncompleteTurnBoundary): | ||
| writeError(w, http.StatusBadRequest, err.Error()) | ||
| default: | ||
| writeError(w, http.StatusInternalServerError, err.Error()) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This wire-contract index says the tests exercise a tool-free side-chat contract, but
handleSideChatdeliberately retains the normal registry andTestSideChatSSEEmitsApprovalRequestAndRunsToolproves an approval-requiring tool executes. Describing the endpoint as tool-free gives maintainers and Desktop consumers the opposite safety semantics; update this entry to say tool-enabled with the normal permission and approval flow.Useful? React with 👍 / 👎.