Merge main into lane-live: adopt operator chat brokering alongside live run events
Combines this lane's "make every view live from the pushed run events" change (android + server run-event scope and frame identity) with main's operator chat brokering work (opencode endpoint adoption, protocol/settings/CLI chat support, operations reference). The two touch different files; git's ort strategy merged them cleanly with no conflict markers and nothing to resolve. Post-merge checks: go build/vet and go test ./... all pass; gradle --no-daemon testDebugUnitTest assembleDebug passes (558 tests, 0 failures).
This commit is contained in:
@@ -16,8 +16,12 @@ import "encoding/json"
|
||||
// brokered values match the service exactly; all list fields are optional so
|
||||
// older peers ignore them.
|
||||
const (
|
||||
ChatSessions = "chat_sessions"
|
||||
ChatCreate = "chat_create"
|
||||
ChatSessions = "chat_sessions"
|
||||
ChatCreate = "chat_create"
|
||||
// ChatAdopt records a session that already exists on the configured OpenCode
|
||||
// endpoint in the operator-session registry, using the endpoint's own
|
||||
// directory and title, so it appears in chat_sessions and can be continued.
|
||||
ChatAdopt = "chat_adopt"
|
||||
ChatPrompt = "chat_prompt"
|
||||
ChatMessages = "chat_messages"
|
||||
ChatInterrupt = "chat_interrupt"
|
||||
@@ -122,6 +126,14 @@ type ChatCreateRequest struct {
|
||||
Directory string `json:"directory,omitempty"`
|
||||
}
|
||||
|
||||
// ChatAdoptRequest is the chat_adopt request body: the id of a session that
|
||||
// already exists on the configured endpoint. The server records it in the
|
||||
// operator-session registry with the endpoint's own directory and title and
|
||||
// echoes the adopted session (and the registry list row) like chat_create.
|
||||
type ChatAdoptRequest struct {
|
||||
SessionID string `json:"session_id"`
|
||||
}
|
||||
|
||||
// ChatQuery is the session-scoped request body for chat_messages and
|
||||
// chat_interrupt, which name their target session through it; Limit caps the
|
||||
// returned history (server default when zero).
|
||||
|
||||
@@ -23,6 +23,7 @@ func chatSamples() []struct {
|
||||
}},
|
||||
{"session_busy", ChatSession{ID: "ses_2", Title: "held", Busy: true}},
|
||||
{"create", ChatCreateRequest{Title: "demo", Directory: "/work"}},
|
||||
{"adopt", ChatAdoptRequest{SessionID: "ses_1"}},
|
||||
{"query", ChatQuery{SessionID: "ses_1", Limit: 50}},
|
||||
{"prompt", ChatPromptRequest{SessionID: "ses_1", Text: "hello", Model: "m", Agent: "build", Files: []string{"file:///tmp/a.png"}}},
|
||||
{"message", ChatMessage{
|
||||
@@ -155,6 +156,7 @@ func TestChatEnvelopeRoundTrip(t *testing.T) {
|
||||
ChatSessions: []ChatSession{session},
|
||||
ChatSession: &session,
|
||||
ChatCreate: &ChatCreateRequest{Title: "new"},
|
||||
ChatAdopt: &ChatAdoptRequest{SessionID: "ses_1"},
|
||||
ChatQuery: &ChatQuery{SessionID: "ses_1", Limit: 10},
|
||||
ChatPrompt: &ChatPromptRequest{SessionID: "ses_1", Text: "hi"},
|
||||
ChatMessages: []ChatMessage{{ID: "msg_1", SessionID: "ses_1", Role: ChatRoleUser, Parts: []ChatPart{{Type: ChatPartText, Text: "hi"}}}},
|
||||
@@ -179,6 +181,7 @@ func TestChatEnvelopeRoundTrip(t *testing.T) {
|
||||
if !reflect.DeepEqual(decoded.ChatSessions, message.ChatSessions) ||
|
||||
!reflect.DeepEqual(decoded.ChatSession, message.ChatSession) ||
|
||||
!reflect.DeepEqual(decoded.ChatCreate, message.ChatCreate) ||
|
||||
!reflect.DeepEqual(decoded.ChatAdopt, message.ChatAdopt) ||
|
||||
!reflect.DeepEqual(decoded.ChatQuery, message.ChatQuery) ||
|
||||
!reflect.DeepEqual(decoded.ChatPrompt, message.ChatPrompt) ||
|
||||
!reflect.DeepEqual(decoded.ChatMessages, message.ChatMessages) ||
|
||||
@@ -195,7 +198,7 @@ func TestChatFieldsOmittedWhenUnused(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, absent := range []string{"chat_sessions", "chat_session", "chat_create", "chat_query", "chat_prompt", "chat_messages", "chat_event", "chat_permission", "chat_reply", "chat_directories"} {
|
||||
for _, absent := range []string{"chat_sessions", "chat_session", "chat_create", "chat_adopt", "chat_query", "chat_prompt", "chat_messages", "chat_event", "chat_permission", "chat_reply", "chat_directories"} {
|
||||
if strings.Contains(string(minimal), absent) {
|
||||
t.Fatalf("absent %q must be omitted: %s", absent, minimal)
|
||||
}
|
||||
|
||||
@@ -159,6 +159,7 @@ type Message struct {
|
||||
ChatSessions []ChatSession `json:"chat_sessions,omitempty"`
|
||||
ChatSession *ChatSession `json:"chat_session,omitempty"`
|
||||
ChatCreate *ChatCreateRequest `json:"chat_create,omitempty"`
|
||||
ChatAdopt *ChatAdoptRequest `json:"chat_adopt,omitempty"`
|
||||
ChatQuery *ChatQuery `json:"chat_query,omitempty"`
|
||||
ChatPrompt *ChatPromptRequest `json:"chat_prompt,omitempty"`
|
||||
ChatMessages []ChatMessage `json:"chat_messages,omitempty"`
|
||||
|
||||
Reference in New Issue
Block a user