mirror of
https://github.com/multica-ai/multica.git
synced 2026-07-26 20:45:37 +02:00
* feat(slack): Socket Mode channel.Channel adapter (MUL-3516) First slice of the Slack adapter: implements channel.Channel (Type/Connect/Disconnect/Send/Capabilities) over Slack Socket Mode, normalizes inbound events to channel.InboundMessage (DM, channel @mention, thread reply; bot-loop + edit/delete guards), decodes the per-installation config/secret blob, and registers the Factory under TypeSlack. No engine, core, or channel_* schema change. Unit-tested (translation, capabilities, config decode, chunking, Send via httptest). Resolvers + engine wiring + Block Kit binding replier follow. Co-authored-by: multica-agent <github@multica.ai> * fix(slack): address adapter review (MUL-3516) - Propagate InboundHandler errors through dispatchEventsAPI/handleSocketEvent to Connect so an infra failure tears down the connection for Supervisor reconnect/backoff instead of being silently swallowed (ACK still happens first). - Capabilities: declare only CapText | CapThreadReply; drop CapRichCard/CapAttachment/CapMessageEdit until those Send paths are wired. - slackChatType: map mpim (multi-party DM) to group, not p2p, so the 'must address bot' filter applies; only 1:1 im is p2p. - Document the group-addressing decision: explicit @bot mention required in groups; mention-free thread continuation deferred to the session-aware layer. - Tests: handler-error propagation, slackChatType table, mpim-requires-mention, capabilities negative assertions. Co-authored-by: multica-agent <github@multica.ai> * refactor(channel): shared channel-agnostic ChatSession service (MUL-3516) Extract the session/append//issue machinery — currently locked inside the Feishu-pinned lark.chatSessionService — into a shared engine.ChatSession parameterized by channel_type + session titles, so every IM adapter reuses it instead of re-implementing it. Logic is verbatim (find-or-create session+binding with unique-violation race re-read; append+touch+reply-target+in-tx dedup Mark; /issue parse with bare-command previous-message fallback) but channel-neutral: command-parse source is supplied by the adapter (enrichment is platform-specific). Backed by a narrow SessionQueries interface so it is unit-tested with an in-memory fake (no DB). /issue parser moved to engine.ParseIssueCommand. Next: migrate Feishu onto it and wire Slack's ResolverSet, removing the lark duplicate. Co-authored-by: multica-agent <github@multica.ai> * fix(channel): decouple session binding key from outbound target (MUL-3516) Addresses Elon's round-2 review. engine.ChatSession.EnsureSession previously keyed the binding on a raw chat id (EnsureSessionInput.ChatID), so a resolver wiring Slack straight through would collapse every @bot thread in one channel into a single chat_session and overwrite last_thread_id. Make the API un-misusable: - EnsureSessionInput.ChatID -> BindingKey: the explicit session-isolation key (Feishu: chat id; Slack DM: channel id; Slack channel: channel id + thread root), documented so a raw threaded-platform chat id is never passed straight through. - Add EnsureSessionInput.BindingConfig (opaque) persisted on the binding's config column, so the real outbound channel/thread is preserved when BindingKey is composite — outbound routing stays separate from the isolation key. - channel.sql CreateChannelChatSessionBinding now writes config (additive, uses the existing NOT NULL column; lark caller passes '{}', no schema change, no Feishu regression). - Tests: TestEnsureSession_ThreadRootIsolation (two thread roots in one channel -> two sessions; same root reuses) and TestEnsureSession_StoresBindingConfig. No production wiring change yet (per review, the not-yet-wired shared service is an accepted preparatory state); this makes the API correct before Feishu/Slack are migrated onto it. Co-authored-by: multica-agent <github@multica.ai> * feat(slack): Slack ResolverSet with thread-root session isolation (MUL-3516) Wires Slack into the channel-agnostic engine.Router via a ResolverSet built on the generic channel_* queries (installation route by team_id, identity + workspace-membership recheck, two-phase dedup, audit) plus the shared engine.ChatSession. No new query, no schema change. slackSessionRouting is the per-message isolation rule (Elon round-2 / Niko round-3): a DM is one session per channel; a channel/group message is isolated by thread root (key = channel:threadRoot, root = inbound thread_ts or the message ts for a top-level @mention), so two @bot threads in one channel are two sessions. The real channel id rides in BindingConfig for outbound; the reply thread is returned separately. Tests cover DM/channel/thread routing, config, and that distinct thread roots isolate while a same-thread follow-up reuses its key. Not yet wired into router.go (still a preparatory commit, per review); Feishu migration onto the shared service, router/config wiring, and the Slack outbound path follow. Co-authored-by: multica-agent <github@multica.ai> * feat(slack): Markdown->mrkdwn outbound formatting (MUL-3516) Slack renders mrkdwn, not Markdown, so an unconverted agent reply shows literal ** , ## and [text](url). Add formatMrkdwn — a faithful Go port of Hermes Agent's slack format_message (MIT) — and apply it in slackChannel.Send before chunking/posting. Protects fenced+inline code, converted links, and existing Slack entities behind placeholders; converts headers/bold/italic/strike/links; escapes control chars. Unit tests cover each construct plus fenced-code protection and a link nested in bold. Co-authored-by: multica-agent <github@multica.ai> * docs(slack): preserve Hermes MIT notice for ported mrkdwn converter (MUL-3516) Addresses Niko's review. formatMrkdwn is a substantial port of Hermes Agent's slack format_message; MIT requires preserving the copyright + permission notice. Add the full Hermes MIT copyright/permission notice + source URL as a header on mrkdwn.go (no repo-level third-party notice file exists, and the header cannot get separated from the ported code). Also add the suggested Send-layer regression test (TestSend_AppliesMrkdwn) that pins the wiring: slackChannel.Send converts Markdown to mrkdwn before posting. Co-authored-by: multica-agent <github@multica.ai> * refactor(lark): migrate Feishu onto shared engine.ChatSession, drop duplicate (MUL-3516) Completes 'every IM reuses one shared session service' and removes the dual-path the reviewers flagged as temporary. Feishu's ResolverSet now drives the channel-agnostic engine.ChatSession (channel_type=feishu, Lark session titles preserved) instead of the Feishu-specific lark.chatSessionService, which is deleted. Behavior is unchanged: engine.ChatSession is the verbatim port of the old logic and is unit-tested; the new Feishu binder param-mapping (BindingKey=chat id, CommandText=un-enriched CommandBody from Raw) is covered by feishu_resolvers_test.go. - Delete chat_service.go (chatSessionService + helpers) and issue_command.go/_test.go (parser now engine.ParseIssueCommand). Relocate the shared TxStarter interface to tx.go (still used by binding-token + registration services). - chat.go keeps only the AuditLogger seam; remove the now-dead ChatSessionService / EnsureChatSessionParams / AppendUserMessageParams / AppendResult / IssueCommand types. - router.go constructs engine.NewChatSession for Feishu; inbound_enricher_test + doc.go updated. make-test parity: go build ./..., go vet, gofmt, and go test ./internal/integrations/{lark,channel/...,slack} all pass (full Feishu suite green). Co-authored-by: multica-agent <github@multica.ai> * feat(slack): wire Slack adapter + ResolverSet + outbound into router (MUL-3516) Activates the full Slack pipeline, gated by MULTICA_SLACK_SECRET_KEY (the bot/app-token decryption key). When unset the block is skipped, so existing deployments are unaffected and Feishu is untouched. - router.go registers slack.RegisterSlack (Socket Mode connect/send Factory) + channelRouter.Register(TypeSlack, NewSlackResolverSet) (inbound pipeline) + slack.NewOutbound(...).Register(bus) (outbound). - New slack/outbound.go: an EventChatDone subscriber mirroring the Feishu Patcher. It finds the Slack chat binding for the finished session, recovers the real channel from the binding config (the channel_chat_id may be a composite thread-isolation key) + the reply thread from last_thread_id, and posts via slackChannel.Send (reusing formatMrkdwn / chunking / threading). Sessions with no Slack binding are ignored, so it coexists with the Feishu Patcher on the shared bus. - Tests: posts to the bound channel/thread with the real channel id; ignores non-Slack sessions, empty completions, revoked installations, and non-chat events. Slack now shares engine.ChatSession, channel_* tables, IssueService and TaskService with Feishu. Remaining: config-driven installation provisioning (an operator currently creates the channel_type='slack' row; the config block shape — which workspace/agent — is a product decision) and a live end-to-end smoke. go build ./..., go vet, gofmt, and go test ./internal/integrations/{slack,channel/...,lark} all pass. Co-authored-by: multica-agent <github@multica.ai> --------- Co-authored-by: J <j@multica.ai> Co-authored-by: multica-agent <github@multica.ai>
149 lines
4.5 KiB
Go
149 lines
4.5 KiB
Go
package slack
|
|
|
|
import (
|
|
"context"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/jackc/pgx/v5"
|
|
"github.com/jackc/pgx/v5/pgtype"
|
|
|
|
"github.com/multica-ai/multica/server/internal/events"
|
|
"github.com/multica-ai/multica/server/internal/integrations/channel"
|
|
db "github.com/multica-ai/multica/server/pkg/db/generated"
|
|
"github.com/multica-ai/multica/server/pkg/protocol"
|
|
)
|
|
|
|
func uid(b byte) pgtype.UUID {
|
|
var u pgtype.UUID
|
|
u.Bytes[0] = b
|
|
u.Valid = true
|
|
return u
|
|
}
|
|
|
|
type fakeOutboundQueries struct {
|
|
binding db.ChannelChatSessionBinding
|
|
bindingErr error
|
|
inst db.ChannelInstallation
|
|
instErr error
|
|
}
|
|
|
|
func (f *fakeOutboundQueries) GetChannelChatSessionBindingBySession(context.Context, db.GetChannelChatSessionBindingBySessionParams) (db.ChannelChatSessionBinding, error) {
|
|
return f.binding, f.bindingErr
|
|
}
|
|
|
|
func (f *fakeOutboundQueries) GetChannelInstallation(context.Context, db.GetChannelInstallationParams) (db.ChannelInstallation, error) {
|
|
return f.inst, f.instErr
|
|
}
|
|
|
|
type fakeSender struct {
|
|
called int
|
|
got channel.OutboundMessage
|
|
}
|
|
|
|
func (f *fakeSender) Send(_ context.Context, out channel.OutboundMessage) (channel.SendResult, error) {
|
|
f.called++
|
|
f.got = out
|
|
return channel.SendResult{MessageID: "1.1"}, nil
|
|
}
|
|
|
|
// slackInstallConfigJSON builds an installation config blob with base64 tokens
|
|
// (a nil Decrypter treats the decoded bytes as plaintext).
|
|
func slackInstallConfigJSON() []byte {
|
|
b, _ := json.Marshal(map[string]string{
|
|
"app_id": "T1",
|
|
"bot_user_id": "UBOT",
|
|
"bot_token_encrypted": base64.StdEncoding.EncodeToString([]byte("xoxb-test")),
|
|
"app_token_encrypted": base64.StdEncoding.EncodeToString([]byte("xapp-test")),
|
|
})
|
|
return b
|
|
}
|
|
|
|
func newTestOutbound(q outboundQueries, fs *fakeSender) *Outbound {
|
|
o := NewOutbound(q, nil, nil)
|
|
o.newSender = func(credentials) replySender { return fs }
|
|
return o
|
|
}
|
|
|
|
func chatDoneEvent(sessionID string, content string) events.Event {
|
|
return events.Event{
|
|
Type: protocol.EventChatDone,
|
|
ChatSessionID: sessionID,
|
|
Payload: protocol.ChatDonePayload{Content: content},
|
|
}
|
|
}
|
|
|
|
func TestOutbound_PostsReplyToBoundSlackChannel(t *testing.T) {
|
|
q := &fakeOutboundQueries{
|
|
// Composite isolation key; real channel + reply thread come from config /
|
|
// last_thread_id.
|
|
binding: db.ChannelChatSessionBinding{
|
|
InstallationID: uid(1),
|
|
ChannelChatID: "C123:1111.0",
|
|
Config: []byte(`{"channel_id":"C123"}`),
|
|
LastThreadID: pgtype.Text{String: "1111.0", Valid: true},
|
|
},
|
|
inst: db.ChannelInstallation{ID: uid(1), Status: "active", Config: slackInstallConfigJSON()},
|
|
}
|
|
fs := &fakeSender{}
|
|
o := newTestOutbound(q, fs)
|
|
|
|
o.handleEvent(chatDoneEvent("00000000-0000-0000-0000-000000000001", "**all done**"))
|
|
|
|
if fs.called != 1 {
|
|
t.Fatalf("sender called %d times, want 1", fs.called)
|
|
}
|
|
if fs.got.ChatID != "C123" {
|
|
t.Errorf("ChatID = %q, want the real channel from config (not the composite key)", fs.got.ChatID)
|
|
}
|
|
if fs.got.ThreadID != "1111.0" {
|
|
t.Errorf("ThreadID = %q, want the recorded reply thread", fs.got.ThreadID)
|
|
}
|
|
if fs.got.Text != "**all done**" {
|
|
t.Errorf("Text = %q, want the raw content (Send applies mrkdwn)", fs.got.Text)
|
|
}
|
|
}
|
|
|
|
func TestOutbound_IgnoresNonSlackAndEmptyAndRevoked(t *testing.T) {
|
|
const sid = "00000000-0000-0000-0000-000000000001"
|
|
activeInst := db.ChannelInstallation{ID: uid(1), Status: "active", Config: slackInstallConfigJSON()}
|
|
boundBinding := db.ChannelChatSessionBinding{InstallationID: uid(1), ChannelChatID: "C1", Config: []byte(`{"channel_id":"C1"}`)}
|
|
|
|
cases := []struct {
|
|
name string
|
|
q *fakeOutboundQueries
|
|
evt events.Event
|
|
}{
|
|
{
|
|
name: "no slack binding (Feishu / web session)",
|
|
q: &fakeOutboundQueries{bindingErr: pgx.ErrNoRows},
|
|
evt: chatDoneEvent(sid, "hi"),
|
|
},
|
|
{
|
|
name: "empty completion content",
|
|
q: &fakeOutboundQueries{binding: boundBinding, inst: activeInst},
|
|
evt: chatDoneEvent(sid, ""),
|
|
},
|
|
{
|
|
name: "revoked installation",
|
|
q: &fakeOutboundQueries{binding: boundBinding, inst: db.ChannelInstallation{ID: uid(1), Status: "revoked", Config: slackInstallConfigJSON()}},
|
|
evt: chatDoneEvent(sid, "hi"),
|
|
},
|
|
{
|
|
name: "non-chat event (no session id)",
|
|
q: &fakeOutboundQueries{},
|
|
evt: chatDoneEvent("", "hi"),
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
fs := &fakeSender{}
|
|
newTestOutbound(tc.q, fs).handleEvent(tc.evt)
|
|
if fs.called != 0 {
|
|
t.Errorf("%s: sender must not be called, got %d", tc.name, fs.called)
|
|
}
|
|
})
|
|
}
|
|
}
|