Files
cc-connect/core/session.go
T
Leigh StillardandClaude Opus 4.6 647398f765 feat: multi-workspace mode — single bot, multiple workspaces per channel (#79)
* feat: add multi-workspace mode and base_dir config fields

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add WorkspaceBindingManager for channel-to-workspace persistence

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add workspacePool for managing per-workspace agent state

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add ChannelNameResolver interface and Slack implementation

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add multi-workspace fields, SetMultiWorkspace, and idle reaper to Engine

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add resolveWorkspace method for channel-to-directory mapping

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: wire multi-workspace mode setup in main.go

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add workspace init flow for cloning repos and binding channels

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add /workspace commands (init, unbind, list, status)

Add handleWorkspaceCommand with subcommands:
- (no args): show current workspace binding for the channel
- init <git-url>: clone repo and bind workspace to channel
- unbind: remove workspace binding from channel
- list: show all workspace bindings for the project

Only available when multi-workspace mode is enabled.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: wire multi-workspace routing into handleMessage with per-workspace agents

Add workspace resolution to handleMessage that resolves channels to workspace
directories, creates per-workspace agents with correct work_dir, and routes
messages through workspace-specific session managers. The normal (single-workspace)
code path is unchanged — all new logic is gated behind e.multiWorkspace.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* test: add integration tests for multi-workspace resolution

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: resolve multi-workspace bugs found during live testing

Three bugs fixed:

1. App mention events not handled - Slack sends `app_mention` events
   (not `message.channels`) when the bot is @mentioned. Added
   AppMentionEvent handler in the Slack platform.

2. Bot mention prefix not stripped - app_mention text includes
   `<@UBOTID> ` prefix, breaking command parsing and workspace
   resolution. Now stripped before passing to engine.

3. Slash command syntax incompatible with Slack - `/workspace` commands
   were being intercepted by Slack as slash commands. Changed all
   user-facing references and prefix detection to use `workspace`
   without the leading slash.

Also added debug logging to handleEvent for diagnosing event delivery.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: instruct agent to use Slack mrkdwn formatting

Add Slack formatting guidelines to the agent system prompt so responses
use Slack's mrkdwn syntax instead of standard Markdown (e.g. *bold*
instead of **bold**, no ## headings).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-12 19:38:58 +08:00

288 lines
7.1 KiB
Go

package core
import (
"encoding/json"
"fmt"
"log/slog"
"os"
"path/filepath"
"sync"
"time"
)
// Session tracks one conversation between a user and the agent.
type Session struct {
ID string `json:"id"`
Name string `json:"name"`
AgentSessionID string `json:"agent_session_id"`
History []HistoryEntry `json:"history"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
mu sync.Mutex `json:"-"`
busy bool `json:"-"`
}
func (s *Session) TryLock() bool {
s.mu.Lock()
defer s.mu.Unlock()
if s.busy {
return false
}
s.busy = true
return true
}
func (s *Session) Unlock() {
s.mu.Lock()
defer s.mu.Unlock()
s.busy = false
s.UpdatedAt = time.Now()
}
func (s *Session) AddHistory(role, content string) {
s.mu.Lock()
defer s.mu.Unlock()
s.History = append(s.History, HistoryEntry{
Role: role,
Content: content,
Timestamp: time.Now(),
})
}
func (s *Session) ClearHistory() {
s.mu.Lock()
defer s.mu.Unlock()
s.History = nil
}
// GetHistory returns the last n entries. If n <= 0, returns all.
func (s *Session) GetHistory(n int) []HistoryEntry {
s.mu.Lock()
defer s.mu.Unlock()
total := len(s.History)
if n <= 0 || n > total {
n = total
}
out := make([]HistoryEntry, n)
copy(out, s.History[total-n:])
return out
}
// sessionSnapshot is the JSON-serializable state of the SessionManager.
type sessionSnapshot struct {
Sessions map[string]*Session `json:"sessions"`
ActiveSession map[string]string `json:"active_session"`
UserSessions map[string][]string `json:"user_sessions"`
Counter int64 `json:"counter"`
SessionNames map[string]string `json:"session_names,omitempty"` // agent session ID → custom name
}
// SessionManager supports multiple named sessions per user with active-session tracking.
// It can persist state to a JSON file and reload on startup.
type SessionManager struct {
mu sync.RWMutex
sessions map[string]*Session
activeSession map[string]string
userSessions map[string][]string
sessionNames map[string]string // agent session ID → custom name
counter int64
storePath string // empty = no persistence
}
func NewSessionManager(storePath string) *SessionManager {
sm := &SessionManager{
sessions: make(map[string]*Session),
activeSession: make(map[string]string),
userSessions: make(map[string][]string),
sessionNames: make(map[string]string),
storePath: storePath,
}
if storePath != "" {
sm.load()
}
return sm
}
// StorePath returns the file path used for session persistence.
func (sm *SessionManager) StorePath() string {
return sm.storePath
}
func (sm *SessionManager) nextID() string {
sm.counter++
return fmt.Sprintf("s%d", sm.counter)
}
func (sm *SessionManager) GetOrCreateActive(userKey string) *Session {
sm.mu.Lock()
defer sm.mu.Unlock()
if sid, ok := sm.activeSession[userKey]; ok {
if s, ok := sm.sessions[sid]; ok {
return s
}
}
return sm.createLocked(userKey, "default")
}
func (sm *SessionManager) NewSession(userKey, name string) *Session {
sm.mu.Lock()
defer sm.mu.Unlock()
s := sm.createLocked(userKey, name)
sm.saveLocked()
return s
}
func (sm *SessionManager) createLocked(userKey, name string) *Session {
id := sm.nextID()
now := time.Now()
s := &Session{
ID: id,
Name: name,
CreatedAt: now,
UpdatedAt: now,
}
sm.sessions[id] = s
sm.activeSession[userKey] = id
sm.userSessions[userKey] = append(sm.userSessions[userKey], id)
return s
}
func (sm *SessionManager) SwitchSession(userKey, target string) (*Session, error) {
sm.mu.Lock()
defer sm.mu.Unlock()
for _, sid := range sm.userSessions[userKey] {
s := sm.sessions[sid]
if s != nil && (s.ID == target || s.Name == target) {
sm.activeSession[userKey] = s.ID
sm.saveLocked()
return s, nil
}
}
return nil, fmt.Errorf("session %q not found", target)
}
func (sm *SessionManager) ListSessions(userKey string) []*Session {
sm.mu.RLock()
defer sm.mu.RUnlock()
ids := sm.userSessions[userKey]
out := make([]*Session, 0, len(ids))
for _, sid := range ids {
if s, ok := sm.sessions[sid]; ok {
out = append(out, s)
}
}
return out
}
func (sm *SessionManager) ActiveSessionID(userKey string) string {
sm.mu.RLock()
defer sm.mu.RUnlock()
return sm.activeSession[userKey]
}
// SetSessionName sets a custom display name for an agent session.
func (sm *SessionManager) SetSessionName(agentSessionID, name string) {
sm.mu.Lock()
defer sm.mu.Unlock()
if name == "" {
delete(sm.sessionNames, agentSessionID)
} else {
sm.sessionNames[agentSessionID] = name
}
sm.saveLocked()
}
// GetSessionName returns the custom name for an agent session, or "".
func (sm *SessionManager) GetSessionName(agentSessionID string) string {
sm.mu.RLock()
defer sm.mu.RUnlock()
return sm.sessionNames[agentSessionID]
}
// Save persists current state to disk. Safe to call from outside (e.g. after message processing).
func (sm *SessionManager) Save() {
sm.mu.RLock()
defer sm.mu.RUnlock()
sm.saveLocked()
}
func (sm *SessionManager) saveLocked() {
if sm.storePath == "" {
return
}
// Build a deep-copy snapshot to avoid racing with concurrent Session mutations.
snapSessions := make(map[string]*Session, len(sm.sessions))
for id, s := range sm.sessions {
s.mu.Lock()
snapSessions[id] = &Session{
ID: s.ID,
Name: s.Name,
AgentSessionID: s.AgentSessionID,
History: append([]HistoryEntry(nil), s.History...),
CreatedAt: s.CreatedAt,
UpdatedAt: s.UpdatedAt,
}
s.mu.Unlock()
}
snap := sessionSnapshot{
Sessions: snapSessions,
ActiveSession: sm.activeSession,
UserSessions: sm.userSessions,
Counter: sm.counter,
SessionNames: sm.sessionNames,
}
data, err := json.MarshalIndent(snap, "", " ")
if err != nil {
slog.Error("session: failed to marshal", "error", err)
return
}
if err := os.MkdirAll(filepath.Dir(sm.storePath), 0o755); err != nil {
slog.Error("session: failed to create dir", "error", err)
return
}
if err := AtomicWriteFile(sm.storePath, data, 0o644); err != nil {
slog.Error("session: failed to write", "path", sm.storePath, "error", err)
}
}
func (sm *SessionManager) load() {
data, err := os.ReadFile(sm.storePath)
if err != nil {
if !os.IsNotExist(err) {
slog.Error("session: failed to read", "path", sm.storePath, "error", err)
}
return
}
var snap sessionSnapshot
if err := json.Unmarshal(data, &snap); err != nil {
slog.Error("session: failed to unmarshal", "path", sm.storePath, "error", err)
return
}
sm.sessions = snap.Sessions
sm.activeSession = snap.ActiveSession
sm.userSessions = snap.UserSessions
sm.sessionNames = snap.SessionNames
sm.counter = snap.Counter
if sm.sessions == nil {
sm.sessions = make(map[string]*Session)
}
if sm.activeSession == nil {
sm.activeSession = make(map[string]string)
}
if sm.userSessions == nil {
sm.userSessions = make(map[string][]string)
}
if sm.sessionNames == nil {
sm.sessionNames = make(map[string]string)
}
slog.Info("session: loaded from disk", "path", sm.storePath, "sessions", len(sm.sessions))
}