+
-
+
@@ -441,6 +460,7 @@
-
+
-
+
-
+
@@ -649,6 +681,7 @@ import ChannelBadge from '@/components/chat-list/channel-badge/index.vue'
const props = defineProps<{
botId: string
+ botType?: string
}>()
const { t } = useI18n()
@@ -656,6 +689,8 @@ const queryCache = useQueryCache()
const deletingRuleId = ref('')
const allowGuestDraft = ref(false)
+const isPersonalBot = computed(() => props.botType === 'personal')
+
type RuleSelection = {
userId: string
channelIdentityId: string
@@ -710,6 +745,16 @@ function bindSelectionWatchers(selection: RuleSelection) {
selection.sourceThreadId = ''
}
})
+ watch(() => selection.sourceConversationType, (value) => {
+ if (value === 'private') {
+ selection.observedConversationRouteId = ''
+ selection.sourceConversationId = ''
+ selection.sourceThreadId = ''
+ }
+ if (value !== 'thread') {
+ selection.sourceThreadId = ''
+ }
+ })
}
bindSelectionWatchers(whitelistSelection)
@@ -930,14 +975,23 @@ function buildSourceScope(selection: RuleSelection): AclSourceScope | undefined
function normalizePayload(selection: RuleSelection): AclUpsertRuleRequest | null {
const user_id = selection.userId.trim()
const channel_identity_id = selection.channelIdentityId.trim()
+ const sourceConversationType = selection.sourceConversationType.trim()
if ((user_id && channel_identity_id) || (!user_id && !channel_identity_id)) {
toast.error(t('bots.access.validation'))
return null
}
+ if (selection.sourceConversationId.trim() && !['group', 'thread'].includes(sourceConversationType)) {
+ toast.error(t('bots.access.validationConversationRequiresGroupOrThread'))
+ return null
+ }
if (selection.sourceThreadId.trim() && !selection.sourceConversationId.trim()) {
toast.error(t('bots.access.validationThreadRequiresConversation'))
return null
}
+ if (selection.sourceThreadId.trim() && sourceConversationType !== 'thread') {
+ toast.error(t('bots.access.validationThreadRequiresThreadType'))
+ return null
+ }
if ((selection.sourceConversationId.trim() || selection.sourceThreadId.trim()) && !selection.sourceChannel.trim()) {
toast.error(t('bots.access.validationConversationRequiresChannel'))
return null
@@ -1030,6 +1084,10 @@ function clearSourceScope(selection: RuleSelection) {
selection.sourceThreadId = ''
}
+function isObservedConversationLocked(selection: RuleSelection): boolean {
+ return !!selection.observedConversationRouteId
+}
+
function formatRuleLabel(item: AclRule): string {
if (item.subject_kind === 'user') {
return item.user_display_name || item.user_username || item.user_id || '-'
diff --git a/apps/web/src/pages/bots/detail.vue b/apps/web/src/pages/bots/detail.vue
index a39d5b00..75afe32b 100644
--- a/apps/web/src/pages/bots/detail.vue
+++ b/apps/web/src/pages/bots/detail.vue
@@ -91,6 +91,7 @@
/>
{{ statusLabel }}
+
{{ botTypeLabel }}
@@ -282,15 +283,15 @@ const tabList = computed(() => {
{ value: 'email', label: 'bots.tabs.email', component: BotEmail, params: { 'bot-id': bot_id } },
{ value: 'container', label: 'bots.tabs.container', component: BotContainer, params: {} },
{ value: 'terminal', label: 'bots.tabs.terminal', component: BotTerminal, params: { 'bot-id': bot_id } },
- { value: 'files', label: 'bots.tabs.files', component: BotFiles, params: { 'bot-id': bot_id } },
+ { value: 'files', label: 'bots.tabs.files', component: BotFiles, params: { 'bot-id': bot_id, 'bot-type': bot.value?.type } },
{ value: 'mcp', label: 'bots.tabs.mcp', component: BotMcp, params: { 'bot-id': bot_id } },
{ value: 'subagents', label: 'bots.tabs.subagents', component: BotSubagents, params: { 'bot-id': bot_id } },
{ value: 'heartbeat', label: 'bots.tabs.heartbeat', component: BotHeartbeat, params: { 'bot-id': bot_id } },
{ value: 'schedule', label: 'bots.tabs.schedule', component: BotSchedule, params: { 'bot-id': bot_id } },
{ value: 'history', label: 'bots.tabs.history', component: BotHistory, params: { 'bot-id': bot_id } },
{ value: 'skills', label: 'bots.tabs.skills', component: BotSkills, params: { 'bot-id': bot_id } },
- { value: 'access', label: 'bots.tabs.access', component: BotAccess, params: { 'bot-id': bot_id } },
- { value: 'settings', label: 'bots.tabs.settings', component: BotSettings, params: { 'bot-id': bot_id } }
+ { value: 'access', label: 'bots.tabs.access', component: BotAccess, params: { 'bot-id': bot_id, 'bot-type': bot.value?.type } },
+ { value: 'settings', label: 'bots.tabs.settings', component: BotSettings, params: { 'bot-id': bot_id, 'bot-type': bot.value?.type } }
]
})
@@ -368,6 +369,12 @@ const {
statusVariant,
} = useBotStatusMeta(bot, t)
+const botTypeLabel = computed(() => {
+ const type = bot.value?.type
+ if (type === 'personal' || type === 'public') return t('bots.types.' + type)
+ return type ?? ''
+})
+
const checks = ref
([])
const checksLoading = ref(false)
diff --git a/db/queries/messages.sql b/db/queries/messages.sql
index 92f67ba0..4433160d 100644
--- a/db/queries/messages.sql
+++ b/db/queries/messages.sql
@@ -164,23 +164,54 @@ DELETE FROM bot_history_messages
WHERE bot_id = sqlc.arg(bot_id);
-- name: ListObservedConversationsByChannelIdentity :many
+WITH observed_routes AS (
+ SELECT
+ (i.header->>'route_id')::uuid AS route_id,
+ MAX(i.created_at)::timestamptz AS last_observed_at
+ FROM bot_inbox i
+ WHERE i.bot_id = sqlc.arg(bot_id)
+ AND i.header->>'channel-identity-id' = sqlc.arg(channel_identity_id)::text
+ AND COALESCE(i.header->>'route_id', '') != ''
+ GROUP BY (i.header->>'route_id')::uuid
+
+ UNION ALL
+
+ SELECT
+ m.route_id,
+ MAX(m.created_at)::timestamptz AS last_observed_at
+ FROM bot_history_messages m
+ WHERE m.bot_id = sqlc.arg(bot_id)
+ AND m.sender_channel_identity_id = sqlc.arg(channel_identity_id)::uuid
+ AND m.route_id IS NOT NULL
+ GROUP BY m.route_id
+),
+ranked_routes AS (
+ SELECT
+ route_id,
+ MAX(last_observed_at)::timestamptz AS last_observed_at
+ FROM observed_routes
+ GROUP BY route_id
+)
SELECT
r.id AS route_id,
r.channel_type AS channel,
- COALESCE(r.conversation_type, '') AS conversation_type,
+ CASE
+ WHEN LOWER(COALESCE(r.conversation_type, '')) IN ('thread', 'topic') THEN 'thread'
+ ELSE 'group'
+ END AS conversation_type,
r.external_conversation_id AS conversation_id,
COALESCE(r.external_thread_id, '') AS thread_id,
COALESCE(r.metadata->>'conversation_name', '')::text AS conversation_name,
- MAX(m.created_at)::timestamptz AS last_observed_at
-FROM bot_history_messages m
-JOIN bot_channel_routes r ON r.id = m.route_id
-WHERE m.bot_id = sqlc.arg(bot_id)
- AND m.sender_channel_identity_id = sqlc.arg(channel_identity_id)
+ rr.last_observed_at
+FROM ranked_routes rr
+JOIN bot_channel_routes r ON r.id = rr.route_id
+WHERE LOWER(COALESCE(r.conversation_type, '')) NOT IN ('', 'p2p', 'private', 'direct', 'dm')
GROUP BY
r.id,
r.channel_type,
r.conversation_type,
r.external_conversation_id,
r.external_thread_id,
- r.metadata
-ORDER BY MAX(m.created_at) DESC;
+ r.metadata,
+ rr.last_observed_at
+ORDER BY rr.last_observed_at DESC;
diff --git a/internal/acl/service.go b/internal/acl/service.go
index 6a3af264..4d9ea291 100644
--- a/internal/acl/service.go
+++ b/internal/acl/service.go
@@ -199,13 +199,9 @@ func (s *Service) ListObservedConversationsByChannelIdentity(ctx context.Context
if err != nil {
return nil, err
}
- pgChannelIdentityID, err := db.ParseUUID(channelIdentityID)
- if err != nil {
- return nil, err
- }
rows, err := s.queries.ListObservedConversationsByChannelIdentity(ctx, sqlc.ListObservedConversationsByChannelIdentityParams{
BotID: pgBotID,
- ChannelIdentityID: pgChannelIdentityID,
+ ChannelIdentityID: strings.TrimSpace(channelIdentityID),
})
if err != nil {
return nil, err
diff --git a/internal/db/sqlc/messages.sql.go b/internal/db/sqlc/messages.sql.go
index fbc17415..20032e70 100644
--- a/internal/db/sqlc/messages.sql.go
+++ b/internal/db/sqlc/messages.sql.go
@@ -545,31 +545,62 @@ func (q *Queries) ListMessagesSince(ctx context.Context, arg ListMessagesSincePa
}
const listObservedConversationsByChannelIdentity = `-- name: ListObservedConversationsByChannelIdentity :many
+WITH observed_routes AS (
+ SELECT
+ (i.header->>'route_id')::uuid AS route_id,
+ MAX(i.created_at)::timestamptz AS last_observed_at
+ FROM bot_inbox i
+ WHERE i.bot_id = $1
+ AND i.header->>'channel-identity-id' = $2::text
+ AND COALESCE(i.header->>'route_id', '') != ''
+ GROUP BY (i.header->>'route_id')::uuid
+
+ UNION ALL
+
+ SELECT
+ m.route_id,
+ MAX(m.created_at)::timestamptz AS last_observed_at
+ FROM bot_history_messages m
+ WHERE m.bot_id = $1
+ AND m.sender_channel_identity_id = $2::uuid
+ AND m.route_id IS NOT NULL
+ GROUP BY m.route_id
+),
+ranked_routes AS (
+ SELECT
+ route_id,
+ MAX(last_observed_at)::timestamptz AS last_observed_at
+ FROM observed_routes
+ GROUP BY route_id
+)
SELECT
r.id AS route_id,
r.channel_type AS channel,
- COALESCE(r.conversation_type, '') AS conversation_type,
+ CASE
+ WHEN LOWER(COALESCE(r.conversation_type, '')) IN ('thread', 'topic') THEN 'thread'
+ ELSE 'group'
+ END AS conversation_type,
r.external_conversation_id AS conversation_id,
COALESCE(r.external_thread_id, '') AS thread_id,
COALESCE(r.metadata->>'conversation_name', '')::text AS conversation_name,
- MAX(m.created_at)::timestamptz AS last_observed_at
-FROM bot_history_messages m
-JOIN bot_channel_routes r ON r.id = m.route_id
-WHERE m.bot_id = $1
- AND m.sender_channel_identity_id = $2
+ rr.last_observed_at
+FROM ranked_routes rr
+JOIN bot_channel_routes r ON r.id = rr.route_id
+WHERE LOWER(COALESCE(r.conversation_type, '')) NOT IN ('', 'p2p', 'private', 'direct', 'dm')
GROUP BY
r.id,
r.channel_type,
r.conversation_type,
r.external_conversation_id,
r.external_thread_id,
- r.metadata
-ORDER BY MAX(m.created_at) DESC
+ r.metadata,
+ rr.last_observed_at
+ORDER BY rr.last_observed_at DESC
`
type ListObservedConversationsByChannelIdentityParams struct {
BotID pgtype.UUID `json:"bot_id"`
- ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
+ ChannelIdentityID string `json:"channel_identity_id"`
}
type ListObservedConversationsByChannelIdentityRow struct {
diff --git a/packages/agent/src/types/agent.ts b/packages/agent/src/types/agent.ts
index 6eca5a2f..d6fb1da8 100644
--- a/packages/agent/src/types/agent.ts
+++ b/packages/agent/src/types/agent.ts
@@ -5,9 +5,9 @@ import { MCPConnection } from './mcp'
export interface IdentityContext {
botId: string
- containerId: string
- channelIdentityId: string
- displayName: string
+ containerId?: string
+ channelIdentityId?: string
+ displayName?: string
currentPlatform?: string
replyTarget?: string
conversationType?: string